权限 代理
This commit is contained in:
parent
3d55e06dae
commit
734df77aad
|
@ -4,16 +4,21 @@ import com.alibaba.fastjson2.JSON;
|
|||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.business.domain.BusAiInfo;
|
||||
import com.ruoyi.business.domain.BusOrderInfo;
|
||||
import com.ruoyi.business.domain.SysCookie;
|
||||
import com.ruoyi.business.service.IAiService;
|
||||
import com.ruoyi.business.service.IBusAiInfoService;
|
||||
import com.ruoyi.business.service.IBusOrderInfoService;
|
||||
import com.ruoyi.business.service.IMeituanService;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.utils.HttpClientUtilT;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
|
@ -27,10 +32,31 @@ public class AiController {
|
|||
@Autowired
|
||||
private IAiService aiService;
|
||||
|
||||
@Autowired
|
||||
private IBusOrderInfoService orderInfoService;
|
||||
|
||||
@GetMapping(value = "/addAiTask")
|
||||
public R addAiTask(String phoneNum, String virtualPhone)
|
||||
public R addAiTask(String phoneNum, String virtualPhone) throws Exception
|
||||
{
|
||||
return aiService.addAiTask(phoneNum, virtualPhone);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
||||
String[] phone = {"14745230752,0269","14743647579,5126","14743668724,5124"};
|
||||
|
||||
// ,"15710735021,0938","15702041692,5116","14745230954,7539","18688423029,4964"
|
||||
// ,"14743659441,5088","14750080943,8848","14745230804,5906"
|
||||
for (String ss :phone){
|
||||
String[] ph = ss.split(",");
|
||||
aiService.addAiTask("外卖商户","客户",ph[0], ph[1]);
|
||||
}
|
||||
|
||||
// List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoList(orderInfo);
|
||||
// List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoList(orderInfo); //
|
||||
// for (BusOrderInfo busOrderInfo : list) {
|
||||
// if (new Date().getTime() >= sdf.parse(busOrderInfo.getCompleteTime()).getTime()+60000){
|
||||
// aiService.addAiTask("","客户",ph[0], ph[1]);
|
||||
// }
|
||||
// }
|
||||
// return aiService.addAiTask(phoneNum, virtualPhone);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping(value = "/appendAiTask")
|
||||
|
|
|
@ -6,7 +6,11 @@ import javax.servlet.http.HttpServletResponse;
|
|||
|
||||
import com.ruoyi.business.domain.BusIntegralRecord;
|
||||
import com.ruoyi.business.service.IBusIntegralRecordService;
|
||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.system.service.ISysDeptService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import io.swagger.models.auth.In;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
|
@ -42,14 +46,12 @@ public class BusAgentInfoController extends BaseController
|
|||
@Autowired
|
||||
private IBusAgentInfoService busAgentInfoService;
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
@Autowired
|
||||
private IBusIntegralRecordService recordService;
|
||||
|
||||
/**
|
||||
* 查询代理管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusAgentInfo busAgentInfo)
|
||||
{
|
||||
|
@ -84,18 +86,14 @@ public class BusAgentInfoController extends BaseController
|
|||
/**
|
||||
* 新增代理管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:info:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:info:add')")
|
||||
@Log(title = "代理管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BusAgentInfo busAgentInfo)
|
||||
{
|
||||
SysUser user = new SysUser();
|
||||
user.setUserName(busAgentInfo.getAgentAccount());
|
||||
user.setNickName(busAgentInfo.getAgentName());
|
||||
user.setPassword(busAgentInfo.getPassword());
|
||||
user.setPhonenumber(busAgentInfo.getPhoneNumber());
|
||||
userService.insertUser(user);
|
||||
return toAjax(busAgentInfoService.insertBusAgentInfo(busAgentInfo));
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
// 1级代理角色对应部门 insertList
|
||||
return toAjax(busAgentInfoService.insertAgentInfo(loginUser,busAgentInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -41,7 +41,7 @@ public class BusAgentIntegralController extends BaseController
|
|||
/**
|
||||
* 查询代理管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusAgentInfo busAgentInfo)
|
||||
{
|
||||
|
@ -76,7 +76,7 @@ public class BusAgentIntegralController extends BaseController
|
|||
/**
|
||||
* 新增代理管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:info:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:info:add')")
|
||||
@Log(title = "代理管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BusAgentInfo busAgentInfo)
|
||||
|
|
|
@ -37,7 +37,7 @@ public class BusBanOperateController extends BaseController
|
|||
/**
|
||||
* 查询免运营订单信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:info:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusBanOperateInfo busBanOperateInfo)
|
||||
{
|
||||
|
|
|
@ -37,7 +37,7 @@ public class BusIntegralConsumeController extends BaseController
|
|||
/**
|
||||
* 查询积分变更记录列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:consume:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:consume:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusIntegralRecord busIntegralRecord)
|
||||
{
|
||||
|
@ -50,7 +50,7 @@ public class BusIntegralConsumeController extends BaseController
|
|||
/**
|
||||
* 新增积分变更记录
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:record:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:record:add')")
|
||||
@Log(title = "积分变更记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BusIntegralRecord busIntegralRecord)
|
||||
|
|
|
@ -37,7 +37,7 @@ public class BusIntegralRecordController extends BaseController
|
|||
/**
|
||||
* 查询积分变更记录列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:record:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:record:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusIntegralRecord busIntegralRecord)
|
||||
{
|
||||
|
|
|
@ -37,7 +37,7 @@ public class BusReturnVisitInfoController extends BaseController
|
|||
/**
|
||||
* 查询回访数据列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('business:visit:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:visit:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusReturnVisitInfo busReturnVisitInfo)
|
||||
{
|
||||
|
|
|
@ -50,7 +50,7 @@ public class BusSaleInfoController extends BaseController
|
|||
/**
|
||||
* 查询店铺归属-销售人员统计列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('business:sale:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:sale:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusSaleInfo busSaleInfo)
|
||||
{
|
||||
|
@ -82,7 +82,7 @@ public class BusSaleInfoController extends BaseController
|
|||
// return getDataTable(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('business:sale:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:sale:list')")
|
||||
@GetMapping("/listA")
|
||||
public AjaxResult listA(BusSaleInfo busSaleInfo)
|
||||
{
|
||||
|
@ -115,7 +115,7 @@ public class BusSaleInfoController extends BaseController
|
|||
/**
|
||||
* 新增店铺归属-销售人员统计
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('business:sale:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:sale:add')")
|
||||
@Log(title = "店铺归属-销售人员统计", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/saveOrUpdateSale")
|
||||
public AjaxResult saveOrUpdateSale(@RequestBody BusSaleInfo busSaleInfo)
|
||||
|
|
|
@ -12,6 +12,7 @@ import com.ruoyi.business.resp.RespBusStoreInfo;
|
|||
import com.ruoyi.business.service.IBusStoreConfigInfoService;
|
||||
import com.ruoyi.business.service.IBusStoreDayInfoService;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
@ -67,13 +68,14 @@ public class BusStoreInfoController extends BaseController
|
|||
}
|
||||
|
||||
@ApiOperation("查询店铺信息列表")
|
||||
@PreAuthorize("@ss.hasPermi('business:store:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:list')")
|
||||
@GetMapping("/listA")
|
||||
public TableDataInfo listA(ReqBusStoreInfo reqBusStoreInfo)
|
||||
{//new RespBusStoreInfo(busStoreInfo1)
|
||||
startPage();
|
||||
BusStoreInfo busStoreInfo = new BusStoreInfo();
|
||||
BeanUtils.copyProperties(reqBusStoreInfo, busStoreInfo);
|
||||
busStoreInfo.setBindUser(SecurityUtils.getLoginUser().getUsername());
|
||||
List<BusStoreInfo> list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo);
|
||||
List<RespBusStoreInfo> tableList = list.stream()
|
||||
.map(busStoreInfo1 -> {
|
||||
|
@ -96,7 +98,7 @@ public class BusStoreInfoController extends BaseController
|
|||
}
|
||||
|
||||
@ApiOperation("查询店铺信息列表")
|
||||
@PreAuthorize("@ss.hasPermi('business:store:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:list')")
|
||||
@GetMapping("/getMtUrl")
|
||||
public AjaxResult getMtUrl(ReqBusStoreInfo reqBusStoreInfo)
|
||||
{
|
||||
|
@ -107,7 +109,7 @@ public class BusStoreInfoController extends BaseController
|
|||
return success(url);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('business:store:edit')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:edit')")
|
||||
@Log(title = "修改营销状态", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("changeReturnVisitStatus")
|
||||
public AjaxResult changeReturnVisitStatus(@RequestBody BusStoreInfo busStoreInfo1)
|
||||
|
@ -118,7 +120,7 @@ public class BusStoreInfoController extends BaseController
|
|||
return toAjax(busStoreInfoService.updateBusStoreInfo(busStoreInfo));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('business:store:edit')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:edit')")
|
||||
@Log(title = "自配送、删除状态", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("changeSelfDeliveryStatus")
|
||||
public AjaxResult changeSelfDeliveryStatus(@RequestBody BusStoreInfo busStoreInfo1)
|
||||
|
@ -129,7 +131,7 @@ public class BusStoreInfoController extends BaseController
|
|||
return toAjax(busStoreInfoService.updateBusStoreInfo(busStoreInfo));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('business:store:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:query')")
|
||||
@GetMapping(value = "/config/{storeCode}")
|
||||
public AjaxResult getStoreConfig(@PathVariable("storeCode") String storeCode)
|
||||
{
|
||||
|
@ -148,7 +150,7 @@ public class BusStoreInfoController extends BaseController
|
|||
/**
|
||||
* 新增修改店铺配置信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('business:store:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:add')")
|
||||
@Log(title = "新增修改店铺配置信息", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public AjaxResult saveOrUpdate(@RequestBody ReqBusStoreConfigInfo reqBusStoreConfigInfo)
|
||||
|
@ -161,7 +163,7 @@ public class BusStoreInfoController extends BaseController
|
|||
/**
|
||||
* 导出店铺信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('business:store:export')")
|
||||
// @PreAuthorize("@ss.hasPermi('business:store:export')")
|
||||
@Log(title = "店铺信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BusStoreInfo busStoreInfo)
|
||||
|
|
|
@ -48,7 +48,7 @@ public class RyTask
|
|||
List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoList(orderInfo); //
|
||||
for (BusOrderInfo busOrderInfo : list) {
|
||||
if (new Date().getTime() >= sdf.parse(busOrderInfo.getCompleteTime()).getTime()+60000){
|
||||
aiService.addAiTask(busOrderInfo.getPrivcyPhone(), busOrderInfo.getRecipientPhone());
|
||||
// aiService.addAiTask(busOrderInfo.getPrivcyPhone(), busOrderInfo.getRecipientPhone());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -209,7 +209,7 @@ public class BusOrderInfo extends BaseEntity
|
|||
// this.customId = orderInfo;
|
||||
this.orderNo = orderInfo.getWmOrderViewId();
|
||||
this.orderStatus = orderInfo.getStatusDesc();
|
||||
this.completeTime = orderInfo.getExpectTimeFmt();
|
||||
this.completeTime = "2024-"+orderInfo.getExpectTimeFmt();
|
||||
this.dayseq = orderInfo.getDaySeq();
|
||||
// this.privcyPhone = orderInfo.;
|
||||
// this.recipientPhone = recipientPhone;
|
||||
|
|
|
@ -15,7 +15,7 @@ public interface IAiService
|
|||
* @param phoneNo
|
||||
* @param virtualPhone
|
||||
*/
|
||||
R addAiTask(String phoneNo,String virtualPhone);
|
||||
R addAiTask(String storeName,String remark,String phoneNo,String virtualPhone);
|
||||
R appendAiTask(String phoneNo,String virtualPhone);
|
||||
void queryAiTask();
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.ruoyi.business.service;
|
|||
|
||||
import java.util.List;
|
||||
import com.ruoyi.business.domain.BusAgentInfo;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
|
||||
/**
|
||||
* 代理管理Service接口
|
||||
|
@ -66,4 +67,6 @@ public interface IBusAgentInfoService
|
|||
* @return 结果
|
||||
*/
|
||||
public int getIntegralByAccount(String account);
|
||||
|
||||
int insertAgentInfo(LoginUser loginUser, BusAgentInfo busAgentInfo);
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ public class AiServiceImpl implements IAiService
|
|||
private static String dialTaskMainSn;
|
||||
|
||||
@Override
|
||||
public R addAiTask(String phoneNo, String virtualPhone) {
|
||||
public R addAiTask(String storeName,String remark,String phoneNo, String virtualPhone) {
|
||||
String url = "https://ai002.ciopaas.com/api/login";
|
||||
String userName = "zw982210";
|
||||
Map<String, String> header = new HashMap<>();
|
||||
|
@ -58,12 +58,12 @@ public class AiServiceImpl implements IAiService
|
|||
String projectSn = data.getString("project_sn");
|
||||
System.out.println("login 返回:===========apikey,userSn,projectSn============="+apiKey+","+userSn+","+projectSn);
|
||||
|
||||
String projectSn1 = projectSn.split(",")[0];
|
||||
String projectSn1 = projectSn.split(",")[1];
|
||||
aKey = apiKey;
|
||||
uSn = userSn;
|
||||
pSn = projectSn1;
|
||||
|
||||
String requestJson = "{\"api_key\": \""+apiKey+"\",\"user_sn\": \""+userSn+"\",\"source\": \"测试任务\",\"project_sn\": \""+projectSn1+"\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\",\"client_info_json\": {\"data\": [{\"姓名\": \"ws测试\",\"电话\": \""+phoneNo+"\",\"备注\": \"门店新客\",\"虚拟分机号\": \""+virtualPhone+"\"}]},\"is_open_second_dialing\": \"1\",\n" +
|
||||
String requestJson = "{\"api_key\": \""+apiKey+"\",\"user_sn\": \""+userSn+"\",\"source\": \""+storeName+"\",\"project_sn\": \""+projectSn1+"\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\",\"client_info_json\": {\"data\": [{\"姓名\": \""+storeName+"\",\"电话\": \""+phoneNo+"\",\"备注\": \"客户\",\"虚拟分机号\": \""+virtualPhone+"\"}]},\"is_open_second_dialing\": \"1\",\n" +
|
||||
"\"is_open_remove_duplication\": \"0\",\"dial_task_main_sn\": \"20240621203741220560000000000034\",\"is_append\": \"0\"}";
|
||||
String requestUrl = "https://ai002.ciopaas.com/api/addJsonOfAsync";
|
||||
String requestResult = HttpClientUtilT.doPostJson(requestUrl,header,requestJson);
|
||||
|
|
|
@ -1,11 +1,19 @@
|
|||
package com.ruoyi.business.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.system.service.ISysDeptService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.business.mapper.BusAgentInfoMapper;
|
||||
import com.ruoyi.business.domain.BusAgentInfo;
|
||||
import com.ruoyi.business.service.IBusAgentInfoService;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
* 代理管理Service业务层处理
|
||||
|
@ -19,6 +27,11 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
|||
@Autowired
|
||||
private BusAgentInfoMapper busAgentInfoMapper;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
@Autowired
|
||||
private ISysDeptService deptService;
|
||||
|
||||
/**
|
||||
* 查询代理管理
|
||||
*
|
||||
|
@ -95,4 +108,24 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
|||
public int getIntegralByAccount(String account) {
|
||||
return busAgentInfoMapper.getIntegralByAccount(account);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int insertAgentInfo(LoginUser loginUser, BusAgentInfo busAgentInfo) {
|
||||
SysUser user = new SysUser();
|
||||
user.setUserName(busAgentInfo.getAgentAccount());
|
||||
user.setNickName(busAgentInfo.getAgentName());
|
||||
String pwd = SecurityUtils.encryptPassword(busAgentInfo.getPassword());
|
||||
user.setPassword(pwd);
|
||||
user.setPhonenumber(busAgentInfo.getPhoneNumber());
|
||||
SysDept dept = deptService.selectDeptIdById(loginUser.getDeptId());
|
||||
user.setDeptId(dept.getDeptId());
|
||||
user.setDept(dept);
|
||||
busAgentInfo.setSuperiorAgentCode(loginUser.getUserId());
|
||||
busAgentInfo.setSuperiorAgentAccount(loginUser.getUsername());
|
||||
busAgentInfo.setDelStatus("1");
|
||||
user.setRoleId(101L);
|
||||
userService.insertUser(user);
|
||||
return insertBusAgentInfo(busAgentInfo);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,13 +1,18 @@
|
|||
package com.ruoyi.business.service.impl;
|
||||
|
||||
import com.ruoyi.business.domain.BusOrderInfo;
|
||||
import com.ruoyi.business.service.IAiService;
|
||||
import com.ruoyi.business.service.IBusOrderInfoService;
|
||||
import com.ruoyi.business.service.IMeituanService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@EnableScheduling
|
||||
|
@ -18,6 +23,11 @@ public class JobServiceImpl {
|
|||
@Autowired
|
||||
private IMeituanService iMeituanService;
|
||||
|
||||
@Autowired
|
||||
private IAiService aiService;
|
||||
|
||||
@Autowired
|
||||
private IBusOrderInfoService orderInfoService;
|
||||
// //初始延迟1秒,每隔2秒
|
||||
// @Scheduled(fixedRateString = "2000",initialDelay = 1000)
|
||||
// public void testFixedRate(){
|
||||
|
@ -36,10 +46,28 @@ public class JobServiceImpl {
|
|||
// System.out.println("cron,当前时间:" +format.format(new Date()));
|
||||
// }
|
||||
|
||||
@Scheduled(fixedDelayString= "10000")//600000
|
||||
public void testFixedDelay(){
|
||||
System.out.println("fixedDelayString,当前时间:" +format.format(new Date()));
|
||||
|
||||
iMeituanService.orderInfoList();
|
||||
}
|
||||
// @Scheduled(fixedDelayString= "300000")//600000 5分钟
|
||||
// public void testFixedDelay(){
|
||||
// System.out.println("fixedDelayString,当前时间:" +format.format(new Date()));
|
||||
// iMeituanService.orderInfoList();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// @Scheduled(fixedDelayString= "300000")//600000 获取订单
|
||||
// public void getAiList(){
|
||||
// System.out.println("fixedDelayString,当前时间:" +format.format(new Date()));
|
||||
// aiService.queryAiTask();
|
||||
// }
|
||||
//
|
||||
// @Scheduled(fixedDelayString= "60000")//600000
|
||||
// public void setAi() throws ParseException {
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
||||
// BusOrderInfo orderInfo = new BusOrderInfo();
|
||||
// List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoList(orderInfo); //
|
||||
// for (BusOrderInfo busOrderInfo : list) {
|
||||
// if (new Date().getTime() >= sdf.parse(busOrderInfo.getCompleteTime()).getTime()+60000){
|
||||
// aiService.addAiTask(busOrderInfo.getPrivcyPhone(), busOrderInfo.getRecipientPhone());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -115,4 +115,6 @@ public interface SysDeptMapper
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteDeptById(Long deptId);
|
||||
|
||||
SysDept selectDeptIdById(Long deptId);
|
||||
}
|
||||
|
|
|
@ -121,4 +121,6 @@ public interface ISysDeptService
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteDeptById(Long deptId);
|
||||
|
||||
SysDept selectDeptIdById(Long deptId);
|
||||
}
|
||||
|
|
|
@ -293,6 +293,11 @@ public class SysDeptServiceImpl implements ISysDeptService
|
|||
return deptMapper.deleteDeptById(deptId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysDept selectDeptIdById(Long deptId) {
|
||||
return deptMapper.selectDeptIdById(deptId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归列表
|
||||
*/
|
||||
|
|
|
@ -86,7 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectDeptVo"/>
|
||||
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectDeptIdById" resultMap="SysDeptResult">
|
||||
<include refid="selectDeptVo"/>
|
||||
where del_flag = '0' and parent_id = #{deptId} limit 1
|
||||
</select>
|
||||
|
||||
<insert id="insertDept" parameterType="SysDept">
|
||||
insert into sys_dept(
|
||||
<if test="deptId != null and deptId != 0">dept_id,</if>
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:info:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
@ -88,7 +87,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="上次登录ip" align="center" prop="lastLoginIp" />
|
||||
<el-table-column label="登录次数" align="center" prop="loginNum" />
|
||||
<el-table-column label="删除状态" align="center" prop="delStatus" />
|
||||
<!-- <el-table-column label="删除状态" align="center" prop="delStatus" /> -->
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
@ -96,7 +95,6 @@
|
|||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate1(scope.row)"
|
||||
v-hasPermi="['system:info:edit']"
|
||||
>充值</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
@ -190,21 +190,18 @@
|
|||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:role:edit']"
|
||||
>配置</el-button>
|
||||
<el-button v-if="scope.row.selfDeliveryStatus == 1 && scope.row.returnVisitStatus !== 1"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-bicycle"
|
||||
@click="handleSelfDelivery(scope.row)"
|
||||
v-hasPermi="['system:role:edit']"
|
||||
>自配送</el-button>
|
||||
<el-button v-if="scope.row.returnVisitStatus !== 1"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
>删除</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
|
@ -553,7 +550,8 @@ export default {
|
|||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
var url = 'https://p.kdocs.cn/s/VEQ34BIAIQ';
|
||||
// var url = 'https://p.kdocs.cn/s/VEQ34BIAIQ';
|
||||
var url = 'http://43.140.224.18/h5/test.html'
|
||||
window.open(url,'_blank');
|
||||
//
|
||||
// this.reset();
|
||||
|
|
Loading…
Reference in New Issue