EventTemplate控制器编写

pqs-common/common-influxdb/src/test/java/DataTest.java

@@ -353,4 +353,27 @@ public class DataTest {
         influxDBUtil.batchInsert("test", "", ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, records);
     }
 
+    public static void batchInsertPqsCommunicate(InfluxDbUtils influxDBUtil) {
+        Map<String, String> tags = new HashMap<>();
+        tags.put("line_id", "025fa0e4c91f72ad7f1c1bd29026f20a");
+
+
+        Map<String, Object> fields = new HashMap<>();
+        fields.put("description", "在线");
+        fields.put("type", 1);
+
+        influxDBUtil.insert("pqs_communicate", tags, fields, System.currentTimeMillis()-170000000, TimeUnit.MILLISECONDS);
+
+        Map<String, String> tags1 = new HashMap<>();
+        tags1.put("line_id", "025fa0e4c91f72ad7f1c1bd29026f20a");
+
+
+        Map<String, Object> fields1 = new HashMap<>();
+        fields1.put("description", "掉线");
+        fields1.put("type", 0);
+
+        influxDBUtil.insert("pqs_communicate", tags1, fields1, System.currentTimeMillis()-70000000, TimeUnit.MILLISECONDS);
+    }
+
+
 }

pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java

@@ -15,9 +15,9 @@ public enum TemplateTreeEnum {
     REPORT_LEVEL(0, "报告基础项"),
     LINE_LEVEL(1, "监测点"),
     DETAIL_LEVEL(2, "监测点详情"),
-    TRANS_LEVEL(3, "暂降事件列表表格"),
+    TRANS_LEVEL(2, "暂降事件列表表格"),
-    TRANS_D_LEVEL(4, "暂降密度图形"),
+    TRANS_D_LEVEL(2, "暂降密度图形"),
-    TRANS_R_LEVEL(5, "暂降原因表格");
+    TRANS_R_LEVEL(2, "暂降原因表格");
 
     private final Integer code;
     private final String message;

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java

@@ -0,0 +1,61 @@
+package com.njcn.system.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.web.constant.ValidMessage;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+@Data
+public class EventDictParam {
+
+    /**
+     * 父级id
+     */
+    @ApiModelProperty(value = "父级id")
+    private String pid;
+
+    /**
+     * 字典表字段名称
+     */
+    @ApiModelProperty(value = "字典表字段名称")
+    private String name;
+
+    /**
+     * 字典表字段描述
+     */
+    @ApiModelProperty(value = "字典表字段描述")
+    private String describe;
+
+
+    /**
+     * 更新操作实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class DictUpdateParam extends EventDictParam {
+
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+    /**
+     * 分页查询实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class DictQueryParam extends BaseParam {
+        @ApiModelProperty("pid")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String pid;
+
+
+    }
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java

@@ -49,7 +49,7 @@ public class EventTemplateParam {
     }
 
     /**
-     * 分页查询实体
+     * 查询数据
      */
     @Data
     @EqualsAndHashCode(callSuper = true)

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/ReportDict.java

@@ -0,0 +1,35 @@
+package com.njcn.system.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ *
+ * @author hany
+ * @createTime 2022/09/27
+ */
+@Data
+@TableName("report_dict")
+public class ReportDict extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String name;
+
+    private Integer type;
+
+    private String describe;
+
+    private String pid;
+
+    private String pids;
+
+    private Integer state;
+
+    private Integer level;
+
+    private Integer sort;
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java

@@ -17,16 +17,18 @@ import java.util.List;
 @Data
 public class EventTemplateTree implements Serializable {
     private String id;
-    @ApiModelProperty(name = "name",value = "名称")
-    private String name;
     @ApiModelProperty(name = "parentId",value = "父id")
     private String pid;
     @ApiModelProperty(name = "level",value = "等级")
     private Integer level;
-    @ApiModelProperty(name = "state",value = "数据状态")
+    @ApiModelProperty(name = "name",value = "名称")
-    private Integer state;
+    private String name;
+    @ApiModelProperty(name = "describe",value = "描述")
+    private String describe;
     @ApiModelProperty(name = "sort",value = "排序")
     private Integer sort;
+    @ApiModelProperty(name = "state",value = "数据状态")
+    private Integer state;
     @ApiModelProperty(name = "children",value = "子节点")
     private List<EventTemplateTree> children = new ArrayList<>();
 

pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java

@@ -0,0 +1,126 @@
+package com.njcn.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.system.pojo.param.EventDictParam;
+import com.njcn.system.pojo.po.ReportDict;
+import com.njcn.system.service.IEventDictService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * @author hany
+ * @createTime 2022/09/27
+ */
+@Slf4j
+@RestController
+@RequestMapping("/reportDict")
+@RequiredArgsConstructor
+@Api(tags = "字典数据管理")
+public class EventDictController extends BaseController {
+
+    private final IEventDictService iEventDictService;
+
+    /**
+     * 新增字典
+     * @param eventDictParam
+     * @return
+     */
+    @PostMapping("/addDict")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增字典表")
+    @ApiImplicitParam(name = "eventDictParam", value = "字典表数据", required = true)
+    public HttpResult<Boolean> addDict(@RequestBody EventDictParam eventDictParam){
+        String methodDescribe = getMethodDescribe("addDict");
+        LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventDictParam);
+        boolean res = iEventDictService.addDict(eventDictParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe);
+        } else{
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null,methodDescribe);
+        }
+    }
+
+    /**
+     * 修改字典
+     * @param dictUpdateParam
+     * @return
+     */
+    @PostMapping("/updateDict")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("更新字典表")
+    @ApiImplicitParam(name = "dictUpadateParam", value = "更新字典表实体", required = true)
+    public HttpResult<Boolean> updateDict(@RequestBody EventDictParam.DictUpdateParam dictUpdateParam){
+        String methodDescribe = getMethodDescribe("updateDict");
+        LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictUpdateParam);
+        boolean res = iEventDictService.updateDict(dictUpdateParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe);
+        } else{
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null,methodDescribe);
+        }
+    }
+
+    /**
+     * 删除字典
+     * @param id
+     * @return
+     */
+    @PostMapping("/deleteDict")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("删除字典表")
+    @ApiImplicitParam(name = "id", value = "字典表索引", required = true)
+    public HttpResult<Boolean> delDict(@RequestBody String id){
+        String methodDescribe = getMethodDescribe("deleteDict");
+        iEventDictService.delete(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe);
+    }
+
+    /**
+     * 查询字典列表
+     * @param dictQueryParam
+     * @return
+     */
+    @PostMapping("/getList")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询字典列表")
+    @ApiImplicitParam(name = "dictQueryParam", value = "查询字典列表实体", required = true)
+    public HttpResult<Page<ReportDict>> getList(@RequestBody EventDictParam.DictQueryParam dictQueryParam){
+        String methodDescribe = getMethodDescribe("getList");
+        Page<ReportDict> res = iEventDictService.getList(dictQueryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
+    /**
+     * 查询字典
+     * @param id
+     * @return
+     */
+    @PostMapping("/getDictById")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("查询字典")
+    public HttpResult<ReportDict> getDictById(String id){
+        String methodDescribe = getMethodDescribe("getDictById");
+        ReportDict res = iEventDictService.getDictById(id);
+        if (Objects.nonNull(res)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL,null, methodDescribe);
+        }
+    }
+}

pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java

@@ -1,15 +1,13 @@
 package com.njcn.system.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.common.utils.LogUtil;
 import com.njcn.system.pojo.param.EventTemplateParam;
 import com.njcn.system.pojo.po.EventTemplate;
-import com.njcn.system.pojo.vo.EventTemplateTree;
 import com.njcn.system.service.IEventTemplateService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -17,10 +15,12 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.jdbc.Null;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * pqs
@@ -38,38 +38,43 @@ public class EventTemplateController extends BaseController{
 
     private final IEventTemplateService iEventTemplateService;
 
-    /**
-     * 获取字典树
-     * @author hany
-     * @date 2022/09/09
-     */
-    @ApiOperation("获取字典树")
-    @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
-    @GetMapping("/getEventTemplateTree")
-    public HttpResult<List<EventTemplateTree>> getEventTemplateTree(){
-        String methodDescribe = getMethodDescribe("getEventTemplateTree");
-        List<EventTemplateTree> tree = iEventTemplateService.getEventTemplateTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
-    }
 
     /**
-     * 分页查询字典类型数据
+     * 查询所有模板
      * @author hany
      * @date 2022/09/09
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getList")
-    @ApiOperation("查询字典数据")
+    @ApiOperation("查询模板数据")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<List<EventTemplate>> getList() {
-    public HttpResult<Page<EventTemplate>> getList(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getList");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        List<EventTemplate> result = iEventTemplateService.getList();
-        Page<EventTemplate> result = iEventTemplateService.getList(queryParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
     /**
-     * 新增
+     * 根据id查询模板
+     * @author hany
+     * @date 2022/09/26
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getTemplateById")
+    @ApiOperation("查询模板数据")
+    @ApiImplicitParam(name = "id",value = "模板id",required = true)
+    public HttpResult<EventTemplate> getTemplateById(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getTemplateById");
+        EventTemplate eventTemplate = iEventTemplateService.getTemplateById(id);
+        if (Objects.nonNull(eventTemplate)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventTemplate, methodDescribe);
+        }
+        else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 新增模板
      * @author hany
      * @date 2022/09/09
      */
@@ -77,7 +82,7 @@ public class EventTemplateController extends BaseController{
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("新增模板")
     @ApiImplicitParam(name = "eventTemplateParam", value = "模板数据", required = true)
-    public HttpResult<Boolean> add(@RequestBody @Validated EventTemplateParam eventTemplateParam){
+    public HttpResult<Object> add(@RequestBody @Validated EventTemplateParam eventTemplateParam){
         String methodDescribe = getMethodDescribe("add");
         boolean result = iEventTemplateService.add(eventTemplateParam);
         if (result) {
@@ -88,12 +93,12 @@ public class EventTemplateController extends BaseController{
     }
 
     /**
-     * 修改
+     * 修改模板
      * @author hany
      * @date 2022/09/08
      */
     @PostMapping("/update")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
     @ApiOperation("修改模板")
     @ApiImplicitParam(name = "eventUpdateParam", value = "模板实体", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){
@@ -107,7 +112,8 @@ public class EventTemplateController extends BaseController{
     }
 
     /**
-     * 删除
+     * 删除模板
+     * @param ids 暂态报表模板id
      * @author hany
      * @date 2022/09/08
      */
@@ -120,7 +126,8 @@ public class EventTemplateController extends BaseController{
         boolean result = iEventTemplateService.delete(ids);
         if(result){
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
         }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
     }
 }

pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java

@@ -0,0 +1,43 @@
+package com.njcn.system.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.system.pojo.vo.EventTemplateTree;
+import com.njcn.system.service.IEventTreeService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "字典树管理")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/EventTree")
+public class EventTreeController extends BaseController {
+
+    private final IEventTreeService iEventTreeService;
+
+    /**
+     * 获取字典树
+     * @author hany
+     * @date 2022/09/09
+     */
+    @ApiOperation("获取字典树")
+    @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
+    @GetMapping("/getEventTree")
+    public HttpResult<List<EventTemplateTree>> getEventTemplateTree(){
+        String methodDescribe = getMethodDescribe("getEventTree");
+        List<EventTemplateTree> tree = iEventTreeService.getEventTree();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
+    }
+}

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventDictMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.system.pojo.po.ReportDict;
+
+public interface EventDictMapper extends BaseMapper<ReportDict> {
+}

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java

@@ -1,11 +1,8 @@
 package com.njcn.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.system.pojo.po.EventTemplate;
 import com.njcn.system.pojo.vo.EventTemplateTree;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,17 +14,9 @@ public interface EventTemplateMapper extends BaseMapper<EventTemplate> {
 
     /**
      * 返回所有树节点（全部report_template_dict表数据）
-     *
      * @author hany
      * @date 2022/09/21
      */
     List<EventTemplateTree> getAllList();
 
-    /**
-     * 分页查询字典数据
-     * @param page 分页数据
-     * @param queryWrapper 查询条件
-     * @return 字典数据
-     */
-    Page<EventTemplate> page(@Param("page")Page<EventTemplate> page, @Param("ew") QueryWrapper<EventTemplate> queryWrapper);
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml

@@ -13,8 +13,8 @@
 
     <!--获取所有表数据-->
     <select id="getAllList" resultType="com.njcn.system.pojo.vo.EventTemplateTree">
-        select id, pid, name, level, sort
+        select id, name, type ,code
-        from report_template_dict
+        from report_template
         where state = 1
     </select>
 

pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventDictService.java

@@ -0,0 +1,46 @@
+package com.njcn.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.system.pojo.param.EventDictParam;
+import com.njcn.system.pojo.po.ReportDict;
+
+/**
+ * @author hany
+ * @createTime 2022/09/27
+ */
+public interface IEventDictService {
+    /**
+     * 新增字典
+     * @param eventDictParam
+     * @return
+     */
+    boolean addDict(EventDictParam eventDictParam);
+
+    /**
+     * 修改字典
+     * @param dictUpdateParam
+     * @return
+     */
+    boolean updateDict(EventDictParam.DictUpdateParam dictUpdateParam);
+
+    /**
+     * 删除字典
+     * @param id
+     * @return
+     */
+    boolean delete(String id);
+
+    /**
+     * 查询字典列表
+     * @param dictQueryParam
+     * @return
+     */
+    Page<ReportDict> getList(EventDictParam.DictQueryParam dictQueryParam);
+
+    /**
+     * 查询字典
+     * @param id
+     * @return
+     */
+    ReportDict getDictById(String id);
+}

pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java

@@ -1,9 +1,7 @@
 package com.njcn.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.system.pojo.param.EventTemplateParam;
 import com.njcn.system.pojo.po.EventTemplate;
-import com.njcn.system.pojo.vo.EventTemplateTree;
 
 import java.util.List;
 
@@ -15,30 +13,31 @@ import java.util.List;
 public interface IEventTemplateService {
 
     /**
-     * 获取字典树
+     * 查询模板
-     */
-    List<EventTemplateTree> getEventTemplateTree();
-
-    /**
-     * 根据前台传递参数，分页查询字典数据
-     * @param queryParam 查询参数
      * @return 字典列表
      */
-    Page<EventTemplate> getList(EventTemplateParam.EventTemplateQueryParam queryParam);
+    List<EventTemplate> getList();
 
     /**
-     * 新增
+     * 根据id查询模板
+     * @return
+     */
+    EventTemplate getTemplateById(String id);
+
+    /**
+     * 新增模板
+     * * @param EventTemplateParam 模板实体
      */
     boolean add(EventTemplateParam eventTemplateParam);
 
     /**
-     * 修改
+     * 修改模板
      * @param eventDataUpdateParam
      */
     boolean update(EventTemplateParam.EventTemplateUpdateParam eventDataUpdateParam);
 
     /**
-     * 删除
+     * 删除模板
      * @param ids 模板ids
      */
     boolean delete(List<String> ids);

pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTreeService.java

@@ -0,0 +1,15 @@
+package com.njcn.system.service;
+
+import com.njcn.system.pojo.vo.EventTemplateTree;
+import java.util.List;
+
+public interface IEventTreeService {
+
+    /**
+     * 获取字典树
+     *
+     * @author hany
+     * @date 2022/09/26
+     */
+    List<EventTemplateTree> getEventTree();
+}

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java

@@ -0,0 +1,138 @@
+package com.njcn.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.db.constant.DbConstant;
+import com.njcn.system.enums.EventResponseEnum;
+import com.njcn.system.mapper.EventDictMapper;
+import com.njcn.system.pojo.param.EventDictParam;
+import com.njcn.system.pojo.po.ReportDict;
+import com.njcn.system.service.IEventDictService;
+import com.njcn.web.factory.PageFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * @author hany
+ * @createTime 2022/09/27
+ */
+@Service
+public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDict> implements IEventDictService {
+
+
+    /**
+     * 新增字典数据
+     * @param eventDictParam
+     * @return
+     */
+    @Override
+    public boolean addDict (EventDictParam eventDictParam){
+        checkName(eventDictParam,true);
+        ReportDict rptDict = new ReportDict();
+        BeanUtils.copyProperties(eventDictParam,rptDict);
+        rptDict.setState(DataStateEnum.ENABLE.getCode());
+        return this.save(rptDict);
+    }
+
+    /**
+     * 修改字典数据
+     * @param dictUpdateParam
+     * @return
+     */
+    @Override
+    public boolean updateDict (EventDictParam.DictUpdateParam dictUpdateParam){
+        checkName(dictUpdateParam,false);
+        ReportDict rptDict = new ReportDict();
+        BeanUtils.copyProperties(dictUpdateParam,rptDict);
+        return this.updateById(rptDict);
+    }
+
+    /**
+     * 删除字典数据
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean delete (String id){
+        LambdaQueryWrapper<ReportDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ReportDict::getPid,id).eq(ReportDict::getState,DataStateEnum.ENABLE.getCode());
+        int res = this.count(lambdaQueryWrapper);
+        if(res>0){
+            throw new BusinessException(EventResponseEnum.CHILDREN_EXIT);
+        }
+        UpdateWrapper<ReportDict> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(ReportDict::getState,DataStateEnum.ENABLE.getCode()).set(ReportDict::getState,DataStateEnum.DELETED.getCode()).eq(ReportDict::getId,id);
+        return this.update(updateWrapper);
+    }
+
+    /**
+     * 查询字典列表
+     * @param dictQueryParam
+     * @return
+     */
+    @Override
+    public Page<ReportDict> getList(EventDictParam.DictQueryParam dictQueryParam){
+        QueryWrapper<ReportDict> queryWrapper = new QueryWrapper<>();
+        if (Objects.nonNull(dictQueryParam)) {
+            //查询参数不为空，进行条件填充
+            if (StrUtil.isNotBlank(dictQueryParam.getSearchValue())) {
+                //字典类型表，提供名称、编码模糊查询
+                queryWrapper
+                        .and(param -> param.like("report_dict.name",dictQueryParam.getSearchValue())
+                                .or().like("report_dict.describe",dictQueryParam.getSearchValue()));
+            }
+            //排序
+            if (ObjectUtil.isAllNotEmpty(dictQueryParam.getSortBy(), dictQueryParam.getOrderBy())) {
+                queryWrapper.orderBy(true, dictQueryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(dictQueryParam.getSortBy()));
+            }else{
+                queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
+                //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
+                queryWrapper.orderBy(true, true, "report_dict.update_time");
+            }
+        }
+        queryWrapper.eq("report_dict.state", DataStateEnum.ENABLE.getCode());
+        return this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(dictQueryParam),PageFactory.getPageSize(dictQueryParam)),queryWrapper);
+    }
+
+    /**
+     * 查询字典
+     * @param id
+     * @return
+     */
+    @Override
+    public ReportDict getDictById(String id){
+        return this.getById(id);
+    }
+
+    /**
+     * 名称重复校验
+     * @author hany
+     * @date 2022/09/27
+     */
+    private void checkName(EventDictParam eventDictParam,boolean flag){
+        LambdaQueryWrapper<ReportDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ReportDict::getName,eventDictParam.getName())
+                .eq(ReportDict::getState, DataStateEnum.ENABLE.getCode());
+        //修改
+        if(!flag){
+            if(eventDictParam instanceof EventDictParam.DictUpdateParam ){
+                lambdaQueryWrapper.ne(ReportDict::getId,((EventDictParam.DictUpdateParam)eventDictParam).getId());
+            }
+        }
+        int res = this.count(lambdaQueryWrapper);
+        //大于等于1个则表示重复
+        if (res >= 1) {
+            throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT);
+        }
+
+    }
+}

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java

@@ -1,31 +1,23 @@
 package com.njcn.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.db.constant.DbConstant;
 import com.njcn.system.enums.EventResponseEnum;
-import com.njcn.system.enums.TemplateTreeEnum;
 import com.njcn.system.mapper.EventTemplateMapper;
 import com.njcn.system.pojo.param.EventTemplateParam;
 import com.njcn.system.pojo.po.EventTemplate;
-import com.njcn.system.pojo.vo.EventTemplateTree;
 import com.njcn.system.service.IEventTemplateService;
-import com.njcn.web.factory.PageFactory;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author: hany
@@ -34,83 +26,28 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, EventTemplate> implements IEventTemplateService {
 
-    private final EventTemplateMapper eventTemplateMapper;
-
     /**
-     * 获取字典树
+     * 查询所有模板
-     * @author hany
-     * @date 2022/09/09
-     */
-    @Override
-    public List<EventTemplateTree> getEventTemplateTree() {
-        List<EventTemplateTree> dictTree = new ArrayList<>();
-        List<EventTemplateTree> allList = eventTemplateMapper.getAllList();
-        List<EventTemplateTree> reportList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.REPORT_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-        List<EventTemplateTree> lineList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-        List<EventTemplateTree> detailList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.DETAIL_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-        List<EventTemplateTree> eventList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-        List<EventTemplateTree> densityList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_D_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-        List<EventTemplateTree> reasonList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_R_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
-
-        lineList.forEach(line -> line.setChildren(getChildren(line, detailList)));
-        lineList.forEach(line -> line.setChildren(getChildren(line, eventList)));
-        lineList.forEach(line -> line.setChildren(getChildren(line, densityList)));
-        lineList.forEach(line -> line.setChildren(getChildren(line, reasonList)));
-        reportList.forEach(report -> report.setChildren(getChildren(report, lineList)));
-
-        if (CollectionUtil.isNotEmpty(allList)) {
-            EventTemplateTree eventTemplateTree = new EventTemplateTree();
-            eventTemplateTree.setId("9999999");
-            eventTemplateTree.setLevel(0);
-            eventTemplateTree.setName("新增模板");
-            if (CollectionUtil.isNotEmpty(reportList)) {
-                eventTemplateTree.setChildren(reportList);
-            }
-            dictTree.add(eventTemplateTree);
-        }
-        return dictTree;
-    }
-
-    /**
-     * 获取全部子节点
-     *
-     * @author hany
-     * @date 2022/09/21
-     */
-    public List<EventTemplateTree> getChildren(EventTemplateTree item, List<EventTemplateTree> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
-    }
-
-    /**
-     * 分页查询字典类型数据
      * @author hany
      * @date 2022/09/13
      * @return
      */
     @Override
-    public Page<EventTemplate> getList(EventTemplateParam.EventTemplateQueryParam queryParam) {
+    public List<EventTemplate> getList() {
-        QueryWrapper<EventTemplate> queryWrapper = new QueryWrapper<>();
+        return this.list();
-        if (ObjectUtil.isNotNull(queryParam)) {
+    }
-            //查询参数不为空，进行条件填充
+
-            if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
+    /**
-                //字典类型表，仅提供名称和编码模糊查询
+     * 根据id查询模板数据
-                queryWrapper
+     * @author hany
-                        .and(param -> param.like("report_template.name",queryParam.getSearchValue())
+     * @date 2022/09/26
-                                .or().like("report_template.code",queryParam.getSearchValue()));
+     */
-            }
+    @Override
-            //排序
+    public EventTemplate getTemplateById(String id) {
-            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
+        return this.getById(id);
-                queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
-            } else {
-                //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
-                queryWrapper.orderBy(true, true, "report_template.update_time");
-            }
-        }
-        queryWrapper.ne("report_template.state", DataStateEnum.DELETED.getCode());
-        //初始化分页数据
-        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
     }
 
     /**
@@ -121,10 +58,10 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
     @Override
     public boolean add(EventTemplateParam eventTemplateParam) {
         checkName(eventTemplateParam,true);
-        EventTemplate eventDict = new EventTemplate();
+        EventTemplate eventTemplate = new EventTemplate();
-        BeanUtils.copyProperties(eventTemplateParam,eventDict);
+        BeanUtils.copyProperties(eventTemplateParam,eventTemplate);
-        eventDict.setState(DataStateEnum.ENABLE.getCode());
+        eventTemplate.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(eventDict);
+        return this.save(eventTemplate);
     }
     /**
      * 修改模板
@@ -132,9 +69,9 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
     @Override
     public boolean update(EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam) {
         checkName(eventTemplateUpdateParam,false);
-        EventTemplate eventDict = new EventTemplate();
+        EventTemplate eventTemplate = new EventTemplate();
-        BeanUtils.copyProperties(eventTemplateUpdateParam,eventDict);
+        BeanUtils.copyProperties(eventTemplateUpdateParam,eventTemplate);
-        return this.updateById(eventDict);
+        return this.updateById(eventTemplate);
 
     }
 
@@ -153,16 +90,16 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
     private void checkName(EventTemplateParam eventTemplateParam,boolean flag){
         LambdaQueryWrapper<EventTemplate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(EventTemplate::getName,eventTemplateParam.getName())
-                .eq(EventTemplate::getState, DataStateEnum.ENABLE.getCode());
+                .eq(EventTemplate::getType,eventTemplateParam.getType());
         //修改
         if(!flag){
             if(eventTemplateParam instanceof EventTemplateParam.EventTemplateUpdateParam ){
                 lambdaQueryWrapper.ne(EventTemplate::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId());
             }
         }
-        int res = this.count(lambdaQueryWrapper);
+        int result = this.count(lambdaQueryWrapper);
         //大于等于1个则表示重复
-        if (res >= 1) {
+        if (result >= 1) {
             throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT);
         }
 

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTreeServiceImpl.java

@@ -0,0 +1,67 @@
+package com.njcn.system.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.system.enums.TemplateTreeEnum;
+import com.njcn.system.mapper.EventTemplateMapper;
+import com.njcn.system.pojo.vo.EventTemplateTree;
+import com.njcn.system.service.IEventTreeService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class EventTreeServiceImpl implements IEventTreeService {
+
+    private final EventTemplateMapper eventTemplateMapper;
+
+    /**
+     * 获取字典树
+     * @author hany
+     * @date 2022/09/09
+     */
+    @Override
+    public List<EventTemplateTree> getEventTree() {
+        List<EventTemplateTree> dictTree = new ArrayList<>();
+        List<EventTemplateTree> allList = eventTemplateMapper.getAllList();
+        List<EventTemplateTree> reportList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.REPORT_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+        List<EventTemplateTree> lineList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+        List<EventTemplateTree> detailList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.DETAIL_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+        List<EventTemplateTree> eventList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+        List<EventTemplateTree> densityList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_D_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+        List<EventTemplateTree> reasonList = allList.stream().filter(item -> item.getLevel().equals(TemplateTreeEnum.TRANS_R_LEVEL.getCode())).sorted(Comparator.comparing(EventTemplateTree::getSort)).collect(Collectors.toList());
+
+        lineList.forEach(line -> line.setChildren(getChildren(line, detailList)));
+        lineList.forEach(line -> line.setChildren(getChildren(line, eventList)));
+        lineList.forEach(line -> line.setChildren(getChildren(line, densityList)));
+        lineList.forEach(line -> line.setChildren(getChildren(line, reasonList)));
+        reportList.forEach(report -> report.setChildren(getChildren(report, lineList)));
+
+        if (CollectionUtil.isNotEmpty(allList)) {
+            EventTemplateTree eventTemplateTree = new EventTemplateTree();
+            eventTemplateTree.setId("9999999");
+            eventTemplateTree.setLevel(0);
+            eventTemplateTree.setName("新增模板");
+            if (CollectionUtil.isNotEmpty(reportList)) {
+                eventTemplateTree.setChildren(reportList);
+            }
+            dictTree.add(eventTemplateTree);
+        }
+        return dictTree;
+    }
+
+    /**
+     * 获取全部子节点
+     *
+     * @author hany
+     * @date 2022/09/21
+     */
+    public List<EventTemplateTree> getChildren(EventTemplateTree item, List<EventTemplateTree> all) {
+        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+    }
+
+}

pqs.iws

@@ -1,54 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="EventTemplate控制器编写">
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/ReportDict.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventDictMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventDictService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTreeService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTreeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs.iws" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.iws" afterDir="false" />
+    </list>
     <list id="8dc99cd4-ae87-448e-8b91-038fd7ebf613" name="no commit" comment="no commit">
-      <change beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" afterPath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" />
+      <change beforePath="$PROJECT_DIR$/pqs.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.ipr" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs.iws" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.iws" afterDir="false" />
     </list>
-    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/pqs.iws" afterPath="$PROJECT_DIR$/pqs.iws" />
-    </list>
-    <ignored path="$PROJECT_DIR$/pqs-harmonic/harmonic-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-system/system-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-job/job-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-event/event-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-user/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-influxdb/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-job/job-executor/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-auth/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-energy/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-autocode/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-db/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-quality/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-job/job-admin/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-web/target/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-event/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-swagger/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-event/event-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-user/user-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-core/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-user/user-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-job/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-device/device-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-system/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-device/device-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-poi/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-gateway/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-system/system-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-harmonic/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-quality/quality-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-quality/quality-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-energy/energy-api/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-redis/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-device/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-microservice/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-energy/energy-boot/target/" />
-    <ignored path="$PROJECT_DIR$/pqs-common/common-echarts/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -208,105 +186,12 @@
   <component name="EjbViewSettings">
     <EjbView showMembers="false" autoscrollToSource="false" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="DictDataController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="60" column="111" lean-forward="false" selection-start-line="60" selection-start-column="111" selection-end-line="60" selection-end-column="111" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DictDataParam.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1782">
-              <caret line="73" column="62" lean-forward="false" selection-start-line="73" selection-start-column="62" selection-end-line="73" selection-end-column="62" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IEventTemplateService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="567">
-              <caret line="27" column="76" lean-forward="false" selection-start-line="27" selection-start-column="76" selection-end-line="27" selection-end-column="76" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DictDataMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="28" column="94" lean-forward="false" selection-start-line="28" selection-start-column="94" selection-end-line="28" selection-end-column="94" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventTemplateController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1242">
-              <caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventTemplateParam.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1431">
-              <caret line="60" column="67" lean-forward="false" selection-start-line="60" selection-start-column="67" selection-end-line="60" selection-end-column="67" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventTemplateServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="33" column="67" lean-forward="false" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1520#1521#0" expanded="true" />
-                <element signature="e#1547#1548#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventTemplateMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="22" column="129" lean-forward="false" selection-start-line="22" selection-start-column="129" selection-end-line="22" selection-end-column="129" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="mybatis-mapper" />
+        <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -318,6 +203,14 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
   <component name="GradleLocalSettings">
     <option name="externalProjectsViewState">
       <projects_view />
@@ -369,6 +262,77 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="LineStatusTrackerManager">
+    <file path="$PROJECT_DIR$/pqs.iws">
+      <ranges>
+        <range start1="2" end1="2" start2="2" end2="5" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+        <range start1="3" end1="6" start2="6" end2="26" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="7" end1="9" start2="27" end2="31" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="10" end1="51" start2="32" end2="32" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="209" end1="303" start2="190" end2="190" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="307" end1="307" start2="194" end2="195" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="308" end1="309" start2="196" end2="197" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="320" end1="320" start2="208" end2="216" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="370" end1="370" start2="266" end2="337" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="384" end1="387" start2="351" end2="354" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="389" end1="394" start2="356" end2="356" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="401" end1="401" start2="363" end2="366" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="433" end1="433" start2="398" end2="399" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="530" end1="530" start2="496" end2="500" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="531" end1="532" start2="501" end2="502" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="533" end1="533" start2="503" end2="506" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="535" end1="541" start2="508" end2="511" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="542" end1="543" start2="512" end2="512" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="544" end1="545" start2="513" end2="513" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="546" end1="549" start2="514" end2="521" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="551" end1="551" start2="523" end2="528" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="553" end1="553" start2="530" end2="535" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="558" end1="558" start2="540" end2="545" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="565" end1="575" start2="552" end2="552" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="576" end1="577" start2="553" end2="554" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="585" end1="586" start2="562" end2="562" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="587" end1="595" start2="563" end2="563" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="596" end1="597" start2="564" end2="568" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="599" end1="603" start2="570" end2="570" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="604" end1="611" start2="571" end2="585" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="613" end1="620" start2="587" end2="587" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="622" end1="623" start2="589" end2="589" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="624" end1="626" start2="590" end2="590" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="629" end1="638" start2="593" end2="596" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="640" end1="641" start2="598" end2="599" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="642" end1="644" start2="600" end2="605" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="646" end1="648" start2="607" end2="607" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="649" end1="650" start2="608" end2="614" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="652" end1="653" start2="616" end2="617" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="654" end1="656" start2="618" end2="621" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="658" end1="660" start2="623" end2="623" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="661" end1="662" start2="624" end2="628" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="664" end1="666" start2="630" end2="630" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="667" end1="668" start2="631" end2="635" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="670" end1="672" start2="637" end2="637" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="673" end1="674" start2="638" end2="642" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="676" end1="678" start2="644" end2="644" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="679" end1="680" start2="645" end2="649" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="682" end1="683" start2="651" end2="652" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="684" end1="686" start2="653" end2="658" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="688" end1="690" start2="660" end2="660" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="691" end1="692" start2="661" end2="665" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="694" end1="696" start2="667" end2="667" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="697" end1="698" start2="668" end2="676" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="700" end1="701" start2="678" end2="679" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="702" end1="704" start2="680" end2="694" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="705" end1="718" start2="695" end2="708" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="720" end1="722" start2="710" end2="712" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="725" end1="728" start2="715" end2="716" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="798" end1="798" start2="786" end2="797" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="813" end1="814" start2="812" end2="855" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+        <range start1="871" end1="875" start2="912" end2="913" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+        <range start1="878" end1="879" start2="916" end2="918" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+        <range start1="932" end1="937" start2="971" end2="974" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+        <range start1="941" end1="941" start2="978" end2="981" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
+      </ranges>
+    </file>
+  </component>
   <component name="LvcsProjectConfiguration">
     <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
     <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
@@ -382,16 +346,11 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="E:\AJava\maven\repository" />
+        <option name="localRepository" value="D:\AJava\Maven\apache-maven-3.8.6\mvn_repo" />
-        <option name="mavenHome" value="E:/AJava/maven/apache-maven-3.3.9" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../../AJava/Maven/apache-maven-3.8.6" />
-        <option name="userSettingsFile" value="E:\AJava\maven\apache-maven-3.3.9\conf\settings.xml" />
+        <option name="userSettingsFile" value="D:\AJava\Maven\apache-maven-3.8.6\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
@@ -399,6 +358,9 @@
       <select />
     </treeState>
   </component>
+  <component name="MavenRunner">
+    <option name="skipTests" value="true" />
+  </component>
   <component name="PerforceConfiguration">
     <option name="PORT" value="magic:1666" />
     <option name="USER" value="" />
@@ -431,6 +393,7 @@
     <option name="width" value="999" />
     <option name="height" value="696" />
   </component>
+  <component name="ProjectId" id="2EpPn8lOcjRPEvzEDTnT8ge0J6l" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -528,53 +491,64 @@
     <view id="SourcepathPane" />
     <view id="ClasspathPane" />
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
-    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="MemberChooser.sorted" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelOrder2" value="2" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
+    <property name="RequestMappingsPanelWidth2" value="75" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/TransientServiceImpl.java" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="project.structure.last.edited" value="Modules" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth2" value="75" />
-    <property name="RequestMappingsPanelOrder2" value="2" />
-    <property name="restartRequiresConfirmation" value="false" />
-    <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
+    <property name="restartRequiresConfirmation" value="false" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+  </component>
+  <component name="ReactorSettings">
+    <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Work\Git workspace\pqs\pqs-job\job-executor\src\main\java\com\njcn\executor\pojo\vo" />
+      <recent name="D:\Work\Git workspace\pqs\pqs-job\job-executor\src\main\java\com\njcn\executor\handler" />
+      <recent name="D:\Work\Git workspace\pqs\pqs-device\device-api\src\main\java\com\njcn\device\pojo\dto" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.njcn.system.enums" />
       <recent name="com.njcn.system.mapper" />
       <recent name="com.njcn.system.service" />
     </key>
   </component>
+  <component name="RunAnythingCache">
+    <option name="myCommands">
+      <command value="mvn idea:idea" />
+    </option>
+  </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
       <set>
         <option value="SpringBootApplicationConfigurationType" />
       </set>
     </option>
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.SystemBootMain">
+  <component name="RunManager" selected="Spring Boot.DeviceBootApplication">
     <configuration default="true" type="Applet" factoryName="Applet">
       <module />
       <option name="HTML_USED" value="false" />
@@ -583,149 +557,160 @@
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
     </configuration>
     <configuration name="DataTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="DataTest" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="common-influxDB" />
-      <envs />
+      <shortenClasspath name="MANIFEST" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <method v="2">
-      <option name="ALTERNATIVE_JRE_PATH" />
+        <option name="Make" enabled="true" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      </method>
-      <option name="ENV_VARIABLES" />
+    </configuration>
-      <option name="PASS_PARENT_ENVS" value="true" />
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <module name="" />
+      <option name="arquillianRunConfiguration">
-      <envs />
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="wholeProject" />
       </option>
-      <envs />
+      <method v="2">
-      <patterns />
+        <option name="Make" enabled="true" />
-    </configuration>
+      </method>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
     </configuration>
     <configuration name="AuthApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.auth.AuthApplication" />
       <module name="pqs-auth" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.auth.AuthApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="DeviceBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.device.DeviceBootApplication" />
       <module name="device-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.device.DeviceBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="EnergyBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.energy.EnergyBootApplication" />
       <module name="energy-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.energy.EnergyBootApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="EventBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.event.EventBootApplication" />
       <module name="event-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.event.EventBootApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="GatewayMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.gateway.GatewayMain" />
       <module name="pqs-gateway" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.gateway.GatewayMain" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="HarmonicBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.harmonic.HarmonicBootApplication" />
       <module name="harmonic-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.harmonic.HarmonicBootApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="JobAdminApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.job.admin.JobAdminApplication" />
       <module name="job-admin" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.job.admin.JobAdminApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="JobExecutorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.executor.JobExecutorApplication" />
       <module name="job-executor" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.executor.JobExecutorApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="CLASSPATH_FILE" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="QualityBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.quality.QualityBootApplication" />
       <module name="quality-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.quality.QualityBootApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="SystemBootMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.system.SystemBootMain" />
       <module name="system-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.system.SystemBootMain" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="UserBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.user.UserBootApplication" />
       <module name="user-boot" />
-      <envs />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.user.UserBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <list size="12">
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <item index="0" class="java.lang.String" itemvalue="Spring Boot.DeviceBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
-      <item index="1" class="java.lang.String" itemvalue="Spring Boot.SystemBootMain" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <item index="2" class="java.lang.String" itemvalue="Spring Boot.HarmonicBootApplication" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <item index="3" class="java.lang.String" itemvalue="Spring Boot.AuthApplication" />
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <item index="4" class="java.lang.String" itemvalue="Spring Boot.JobAdminApplication" />
+      <method v="2">
-      <item index="5" class="java.lang.String" itemvalue="Spring Boot.EventBootApplication" />
+        <option name="Make" enabled="true" />
-      <item index="6" class="java.lang.String" itemvalue="Spring Boot.EnergyBootApplication" />
+      </method>
-      <item index="7" class="java.lang.String" itemvalue="Spring Boot.QualityBootApplication" />
+    </configuration>
-      <item index="8" class="java.lang.String" itemvalue="Spring Boot.UserBootApplication" />
+    <list>
-      <item index="9" class="java.lang.String" itemvalue="Spring Boot.JobExecutorApplication" />
+      <item itemvalue="Application.DataTest" />
-      <item index="10" class="java.lang.String" itemvalue="Spring Boot.GatewayMain" />
+      <item itemvalue="Spring Boot.DeviceBootApplication" />
-      <item index="11" class="java.lang.String" itemvalue="Application.DataTest" />
+      <item itemvalue="Spring Boot.SystemBootMain" />
+      <item itemvalue="Spring Boot.HarmonicBootApplication" />
+      <item itemvalue="Spring Boot.AuthApplication" />
+      <item itemvalue="Spring Boot.JobAdminApplication" />
+      <item itemvalue="Spring Boot.EventBootApplication" />
+      <item itemvalue="Spring Boot.EnergyBootApplication" />
+      <item itemvalue="Spring Boot.QualityBootApplication" />
+      <item itemvalue="Spring Boot.UserBootApplication" />
+      <item itemvalue="Spring Boot.JobExecutorApplication" />
+      <item itemvalue="Spring Boot.GatewayMain" />
     </list>
     <recent_temporary>
-      <list size="1">
+      <list>
-        <item index="0" class="java.lang.String" itemvalue="Application.DataTest" />
+        <item itemvalue="Application.DataTest" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="project-level" UseSingleDictionary="true" transferred="true" />
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="StarteamConfiguration">
     <option name="SERVER" value="" />
     <option name="PORT" value="49201" />
@@ -796,6 +781,17 @@
       <workItem from="1663029650131" duration="12789000" />
       <workItem from="1663117208099" duration="1186000" />
       <workItem from="1663207780590" duration="115000" />
+      <workItem from="1663289724956" duration="15777000" />
+      <workItem from="1663507661308" duration="280000" />
+      <workItem from="1663548172230" duration="21000" />
+      <workItem from="1663548204444" duration="1671000" />
+      <workItem from="1663568302952" duration="903000" />
+      <workItem from="1663661596023" duration="5476000" />
+      <workItem from="1663729105885" duration="24749000" />
+      <workItem from="1663834703892" duration="1051000" />
+      <workItem from="1663835775824" duration="16834000" />
+      <workItem from="1664152527664" duration="23000" />
+      <workItem from="1664152563348" duration="59006000" />
     </task>
     <task id="LOCAL-00001" summary="EventTemplate控制器编写">
       <created>1663058049505</created>