报警统计功能

alarm-web/src/main/java/com/gyee/alarm/controller/AlarmConfigurationController.java

@@ -178,13 +178,13 @@ public class AlarmConfigurationController {
                         .rank(3).uniformCode("AI242").stationId("SXJ_KGDL_HSM_FDC_STA").modelId("/HW3-S2500(121)")
                         .alarmType("windturbine").deviceType("windturbine").components("CLX").subcomponents("")
                         .description("温度等于850度或者温度小于零下40度")
-                        .characteristic("正常停机").resetTable(false).enable(true)
+                        .characteristic("正常停机").resetTable(false).enable(true).name("").nemCode("").faultCause("").resolvent("")
                         .build(),
                 ProEconAlarmConfiguration.builder().id("").tagId("1").deviceId("SXJ_KGDL_HSM_F_WT_0002_EQ").suffix("")
                         .rank(3).uniformCode("AI242").stationId("SXJ_KGDL_HSM_FDC_STA").modelId("/HW3-S2500(121)")
                         .alarmType("windturbine").deviceType("windturbine").components("CLX").subcomponents("")
                         .description("温度等于850度或者温度小于零下40度")
-                        .characteristic("正常停机").resetTable(false).enable(true)
+                        .characteristic("正常停机").resetTable(false).enable(true).name("").nemCode("").faultCause("").resolvent("")
                         .build()
 
 

alarm-web/src/main/java/com/gyee/alarm/controller/AlertRuleController.java

@@ -52,6 +52,45 @@ public class AlertRuleController {
 
     @Resource
     private TokenService tokenService;
+
+
+    @GetMapping(value = "/querymodellist")
+    @ApiOperation(value = "查询型号信息", notes = "查询型号信息")
+    public AjaxResult queryModelList(String wpId) {
+
+        List<String> modells=new ArrayList<>();
+        if(StringUtils.notEmp( wpId) && CacheContext.wpwtmap.containsKey(wpId))
+        {
+            List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get(wpId);
+
+            for(ProBasicEquipment wt:wtls)
+            {
+                if(!modells.contains(wt.getModelId()))
+                {
+                    modells.add(wt.getModelId());
+                }
+            }
+        }else   if(StringUtils.notEmp( wpId) && CacheContext.subWtsMap.containsKey(wpId))
+        {
+
+            List<ProBasicEquipment> wtls=CacheContext.subWtsMap.get(wpId);
+
+            for(ProBasicEquipment wt:wtls)
+            {
+                if(!modells.contains(wt.getModelId()))
+                {
+                    modells.add(wt.getModelId());
+                }
+            }
+        }
+
+        if (StringUtils.notEmp(modells)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, modells);
+        } else {
+            return AjaxResult.successData(AjaxStatus.loginexpire.code, "error");
+        }
+    }
     @GetMapping(value = "/list")
     @ApiOperation(value = "查询报警关联部件名称", notes = "查询报警关联部件名称")
     public AjaxResult queryTree() {
@@ -162,6 +201,7 @@ public class AlertRuleController {
 
             List<ProBasicEquipmentPoint> ailist = new ArrayList<>();
             List<ProBasicEquipmentPoint> dilist = new ArrayList<>();
+            List<ProBasicEquipmentPoint> list = new ArrayList<>();
             for (ProBasicEquipment wt : wtls) {
                 if (wt.getModelId().equals(modelId) && CacheContext.wtpAimap.containsKey(wt.getId())) {
                     Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
@@ -172,6 +212,7 @@ public class AlertRuleController {
                         } else if (entry.getKey().contains("DI")) {
                             dilist.add(entry.getValue());
                         }
+                        list.add(entry.getValue());
                     }
                     break;
                 }
@@ -179,6 +220,8 @@ public class AlertRuleController {
 
             map.put("ai", ailist);
             map.put("di", dilist);
+
+            map.put("total", list);
         }
 
         if (StringUtils.notEmp(map)) {
@@ -238,6 +281,7 @@ public class AlertRuleController {
 
             List<ProBasicPowerstationPoint> ailist = new ArrayList<>();
             List<ProBasicPowerstationPoint> dilist = new ArrayList<>();
+            List<ProBasicPowerstationPoint> list = new ArrayList<>();
             for (Map.Entry<String, ProBasicPowerstationPoint> entry : submap.entrySet()) {
 
                 if (entry.getKey().contains("AI")) {
@@ -245,10 +289,12 @@ public class AlertRuleController {
                 } else if (entry.getKey().contains("DI")) {
                     dilist.add(entry.getValue());
                 }
-
+                list.add(entry.getValue());
             }
             map.put("ai", ailist);
             map.put("di", dilist);
+
+            map.put("total", list);
         }
 
         if (StringUtils.notEmp(map)) {

alarm-web/src/main/java/com/gyee/alarm/controller/InspectOrderController.java

@@ -0,0 +1,114 @@
+package com.gyee.alarm.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.alarm.model.vo.AjaxResult;
+import com.gyee.alarm.model.vo.AjaxStatus;
+import com.gyee.alarm.model.vo.InspectOrderDto;
+import com.gyee.alarm.service.InspectOrderService;
+import com.gyee.alarm.util.DateUtils;
+import com.gyee.alarm.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+
+@RestController
+@RequestMapping("/inspectorder")
+@CrossOrigin
+@Api(value = "检修计划")
+public class InspectOrderController {
+
+    @Resource
+    private InspectOrderService inspectOrderService;
+
+    @ApiOperation(value = "分页查询隐患巡检单")
+    @GetMapping("/order/page")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "pagenum", value = "当前页", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "pagesize", value = "分页大小", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "step", value = "节点 1-待审核，2-已审核，3-未计划，4-已计划，5-未巡检，6-已巡检", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "windturbineId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "startTime", value = "起始时间", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true, dataType = "string", paramType = "query")
+
+    })
+    public AjaxResult getInspectOrderPage(Integer pageNum,Integer pageSize,Optional<Integer> step,String windturbineId,String startTime,String endTime )
+
+    {
+
+        AjaxResult wrapper = null;
+
+        Date dateStart = DateUtils.parseDate(startTime);
+        Date dateEnd = DateUtils.parseDate(endTime);
+
+        IPage<InspectOrderDto> inspectOrderDtoPage = inspectOrderService.getInspectOrderDtoPage(pageNum, pageSize, windturbineId, step, dateStart, dateEnd);
+
+        if (StringUtils.notEmp(inspectOrderDtoPage)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, inspectOrderDtoPage);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, "error");
+        }
+    }
+
+    @ApiOperation(value = "分页查询隐患报告（待审核报告）")
+    @GetMapping("/port/list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "stationId", value = "节场站id", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "windturbineId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+
+    })
+    public AjaxResult getNoVerifiedPort( String stationId, String windturbineId) {
+        List<InspectOrderDto> inspectOrderDtoPage = inspectOrderService.getInspectOrderDtoPage(stationId, windturbineId);
+        if (StringUtils.notEmp(inspectOrderDtoPage)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, inspectOrderDtoPage);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, "error");
+        }
+    }
+
+
+    @ApiOperation(value = "审核诊断报告")
+    @PostMapping("/update")
+    public AjaxResult saveInspectOrder(HttpServletRequest request, @RequestBody InspectOrderDto inspectOrderDto) {
+
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+
+        AjaxResult AjaxResult = null;
+        //如果id为空，则代表报告评审，否则代表更新流程
+        AjaxResult = inspectOrderService.updateInspectOrder(userId, inspectOrderDto);
+        return AjaxResult;
+    }
+
+
+    @ApiOperation(value = "第三方系统获取巡检单")
+    @GetMapping("/order/list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "起始时间", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true, dataType = "string", paramType = "query")
+
+    })
+    public AjaxResult getInspectOrderList(long startTime, long endTime  ) {
+
+        List<InspectOrderDto> orderDtoList = inspectOrderService.getOrderDtoList(new Date(startTime), new Date(endTime));
+        if (StringUtils.notEmp(orderDtoList)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, orderDtoList);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, "error");
+        }
+    }
+}

alarm-web/src/main/java/com/gyee/alarm/controller/ProEconEarlyReportController.java

@@ -1,10 +1,26 @@
 package com.gyee.alarm.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import com.gyee.alarm.model.vo.AjaxResult;
+import com.gyee.alarm.model.vo.AjaxStatus;
+import com.gyee.alarm.service.EarlyReportService;
+import com.gyee.alarm.util.StringUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 预警报告 前端控制器
@@ -14,7 +30,54 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-09-05
  */
 @RestController
-@RequestMapping("//pro-econ-early-report")
+@RequestMapping("//earlyreport")
 public class ProEconEarlyReportController {
 
+
+    @Resource
+    private EarlyReportService earlyReportService;
+
+    @ApiOperation(value = "分页查询风机诊断报告")
+    @GetMapping("/list")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "pageNum", value = "当前页", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "pagesize", value = "分页大小", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "stationId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "keyword", value = "关键字", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "starttime", value = "起始时间", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endtime", value = "结束时间", required = true, dataType = "string", paramType = "query")
+
+    })
+    public AjaxResult getReportList(Integer pageNum,Integer pageSize,String stationid,String keyWord,String startTime,String endTime  ) {
+
+        Page<ProEconEarlyReport> page = new Page<>(pageNum,pageSize);
+
+        IPage reportByPage = earlyReportService.getReportByPage(page,stationid);
+        if (StringUtils.notEmp(reportByPage)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, reportByPage);
+        } else {
+            return AjaxResult.successData(AjaxStatus.loginexpire.code, "error");
+        }
+    }
+
+    @ApiOperation(value = "根据id获取报告详细内容")
+    @GetMapping("/info")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "reportId", value = "报告编号", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult getReportInfo(String reportId) {
+
+        ProEconEarlyReport report = earlyReportService.getEarlyReportById(reportId);
+
+        if (StringUtils.notEmp(report)) {
+
+            return AjaxResult.successData(AjaxStatus.success.code, report);
+        } else {
+            return AjaxResult.successData(AjaxStatus.loginexpire.code, "error");
+        }
+    }
+
+
 }

alarm-web/src/main/java/com/gyee/alarm/controller/ProEconEarlyWarnScoreController.java

@@ -1,10 +1,20 @@
 package com.gyee.alarm.controller;
 
 
+import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
+import com.gyee.alarm.service.EarlyWarnScoreService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 预警得分 前端控制器
@@ -14,7 +24,20 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-09-05
  */
 @RestController
-@RequestMapping("//pro-econ-early-warn-score")
+@RequestMapping("//earlywarnscore")
 public class ProEconEarlyWarnScoreController {
 
+
+    @Autowired
+    private EarlyWarnScoreService earlyWarnScoreService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "预警分数查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "设备编号", required = true, dataType = "String", paramType = "query")
+    })
+    public List<ProEconEarlyWarnScore> getListEarlyWarnScore(String windturbineid) {
+        List<ProEconEarlyWarnScore> lst = earlyWarnScoreService.getListEarlyWarnScore(windturbineid);
+        return lst;
+    }
 }

alarm-web/src/main/java/com/gyee/alarm/controller/ProEconInspectOrderController.java

@@ -0,0 +1,20 @@
+package com.gyee.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 评审记录 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-09-13
+ */
+@RestController
+@RequestMapping("//pro-econ-inspect-order")
+public class ProEconInspectOrderController {
+
+}

alarm-web/src/main/java/com/gyee/alarm/init/CacheContext.java

@@ -778,6 +778,8 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 //        inputOrOutPutService.initialInputOrOutputSpeed();
+
+
         logger.info("缓存结束------------------------------------------------------------");
     }
 }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconEarlyReportAlarmMapper.java

@@ -1,7 +1,11 @@
 package com.gyee.alarm.mapper.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconEarlyReportAlarmMapper extends BaseMapper<ProEconEarlyReportAlarm> {
 
+    @Select("select * from pro_econ_early_report_alarm where  report_windturbine_id=#{windturbineReportId}")
+    List<ProEconEarlyReportAlarm> findByWindturbineReportId(@Param("windturbineReportId") String windturbineReportId);
+
 }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconEarlyReportConclusioMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.alarm.mapper.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
 
 /**
  * <p>

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconEarlyReportMapper.java

@@ -1,7 +1,11 @@
 package com.gyee.alarm.mapper.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import org.apache.ibatis.annotations.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,32 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconEarlyReportMapper extends BaseMapper<ProEconEarlyReport> {
 
+
+    @Select("select * from pro_econ_early_report where report_date>#{startTime} and report_date<=#{endTime}")
+    @Results({
+            @Result(id = true, column = "id", property = "id"),
+            @Result(
+                    property = "proEconEarlyReportWtList",
+                    column = "id",
+                    javaType = List.class,
+                    many = @Many(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportWtMapper.findByReportId")
+
+            )})
+    List<ProEconEarlyReport> findEarlyReportByDate(@Param("stationId")String stationId, @Param("startTime") Date startTime, @Param("endTime")Date endTime);
+
+    @Select("select * from pro_econ_early_report where ID=#{id}")
+    @Results({
+            @Result(id = true, column = "id", property = "id"),
+            @Result(
+                    property = "proEconEarlyReportWtList",
+                    column = "id",
+                    javaType = List.class,
+                    many = @Many(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportWtMapper.findByReportId")
+
+            )})
+    List<ProEconEarlyReport> findEarlyReportById(@Param("id") String id);
+
+
+    @Select(" select * from pro_econ_early_report where id=(select max(id) from pro_econ_early_report) ")
+    ProEconEarlyReport findLastReport();
 }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconEarlyReportWtMapper.java

@@ -1,7 +1,11 @@
 package com.gyee.alarm.mapper.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,51 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconEarlyReportWtMapper extends BaseMapper<ProEconEarlyReportWt> {
 
+    @Select("select * from pro_econ_early_report_wt where report_id=#{reportId}")
+    @Results({
+            @Result(id = true, column = "id", property = "id"),
+            @Result(
+                    property = "alarmInfoList",
+                    column = "id",
+                    javaType = List.class,
+                    many = @Many(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportAlarmMapper.findByWindturbineReportId")
+            )})
+    List<ProEconEarlyReportWt> findByReportId(@Param("reportId")String reportId);
+
+    @Select("<script>select * from pro_econ_early_report_wt where ID in <foreach item='item' index='index' collection='idList'  open='(' separator=',' close=')'>#{item} </foreach></script>")
+    @Results({
+            @Result(id = true, column = "id", property = "id"),
+            @Result(
+                    property = "alarmInfoList",
+                    column = "id",
+                    javaType = List.class,
+                    many = @Many(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportAlarmMapper.findByWindturbineReportId")
+            ),
+            @Result(
+                    property = "earlyReport",
+                    column = "report_id",
+                    javaType = ProEconEarlyReport.class,
+                    one = @One(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportMapper.selectById")
+            )
+    })
+    List<ProEconEarlyReportWt> findByIds(@Param("idList") List<String> idList);
+
+    @Select("<script>select * from pro_econ_early_report_wt where report_id in <foreach item='item' index='index' collection='reportIdList'  open='(' separator=',' close=')'>#{item} </foreach></script>")
+    @Results({
+            @Result(id = true, column = "id", property = "id"),
+            @Result(
+                    property = "alarmInfoList",
+                    column = "id",
+                    javaType = List.class,
+                    many = @Many(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportAlarmMapper.findByWindturbineReportId")
+            ),
+            @Result(
+                    property = "earlyReport",
+                    column = "report_id",
+                    javaType = ProEconEarlyReport.class,
+                    one = @One(select = "com.gyee.alarm.mapper.auto.ProEconEarlyReportMapper.selectById")
+            )
+    })
+    List<ProEconEarlyReportWt> findByReportIds(@Param("reportIdList") List<String> reportIdList);
+
 }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconEarlyWarnScoreMapper.java

@@ -1,7 +1,11 @@
 package com.gyee.alarm.mapper.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconEarlyWarnScoreMapper extends BaseMapper<ProEconEarlyWarnScore> {
 
+    @Select("select * from pro_econ_early_warn_score where windturbine_id = #{windturbineid} and statdate =DATE_SUB(curdate(),INTERVAL 1 day) ")
+    List<ProEconEarlyWarnScore> getListEarlyWarnScore(@Param("windturbineid") String windturbineid);
 }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconInspectOrderMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.alarm.mapper.auto;
+
+import com.gyee.alarm.model.auto.ProEconInspectOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 评审记录 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-09-13
+ */
+public interface ProEconInspectOrderMapper extends BaseMapper<ProEconInspectOrder> {
+
+}

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconAlarmConfiguration.java

