修改下发班组任务信息

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<KqCmdBean> 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<KqCmdBean> 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("系统异常,请联系管理员");
+    }
+
     /**
      * 下发人员
      *

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() {

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<KqCmdBean> getProDeviceWorker(KqCmdBean o);
 
     List<KqCmdBean> getDeviceTask(KqCmdBean o);
+
+    /**
+     * 查询任务列表
+     * @param o
+     * @return
+     */
+    List<KqCmdBean> getTaskList(KqCmdBean o);
+
+    /**
+     * 查询历史执行任务
+     * @param o
+     * @return
+     */
+    List<KqCmdBean> getHisTaskList(KqCmdBean o);
+
+    /**
+     * 删除任务
+     * @param list
+     */
+    int delTaskById(@Param("list") List<String> list);
+
+    int delHisTaskById(@Param("list") List<String> list);
 }

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<KqCmdBean> getTaskList(KqCmdBean o);
+
+    /**
+     * 查询历史人物列表
+     * @param o
+     * @return
+     */
+    List<KqCmdBean> getHisTaskList(KqCmdBean o);
+
+    /**
+     * 删除
+     * @param o
+     * @return
+     */
+    AjaxResult delTaskById(KqCmdBean o);
+    /**
+     * 删除
+     * @param o
+     * @return
+     */
+    AjaxResult delHisTaskById(KqCmdBean o);
 }

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<KqCmdBean> getTaskList(KqCmdBean o) {
+
+        return mapper.getTaskList(o);
+    }
+
+    @Override
+    public List<KqCmdBean> getHisTaskList(KqCmdBean o) {
+        return mapper.getHisTaskList(o);
+    }
+
+    @Override
+    public AjaxResult delTaskById(KqCmdBean o) {
+        try{
+            if(StringUtils.isEmpty(o.getTaskId())){
+                return AjaxResult.error("请先选择任务");
+            }else{
+                List<String> 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<String> 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的数据列表

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml

@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.bmw.mapper.KqCmdMapper">
+    <delete id="delTaskById">
+        delete  from kq_cmd_task
+                where id in
+                <foreach collection="list" item="item" open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+
+    </delete>
+    <delete id="delHisTaskById">
+        delete  from kq_cmd_task_history
+        where id in
+        <foreach collection="list" item="item" open="(" close=")" separator="," >
+            #{item}
+        </foreach>
+    </delete>
+
 
     <select id="getUserByDeviceId" resultType="com.bonus.bmw.domain.vo.KqCmdBean">
         select
@@ -72,4 +88,82 @@
         LEFT JOIN pm_sub ps ON ps.id = pad.sub_id
         LEFT JOIN pm_sub_team pst ON pst.id = pad.team_id
     </select>
+    <select id="getTaskList" resultType="com.bonus.bmw.domain.vo.KqCmdBean">
+        SELECT id taskId,cmd_code cmdCode,cmd_param cmdParam,trans_status transStatus,
+               trans_status_update_time,create_time createTime,msg,
+               CASE
+                   WHEN cmd_code = 'SET_USER_INFO' THEN '下发人员'
+                   WHEN cmd_code = 'DELETE_USER' THEN '删除人员'
+                   WHEN cmd_code = 'GET_USER_INFO' THEN '获取人员'
+                   WHEN cmd_code = 'RESET_FK' THEN '重启'
+                   WHEN cmd_code = 'GET_DEVICE_SETTING' THEN '获取配置'
+                   WHEN cmd_code = 'SET_DEVICE_SETTING' THEN '修改配置'
+                   ELSE cmd_code
+                   END AS cmdName ,
+               CASE
+                   WHEN trans_status = '0' THEN '待执行'
+                   WHEN trans_status = '1' THEN '执行中'
+                   WHEN trans_status = '2' THEN '已完成'
+                   WHEN trans_status = '3' THEN '任务繁忙-人员占用'
+                    ELSE trans_status
+                   END AS statusName
+        from kq_cmd_task
+        where device_code=#{deviceCode}
+        <if test="cmdCode!=null and cmdCode!=''">
+            and cmd_code=#{cmdCode}
+        </if>
+        <if test="cmdName!=null and cmdName!=''">
+            and  CASE
+            WHEN cmd_code = 'SET_USER_INFO' THEN '下发人员'
+            WHEN cmd_code = 'DELETE_USER' THEN '删除人员'
+            WHEN cmd_code = 'GET_USER_INFO' THEN '获取人员'
+            WHEN cmd_code = 'RESET_FK' THEN '重启'
+            WHEN cmd_code = 'GET_DEVICE_SETTING' THEN '获取配置'
+            WHEN cmd_code = 'SET_DEVICE_SETTING' THEN '修改配置'
+            ELSE cmd_code END
+             like concat('%',#{cmdName},'%')
+        </if>
+        <if test="transStatus!=null and transStatus!=''">
+            and trans_status=#{transStatus}
+        </if>
+    </select>
+    <select id="getHisTaskList" resultType="com.bonus.bmw.domain.vo.KqCmdBean">
+        SELECT id taskId,cmd_code cmdCode,cmd_param cmdParam,trans_status transStatus,
+               trans_status_update_time exeTime,create_time createTime,msg,
+               CASE
+                   WHEN cmd_code = 'SET_USER_INFO' THEN '下发人员'
+                   WHEN cmd_code = 'DELETE_USER' THEN '删除人员'
+                   WHEN cmd_code = 'GET_USER_INFO' THEN '获取人员'
+                   WHEN cmd_code = 'RESET_FK' THEN '重启'
+                   WHEN cmd_code = 'GET_DEVICE_SETTING' THEN '获取配置'
+                   WHEN cmd_code = 'SET_DEVICE_SETTING' THEN '修改配置'
+                   ELSE cmd_code
+                   END AS cmdName ,
+               CASE
+                   WHEN trans_status = '0' THEN '待执行'
+                   WHEN trans_status = '1' THEN '执行中'
+                   WHEN trans_status = '2' THEN '已完成'
+                   WHEN trans_status = '3' THEN '任务繁忙-人员占用'
+                   ELSE trans_status
+                   END AS statusName
+        from kq_cmd_task_history
+        where device_code=#{deviceCode}
+        <if test="cmdCode!=null and cmdCode!=''">
+            and cmd_code=#{cmdCode}
+        </if>
+        <if test="cmdName!=null and cmdName!=''">
+            and    CASE
+            WHEN cmd_code = 'SET_USER_INFO' THEN '下发人员'
+            WHEN cmd_code = 'DELETE_USER' THEN '删除人员'
+            WHEN cmd_code = 'GET_USER_INFO' THEN '获取人员'
+            WHEN cmd_code = 'RESET_FK' THEN '重启'
+            WHEN cmd_code = 'GET_DEVICE_SETTING' THEN '获取配置'
+            WHEN cmd_code = 'SET_DEVICE_SETTING' THEN '修改配置'
+            ELSE cmd_code END
+            like concat('%',#{cmdName},'%')
+        </if>
+        <if test="transStatus!=null and transStatus!=''">
+            and trans_status=#{transStatus}
+        </if>
+    </select>
 </mapper>