From 33b0c2203c817316d017acf1992ce8b62b48eec7 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 2 Dec 2025 13:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8F=91=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bmw/controller/KqCmdController.java | 47 ++++++++++ .../com/bonus/bmw/domain/vo/KqCmdBean.java | 43 +++++++-- .../com/bonus/bmw/mapper/KqCmdMapper.java | 23 +++++ .../com/bonus/bmw/service/KqCmdService.java | 27 ++++++ .../bmw/service/impl/KqCmdServiceImpl.java | 55 ++++++++++- .../resources/mapper/bmw/KqCmdTaskMapper.xml | 94 +++++++++++++++++++ 6 files changed, 280 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java index d8f9820..656fb7a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java @@ -80,6 +80,34 @@ public class KqCmdController extends BaseController { } return getDataTableError(new ArrayList<>()); } + + + + @GetMapping("/getTaskList") + @SysLog(title = "任务列表", businessType = OperaType.QUERY, logType = 0, module = "获取任务列表", details = "获取任务列表") + public TableDataInfo getTaskList(KqCmdBean o) { + try { + startPage(); + List list = service.getTaskList(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + @GetMapping("/getHisTaskList") + @SysLog(title = "历史人任务列表", businessType = OperaType.QUERY, logType = 0, module = "获取任务列表", details = "获取任务列表") + public TableDataInfo getHisTaskList(KqCmdBean o) { + try { + startPage(); + List list = service.getHisTaskList(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } /** * 获取工程考勤机人员列表 * @@ -97,6 +125,25 @@ public class KqCmdController extends BaseController { return error("系统异常,请联系管理员"); } + @PostMapping("delTaskById") + public AjaxResult delTaskById(@RequestBody KqCmdBean o) { + try { + return service.delTaskById(o); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + @PostMapping("delHisTaskById") + public AjaxResult delHisTaskById(@RequestBody KqCmdBean o) { + try { + return service.delHisTaskById(o); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + /** * 下发人员 * diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java index 4b34c7a..bef4bd6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java @@ -9,11 +9,43 @@ import java.util.Date; */ @Data public class KqCmdBean { + /** + * 任务id + */ + private String taskId; + + /** + * 任务状态 + */ + private String transStatus; + /** + * 创建时间 + */ + private String createTime; + /** + * 执行时间 + */ + private String exeTime; + + private String cmdName; + + private String statusName; + /** + * 执行消息 + */ + private String msg; + /** + * 层级 + */ private String level; - + /** + * 是否在线 + */ private String onLine; - + /** + * 关键字 + */ private String keyWord; /** * 更新时间 @@ -61,7 +93,6 @@ public class KqCmdBean { /** * 任务状态 0 待执行 1已执行 2 完成 3执行失败 4 取消 */ - private String transStatus; /** * 任务执行更新时间 @@ -73,10 +104,7 @@ public class KqCmdBean { */ private Integer updateState; - /** - * 消息内容 - */ - private String msg; + /** * 人脸图片 */ @@ -99,7 +127,6 @@ public class KqCmdBean { private String workerName; private String phone; - private String createTime; private String isHand; public KqCmdBean() { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java index 36686b5..b8cfbd9 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/KqCmdMapper.java @@ -2,6 +2,7 @@ package com.bonus.bmw.mapper; import com.bonus.bmw.domain.vo.KqCmdBean; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +21,26 @@ public interface KqCmdMapper { List getProDeviceWorker(KqCmdBean o); List getDeviceTask(KqCmdBean o); + + /** + * 查询任务列表 + * @param o + * @return + */ + List getTaskList(KqCmdBean o); + + /** + * 查询历史执行任务 + * @param o + * @return + */ + List getHisTaskList(KqCmdBean o); + + /** + * 删除任务 + * @param list + */ + int delTaskById(@Param("list") List list); + + int delHisTaskById(@Param("list") List list); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java index e3dac6a..274e71f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/KqCmdService.java @@ -22,4 +22,31 @@ public interface KqCmdService{ AjaxResult delWorkerByDevice(KqCmdBean o); AjaxResult getDeviceTask(KqCmdBean o); + + /** + * 查询任务列表 + * @param o + * @return + */ + List getTaskList(KqCmdBean o); + + /** + * 查询历史人物列表 + * @param o + * @return + */ + List getHisTaskList(KqCmdBean o); + + /** + * 删除 + * @param o + * @return + */ + AjaxResult delTaskById(KqCmdBean o); + /** + * 删除 + * @param o + * @return + */ + AjaxResult delHisTaskById(KqCmdBean o); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java index 648a55a..cf429b3 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java @@ -5,8 +5,10 @@ import com.bonus.bmw.domain.vo.TreeNode; import com.bonus.bmw.mapper.KqCmdMapper; import com.bonus.bmw.service.KqCmdService; import com.bonus.common.core.constant.SecurityConstants; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.system.api.RemoteUploadUtilsService; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; @@ -14,6 +16,7 @@ import javax.annotation.Resource; import java.util.*; @Service +@Slf4j public class KqCmdServiceImpl implements KqCmdService { @Resource @@ -42,6 +45,7 @@ public class KqCmdServiceImpl implements KqCmdService { try { urkSendServiceImpl.getDevUserList(o.getDeviceCode()); } catch (Exception e) { + log.error(e.toString(), e); throw new RuntimeException(e); } return AjaxResult.success(); @@ -62,6 +66,7 @@ public class KqCmdServiceImpl implements KqCmdService { try { urkSendServiceImpl.reloadDevice(o.getDeviceCode()); } catch (Exception e) { + log.error(e.toString(), e); throw new RuntimeException(e); } return AjaxResult.success(); @@ -80,6 +85,7 @@ public class KqCmdServiceImpl implements KqCmdService { urkSendServiceImpl.delDevUser(o.getDeviceCode(), Arrays.asList(o.getWorkerIds())); urkSendServiceImpl.addUserList(o.getDeviceCode(), Arrays.asList(o.getWorkerIds())); } catch (Exception e) { + log.error(e.toString(), e); throw new RuntimeException(e); } return AjaxResult.success(); @@ -90,7 +96,7 @@ public class KqCmdServiceImpl implements KqCmdService { try { urkSendServiceImpl.delDevUser(o.getDeviceCode(), Arrays.asList(o.getWorkerIds())); } catch (Exception e) { - throw new RuntimeException(e); + log.error(e.toString(), e); } return AjaxResult.success(); } @@ -101,6 +107,53 @@ public class KqCmdServiceImpl implements KqCmdService { return AjaxResult.success(list); } + @Override + public List getTaskList(KqCmdBean o) { + + return mapper.getTaskList(o); + } + + @Override + public List getHisTaskList(KqCmdBean o) { + return mapper.getHisTaskList(o); + } + + @Override + public AjaxResult delTaskById(KqCmdBean o) { + try{ + if(StringUtils.isEmpty(o.getTaskId())){ + return AjaxResult.error("请先选择任务"); + }else{ + List list=Arrays.asList(o.getTaskId().split(",")); + int num=mapper.delTaskById(list); + if(num>0){ + return AjaxResult.success("删除成功"); + } + } + }catch (Exception e){ + log.error(e.toString(), e); + } + return AjaxResult.error("删除失败"); + } + + @Override + public AjaxResult delHisTaskById(KqCmdBean o) { + try{ + if(StringUtils.isEmpty(o.getTaskId())){ + return AjaxResult.error("请先选择任务"); + }else{ + List list=Arrays.asList(o.getTaskId().split(",")); + int num= mapper.delHisTaskById(list); + if(num>0){ + return AjaxResult.success("删除成功"); + } + } + + }catch (Exception e){ + log.error(e.toString(), e); + } + return AjaxResult.error("删除失败"); + } /** * 构建设备树 * @param data 包含pro_id和device_code的数据列表 diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml index 83fdb41..9b674e4 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml @@ -1,6 +1,22 @@ + + delete from kq_cmd_task + where id in + + #{item} + + + + + delete from kq_cmd_task_history + where id in + + #{item} + + + + +