@@ -1,5 +1,6 @@
 package com.gyee.alarm.model.auto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Builder;
@@ -24,106 +25,127 @@ public class ProEconAlarmConfiguration extends Model {
     /**
      * 编号
      */
+    @ExcelProperty("编号")
     private String id;
 
     /**
      * 测点（如果根据uniformcode配置此字段可为空）
      */
+    @ExcelProperty("测点")
     private String tagId;
 
     /**
-     * 报警类别，0触发，1触发，-1变化触发，4ai点触发
+     * 触发条件，0触发，1触发，-1变化触发，4ai点触发
      */
+    @ExcelProperty("触发条件")
     private Integer triggerType;
 
     /**
      * 设备ID
      */
+    @ExcelProperty("设备ID")
     private String deviceId;
 
     /**
      * 后缀
      */
+    @ExcelProperty("后缀")
     private String suffix;
 
     /**
      * 报警级别
      */
+    @ExcelProperty("报警级别")
     private Integer rank;
 
     /**
      * 统一识别码(如果通过uniformCode配置，则设备类型，场站，机型不能为空)
      */
+    @ExcelProperty("统一识别码")
     private String uniformCode;
 
     /**
      * 场站ID
      */
+    @ExcelProperty("场站ID")
     private String stationId;
 
     /**
      * 机型
      */
+    @ExcelProperty("机型")
     private String modelId;
 
     /**
      * 报警类型 /自定义报警 custom，风机 windturbine，场站 station，升压站 booststation
      */
+    @ExcelProperty("报警类型")
     private String alarmType;
 
     /**
      * 设备类型，场站 station，风机 windturbine，升压站 booststation
      */
+    @ExcelProperty("设备类型")
     private String deviceType;
 
     /**
      * 设备部件
      */
+    @ExcelProperty("设备部件")
     private String components;
 
     /**
      * 设备子部件
      */
+    @ExcelProperty("设备子部件")
     private String subcomponents;
 
     /**
      * 报警描述
      */
+    @ExcelProperty("报警描述")
     private String description;
 
     /**
      * 特性
      */
+    @ExcelProperty("特性")
     private String characteristic;
 
     /**
      * 是否可复位
      */
+    @ExcelProperty("是否可复位")
     private Boolean resetTable;
 
     /**
      * 是否启用
      */
+    @ExcelProperty("是否启用")
     private Boolean enable;
 
     /**
      * 故障名称
      */
+    @ExcelProperty("故障名称")
     private String name;
 
     /**
      *故障码
      */
+    @ExcelProperty("故障码")
     private String nemCode;
 
     /**
      * 故障原因
      */
+    @ExcelProperty("故障原因")
     private String faultCause;
 
     /**
      * 排查方法
      */
+    @ExcelProperty("排查方法")
     private String resolvent;
 
 

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReport.java

@@ -1,10 +1,13 @@
 package com.gyee.alarm.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 预警报告
@@ -47,17 +50,18 @@ public class ProEconEarlyReport extends Model {
     /**
      * 报告日期
      */
-    private LocalDateTime reportDate;
+    private Date reportDate;
 
     /**
      * 报告分析起始时间
      */
-    private LocalDateTime statStartDate;
+    private Date statStartDate;
 
     /**
      * 报告分析结束时间
      */
-    private LocalDateTime statEndDate;
-
+    private Date statEndDate;
 
+    @TableField(exist = false)
+    private List<ProEconEarlyReportWt> proEconEarlyReportWtList;
 }

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportAlarm.java

@@ -1,6 +1,5 @@
 package com.gyee.alarm.model.auto;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -52,12 +51,12 @@ public class ProEconEarlyReportAlarm extends Model {
     /**
      * 报警数量
      */
-    private Integer count;
+    private Long count;
 
     /**
      * 报警持续时长
      */
-    private BigDecimal keepTime;
+    private Double keepTime;
 
     /**
      * 预警风机报告表主键

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportWt.java

@@ -1,9 +1,12 @@
 package com.gyee.alarm.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备预警报告
@@ -63,5 +66,12 @@ public class ProEconEarlyReportWt extends Model {
      */
     private Boolean verified;
 
+    @TableField(exist = false)
+    private ProEconEarlyReport earlyReport;
+
+    @TableField(exist = false)
+    private List<ProEconEarlyReportAlarm> alarmInfoList;
 
+    @TableField(exist = false)
+    private List<ProEconEarlyReportAlarm> compareAlarmInfoList;
 }

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyWarnScore.java

@@ -1,11 +1,17 @@
 package com.gyee.alarm.model.auto;
 
-import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
+import com.gyee.alarm.model.vo.Early;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 预警得分
@@ -33,72 +39,85 @@ public class ProEconEarlyWarnScore extends Model {
     /**
      * 日期
      */
-    private LocalDateTime statdate;
+    private Date statdate;
 
     /**
      * 总分
      */
-    private BigDecimal totalScore;
+    private Double totalScore;
 
     /**
      * 传感器分数
      */
-    private BigDecimal sensorScore;
+    private Double sensorScore;
 
     /**
      * 零部件隐患分数
      */
-    private BigDecimal partsScore;
+    private Double partsScore;
 
     /**
      * 控制参数分数
      */
-    private BigDecimal controlScore;
+    private Double controlScore;
 
     /**
      * 性能下降分数
      */
-    private BigDecimal performanceScore;
+    private Double performanceScore;
 
     /**
      * 其它分数
      */
-    private BigDecimal otherScore;
+    private Double otherScore;
 
     /**
      * 测风系统分数
      */
-    private BigDecimal cfxtScore;
+    private Double cfxtScore;
 
     /**
      * 发电机分数
      */
-    private BigDecimal fdjScore;
+    private Double fdjScore;
 
     /**
      * 齿轮箱分数
      */
-    private BigDecimal clxScore;
+    private Double clxScore;
 
     /**
      * 主控柜分数
      */
-    private BigDecimal zkgScore;
+    private Double zkgScore;
 
     /**
      * 机舱分数
      */
-    private BigDecimal jcScore;
+    private Double jcScore;
 
     /**
      * 变桨系统分数
      */
-    private BigDecimal bjxtScore;
+    private Double bjxtScore;
 
     /**
      * 轴承分数
      */
-    private BigDecimal zcScore;
+    private Double zcScore;
+
+    @TableField(exist = false)
+    private String windturbineName;
+    @TableField(exist = false)
+    private String windturbineCode;
+    @TableField(exist = false)
+    private String stationName;
+    @TableField(exist = false)
+    private String stationId;
+    @TableField(exist = false)
+    private String model;
+
+
 
 
 }

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProEconInspectOrder.java

@@ -0,0 +1,142 @@
+package com.gyee.alarm.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+
+import lombok.*;
+
+/**
+ * <p>
+ * 评审记录
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconInspectOrder extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 设备编号
+     */
+    private String windturbineId;
+
+    /**
+     * 诊断报告 earlyreportwindturbine表id
+     */
+    private String reportWindturbineId;
+
+    /**
+     * 评审人
+     */
+    private String verifyUser;
+
+    /**
+     * 评审时间
+     */
+    private Date verifyTime;
+
+    /**
+     * 评审结论
+     */
+    private String verifyView;
+
+    /**
+     * 计划时间
+     */
+    private Date createPlanTime;
+
+    /**
+     * 计划人
+     */
+    private String createPlanUser;
+
+    /**
+     * 计划开始时间
+     */
+    private Date planStartTime;
+
+    /**
+     * 计划结束时间
+     */
+    private Date planEndTime;
+
+    /**
+     * 巡检人
+     */
+    private String inspectUser;
+
+    /**
+     * 巡检时间
+     */
+    private Date inspectTime;
+
+    /**
+     * 巡检结论
+     */
+    private String inspectView;
+
+    /**
+     * 是否与报告相符
+     */
+    private Boolean accordReport;
+
+    /**
+     * 是否关闭
+     */
+    private Boolean closed;
+
+    /**
+     * 结果已经验证
+     */
+    private Boolean verifyResult;
+
+    @TableField(exist = false)
+    private ProEconEarlyReportWt proEconEarlyReportWt;
+
+    @TableField(exist = false)
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private String step;
+
+    @TableField(exist = false)
+    private int stepMark;
+
+    public void setStep(String step) {
+        this.step = step;
+    }
+    public String getStep() {
+        //节点 1-待审核，2-已审核，3-未计划，4-已计划，5-未巡检，6-已巡检
+        String result = "";
+        if (inspectTime != null && createPlanTime != null && verifyTime != null) {
+            result = "已巡检";
+            stepMark=6;
+        } else if (inspectTime == null && createPlanTime != null && verifyTime != null) {
+            result = "已计划，未巡检";
+            stepMark=5;
+        } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == true) {
+            result = "已评审，未计划";
+
+        } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == false) {
+            result="审核不通过";
+        }else{
+            return "";
+        }
+        return step;
+    }
+
+}

alarm-web/src/main/java/com/gyee/alarm/model/vo/Early.java

@@ -0,0 +1,25 @@
+package com.gyee.alarm.model.vo;
+
+import lombok.Data;
+
+@Data
+public class Early implements Comparable<Early> {
+    String name;
+    Double score;
+
+    public Early(String name1, double score1){
+        name = name1;
+        score = score1;
+    }
+
+    @Override
+    public int compareTo(Early user) {
+        if (this.score > user.score) {
+            return 1;
+        } else if (this.score == user.score) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}

alarm-web/src/main/java/com/gyee/alarm/model/vo/InspectOrderDto.java

@@ -0,0 +1,91 @@
+package com.gyee.alarm.model.vo;
+
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description:
+ * @auther: Wanghs
+ * @date: 2022-09-09
+ */
+@Data
+@Accessors(chain = true)
+public class InspectOrderDto implements Serializable {
+
+    private String id;
+    //风机编号
+    private String windturbineId;
+    //风场id
+    private String windpowerStationId;
+    //诊断报告风机表 id
+    private String reportWindturbineId;
+    //评审人
+    private String verifyUser;
+    //评审时间
+    private Date verifyTime;
+    //评审结论
+    private String verifyView;
+    //评审结果 0-不巡检 1-巡检
+    private boolean verifyResult;
+    // 创建计划人
+    private String createPlanUser;
+    //创建计划时间
+    private Date createPlanTime;
+    //计划开始时间
+    private Date planStartTime;
+    //计划结束时间
+    private Date planEndTime;
+    //巡检人
+    private String inspectUser;
+    //巡检时间
+    private Date inspectTime;
+    //巡检结论
+    private String inspectView;
+    //巡检结果是否符合报告结论
+    private boolean accordreport;
+    //0-未关闭  1-已关闭
+    private boolean closed;
+    //是否已审核
+    private boolean earlyReport;
+
+    private ProEconEarlyReportWt earlyReportWindturbine;
+
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private String step;
+
+    public InspectOrderDto setStep(String step) {
+        this.step = step;
+        return this;
+    }
+    public String getStep() {
+        if (earlyReport) {
+            step = "待审核";
+        } else {
+            if (inspectTime != null && createPlanTime != null && verifyTime != null) {
+                step = "已巡检";
+            } else if (inspectTime == null && createPlanTime != null && verifyTime != null) {
+                step = "已计划，待巡检";
+
+            } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == true) {
+                step = "已评审，未计划";
+            } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == false) {
+                step = "已评审，不巡检";
+            } else {
+                return "";
+            }
+        }
+        return step;
+    }
+
+
+}

alarm-web/src/main/java/com/gyee/alarm/service/EarlyReportAlarmService.java

