EventTemplate控制器编写

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

@@ -56,6 +56,7 @@ public enum EventResponseEnum {
     NO_TABLE("501","字典表无influxDB表名数据"),
  	DEV_LINE_EMPTY("501","设备监测点不可为空"),
     DIC_NAME_REPEAT("502","字典名称不可重复"),
+    MODEL_NAME_REPEAT("514","模板名称不可重复"),
     CHILDREN_EXIT("503","存在子节点，不可删除"),
 
 

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

@@ -13,12 +13,6 @@ import javax.validation.constraints.Pattern;
 @Data
 public class EventDictParam {
 
-    /**
-     * 父级id
-     */
-    @ApiModelProperty(value = "父级id")
-    private String pid;
-
     /**
      * 字典表字段名称
      */
@@ -31,6 +25,12 @@ public class EventDictParam {
     @ApiModelProperty(value = "字典表字段描述")
     private String describe;
 
+    /**
+     * 父级id
+     */
+    @ApiModelProperty(value = "父级id")
+    private String pid;
+
 
     /**
      * 更新操作实体

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

@@ -25,7 +25,7 @@ public class EventTemplateParam {
     @ApiModelProperty("模板名称")
     @NotBlank(message = ValidMessage.CODE_NOT_BLANK)
     @Pattern(regexp = PatternRegex.DES64_REGEX, message = ValidMessage.CODE_FORMAT_ERROR)
-    private String code;
+    private String mark;
 
     @ApiModelProperty("类型")
     @NotBlank(message = ValidMessage.CODE_NOT_BLANK)

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

@@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode;
  * @createTime 2022/09/10
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName(value = "report_template")
+@EqualsAndHashCode(callSuper = true)
 public class EventTemplate extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ public class EventTemplate extends BaseEntity {
     /**
      * 模板名称
      */
-    private String code;
+    private String mark;
 
     /**
      * 状态：0-删除 1-正常

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,7 +46,7 @@ public class EventDictController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("新增字典表")
     @ApiImplicitParam(name = "eventDictParam", value = "字典表数据", required = true)
-    public HttpResult<Boolean> addDict(@RequestBody EventDictParam eventDictParam){
+    public HttpResult<Boolean> addDict(@RequestBody EventDictParam eventDictParam) {
         String methodDescribe = getMethodDescribe("addDict");
         LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventDictParam);
         boolean res = iEventDictService.addDict(eventDictParam);
@@ -64,7 +65,7 @@ public class EventDictController extends BaseController {
     @PostMapping("/updateDict")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("更新字典表")
-    @ApiImplicitParam(name = "dictUpadateParam", value = "更新字典表实体", required = true)
+    @ApiImplicitParam(name = "dictUpdateParam", value = "更新字典表实体", required = true)
     public HttpResult<Boolean> updateDict(@RequestBody EventDictParam.DictUpdateParam dictUpdateParam){
         String methodDescribe = getMethodDescribe("updateDict");
         LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictUpdateParam);

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

@@ -29,9 +29,9 @@ import java.util.Objects;
  * @date 2022/9/7
  */
 @Slf4j
-@Api(tags = "报告模板")
 @RestController
 @RequestMapping("/EventTemplate")
+@Api(tags = "报告模板管理")
 @RequiredArgsConstructor
 @Validated
 public class EventTemplateController extends BaseController{
@@ -45,12 +45,12 @@ public class EventTemplateController extends BaseController{
      * @date 2022/09/09
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/getList")
+    @PostMapping("/getList")
-    @ApiOperation("查询模板数据")
+    @ApiOperation("查询所有模板")
     public HttpResult<List<EventTemplate>> getList() {
         String methodDescribe = getMethodDescribe("getList");
-        List<EventTemplate> result = iEventTemplateService.getList();
+        List<EventTemplate> list = iEventTemplateService.getList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
     /**
@@ -81,7 +81,7 @@ public class EventTemplateController extends BaseController{
     @PostMapping("/add")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("新增模板")
-    @ApiImplicitParam(name = "eventTemplateParam", value = "模板数据", required = true)
+    @ApiImplicitParam(name = "eventTemplateParam", value = "模板实体", required = true)
     public HttpResult<Object> add(@RequestBody @Validated EventTemplateParam eventTemplateParam){
         String methodDescribe = getMethodDescribe("add");
         boolean result = iEventTemplateService.add(eventTemplateParam);
@@ -100,7 +100,7 @@ public class EventTemplateController extends BaseController{
     @PostMapping("/update")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
     @ApiOperation("修改模板")
-    @ApiImplicitParam(name = "eventUpdateParam", value = "模板实体", required = true)
+    @ApiImplicitParam(name = "eventUpdateParam", value = "模板更新实体", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){
         String methodDescribe = getMethodDescribe("update");
         boolean result = iEventTemplateService.update(eventUpdateParam);
@@ -120,7 +120,7 @@ public class EventTemplateController extends BaseController{
     @PostMapping("/delete")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("删除模板")
-    @ApiImplicitParam(name = "ids", value = "模板ids", required = true)
+    @ApiImplicitParam(name = "ids", value = "模板索引", required = true)
     public HttpResult<EventTemplate> delete(@RequestBody List<String> ids){
         String methodDescribe = getMethodDescribe("delete");
         boolean result = iEventTemplateService.delete(ids);

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

@@ -3,6 +3,7 @@ package com.njcn.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.system.pojo.po.EventTemplate;
 import com.njcn.system.pojo.vo.EventTemplateTree;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,4 +20,11 @@ public interface EventTemplateMapper extends BaseMapper<EventTemplate> {
      */
     List<EventTemplateTree> getAllList();
 
+    /**
+     * 删除模板和字典关系
+     * @param ids
+     * @return
+     */
+    Boolean deleteRelationship (@Param("ids")List<String> ids);
+
 }

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

@@ -4,13 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.system.mapper.EventTemplateMapper">
 
-    <!--获取字典分页列表-->
-    <select id="page" resultType="EventTemplate">
-        SELECT report_template.*
-        FROM report_template report_template
-        WHERE ${ew.sqlSegment}
-    </select>
-
     <!--获取所有表数据-->
     <select id="getAllList" resultType="com.njcn.system.pojo.vo.EventTemplateTree">
         select id, name, type ,code
@@ -18,4 +11,13 @@
         where state = 1
     </select>
 
+    <!--删除模板与字典关系-->
+    <delete id="deleteRelationship">
+        DELETE FROM report_rel where Rt_id in
+        <foreach item="item" index="index" collection="ids" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>

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

@@ -120,12 +120,13 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
      */
     private void checkName(EventDictParam eventDictParam,boolean flag){
         LambdaQueryWrapper<ReportDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(ReportDict::getName,eventDictParam.getName())
+        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());
+                lambdaQueryWrapper.ne(ReportDict::getId, ((EventDictParam.DictUpdateParam) eventDictParam).getId());
             }
         }
         int res = this.count(lambdaQueryWrapper);

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

@@ -12,6 +12,7 @@ import com.njcn.system.mapper.EventTemplateMapper;
 import com.njcn.system.pojo.param.EventTemplateParam;
 import com.njcn.system.pojo.po.EventTemplate;
 import com.njcn.system.service.IEventTemplateService;
+import com.njcn.user.pojo.po.Role;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -81,7 +82,9 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
      */
     @Override
     public boolean delete(List<String> ids) {
-        return this.removeByIds(ids);
+        //删除模板与字典的关系
+        this.baseMapper.deleteRelationship(ids);
+        return this.lambdaUpdate().set(EventTemplate::getState, DataStateEnum.DELETED.getCode()).in(EventTemplate::getId, ids).update();
     }
 
     /**
@@ -100,7 +103,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         int result = this.count(lambdaQueryWrapper);
         //大于等于1个则表示重复
         if (result >= 1) {
-            throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT);
+            throw new BusinessException(EventResponseEnum.MODEL_NAME_REPEAT);
         }
 
     }

pqs.iws

@@ -2,23 +2,15 @@
 <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 beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/ReportDict.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java" beforeDir="false" 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-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-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.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/EventDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.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>
@@ -266,70 +258,21 @@
     <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="4" end1="15" start2="7" end2="9" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="7" end1="9" start2="27" end2="31" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="16" end1="17" start2="10" end2="12" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="10" end1="51" start2="32" end2="32" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="20" end1="21" start2="15" end2="16" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="209" end1="303" start2="190" end2="190" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="268" end1="332" start2="263" end2="278" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="307" end1="307" start2="194" end2="195" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="550" end1="551" start2="496" end2="497" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="308" end1="309" start2="196" end2="197" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="568" end1="579" start2="514" end2="514" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="320" end1="320" start2="208" end2="216" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="622" end1="622" start2="557" end2="559" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="370" end1="370" start2="266" end2="337" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="636" end1="636" start2="573" end2="577" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="384" end1="387" start2="351" end2="354" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="659" end1="659" start2="600" end2="604" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="389" end1="394" start2="356" end2="356" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="793" end1="794" start2="738" end2="742" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="401" end1="401" start2="363" end2="366" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="809" end1="810" start2="757" end2="807" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="433" end1="433" start2="398" end2="399" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="867" end1="871" start2="864" end2="865" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="530" end1="530" start2="496" end2="500" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="873" end1="873" start2="867" end2="868" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="531" end1="532" start2="501" end2="502" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="928" end1="933" start2="923" end2="926" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
-        <range start1="533" end1="533" start2="503" end2="506" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
+        <range start1="937" end1="937" start2="930" end2="933" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
-        <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>
@@ -548,7 +491,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.DeviceBootApplication">
+  <component name="RunManager" selected="Spring Boot.SystemBootMain">
     <configuration default="true" type="Applet" factoryName="Applet">
       <module />
       <option name="HTML_USED" value="false" />
@@ -570,17 +513,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <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">
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
@@ -620,6 +552,8 @@
     <configuration name="EventBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="event-boot" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.event.EventBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -634,6 +568,10 @@
     <configuration name="HarmonicBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="harmonic-boot" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.harmonic.HarmonicBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <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>
@@ -657,6 +595,10 @@
     <configuration name="QualityBootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="quality-boot" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.njcn.quality.QualityBootApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <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>
@@ -791,7 +733,10 @@
       <workItem from="1663834703892" duration="1051000" />
       <workItem from="1663835775824" duration="16834000" />
       <workItem from="1664152527664" duration="23000" />
-      <workItem from="1664152563348" duration="59006000" />
+      <workItem from="1664152563348" duration="62578000" />
+      <workItem from="1664328876284" duration="428000" />
+      <workItem from="1664329319344" duration="573000" />
+      <workItem from="1664329912185" duration="38768000" />
     </task>
     <task id="LOCAL-00001" summary="EventTemplate控制器编写">
       <created>1663058049505</created>
@@ -807,7 +752,56 @@
       <option name="project" value="LOCAL" />
       <updated>1663207857640</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="EventTemplate控制器编写">
+      <created>1663297309522</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1663297309522</updated>
+    </task>
+    <task id="LOCAL-00004" summary="EventTemplate控制器编写">
+      <created>1663297476659</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1663297476659</updated>
+    </task>
+    <task id="LOCAL-00005" summary="EventTemplate控制器编写">
+      <created>1663317186936</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1663317186936</updated>
+    </task>
+    <task id="LOCAL-00006" summary="EventTemplate控制器编写">
+      <created>1663748937878</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1663748937878</updated>
+    </task>
+    <task id="LOCAL-00007" summary="EventTemplate控制器编写">
+      <created>1663922038311</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1663922038311</updated>
+    </task>
+    <task id="LOCAL-00008" summary="装置在线率调度任务">
+      <created>1664169028040</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1664169028040</updated>
+    </task>
+    <task id="LOCAL-00009" summary="EventTemplate控制器编写">
+      <created>1664284251724</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1664284251724</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -865,12 +859,10 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="装置在线率调度任务" />
     <MESSAGE value="EventTemplate控制器编写" />
     <option name="LAST_COMMIT_MESSAGE" value="EventTemplate控制器编写" />
   </component>