@@ -0,0 +1,31 @@
+package com.gyee.alarm.service;
+
+
+import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
+import com.gyee.alarm.service.auto.IProEconEarlyReportAlarmService;
+import com.gyee.alarm.service.auto.IProEconEarlyReportWtService;
+import com.gyee.alarm.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+
+public class EarlyReportAlarmService {
+
+    @Resource
+    private IProEconEarlyReportAlarmService proEconEarlyReportAlarmService;
+
+    public List<ProEconEarlyReportAlarm> findByWindturbineReportId(String windturbineReportId)
+    {
+        List<ProEconEarlyReportAlarm> ls=new ArrayList<>();
+        if(StringUtils.notEmp(windturbineReportId))
+        {
+            ls=proEconEarlyReportAlarmService.findByWindturbineReportId(windturbineReportId);
+        }
+        return ls;
+    }
+}

alarm-web/src/main/java/com/gyee/alarm/service/EarlyReportConclusionService.java

@@ -0,0 +1,32 @@
+package com.gyee.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
+import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
+import com.gyee.alarm.service.auto.IProEconEarlyReportConclusioService;
+
+import com.gyee.alarm.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class EarlyReportConclusionService  {
+
+    @Resource
+    private IProEconEarlyReportConclusioService proEconEarlyReportConclusioService;
+
+
+    public List<ProEconEarlyReportConclusio> getListByPart(List<String> partList)
+    {
+        List<ProEconEarlyReportConclusio> ls=new ArrayList<>();
+        if(StringUtils.notEmp(partList))
+        {
+            ls=proEconEarlyReportConclusioService.getListByPart(partList);
+        }
+        return ls;
+    }
+}

alarm-web/src/main/java/com/gyee/alarm/service/EarlyReportService.java

@@ -0,0 +1,93 @@
+package com.gyee.alarm.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+import com.gyee.alarm.service.auto.IProEconEarlyReportService;
+import com.gyee.alarm.service.auto.IProEconEarlyReportWtService;
+
+import com.gyee.alarm.util.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @auther: Wanghs
+ * @date: 2022-07-26
+ */
+@Service
+public class EarlyReportService  {
+
+    @Resource
+    private IProEconEarlyReportService proEconEarlyReportService;
+    @Resource
+    private IProEconEarlyReportWtService proEconEarlyReportWtService;
+
+
+    public List<ProEconEarlyReport> getEarlyReport(String stationId, Date startTime, Date endTime) {
+        List<ProEconEarlyReport> earlyReportByDate = proEconEarlyReportService.findEarlyReportByDate(stationId, startTime, endTime);
+
+        return earlyReportByDate;
+    }
+
+    public boolean saveEarlyReport(List<ProEconEarlyReport> lst) {
+        boolean b = this.saveEarlyReport(lst);
+        return b;
+    }
+
+    public IPage<ProEconEarlyReport> getReportByPage(Page<ProEconEarlyReport> page, String stationId) {
+        QueryWrapper<ProEconEarlyReport> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(stationId))
+            wrapper.like("station_id", stationId);
+        wrapper.orderByDesc("report_date");
+        IPage<ProEconEarlyReport> reportPage =proEconEarlyReportService.page(page, wrapper);
+        return reportPage;
+    }
+
+    public ProEconEarlyReport getEarlyReportById(String id) {
+
+        ProEconEarlyReport report = null;
+        List<ProEconEarlyReport> earlyReportList = proEconEarlyReportService.findEarlyReportById(id);
+
+        if (earlyReportList != null && earlyReportList.size() > 0) {
+
+            report = earlyReportList.get(0);
+
+            List<ProEconEarlyReportWt> collect = report.getProEconEarlyReportWtList().stream().filter(s -> s.getCompared()).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                List<String> oldReportWindturbineIdList = collect.stream().map(s -> s.getCompareId()).collect(Collectors.toList());
+
+                List<ProEconEarlyReportWt> oldReportWindturbineList = proEconEarlyReportWtService.getReportWindturbineByIds(oldReportWindturbineIdList);
+
+                report.getProEconEarlyReportWtList().forEach(s -> {
+                    if (s.getCompared() && StringUtils.isNotBlank(s.getCompareId())) {
+                        Optional<ProEconEarlyReportWt> first = oldReportWindturbineList.stream().filter(k -> k.getId().equals(s.getCompared())).findFirst();
+                        if (first.isPresent()) {
+                            s.setCompareAlarmInfoList(first.get().getAlarmInfoList());
+                        }
+                    }
+                });
+            }
+
+        }
+
+        return report;
+    }
+
+    public ProEconEarlyReport findLastEarlyReport() {
+        ProEconEarlyReport lastReport = proEconEarlyReportService.findLastReport();
+
+        return lastReport;
+    }
+
+
+}

alarm-web/src/main/java/com/gyee/alarm/service/EarlyReportWindturbineService.java

@@ -0,0 +1,38 @@
+package com.gyee.alarm.service;
+
+
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+import com.gyee.alarm.service.auto.IProEconEarlyReportWtService;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+
+public class EarlyReportWindturbineService{
+
+    @Resource
+    private IProEconEarlyReportWtService proEconEarlyReportWtService;
+    
+    public boolean saveEarlyReportInfo(List<ProEconEarlyReportWt> lst) {
+        boolean b = proEconEarlyReportWtService.saveBatch(lst);
+        return b;
+    }
+
+    public List<ProEconEarlyReportWt> getReportWindturbineByIds(List<String> idList) {
+        List<ProEconEarlyReportWt> reportWindturbineList = proEconEarlyReportWtService.findByIds(idList);
+        return reportWindturbineList;
+
+    }
+
+
+
+    public List<ProEconEarlyReportWt> getReportWindturbineByReportId(List<String> reportIdList) {
+        List<ProEconEarlyReportWt> byReportIds = proEconEarlyReportWtService.findByReportIds(reportIdList);
+        return byReportIds;
+
+    }
+}

alarm-web/src/main/java/com/gyee/alarm/service/EarlyWarnScoreService.java

@@ -0,0 +1,53 @@
+package com.gyee.alarm.service;
+
+
+import com.gyee.alarm.init.Cache.WindturbineCache;
+import com.gyee.alarm.init.CacheContext;
+import com.gyee.alarm.model.auto.ProBasicEquipment;
+import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
+import com.gyee.alarm.service.auto.IProEconEarlyWarnScoreService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+
+public class EarlyWarnScoreService  {
+    @Resource
+    private IProEconEarlyWarnScoreService proEconEarlyWarnScoreService;
+
+
+
+    public List<ProEconEarlyWarnScore> getListEarlyWarnScore(String windturbineid) {
+        List<ProEconEarlyWarnScore> earlyWarnScores =  proEconEarlyWarnScoreService.getListEarlyWarnScore(windturbineid);
+        for (int i = 0; i < earlyWarnScores.size(); i++) {
+
+            if(CacheContext.wtmap.containsKey(earlyWarnScores.get(i).getWindturbineId()))
+            {
+                ProBasicEquipment windturbine= CacheContext.wtmap.get(earlyWarnScores.get(i).getWindturbineId());
+                if(windturbine!=null){
+
+                    if(CacheContext.wpmap.containsKey(windturbine.getWindpowerstationId()))
+                    {
+                        String stationName = CacheContext.wpmap.get(windturbine.getWindpowerstationId()).getName();
+                        earlyWarnScores.get(i).setWindturbineName(windturbine.getName());
+                        earlyWarnScores.get(i).setStationId(windturbine.getWindpowerstationId());
+                        earlyWarnScores.get(i).setModel(windturbine.getModelId());
+                        earlyWarnScores.get(i).setWindturbineCode(windturbine.getNemCode());
+                        earlyWarnScores.get(i).setStationName(stationName.replace("风电场",""));
+                    }
+
+                }
+            }
+
+        }
+        
+        return earlyWarnScores;
+    }
+
+}

alarm-web/src/main/java/com/gyee/alarm/service/InspectOrderService.java

@@ -0,0 +1,422 @@
+package com.gyee.alarm.service;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.alarm.init.CacheContext;
+import com.gyee.alarm.model.auto.ProEconAlarmType;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+import com.gyee.alarm.model.auto.ProEconInspectOrder;
+import com.gyee.alarm.model.vo.AjaxResult;
+import com.gyee.alarm.model.vo.InspectOrderDto;
+import com.gyee.alarm.service.auto.IProEconEarlyReportService;
+import com.gyee.alarm.service.auto.IProEconEarlyReportWtService;
+import com.gyee.alarm.service.auto.IProEconInspectOrderService;
+
+import com.gyee.alarm.util.DateUtils;
+import com.gyee.alarm.util.SnowflakeGenerator;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @auther: Wanghs
+ * @date: 2022-09-09
+ */
+@Service
+public class InspectOrderService  {
+
+    @Resource
+    private IProEconEarlyReportWtService proEconEarlyReportWtService;
+    @Resource
+    private IProEconInspectOrderService proEconInspectOrderService;
+
+    @Resource
+    private EarlyReportWindturbineService earlyReportWindturbineService;
+
+
+
+    @Resource
+    private EarlyReportService earlyReportService;
+    @Resource
+    private IProEconEarlyReportService proEconEarlyReportService;
+    public boolean saveInspectOrder(ProEconInspectOrder order) {
+
+        boolean saveOrder = false;
+        boolean updateReport = false;
+
+        saveOrder = proEconInspectOrderService.save(order);
+
+        ProEconEarlyReportWt verifyReport = proEconEarlyReportWtService.getById(order.getReportWindturbineId());
+
+        if (verifyReport != null) {
+            verifyReport.setVerified(true);
+            updateReport = proEconEarlyReportWtService.updateById(verifyReport);
+        }
+        if (saveOrder && updateReport)
+            return true;
+        else {
+            throw new RuntimeException();
+        }
+
+    }
+
+
+
+    public IPage<InspectOrderDto> getInspectOrderDtoPage(Integer pageNum, Integer pageSize, String windturbineId, Optional<Integer> step, Date startTime, Date endTime) {
+        //节点 1-待审核，2-已审核，3-未计划，4-已计划，5-未巡检，6-已巡检
+        IPage<ProEconInspectOrder> inspectOrderByStep = getInspectOrderByStep(pageNum, pageSize, step, windturbineId, startTime, endTime);
+        List<InspectOrderDto> inspectOrderDtos = packInspectOrderInspectOrderDto(inspectOrderByStep.getRecords());
+        Page<InspectOrderDto> pageDto = new Page<>();
+        pageDto.setPages(inspectOrderByStep.getPages()).setRecords(inspectOrderDtos).setTotal(inspectOrderByStep.getTotal()).setCurrent(inspectOrderByStep.getCurrent()).setSize(inspectOrderByStep.getSize());
+        return pageDto;
+    }
+
+    public List<InspectOrderDto> getInspectOrderDtoPage(String stationId, String windturbineId) {
+        List<ProEconEarlyReportWt> noVerifiedPort = getNoVerifiedPort(stationId, windturbineId);
+        List<InspectOrderDto> inspectOrderDtos = packWindturbineReportInspectOrderDto(noVerifiedPort);
+        return inspectOrderDtos;
+    }
+
+    /**
+     * @param
+     * @return
+     * @return java.util.List<com.gyee.wisdom.alarm.sharding.entity.ProEconEarlyReportWt>
+     * @author Wanghs
+     * @description 获取最近的一批报告，没有被审核过的风机报告
+     * @date 2022/9/12
+     **/
+    private List<ProEconEarlyReportWt> getNoVerifiedPort(String stationId, String windturbineId) {
+
+        List<ProEconEarlyReportWt> resultList = new ArrayList<>();
+
+        //获取id最大的数据
+        ProEconEarlyReport lastEarlyReport = earlyReportService.findLastEarlyReport();
+        if(lastEarlyReport==null)
+            return resultList;
+        // 根据最后一条数据获取报告生成日期
+        Date date = DateUtils.truncate(lastEarlyReport.getReportDate());
+        QueryWrapper<ProEconEarlyReport> wrapper = new QueryWrapper<ProEconEarlyReport>().ge("REPORTDATE", date);
+        List<ProEconEarlyReport> earlyReportList = proEconEarlyReportService.list(wrapper);
+        List<String> collect = earlyReportList.stream().map(s -> s.getId()).collect(Collectors.toList());
+        List<ProEconEarlyReportWt> reportWindturbineList = earlyReportWindturbineService.getReportWindturbineByReportId(collect);
+        //筛选出 不是对比数据，且不是全场平局，且没有审核过的数据
+        reportWindturbineList = reportWindturbineList.stream().filter(s -> s.getVerified() == false && s.getCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
+
+        if (com.gyee.alarm.util.StringUtils.isNotBlank(windturbineId))
+            reportWindturbineList = reportWindturbineList.stream().filter(s -> s.getWindturbineId().equals(windturbineId)).collect(Collectors.toList());
+        if (StringUtils.isNotBlank(stationId))
+            reportWindturbineList = reportWindturbineList.stream().filter(s -> s.getEarlyReport().getStationId().equals(stationId)).collect(Collectors.toList());
+
+        return reportWindturbineList;
+
+    }
+
+    private List<InspectOrderDto> packWindturbineReportInspectOrderDto(List<ProEconEarlyReportWt> earlyReportWindturbineList) {
+        List<InspectOrderDto> resultList = new ArrayList<>();
+
+        earlyReportWindturbineList.stream().forEach(s -> {
+
+            InspectOrderDto dto = new InspectOrderDto()
+                    .setReportWindturbineId(s.getId())
+                    .setWindturbineId(s.getWindturbineId())
+                    .setWindpowerStationId(s.getEarlyReport().getStationId())
+                    .setEarlyReport(true)
+                    .setEarlyReportWindturbine(s);
+            resultList.add(dto);
+        });
+        return resultList;
+    }
+
+
+    private IPage<ProEconInspectOrder> getInspectOrderByStep(int pageNum, int pageSize, Optional<Integer> step, String windturbineId, Date startTime, Date endTime) {
+        List<ProEconInspectOrder> resultList = new ArrayList<>();
+        //节点 1-待审核，2-已审核，3-未计划，4-已计划，5-未巡检，6-已巡检
+        QueryWrapper<ProEconInspectOrder> wrapper = new QueryWrapper<>();
+
+        if (step.isPresent()) {
+            if (step.get() == 2 || step.get() == 3) {
+                wrapper.isNotNull("VERIFYTIME");//评审时间不为空
+                wrapper.isNull("CREATEPLANTIME");//计划时间为空
+                wrapper.isNull("INSPECTTIME");//巡检时间为空
+            } else if (step.get() == 4 || step.get() == 5) {
+                wrapper.isNotNull("VERIFYTIME");//评审时间不为空
+                wrapper.isNotNull("CREATEPLANTIME");//计划时间不为空
+                wrapper.isNull("INSPECTTIME");//巡检时间为空
+            } else if (step.get() == 6) {
+                wrapper.isNotNull("VERIFYTIME");//评审时间不为空
+                wrapper.isNotNull("CREATEPLANTIME");//计划时间不为空
+                wrapper.isNotNull("INSPECTTIME");//巡检时间不为空
+            }
+        }
+
+        if (StringUtils.isNotBlank(windturbineId))
+            wrapper.eq("WINDTURBINEID", windturbineId);
+        if (startTime != null)
+            wrapper.gt("VERIFYTIME", startTime);
+        if (endTime != null)
+            wrapper.lt("VERIFYTIME", endTime);
+
+        Page<ProEconInspectOrder> page = new Page(pageNum, pageSize);
+
+        IPage<ProEconInspectOrder> pageResult = proEconInspectOrderService.page(page, wrapper);
+
+
+        if (pageResult.getRecords().size() > 0) {
+            List<ProEconEarlyReportWt> reportWindturbineById = earlyReportWindturbineService.getReportWindturbineByIds(pageResult.getRecords().stream().map(s -> s.getReportWindturbineId()).collect(Collectors.toList()));
+            pageResult.getRecords().forEach(s -> {
+                Optional<ProEconEarlyReportWt> first = reportWindturbineById.stream().filter(k -> k.getId().equals(s.getReportWindturbineId())).findFirst();
+                if (first.isPresent())
+                    s.setProEconEarlyReportWt(first.get());
+            });
+        }
+
+        return pageResult;
+    }
+
+    private List<InspectOrderDto> packInspectOrderInspectOrderDto(List<ProEconInspectOrder> orderList) {
+        List<InspectOrderDto> resultList = new ArrayList<>();
+
+        orderList.stream().forEach(s -> {
+            InspectOrderDto dto = new InspectOrderDto();
+            BeanUtils.copyProperties(s, dto);
+            dto.setEarlyReport(false);
+            resultList.add(dto);
+        });
+
+        return resultList;
+    }
+
+    public AjaxResult updateInspectOrder(String user, InspectOrderDto dto) {
+        AjaxResult wrapper = null;
+        //代表为 报告评审环节，因此需要 向InspectOrder表中新增数据
+        if (StringUtils.isBlank(dto.getId())) {
+            try {
+                ProEconInspectOrder order = new ProEconInspectOrder();
+                order.setId(String.valueOf(SnowflakeGenerator.generateId()));
+                order.setVerifyTime(new Date());
+                order .setVerifyUser(user);
+                order .setVerifyView(dto.getVerifyView());
+                order .setVerifyResult(dto.isVerifyResult());
+                order .setWindturbineId(dto.getWindturbineId());
+                order .setReportWindturbineId(dto.getReportWindturbineId());
+                //如果不需要巡检则，巡检单直接结束
+                if (!dto.isVerifyResult())
+                    order.setClosed(true);
+                else
+                    order.setClosed(false);
+
+                boolean saveInspectOrder = proEconInspectOrderService.save(order);
+                if (saveInspectOrder)
+                    wrapper = AjaxResult.success("评审成功");
+                else
+                    wrapper = AjaxResult.error("评审失败");
+            } catch (Exception e) {
+                wrapper = AjaxResult.error(JSON.toJSONString(e.getStackTrace()));
+            } finally {
+                return wrapper;
+            }
+        } else {
+            ProEconInspectOrder order = proEconInspectOrderService.getById(dto.getId());
+
+            if (order == null) {
+                wrapper = AjaxResult.error("找不到对应的巡检单");
+            } else {
+                //计划环节
+                if (order.getCreatePlanTime() == null && order.getInspectTime() == null) {
+                    order.setCreatePlanUser(user);
+                    order.setCreatePlanTime(dto.getCreatePlanTime() == null ? new Date() : dto.getCreatePlanTime());
+                    order.setPlanStartTime(dto.getPlanStartTime());
+                    order.setPlanEndTime(dto.getPlanEndTime());
+                }
+                //巡检环节
+                else if (order.getInspectTime() == null && order.getCreatePlanTime() != null) {
+                    order.setInspectUser(user);
+                    order.setInspectTime(dto.getInspectTime() == null ? new Date() : dto.getInspectTime());
+                    order.setInspectView(dto.getInspectView());
+                    order.setAccordReport(dto.isAccordreport());
+                    order.setClosed(true);
+                } else {
+                    return AjaxResult.error("系统异常，请联系管理员");
+                }
+                boolean b = proEconInspectOrderService.updateById(order);
+                if (b)
+                    wrapper = AjaxResult.success("更新成功");
+                else
+                    wrapper = AjaxResult.error("更新失败");
+
+            }
+        }
+        return wrapper;
+    }
+
+    public JSONObject getOrderCountInfo(String stationId) {
+
+        Map<String, Integer> inspectOrderCount = getInspectOrderCount(stationId);
+        Map<String, Integer> noVerifyReport = getNoVerifyReport(stationId);
+
+
+        JSONArray jsonArray = new JSONArray();
+        int wshCount = 0;
+        for (Map.Entry<String, Integer> entry :
+                noVerifyReport.entrySet()) {
+            JSONObject reportObject = new JSONObject();
+            String partName = null;
+            if(CacheContext.alarmTypeMap.containsKey(entry.getKey()))
+            {
+                ProEconAlarmType alarmType=CacheContext.alarmTypeMap.get(entry.getKey());
+                partName=alarmType.getName();
+            }
+
+            reportObject.put("code", entry.getKey());
+            reportObject.put("name", partName);
+            reportObject.put("count", entry.getValue());
+            wshCount = wshCount + entry.getValue();
+
+            jsonArray.add(reportObject);
+        }
+
+        List<String> collect = noVerifyReport.keySet().stream().collect(Collectors.toList());
+
+        if (collect.size() < 4) {
+
+            if (!collect.contains("CLX")) {
+                JSONObject reportObject = new JSONObject();
+                reportObject.put("code", "CLX");
+                reportObject.put("name", "齿轮箱");
+                reportObject.put("count", 0);
+                jsonArray.add(reportObject);
+            }
+            if (!collect.contains("FDJ")) {
+                JSONObject reportObject = new JSONObject();
+                reportObject.put("code", "FDJ");
+                reportObject.put("name", "发电机");
+                reportObject.put("count", 0);
+                jsonArray.add(reportObject);
+            }
+            if (!collect.contains("BJXT")) {
+                JSONObject reportObject = new JSONObject();
+                reportObject.put("code", "BJXT");
+                reportObject.put("name", "变桨系统");
+                reportObject.put("count", 0);
+                jsonArray.add(reportObject);
+            }
+            if (!collect.contains("CDL")) {
+                JSONObject reportObject = new JSONObject();
+                reportObject.put("code", "CDL");
+                reportObject.put("name", "传动链");
+                reportObject.put("count", 0);
+                jsonArray.add(reportObject);
+            }
+        }
+
+
+        JSONObject orderObject = new JSONObject();
+        for (Map.Entry<String, Integer> entry :
+                inspectOrderCount.entrySet()) {
+            orderObject.put(entry.getKey(), entry.getValue());
+        }
+        orderObject.put("WSH", wshCount);
+        String dicString = "WSH-未审核，YSH-已审核，WJH-未计划，YJH-已计划，DXJ-待巡检，YXJ-已巡检";
+        JSONObject resultObject = new JSONObject();
+        resultObject.put("report", jsonArray);
+        resultObject.put("order", orderObject);
+        resultObject.put("dic", dicString);
+        return resultObject;
+    }
+
+    public Map<String, Integer> getInspectOrderCount(String stationId) {
+
+        List<ProEconInspectOrder> list = new ArrayList<>();
+        if (StringUtils.isNotBlank(stationId)) {
+            QueryWrapper<ProEconInspectOrder> wrapper = new QueryWrapper<>();
+            wrapper.eq("WINDPOWERSTATIONID", stationId);
+            list = proEconInspectOrderService.list(wrapper);
+        } else {
+            list = proEconInspectOrderService.list();
+        }
+
+        //已审核
+        List<ProEconInspectOrder> ysh_collect = list.stream().filter(s -> s.getVerifyTime() != null && s.getCreatePlanTime() == null && s.getInspectTime() == null).collect(Collectors.toList());
+
+        //待计划
+        List<ProEconInspectOrder> wjh_collect = list.stream().filter(s -> s.getVerifyTime() != null && s.getCreatePlanTime() == null && s.getInspectTime() == null && s.getClosed() == false).collect(Collectors.toList());
+
+        //已计划 待巡检
+        List<ProEconInspectOrder> yjh_collect = list.stream().filter(s -> s.getVerifyTime() != null && s.getCreatePlanTime() != null && s.getInspectTime() == null).collect(Collectors.toList());
+
+        //已巡检
+        List<ProEconInspectOrder> yxj_collect = list.stream().filter(s -> s.getVerifyTime() != null && s.getCreatePlanTime() != null && s.getInspectTime() != null && s.getClosed() == true).collect(Collectors.toList());
+
+        Map<String, Integer> resultMap = new HashMap<>();
+
+        resultMap.put("YSH", ysh_collect.size());
+        resultMap.put("WJH", wjh_collect.size());
+        resultMap.put("YJH", yjh_collect.size());
+        resultMap.put("DXJ", yjh_collect.size());
+        resultMap.put("YXJ", yxj_collect.size());
+
+        return resultMap;
+
+    }
+
+    public Map<String, Integer> getNoVerifyReport(String stationId) {
+
+        Map<String, Integer> resultMap = new HashMap<>();
+
+        Map<String, List<ProEconEarlyReportWt>> map = new HashMap<>();
+        List<ProEconEarlyReportWt> noVerifiedPort = getNoVerifiedPort(stationId, "");
+        for (ProEconEarlyReportWt windturbine :
+                noVerifiedPort) {
+            String relatedParts = windturbine.getEarlyReport().getRelatedParts();
+            if (!map.containsKey(relatedParts)) {
+                map.put(relatedParts, new ArrayList<>());
+            }
+            List<ProEconEarlyReportWt> earlyReportWindturbines = map.get(relatedParts);
+            earlyReportWindturbines.add(windturbine);
+        }
+
+        for (Map.Entry<String, List<ProEconEarlyReportWt>> entry :
+                map.entrySet()) {
+            if (!resultMap.containsKey(entry.getKey())) {
+                resultMap.put(entry.getKey(), entry.getValue().size());
+            }
+        }
+
+        return resultMap;
+    }
+
+    public List<InspectOrderDto> getOrderDtoList(Date startTime, Date endTime) {
+
+        QueryWrapper<ProEconInspectOrder> wrapper = new QueryWrapper<>();
+        if (startTime != null)
+            wrapper.gt("VERIFYTIME", startTime);
+        if (endTime != null)
+            wrapper.lt("VERIFYTIME", endTime);
+        wrapper.eq("VERIFYRESULT", true);
+
+        List<ProEconInspectOrder> list = proEconInspectOrderService.list(wrapper);
+        List<InspectOrderDto> orderDtoList = packInspectOrderInspectOrderDto(list);
+        if (orderDtoList.size() > 0) {
+            List<ProEconEarlyReportWt> reportWindturbineById = earlyReportWindturbineService.getReportWindturbineByIds(list.stream().map(s -> s.getReportWindturbineId()).collect(Collectors.toList()));
+            orderDtoList.forEach(s -> {
+                Optional<ProEconEarlyReportWt> first = reportWindturbineById.stream().filter(k -> k.getId().equals(s.getReportWindturbineId())).findFirst();
+                if (first.isPresent())
+                    s.setEarlyReportWindturbine(first.get());
+            });
+        }
+        return orderDtoList;
+    }
+
+}

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconEarlyReportAlarmService.java

@@ -1,7 +1,9 @@
 package com.gyee.alarm.service.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEarlyReportAlarmService extends IService<ProEconEarlyReportAlarm> {
 
+    List<ProEconEarlyReportAlarm> findByWindturbineReportId( String windturbineReportId);
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconEarlyReportConclusioService.java

@@ -1,7 +1,9 @@
 package com.gyee.alarm.service.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEarlyReportConclusioService extends IService<ProEconEarlyReportConclusio> {
 
+    public  List<ProEconEarlyReportConclusio> getListByPart(List<String> partList) ;
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconEarlyReportService.java

@@ -1,7 +1,12 @@
 package com.gyee.alarm.service.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReport;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.alarm.model.auto.ProBasicFeatureStat;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +18,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEarlyReportService extends IService<ProEconEarlyReport> {
 
+    public List<ProEconEarlyReport> findEarlyReportByDate(String stationId, Date startTime, Date endTime);
+    public ProBasicFeatureStat getAvgAlarmCount(List<ProBasicFeatureStat> alarmCountList);
+    public Map<String, ProBasicFeatureStat> getSumAlarmCountByWindturbine(List<ProBasicFeatureStat> lst, int limit);
+
+    public List<ProEconEarlyReport> findEarlyReportById( String id);
+
+    public ProEconEarlyReport findLastReport();
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconEarlyReportWtService.java

@@ -1,7 +1,9 @@
 package com.gyee.alarm.service.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEarlyReportWtService extends IService<ProEconEarlyReportWt> {
 
+   public List<ProEconEarlyReportWt> findByReportId(String reportId);
+
+
+    public List<ProEconEarlyReportWt> findByIds(List<String> idList);
+
+
+    public List<ProEconEarlyReportWt> findByReportIds( List<String> reportIdList);
+
+    public List<ProEconEarlyReportWt> getReportWindturbineByIds(List<String> idList);
+
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconEarlyWarnScoreService.java

@@ -1,7 +1,10 @@
 package com.gyee.alarm.service.auto;
 
-import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEarlyWarnScoreService extends IService<ProEconEarlyWarnScore> {
 
+    List<ProEconEarlyWarnScore> getListEarlyWarnScore(String windturbineid);
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/IProEconInspectOrderService.java

@@ -0,0 +1,16 @@
+package com.gyee.alarm.service.auto;
+
+import com.gyee.alarm.model.auto.ProEconInspectOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 评审记录 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-09-13
+ */
+public interface IProEconInspectOrderService extends IService<ProEconInspectOrder> {
+
+}

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportAlarmServiceImpl.java

@@ -1,11 +1,16 @@
 package com.gyee.alarm.service.auto.impl;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.alarm.mapper.auto.ProEconEarlyReportAlarmMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReportAlarm;
 import com.gyee.alarm.service.auto.IProEconEarlyReportAlarmService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.util.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 预警报告报警 服务实现类
@@ -17,4 +22,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconEarlyReportAlarmServiceImpl extends ServiceImpl<ProEconEarlyReportAlarmMapper, ProEconEarlyReportAlarm> implements IProEconEarlyReportAlarmService {
 
+    @Resource
+   private ProEconEarlyReportAlarmMapper proEconEarlyReportAlarmMapper;
+
+    public List<ProEconEarlyReportAlarm> findByWindturbineReportId(String windturbineReportId)
+    {
+        List<ProEconEarlyReportAlarm> ls=new ArrayList<>();
+        if(StringUtils.notEmp(windturbineReportId))
+        {
+            ls= proEconEarlyReportAlarmMapper.findByWindturbineReportId(windturbineReportId);
+        }
+        return ls;
+    }
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportConclusioServiceImpl.java

@@ -1,11 +1,15 @@
 package com.gyee.alarm.service.auto.impl;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.alarm.mapper.auto.ProEconEarlyReportConclusioMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReportConclusio;
 import com.gyee.alarm.service.auto.IProEconEarlyReportConclusioService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 预警报告结论 服务实现类
@@ -17,4 +21,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconEarlyReportConclusioServiceImpl extends ServiceImpl<ProEconEarlyReportConclusioMapper, ProEconEarlyReportConclusio> implements IProEconEarlyReportConclusioService {
 
+
+    public List<ProEconEarlyReportConclusio> getListByPart(List<String> partList) {
+        List<ProEconEarlyReportConclusio> collect=new ArrayList<>();
+        if (partList == null || partList.size() <= 0) {
+            QueryWrapper<ProEconEarlyReportConclusio> qw = new QueryWrapper<>();
+            qw.in("part",partList);
+            collect = list(qw);
+        }
+        return collect;
+
+    }
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportServiceImpl.java

@@ -1,11 +1,19 @@
 package com.gyee.alarm.service.auto.impl;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReport;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.alarm.mapper.auto.ProEconEarlyReportMapper;
+import com.gyee.alarm.model.auto.ProBasicFeatureStat;
+import com.gyee.alarm.model.auto.ProEconEarlyReport;
 import com.gyee.alarm.service.auto.IProEconEarlyReportService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.util.StringUtils;
+import com.gyee.alarm.util.realtimesource.StringUtil;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 预警报告 服务实现类
@@ -17,4 +25,78 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconEarlyReportServiceImpl extends ServiceImpl<ProEconEarlyReportMapper, ProEconEarlyReport> implements IProEconEarlyReportService {
 
+
+    @Resource
+    private ProEconEarlyReportMapper proEconEarlyReportMapper;
+
+    public List<ProEconEarlyReport> findEarlyReportByDate(String stationId, Date startTime,Date endTime)
+    {
+        List<ProEconEarlyReport> ls=new ArrayList<>();
+        if(StringUtils.notEmp(stationId) && StringUtils.notEmp(startTime) && StringUtils.notEmp(endTime))
+        {
+            ls= proEconEarlyReportMapper.findEarlyReportByDate(stationId,  startTime, endTime);
+        }
+        return ls;
+    }
+
+
+    public ProBasicFeatureStat getAvgAlarmCount(List<ProBasicFeatureStat> alarmCountList) {
+        OptionalDouble avgCount = alarmCountList.stream().mapToLong(ProBasicFeatureStat::getTotal).average();
+        OptionalDouble avgTime = alarmCountList.stream().mapToDouble(ProBasicFeatureStat::getTotalSeconds).average();
+        ProBasicFeatureStat alarmCount = new ProBasicFeatureStat();
+        alarmCount.setTotal(avgCount.isPresent() ? (long) avgCount.getAsDouble() : 0);
+        alarmCount.setTotalSeconds(avgTime.isPresent() ? avgTime.getAsDouble() : 0);
+        return alarmCount;
+
+    }
+
+    /**
+     * @param lst alarmcount 集合
+     * @return
+     * @return java.util.Map<java.lang.String, com.gyee.wisdom.alarm.schedule.entity.ProBasicFeatureStat>
+     * @author Wanghs
+     * @description 将每一台风机的所有规则报警次数时长求和并根据总持续时间排序，取出最大的几条数据
+     * @date 2022/8/23
+     **/
+    public Map<String, ProBasicFeatureStat> getSumAlarmCountByWindturbine(List<ProBasicFeatureStat> lst, int limit) {
+
+        //根据风机编号分组，并次数求和
+        Map<String, Long> mapCount = lst.stream().filter(s -> StringUtil.isNotBlank(s.getWtId())).collect(Collectors.groupingBy(ProBasicFeatureStat::getWtId, Collectors.summingLong(ProBasicFeatureStat::getTotal)));
+        //根据风机编号分组，并时长求和
+        Map<String, Double> mapTime = lst.stream().filter(s -> StringUtil.isNotBlank(s.getWtId())).collect(Collectors.groupingBy(ProBasicFeatureStat::getWtId, Collectors.summingDouble(ProBasicFeatureStat::getTotalSeconds)));
+
+        List<ProBasicFeatureStat> alarmCountList = new ArrayList<>();
+        for (Map.Entry<String, Double> entry :
+                mapTime.entrySet()) {
+            ProBasicFeatureStat data = new ProBasicFeatureStat();
+            data.setWtId(entry.getKey());
+            data.setTotalSeconds(entry.getValue());
+            if (mapCount.containsKey(entry.getKey())) {
+                data.setTotal(mapCount.get(entry.getKey()));
+            }
+            alarmCountList.add(data);
+        }
+        Map<String, ProBasicFeatureStat> collect = alarmCountList.stream().
+                sorted(Comparator.comparing(ProBasicFeatureStat::getTotalSeconds, Comparator.reverseOrder())).
+                limit(limit).collect(Collectors.toMap(ProBasicFeatureStat::getWtId, s -> s, (key1, key2) -> key2));
+        return collect;
+
+    }
+
+    public List<ProEconEarlyReport> findEarlyReportById( String id)
+    {
+        List<ProEconEarlyReport> ls=new ArrayList<>();
+        if(StringUtils.notEmp(id) )
+        {
+            ls= proEconEarlyReportMapper.findEarlyReportById(id);
+        }
+        return ls;
+    }
+
+    public ProEconEarlyReport findLastReport()
+    {
+        ProEconEarlyReport vo=proEconEarlyReportMapper.findLastReport();
+        return vo;
+
+    }
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportWtServiceImpl.java

@@ -1,11 +1,16 @@
 package com.gyee.alarm.service.auto.impl;
 
-import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.alarm.mapper.auto.ProEconEarlyReportWtMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyReportWt;
 import com.gyee.alarm.service.auto.IProEconEarlyReportWtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.util.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 设备预警报告 服务实现类
@@ -17,4 +22,45 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconEarlyReportWtServiceImpl extends ServiceImpl<ProEconEarlyReportWtMapper, ProEconEarlyReportWt> implements IProEconEarlyReportWtService {
 
+    @Resource
+    private  ProEconEarlyReportWtMapper proEconEarlyReportWtMapper;
+
+    public List<ProEconEarlyReportWt> findByReportId(String reportId)
+    {
+        List<ProEconEarlyReportWt> ls=new ArrayList<>();
+        if(StringUtils.notEmp(reportId))
+        {
+            ls= proEconEarlyReportWtMapper.findByReportId(reportId);
+        }
+       return ls;
+    }
+
+
+    public List<ProEconEarlyReportWt> findByIds(List<String> idList)
+    {
+        List<ProEconEarlyReportWt> ls=new ArrayList<>();
+        if(StringUtils.notEmp(idList))
+        {
+            ls= proEconEarlyReportWtMapper.findByIds(idList);
+        }
+        return ls;
+    }
+
+
+    public List<ProEconEarlyReportWt> findByReportIds( List<String> reportIdList)
+    {
+        List<ProEconEarlyReportWt> ls=new ArrayList<>();
+        if(StringUtils.notEmp(reportIdList))
+        {
+            ls= proEconEarlyReportWtMapper.findByReportIds(reportIdList);
+        }
+        return ls;
+    }
+
+    public List<ProEconEarlyReportWt> getReportWindturbineByIds(List<String> idList) {
+        List<ProEconEarlyReportWt> reportWindturbineList = this.proEconEarlyReportWtMapper.findByIds(idList);
+        return reportWindturbineList;
+
+    }
+
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyWarnScoreServiceImpl.java

@@ -1,11 +1,17 @@
 package com.gyee.alarm.service.auto.impl;
 
-import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.alarm.mapper.auto.ProEconEarlyWarnScoreMapper;
+import com.gyee.alarm.model.auto.ProEconEarlyWarnScore;
 import com.gyee.alarm.service.auto.IProEconEarlyWarnScoreService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.alarm.util.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 预警得分 服务实现类
@@ -17,4 +23,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconEarlyWarnScoreServiceImpl extends ServiceImpl<ProEconEarlyWarnScoreMapper, ProEconEarlyWarnScore> implements IProEconEarlyWarnScoreService {
 
+    @Resource
+    private ProEconEarlyWarnScoreMapper proEconEarlyWarnScoreMapper;
+
+   public List<ProEconEarlyWarnScore> getListEarlyWarnScore(String windturbineid)
+    {
+        List<ProEconEarlyWarnScore> ls=new ArrayList<>();
+        if(StringUtils.notEmp(windturbineid))
+        {
+            ls=proEconEarlyWarnScoreMapper.getListEarlyWarnScore(windturbineid);
+        }
+        return ls;
+    }
 }

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProEconInspectOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.alarm.service.auto.impl;
+
+import com.gyee.alarm.model.auto.ProEconInspectOrder;
+import com.gyee.alarm.mapper.auto.ProEconInspectOrderMapper;
+import com.gyee.alarm.service.auto.IProEconInspectOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 评审记录 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-09-13
+ */
+@Service
+public class ProEconInspectOrderServiceImpl extends ServiceImpl<ProEconInspectOrderMapper, ProEconInspectOrder> implements IProEconInspectOrderService {
+
+}

log/ota.log

@@ -1,334 +1,229 @@
-2023-09-12 10:01:00.029  INFO 16512 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 16512 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 10:01:00.041  INFO 16512 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 10:01:01.271  INFO 16512 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 10:01:01.273  INFO 16512 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 10:01:01.350  INFO 16512 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 63ms. Found 0 Redis repository interfaces.
-2023-09-12 10:01:01.684  INFO 16512 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:01:01.688  INFO 16512 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$778e0768] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:01:01.704  INFO 16512 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:01:01.933  INFO 16512 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 10:01:01.940  INFO 16512 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 10:01:01.941  INFO 16512 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 10:01:02.040  INFO 16512 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 10:01:02.040  INFO 16512 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1821 ms
-2023-09-12 10:01:02.275  INFO 16512 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 10:01:02.276 ERROR 16512 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 10:01:02.277  INFO 16512 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 10:01:02.277  INFO 16512 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 10:01:02.277  INFO 16512 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 10:01:02.277  INFO 16512 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 10:01:03.737 ERROR 16512 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 10:01:06.475  INFO 16512 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 10:01:06.528  INFO 16512 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 10:01:06.619  INFO 16512 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:01:07.193  INFO 16512 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 10:01:07.203  INFO 16512 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 10:01:07.229  INFO 16512 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 10:01:07.364  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 10:01:07.367  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 10:01:07.370  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 10:01:07.373  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 10:01:07.374  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 10:01:07.378  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 10:01:07.391  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 10:01:07.440  INFO 16512 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 10:01:07.487  INFO 16512 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 10:01:07.490  INFO 16512 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.786 seconds (JVM running for 9.315)
-2023-09-12 10:01:07.494  INFO 16512 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 10:01:07.829  INFO 16512 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 10:01:09.094  INFO 16512 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 10:01:09.098  INFO 16512 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 10:01:10.902  INFO 16512 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 10:01:42.443  INFO 16512 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
-2023-09-12 10:01:42.445  INFO 16512 --- [main] com.gyee.alarm.AlarmWeb                  : 
+2023-09-13 09:51:37.900  INFO 28108 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 28108 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
+2023-09-13 09:51:37.913  INFO 28108 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
+2023-09-13 09:51:39.237  INFO 28108 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-09-13 09:51:39.240  INFO 28108 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2023-09-13 09:51:39.328  INFO 28108 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 71ms. Found 0 Redis repository interfaces.
+2023-09-13 09:51:39.686  INFO 28108 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 09:51:39.691  INFO 28108 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$6834b87c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 09:51:39.707  INFO 28108 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 09:51:39.949  INFO 28108 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
+2023-09-13 09:51:39.956  INFO 28108 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-09-13 09:51:39.956  INFO 28108 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
+2023-09-13 09:51:40.067  INFO 28108 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-09-13 09:51:40.067  INFO 28108 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1950 ms
+2023-09-13 09:51:40.343  INFO 28108 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
+2023-09-13 09:51:40.344 ERROR 28108 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
+2023-09-13 09:51:40.345  INFO 28108 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
+2023-09-13 09:51:40.345  INFO 28108 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
+2023-09-13 09:51:40.345  INFO 28108 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
+2023-09-13 09:51:40.345  INFO 28108 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-09-13 09:51:41.880 ERROR 28108 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
+2023-09-13 09:51:44.677  INFO 28108 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2023-09-13 09:51:44.726  INFO 28108 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
+2023-09-13 09:51:44.819  INFO 28108 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-09-13 09:51:45.406  INFO 28108 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2023-09-13 09:51:45.418  INFO 28108 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2023-09-13 09:51:45.450  INFO 28108 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2023-09-13 09:51:45.614  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
+2023-09-13 09:51:45.618  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
+2023-09-13 09:51:45.622  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
+2023-09-13 09:51:45.627  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
+2023-09-13 09:51:45.629  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
+2023-09-13 09:51:45.635  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
+2023-09-13 09:51:45.653  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
+2023-09-13 09:51:45.696  INFO 28108 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
+2023-09-13 09:51:45.737  INFO 28108 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
+2023-09-13 09:51:45.740  INFO 28108 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 8.218 seconds (JVM running for 9.461)
+2023-09-13 09:51:45.744  INFO 28108 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
+2023-09-13 09:51:45.956  INFO 28108 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
+2023-09-13 09:51:47.098  INFO 28108 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2023-09-13 09:51:47.101  INFO 28108 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2023-09-13 09:51:48.856  INFO 28108 --- [main] com.gyee.alarm.init.CacheContext         : 3227
+2023-09-13 09:52:18.490  INFO 28108 --- [http-nio-6015-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-09-13 09:52:18.490  INFO 28108 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-09-13 09:52:18.498  INFO 28108 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 8 ms
+2023-09-13 09:52:21.040  INFO 28108 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-09-13 09:52:21.043  INFO 28108 --- [main] com.gyee.alarm.AlarmWeb                  : 
 -------------------------------------------------------------------
 	智能报警系统启动成功，访问路径如下:
 	本地路径: 		http://localhost:6015/
 	网络地址: 		http://192.168.56.1:6015/
 	API文档: 		http://192.168.56.1:6015//swagger-ui.html
 -----------------------------------------------------------------------
-2023-09-12 10:01:43.794  INFO 16512 --- [RMI TCP Connection(7)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-12 10:01:43.794  INFO 16512 --- [RMI TCP Connection(7)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2023-09-12 10:01:43.799  INFO 16512 --- [RMI TCP Connection(7)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 5 ms
-2023-09-12 10:02:02.391  WARN 16512 --- [http-nio-6015-exec-5] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.gyee.alarm.model.auto.ProEconAlarmSwitch["isAlart"])]
-2023-09-12 10:02:02.391  WARN 16512 --- [http-nio-6015-exec-6] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.gyee.alarm.model.auto.ProEconAlarmSwitch["isAlart"])]
-2023-09-12 10:02:02.703  WARN 16512 --- [http-nio-6015-exec-7] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.Integer` out of VALUE_FALSE token
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.gyee.alarm.model.auto.ProEconAlarmSwitch["isAlart"])]
-2023-09-12 10:02:02.704  WARN 16512 --- [http-nio-6015-exec-8] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize instance of `java.lang.Integer` out of VALUE_TRUE token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.Integer` out of VALUE_TRUE token
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.gyee.alarm.model.auto.ProEconAlarmSwitch["isAlart"])]
-2023-09-12 10:02:02.705  WARN 16512 --- [http-nio-6015-exec-9] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.http.converter.HttpMessageNotReadableException: JSON parse error: Cannot deserialize instance of `java.lang.Integer` out of VALUE_TRUE token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.Integer` out of VALUE_TRUE token
- at [Source: (PushbackInputStream); line: 1, column: 36] (through reference chain: com.gyee.alarm.model.auto.ProEconAlarmSwitch["isAlart"])]
-2023-09-12 10:10:22.402  INFO 16512 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:10:22.523  INFO 16512 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
-2023-09-12 10:10:22.525  INFO 16512 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
-2023-09-12 10:10:22.527  INFO 16512 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
-2023-09-12 10:10:22.527  INFO 16512 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
-2023-09-12 10:10:27.398  INFO 5464 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 5464 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 10:10:27.400  INFO 5464 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 10:10:28.515  INFO 5464 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 10:10:28.516  INFO 5464 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 10:10:28.595  INFO 5464 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 67ms. Found 0 Redis repository interfaces.
-2023-09-12 10:10:28.892  INFO 5464 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:28.896  INFO 5464 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$6ef07408] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:28.911  INFO 5464 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:29.118  INFO 5464 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 10:10:29.124  INFO 5464 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 10:10:29.125  INFO 5464 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 10:10:29.220  INFO 5464 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 10:10:29.220  INFO 5464 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1647 ms
-2023-09-12 10:10:29.436  INFO 5464 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 10:10:29.437 ERROR 5464 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 10:10:29.438  INFO 5464 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 10:10:29.438  INFO 5464 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 10:10:29.438  INFO 5464 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 10:10:29.438  INFO 5464 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 10:10:30.881 ERROR 5464 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 10:10:33.511  INFO 5464 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 10:10:33.562  INFO 5464 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 10:10:33.656  INFO 5464 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:10:34.188  INFO 5464 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 10:10:34.198  INFO 5464 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 10:10:34.225  INFO 5464 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 10:10:34.357  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 10:10:34.360  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 10:10:34.364  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 10:10:34.367  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 10:10:34.368  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 10:10:34.373  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 10:10:34.388  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 10:10:34.440  INFO 5464 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 10:10:34.486  INFO 5464 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 10:10:34.488  INFO 5464 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.431 seconds (JVM running for 8.556)
-2023-09-12 10:10:34.492  INFO 5464 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 10:10:34.781  INFO 5464 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 10:10:35.675  INFO 5464 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 10:10:35.678  INFO 5464 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 10:10:37.518  INFO 5464 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 10:10:49.022  INFO 5464 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:10:49.063  INFO 5464 --- [main] ConditionEvaluationReportLoggingListener : 
-
-Error starting ApplicationContext. To display the conditions report re-run your application with 'debug' enabled.
-2023-09-12 10:10:49.072 ERROR 5464 --- [main] o.s.boot.SpringApplication               : Application run failed
-
-java.lang.IllegalStateException: Failed to execute CommandLineRunner
-	at org.springframework.boot.SpringApplication.callRunner(SpringApplication.java:787) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	at org.springframework.boot.SpringApplication.callRunners(SpringApplication.java:768) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:322) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1226) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1215) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	at com.gyee.alarm.AlarmWeb.main(AlarmWeb.java:17) [classes/:na]
-Caused by: org.springframework.data.redis.RedisSystemException: Redis exception; nested exception is io.lettuce.core.RedisException: io.lettuce.core.RedisException: Connection closed
-	at org.springframework.data.redis.connection.lettuce.LettuceExceptionConverter.convert(LettuceExceptionConverter.java:74) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.connection.lettuce.LettuceExceptionConverter.convert(LettuceExceptionConverter.java:41) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.PassThroughExceptionTranslationStrategy.translate(PassThroughExceptionTranslationStrategy.java:44) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.FallbackExceptionTranslationStrategy.translate(FallbackExceptionTranslationStrategy.java:42) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.connection.lettuce.LettuceConnection.convertLettuceAccessException(LettuceConnection.java:273) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.connection.lettuce.LettuceStringCommands.convertLettuceAccessException(LettuceStringCommands.java:799) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.connection.lettuce.LettuceStringCommands.get(LettuceStringCommands.java:68) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.connection.DefaultedRedisConnection.get(DefaultedRedisConnection.java:266) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at sun.reflect.GeneratedMethodAccessor174.invoke(Unknown Source) ~[na:na]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_351]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_351]
-	at org.springframework.data.redis.core.CloseSuppressingInvocationHandler.invoke(CloseSuppressingInvocationHandler.java:61) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at com.sun.proxy.$Proxy301.get(Unknown Source) ~[na:na]
-	at com.gyee.alarm.init.redis.RedisServiceImpl$2.doInRedis(RedisServiceImpl.java:45) ~[classes/:na]
-	at com.gyee.alarm.init.redis.RedisServiceImpl$2.doInRedis(RedisServiceImpl.java:41) ~[classes/:na]
-	at org.springframework.data.redis.core.RedisTemplate.execute(RedisTemplate.java:228) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.core.RedisTemplate.execute(RedisTemplate.java:188) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at org.springframework.data.redis.core.RedisTemplate.execute(RedisTemplate.java:175) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	at com.gyee.alarm.init.redis.RedisServiceImpl.get(RedisServiceImpl.java:41) ~[classes/:na]
-	at com.gyee.alarm.init.CacheContext.lambda$run$8(CacheContext.java:387) ~[classes/:na]
-	at java.util.ArrayList.forEach(ArrayList.java:1259) ~[na:1.8.0_351]
-	at com.gyee.alarm.init.CacheContext.run(CacheContext.java:373) ~[classes/:na]
-	at org.springframework.boot.SpringApplication.callRunner(SpringApplication.java:784) [spring-boot-2.2.2.RELEASE.jar:2.2.2.RELEASE]
-	... 5 common frames omitted
-Caused by: io.lettuce.core.RedisException: io.lettuce.core.RedisException: Connection closed
-	at io.lettuce.core.LettuceFutures.awaitOrCancel(LettuceFutures.java:129) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.lettuce.core.FutureSyncInvocationHandler.handleInvocation(FutureSyncInvocationHandler.java:69) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.lettuce.core.internal.AbstractInvocationHandler.invoke(AbstractInvocationHandler.java:80) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at com.sun.proxy.$Proxy298.get(Unknown Source) ~[na:na]
-	at org.springframework.data.redis.connection.lettuce.LettuceStringCommands.get(LettuceStringCommands.java:66) ~[spring-data-redis-2.3.6.RELEASE.jar:2.3.6.RELEASE]
-	... 21 common frames omitted
-Caused by: io.lettuce.core.RedisException: Connection closed
-	at io.lettuce.core.protocol.DefaultEndpoint.notifyDrainQueuedCommands(DefaultEndpoint.java:572) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.lettuce.core.protocol.CommandHandler.channelInactive(CommandHandler.java:322) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:257) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:243) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.fireChannelInactive(AbstractChannelHandlerContext.java:236) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.ChannelInboundHandlerAdapter.channelInactive(ChannelInboundHandlerAdapter.java:81) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.lettuce.core.ChannelGroupListener.channelInactive(ChannelGroupListener.java:46) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:257) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:243) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.fireChannelInactive(AbstractChannelHandlerContext.java:236) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.ChannelInboundHandlerAdapter.channelInactive(ChannelInboundHandlerAdapter.java:81) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.lettuce.core.PlainChannelInitializer$1.channelInactive(PlainChannelInitializer.java:85) ~[lettuce-core-5.2.1.RELEASE.jar:5.2.1.RELEASE]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:257) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:243) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.fireChannelInactive(AbstractChannelHandlerContext.java:236) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.DefaultChannelPipeline$HeadContext.channelInactive(DefaultChannelPipeline.java:1417) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:257) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelInactive(AbstractChannelHandlerContext.java:243) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.DefaultChannelPipeline.fireChannelInactive(DefaultChannelPipeline.java:913) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.AbstractChannel$AbstractUnsafe$8.run(AbstractChannel.java:819) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.concurrent.AbstractEventExecutor.safeExecute$$$capture(AbstractEventExecutor.java:163) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:510) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:518) ~[netty-transport-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.concurrent.SingleThreadEventExecutor$6.run(SingleThreadEventExecutor.java:1050) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[netty-common-4.1.43.Final.jar:4.1.43.Final]
-	at java.lang.Thread.run(Thread.java:750) ~[na:1.8.0_351]
-
-2023-09-12 10:10:49.154  INFO 5464 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
-2023-09-12 10:10:49.157  INFO 5464 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
-2023-09-12 10:10:49.159  INFO 5464 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
-2023-09-12 10:10:49.159  INFO 5464 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
-2023-09-12 10:10:53.893  INFO 18672 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 18672 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 10:10:53.895  INFO 18672 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 10:10:55.002  INFO 18672 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 10:10:55.004  INFO 18672 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 10:10:55.075  INFO 18672 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 62ms. Found 0 Redis repository interfaces.
-2023-09-12 10:10:55.393  INFO 18672 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:55.398  INFO 18672 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$edf20019] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:55.413  INFO 18672 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:10:55.620  INFO 18672 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 10:10:55.627  INFO 18672 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 10:10:55.627  INFO 18672 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 10:10:55.725  INFO 18672 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 10:10:55.725  INFO 18672 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1669 ms
-2023-09-12 10:10:55.953  INFO 18672 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 10:10:55.954 ERROR 18672 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 10:10:55.954  INFO 18672 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 10:10:55.955  INFO 18672 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 10:10:55.955  INFO 18672 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 10:10:55.955  INFO 18672 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 10:10:57.352 ERROR 18672 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 10:10:59.964  INFO 18672 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 10:11:00.011  INFO 18672 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 10:11:00.099  INFO 18672 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:11:00.626  INFO 18672 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 10:11:00.636  INFO 18672 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 10:11:00.662  INFO 18672 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 10:11:00.790  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 10:11:00.793  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 10:11:00.796  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 10:11:00.799  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 10:11:00.799  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 10:11:00.804  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 10:11:00.817  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 10:11:00.868  INFO 18672 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 10:11:00.921  INFO 18672 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 10:11:00.923  INFO 18672 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.337 seconds (JVM running for 8.45)
-2023-09-12 10:11:00.928  INFO 18672 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 10:11:01.076  INFO 18672 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 10:11:01.834  INFO 18672 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 10:11:01.837  INFO 18672 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 10:11:03.470  INFO 18672 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 10:11:34.416  INFO 18672 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
-2023-09-12 10:11:34.418  INFO 18672 --- [main] com.gyee.alarm.AlarmWeb                  : 
+2023-09-13 10:54:04.981  INFO 28108 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-09-13 10:54:05.237  INFO 28108 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
+2023-09-13 10:54:05.247  INFO 28108 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
+2023-09-13 10:54:05.254  INFO 28108 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2023-09-13 10:54:05.254  INFO 28108 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
+2023-09-13 10:54:11.307  INFO 19728 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 19728 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
+2023-09-13 10:54:11.310  INFO 19728 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
+2023-09-13 10:54:12.721  INFO 19728 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-09-13 10:54:12.723  INFO 19728 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2023-09-13 10:54:12.809  INFO 19728 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 73ms. Found 0 Redis repository interfaces.
+2023-09-13 10:54:13.126  INFO 19728 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 10:54:13.131  INFO 19728 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$f979c8d8] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 10:54:13.146  INFO 19728 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 10:54:13.385  INFO 19728 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
+2023-09-13 10:54:13.392  INFO 19728 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-09-13 10:54:13.392  INFO 19728 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
+2023-09-13 10:54:13.497  INFO 19728 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-09-13 10:54:13.498  INFO 19728 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2007 ms
+2023-09-13 10:54:13.739  INFO 19728 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
+2023-09-13 10:54:13.741 ERROR 19728 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
+2023-09-13 10:54:13.741  INFO 19728 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
+2023-09-13 10:54:13.741  INFO 19728 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
+2023-09-13 10:54:13.742  INFO 19728 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
+2023-09-13 10:54:13.742  INFO 19728 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-09-13 10:54:15.244 ERROR 19728 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
+2023-09-13 10:54:18.223  INFO 19728 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2023-09-13 10:54:18.286  INFO 19728 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
+2023-09-13 10:54:18.394  INFO 19728 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-09-13 10:54:18.958  INFO 19728 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2023-09-13 10:54:18.970  INFO 19728 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2023-09-13 10:54:19.032  INFO 19728 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2023-09-13 10:54:19.338  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
+2023-09-13 10:54:19.345  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
+2023-09-13 10:54:19.350  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
+2023-09-13 10:54:19.356  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
+2023-09-13 10:54:19.357  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
+2023-09-13 10:54:19.365  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
+2023-09-13 10:54:19.392  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
+2023-09-13 10:54:19.463  INFO 19728 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
+2023-09-13 10:54:19.514  INFO 19728 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
+2023-09-13 10:54:19.518  INFO 19728 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 8.534 seconds (JVM running for 9.692)
+2023-09-13 10:54:19.523  INFO 19728 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
+2023-09-13 10:54:19.736  INFO 19728 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
+2023-09-13 10:54:20.512  INFO 19728 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2023-09-13 10:54:20.514  INFO 19728 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2023-09-13 10:54:22.235  INFO 19728 --- [main] com.gyee.alarm.init.CacheContext         : 3227
+2023-09-13 10:54:52.904  INFO 19728 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-09-13 10:54:52.906  INFO 19728 --- [main] com.gyee.alarm.AlarmWeb                  : 
 -------------------------------------------------------------------
 	智能报警系统启动成功，访问路径如下:
 	本地路径: 		http://localhost:6015/
 	网络地址: 		http://192.168.56.1:6015/
 	API文档: 		http://192.168.56.1:6015//swagger-ui.html
 -----------------------------------------------------------------------
-2023-09-12 10:11:34.508  INFO 18672 --- [RMI TCP Connection(3)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-12 10:11:34.508  INFO 18672 --- [RMI TCP Connection(3)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2023-09-12 10:11:34.515  INFO 18672 --- [RMI TCP Connection(3)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 7 ms
-2023-09-12 10:33:02.658 ERROR 18672 --- [http-nio-6015-exec-8] o.a.c.c.C.[.[.[/].[dispatcherServlet]    : Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is org.springframework.dao.DuplicateKeyException: com.gyee.alarm.mapper.auto.ProEconAlarmInfoMapper.insert (batch index #1) failed. Cause: java.sql.BatchUpdateException: Batch entry 21 INSERT INTO pro_econ_alarm_info  ( tbname,
-last_update_time,
-val,
-
-trigger_type,
-alarm_id,
-device_id,
-
-rank,
-confirmed,
-uniform_code,
-alarm_type,
-device_type,
-components,
-
-description,
-model_id,
-reset_table,
-enable,
-characteristic,
-station_id,
-project_id,
-line_id,
-station_name,
-projecti_name,
-lineid_name,
-device_name,
-oval,
-is_open )  VALUES  ( 'SXJ_KGDL_DJY_F_WT_0012_EQ_10663',
-'2023-09-12 10:33:02.583+08',
-1,
-
-1,
-'10663',
-'SXJ_KGDL_DJY_F_WT_0012_EQ',
+2023-09-13 10:54:54.005  INFO 19728 --- [RMI TCP Connection(9)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-09-13 10:54:54.005  INFO 19728 --- [RMI TCP Connection(9)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-09-13 10:54:54.017  INFO 19728 --- [RMI TCP Connection(9)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 11 ms
+2023-09-13 11:11:53.602  INFO 19728 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-09-13 11:11:53.792  INFO 19728 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
+2023-09-13 11:11:53.795  INFO 19728 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
+2023-09-13 11:11:53.797  INFO 19728 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2023-09-13 11:11:53.798  INFO 19728 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
+2023-09-13 11:12:00.687  INFO 932 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 932 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
+2023-09-13 11:12:00.689  INFO 932 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
+2023-09-13 11:12:02.267  INFO 932 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-09-13 11:12:02.269  INFO 932 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2023-09-13 11:12:02.363  INFO 932 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 79ms. Found 0 Redis repository interfaces.
+2023-09-13 11:12:02.707  INFO 932 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:12:02.712  INFO 932 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$b93ddb24] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:12:02.727  INFO 932 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:12:02.939  INFO 932 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
+2023-09-13 11:12:02.946  INFO 932 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-09-13 11:12:02.947  INFO 932 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
+2023-09-13 11:12:03.046  INFO 932 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-09-13 11:12:03.046  INFO 932 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2194 ms
+2023-09-13 11:12:03.274  INFO 932 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
+2023-09-13 11:12:03.275 ERROR 932 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
+2023-09-13 11:12:03.276  INFO 932 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
+2023-09-13 11:12:03.276  INFO 932 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
+2023-09-13 11:12:03.276  INFO 932 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
+2023-09-13 11:12:03.276  INFO 932 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-09-13 11:12:04.707 ERROR 932 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
+2023-09-13 11:12:07.360  INFO 932 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2023-09-13 11:12:07.408  INFO 932 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
+2023-09-13 11:12:07.498  INFO 932 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-09-13 11:12:08.042  INFO 932 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2023-09-13 11:12:08.053  INFO 932 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2023-09-13 11:12:08.080  INFO 932 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2023-09-13 11:12:08.211  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
+2023-09-13 11:12:08.214  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
+2023-09-13 11:12:08.217  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
+2023-09-13 11:12:08.220  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
+2023-09-13 11:12:08.220  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
+2023-09-13 11:12:08.224  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
+2023-09-13 11:12:08.239  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
+2023-09-13 11:12:08.289  INFO 932 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
+2023-09-13 11:12:08.339  INFO 932 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
+2023-09-13 11:12:08.341  INFO 932 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.945 seconds (JVM running for 9.093)
+2023-09-13 11:12:08.345  INFO 932 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
+2023-09-13 11:12:08.512  INFO 932 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
+2023-09-13 11:12:09.496  INFO 932 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2023-09-13 11:12:09.498  INFO 932 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2023-09-13 11:12:11.202  INFO 932 --- [main] com.gyee.alarm.init.CacheContext         : 3227
+2023-09-13 11:12:21.775  INFO 932 --- [http-nio-6015-exec-3] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-09-13 11:12:21.775  INFO 932 --- [http-nio-6015-exec-3] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-09-13 11:12:21.780  INFO 932 --- [http-nio-6015-exec-3] o.s.web.servlet.DispatcherServlet        : Completed initialization in 5 ms
+2023-09-13 11:12:21.896 ERROR 932 --- [http-nio-6015-exec-7] o.a.c.c.C.[.[.[/].[dispatcherServlet]    : Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is java.lang.NullPointerException] with root cause
 
-3,
-'TRUE',
-'DI579',
-'windturbine',
-'windturbine',
-'PHXT',
-
-'低温停机 DJY',
-'/UP2000/105',
-'FALSE',
-'TRUE',
-'正常停机',
-'SXJ_KGDL_DJY_FDC_STA',
-'SXJ_KGDL_DJYF01_EG',
-'SXJ_KGDL_DJYF02_LN',
-'右玉丁家窑风电场',
-'丁家窑一期项目',
-'丁家窑一期二号风机线',
-'丁家窑12号风机',
-1,
-0 ) was aborted: 错误: 重复键违反唯一约束"pk_pro_econ_alarm_info"
-  详细：键值"(tbname)=(SXJ_KGDL_DJY_F_WT_0012_EQ_10663)" 已经存在  Call getNextException to see other errors in the batch.
-; 错误: 重复键违反唯一约束"pk_pro_econ_alarm_info"
-  详细：键值"(tbname)=(SXJ_KGDL_DJY_F_WT_0012_EQ_10663)" 已经存在; nested exception is org.postgresql.util.PSQLException: 错误: 重复键违反唯一约束"pk_pro_econ_alarm_info"
-  详细：键值"(tbname)=(SXJ_KGDL_DJY_F_WT_0012_EQ_10663)" 已经存在] with root cause
-
-org.postgresql.util.PSQLException: 错误: 重复键违反唯一约束"pk_pro_econ_alarm_info"
-  详细：键值"(tbname)=(SXJ_KGDL_DJY_F_WT_0012_EQ_10663)" 已经存在
-	at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:2440) ~[postgresql-42.2.5.jar:42.2.5]
-	at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:2183) ~[postgresql-42.2.5.jar:42.2.5]
-	at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:481) ~[postgresql-42.2.5.jar:42.2.5]
-	at org.postgresql.jdbc.PgStatement.executeBatch(PgStatement.java:840) ~[postgresql-42.2.5.jar:42.2.5]
-	at org.postgresql.jdbc.PgPreparedStatement.executeBatch(PgPreparedStatement.java:1538) ~[postgresql-42.2.5.jar:42.2.5]
-	at com.alibaba.druid.filter.FilterChainImpl.statement_executeBatch(FilterChainImpl.java:3066) ~[druid-1.1.10.jar:1.1.10]
-	at com.alibaba.druid.filter.FilterAdapter.statement_executeBatch(FilterAdapter.java:2496) ~[druid-1.1.10.jar:1.1.10]
-	at com.alibaba.druid.filter.FilterEventAdapter.statement_executeBatch(FilterEventAdapter.java:279) ~[druid-1.1.10.jar:1.1.10]
-	at com.alibaba.druid.filter.FilterChainImpl.statement_executeBatch(FilterChainImpl.java:3064) ~[druid-1.1.10.jar:1.1.10]
-	at com.alibaba.druid.proxy.jdbc.StatementProxyImpl.executeBatch(StatementProxyImpl.java:202) ~[druid-1.1.10.jar:1.1.10]
-	at com.alibaba.druid.pool.DruidPooledPreparedStatement.executeBatch(DruidPooledPreparedStatement.java:566) ~[druid-1.1.10.jar:1.1.10]
-	at sun.reflect.GeneratedMethodAccessor447.invoke(Unknown Source) ~[na:na]
+java.lang.NullPointerException: null
+	at com.gyee.alarm.service.TokenService.getSubwpls(TokenService.java:235) ~[classes/:na]
+	at com.gyee.alarm.controller.AlertRuleController.querySublList(AlertRuleController.java:232) ~[classes/:na]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_351]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_351]
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_351]
 	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_351]
-	at org.apache.ibatis.logging.jdbc.PreparedStatementLogger.invoke(PreparedStatementLogger.java:78) ~[mybatis-3.5.4.jar:3.5.4]
-	at com.sun.proxy.$Proxy296.executeBatch(Unknown Source) ~[na:na]
-	at com.baomidou.mybatisplus.core.executor.MybatisBatchExecutor.doFlushStatements(MybatisBatchExecutor.java:133) ~[mybatis-plus-core-3.3.2.jar:3.3.2]
-	at org.apache.ibatis.executor.BaseExecutor.flushStatements(BaseExecutor.java:129) ~[mybatis-3.5.4.jar:3.5.4]
-	at org.apache.ibatis.executor.BaseExecutor.flushStatements(BaseExecutor.java:122) ~[mybatis-3.5.4.jar:3.5.4]
-	at com.baomidou.mybatisplus.core.executor.MybatisCachingExecutor.flushStatements(MybatisCachingExecutor.java:216) ~[mybatis-plus-core-3.3.2.jar:3.3.2]
-	at org.apache.ibatis.session.defaults.DefaultSqlSession.flushStatements(DefaultSqlSession.java:252) ~[mybatis-3.5.4.jar:3.5.4]
-	at com.baomidou.mybatisplus.extension.service.impl.ServiceImpl.lambda$executeBatch$3(ServiceImpl.java:258) ~[mybatis-plus-extension-3.3.2.jar:3.3.2]
-	at com.baomidou.mybatisplus.extension.service.impl.ServiceImpl.executeBatch(ServiceImpl.java:222) ~[mybatis-plus-extension-3.3.2.jar:3.3.2]
-	at com.baomidou.mybatisplus.extension.service.impl.ServiceImpl.executeBatch(ServiceImpl.java:252) ~[mybatis-plus-extension-3.3.2.jar:3.3.2]
-	at com.baomidou.mybatisplus.extension.service.impl.ServiceImpl.saveBatch(ServiceImpl.java:127) ~[mybatis-plus-extension-3.3.2.jar:3.3.2]
-	at com.baomidou.mybatisplus.extension.service.IService.saveBatch(IService.java:69) ~[mybatis-plus-extension-3.3.2.jar:3.3.2]
-	at com.gyee.alarm.service.AlarmHistoryService.updateAlarms(AlarmHistoryService.java:209) ~[classes/:na]
-	at com.gyee.alarm.controller.AlarmHistoryController.updateAlarms(AlarmHistoryController.java:47) ~[classes/:na]
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:888) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:793) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:634) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:741) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) ~[tomcat-embed-websocket-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123) ~[druid-1.1.10.jar:1.1.10]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:108) ~[spring-boot-actuator-2.2.2.RELEASE.jar:2.2.2.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) ~[spring-web-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:526) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:367) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:860) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1591) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) [na:1.8.0_351]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) [na:1.8.0_351]
+	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) [tomcat-embed-core-9.0.29.jar:9.0.29]
+	at java.lang.Thread.run(Thread.java:750) [na:1.8.0_351]
+
+2023-09-13 11:12:26.546 ERROR 932 --- [http-nio-6015-exec-2] o.a.c.c.C.[.[.[/].[dispatcherServlet]    : Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is java.lang.NullPointerException] with root cause
+
+java.lang.NullPointerException: null
+	at com.gyee.alarm.service.TokenService.getSubwpls(TokenService.java:235) ~[classes/:na]
+	at com.gyee.alarm.controller.AlertRuleController.querySublList(AlertRuleController.java:232) ~[classes/:na]
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_351]
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_351]
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_351]
@@ -342,8 +237,8 @@ org.postgresql.util.PSQLException: 错误: 重复键违反唯一约束"pk_pro_ec
 	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
 	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
 	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
-	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
-	at javax.servlet.http.HttpServlet.service(HttpServlet.java:660) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
+	at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:634) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
 	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) ~[spring-webmvc-5.2.2.RELEASE.jar:5.2.2.RELEASE]
 	at javax.servlet.http.HttpServlet.service(HttpServlet.java:741) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
 	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) ~[tomcat-embed-core-9.0.29.jar:9.0.29]
@@ -387,174 +282,74 @@ org.postgresql.util.PSQLException: 错误: 重复键违反唯一约束"pk_pro_ec
 	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) [tomcat-embed-core-9.0.29.jar:9.0.29]
 	at java.lang.Thread.run(Thread.java:750) [na:1.8.0_351]
 
-2023-09-12 10:45:33.845  INFO 18672 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:45:34.068  INFO 18672 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
-2023-09-12 10:45:34.072  INFO 18672 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
-2023-09-12 10:45:34.073  INFO 18672 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
-2023-09-12 10:45:34.073  INFO 18672 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
-2023-09-12 10:45:40.991  INFO 21692 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 21692 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 10:45:40.994  INFO 21692 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 10:45:42.513  INFO 21692 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 10:45:42.515  INFO 21692 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 10:45:42.613  INFO 21692 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 81ms. Found 0 Redis repository interfaces.
-2023-09-12 10:45:42.980  INFO 21692 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:45:42.985  INFO 21692 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$3d5ead1c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:45:43.001  INFO 21692 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 10:45:43.251  INFO 21692 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 10:45:43.258  INFO 21692 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 10:45:43.259  INFO 21692 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 10:45:43.365  INFO 21692 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 10:45:43.365  INFO 21692 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2136 ms
-2023-09-12 10:45:43.606  INFO 21692 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 10:45:43.608 ERROR 21692 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 10:45:43.608  INFO 21692 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 10:45:43.608  INFO 21692 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 10:45:43.608  INFO 21692 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 10:45:43.609  INFO 21692 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 10:45:45.578 ERROR 21692 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 10:45:50.073  INFO 21692 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 10:45:50.136  INFO 21692 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 10:45:50.267  INFO 21692 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 10:45:50.918  INFO 21692 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 10:45:50.930  INFO 21692 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 10:45:50.958  INFO 21692 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 10:45:51.116  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 10:45:51.119  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 10:45:51.123  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 10:45:51.126  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 10:45:51.128  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 10:45:51.134  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 10:45:51.156  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 10:45:51.210  INFO 21692 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 10:45:51.271  INFO 21692 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 10:45:51.274  INFO 21692 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 10.733 seconds (JVM running for 12.709)
-2023-09-12 10:45:51.278  INFO 21692 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 10:45:51.531  INFO 21692 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 10:45:52.907  INFO 21692 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 10:45:52.910  INFO 21692 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 10:45:54.933  INFO 21692 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 10:46:19.885  INFO 21692 --- [http-nio-6015-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-12 10:46:19.885  INFO 21692 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2023-09-12 10:46:19.891  INFO 21692 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 6 ms
-2023-09-12 10:46:31.666  INFO 21692 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
-2023-09-12 10:46:31.668  INFO 21692 --- [main] com.gyee.alarm.AlarmWeb                  : 
--------------------------------------------------------------------
-	智能报警系统启动成功，访问路径如下:
-	本地路径: 		http://localhost:6015/
-	网络地址: 		http://192.168.56.1:6015/
-	API文档: 		http://192.168.56.1:6015//swagger-ui.html
------------------------------------------------------------------------
-2023-09-12 14:56:03.628  INFO 21692 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-12 14:56:03.781  INFO 21692 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
-2023-09-12 14:56:03.832  INFO 21692 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
-2023-09-12 14:56:03.834  INFO 21692 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
-2023-09-12 14:56:03.834  INFO 21692 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
-2023-09-12 14:56:08.143  INFO 19624 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 19624 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 14:56:08.146  INFO 19624 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 14:56:09.422  INFO 19624 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 14:56:09.423  INFO 19624 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 14:56:09.497  INFO 19624 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 63ms. Found 0 Redis repository interfaces.
-2023-09-12 14:56:09.828  INFO 19624 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 14:56:09.832  INFO 19624 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$edf1c730] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 14:56:09.846  INFO 19624 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 14:56:10.068  INFO 19624 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 14:56:10.075  INFO 19624 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 14:56:10.076  INFO 19624 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 14:56:10.182  INFO 19624 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 14:56:10.182  INFO 19624 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1858 ms
-2023-09-12 14:56:10.411  INFO 19624 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 14:56:10.412 ERROR 19624 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 14:56:10.413  INFO 19624 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 14:56:10.413  INFO 19624 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 14:56:10.413  INFO 19624 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 14:56:10.413  INFO 19624 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 14:56:11.852 ERROR 19624 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 14:56:14.639  INFO 19624 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 14:56:14.693  INFO 19624 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 14:56:14.785  INFO 19624 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 14:56:15.351  INFO 19624 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 14:56:15.361  INFO 19624 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 14:56:15.390  INFO 19624 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 14:56:15.531  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 14:56:15.535  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 14:56:15.538  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 14:56:15.541  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 14:56:15.542  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 14:56:15.547  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 14:56:15.563  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 14:56:15.615  INFO 19624 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 14:56:15.661  INFO 19624 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 14:56:15.663  INFO 19624 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.893 seconds (JVM running for 9.319)
-2023-09-12 14:56:15.667  INFO 19624 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 14:56:15.837  INFO 19624 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 14:56:16.680  INFO 19624 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 14:56:16.682  INFO 19624 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 14:56:18.542  INFO 19624 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 14:56:21.603  INFO 19624 --- [http-nio-6015-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-12 14:56:21.603  INFO 19624 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2023-09-12 14:56:21.610  INFO 19624 --- [http-nio-6015-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 7 ms
-2023-09-12 14:56:51.938  INFO 19624 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
-2023-09-12 14:56:51.941  INFO 19624 --- [main] com.gyee.alarm.AlarmWeb                  : 
+2023-09-13 11:12:40.175  INFO 932 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-09-13 11:12:40.177  INFO 932 --- [main] com.gyee.alarm.AlarmWeb                  : 
 -------------------------------------------------------------------
 	智能报警系统启动成功，访问路径如下:
 	本地路径: 		http://localhost:6015/
 	网络地址: 		http://192.168.56.1:6015/
 	API文档: 		http://192.168.56.1:6015//swagger-ui.html
 -----------------------------------------------------------------------
-2023-09-12 15:48:02.565  INFO 19624 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-12 15:48:02.866  INFO 19624 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
-2023-09-12 15:48:02.904  INFO 19624 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
-2023-09-12 15:48:02.906  INFO 19624 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
-2023-09-12 15:48:02.906  INFO 19624 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
-2023-09-12 15:48:17.617  INFO 8448 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 8448 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
-2023-09-12 15:48:17.621  INFO 8448 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
-2023-09-12 15:48:23.057  INFO 8448 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-09-12 15:48:23.061  INFO 8448 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-2023-09-12 15:48:23.375  INFO 8448 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 279ms. Found 0 Redis repository interfaces.
-2023-09-12 15:48:24.436  INFO 8448 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 15:48:24.448  INFO 8448 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$d90579e1] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 15:48:24.493  INFO 8448 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-12 15:48:25.236  INFO 8448 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
-2023-09-12 15:48:25.252  INFO 8448 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2023-09-12 15:48:25.252  INFO 8448 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
-2023-09-12 15:48:25.397  INFO 8448 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2023-09-12 15:48:25.397  INFO 8448 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 7210 ms
-2023-09-12 15:48:25.712  INFO 8448 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
-2023-09-12 15:48:25.713 ERROR 8448 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
-2023-09-12 15:48:25.714  INFO 8448 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
-2023-09-12 15:48:25.714  INFO 8448 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
-2023-09-12 15:48:25.714  INFO 8448 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
-2023-09-12 15:48:25.714  INFO 8448 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
-2023-09-12 15:48:27.745 ERROR 8448 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
-2023-09-12 15:48:31.758  INFO 8448 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
-2023-09-12 15:48:31.824  INFO 8448 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
-2023-09-12 15:48:31.942  INFO 8448 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-12 15:48:32.621  INFO 8448 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
-2023-09-12 15:48:32.634  INFO 8448 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
-2023-09-12 15:48:32.674  INFO 8448 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
-2023-09-12 15:48:32.831  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
-2023-09-12 15:48:32.835  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
-2023-09-12 15:48:32.838  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
-2023-09-12 15:48:32.842  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
-2023-09-12 15:48:32.843  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
-2023-09-12 15:48:32.848  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
-2023-09-12 15:48:32.865  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
-2023-09-12 15:48:32.913  INFO 8448 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
-2023-09-12 15:48:32.962  INFO 8448 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
-2023-09-12 15:48:32.964  INFO 8448 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 16.168 seconds (JVM running for 17.999)
-2023-09-12 15:48:32.968  INFO 8448 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
-2023-09-12 15:48:33.132  INFO 8448 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
-2023-09-12 15:48:34.017  INFO 8448 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
-2023-09-12 15:48:34.020  INFO 8448 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
-2023-09-12 15:48:35.913  INFO 8448 --- [main] com.gyee.alarm.init.CacheContext         : 3227
-2023-09-12 15:49:09.128  INFO 8448 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
-2023-09-12 15:49:09.130  INFO 8448 --- [main] com.gyee.alarm.AlarmWeb                  : 
+2023-09-13 11:13:02.927  WARN 932 --- [http-nio-6015-exec-6] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2023-09-13 11:13:38.257  WARN 932 --- [http-nio-6015-exec-1] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2023-09-13 11:19:48.585  INFO 932 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-09-13 11:19:48.719  INFO 932 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
+2023-09-13 11:19:48.722  INFO 932 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
+2023-09-13 11:19:48.725  INFO 932 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2023-09-13 11:19:48.725  INFO 932 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye
+2023-09-13 11:19:54.448  INFO 19736 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 19736 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
+2023-09-13 11:19:54.450  INFO 19736 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
+2023-09-13 11:19:55.555  INFO 19736 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-09-13 11:19:55.557  INFO 19736 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2023-09-13 11:19:55.627  INFO 19736 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 60ms. Found 0 Redis repository interfaces.
+2023-09-13 11:19:55.927  INFO 19736 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:19:55.932  INFO 19736 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$7a8a2a5d] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:19:55.946  INFO 19736 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-09-13 11:19:56.155  INFO 19736 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
+2023-09-13 11:19:56.162  INFO 19736 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-09-13 11:19:56.162  INFO 19736 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
+2023-09-13 11:19:56.261  INFO 19736 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-09-13 11:19:56.261  INFO 19736 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1654 ms
+2023-09-13 11:19:56.484  INFO 19736 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
+2023-09-13 11:19:56.485 ERROR 19736 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
+2023-09-13 11:19:56.486  INFO 19736 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
+2023-09-13 11:19:56.486  INFO 19736 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
+2023-09-13 11:19:56.486  INFO 19736 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
+2023-09-13 11:19:56.486  INFO 19736 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-09-13 11:19:57.894 ERROR 19736 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
+2023-09-13 11:20:00.479  INFO 19736 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2023-09-13 11:20:00.526  INFO 19736 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
+2023-09-13 11:20:00.612  INFO 19736 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-09-13 11:20:01.135  INFO 19736 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2023-09-13 11:20:01.145  INFO 19736 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2023-09-13 11:20:01.170  INFO 19736 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2023-09-13 11:20:01.297  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
+2023-09-13 11:20:01.300  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
+2023-09-13 11:20:01.303  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_2
+2023-09-13 11:20:01.306  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
+2023-09-13 11:20:01.307  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
+2023-09-13 11:20:01.311  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
+2023-09-13 11:20:01.325  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_2
+2023-09-13 11:20:01.371  INFO 19736 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: findListUsingGET_1
+2023-09-13 11:20:01.420  INFO 19736 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
+2023-09-13 11:20:01.423  INFO 19736 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 7.26 seconds (JVM running for 8.344)
+2023-09-13 11:20:01.428  INFO 19736 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
+2023-09-13 11:20:01.580  INFO 19736 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_DJY_FDC_STA------------------20
+2023-09-13 11:20:02.358  INFO 19736 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2023-09-13 11:20:02.360  INFO 19736 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2023-09-13 11:20:03.947  INFO 19736 --- [main] com.gyee.alarm.init.CacheContext         : 3227
+2023-09-13 11:20:34.080  INFO 19736 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-09-13 11:20:34.083  INFO 19736 --- [main] com.gyee.alarm.AlarmWeb                  : 
 -------------------------------------------------------------------
 	智能报警系统启动成功，访问路径如下:
 	本地路径: 		http://localhost:6015/
 	网络地址: 		http://192.168.56.1:6015/
 	API文档: 		http://192.168.56.1:6015//swagger-ui.html
 -----------------------------------------------------------------------
-2023-09-12 15:49:09.527  INFO 8448 --- [RMI TCP Connection(12)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-12 15:49:09.528  INFO 8448 --- [RMI TCP Connection(12)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
-2023-09-12 15:49:09.540  INFO 8448 --- [RMI TCP Connection(12)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 12 ms
+2023-09-13 11:20:35.106  INFO 19736 --- [RMI TCP Connection(2)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-09-13 11:20:35.107  INFO 19736 --- [RMI TCP Connection(2)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-09-13 11:20:35.116  INFO 19736 --- [RMI TCP Connection(2)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms
+2023-09-13 14:34:26.453  WARN 19736 --- [http-nio-6015-exec-3] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2023-09-13 14:35:28.290  WARN 19736 --- [http-nio-6015-exec-5] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2023-09-13 14:36:55.001  WARN 19736 --- [http-nio-6015-exec-7] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
+2023-09-13 14:37:06.093  WARN 19736 --- [http-nio-6015-exec-4] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]