切换mysql为达梦数据库-代码审查

1.advanceboot模块

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java

@@ -2,9 +2,6 @@ package com.njcn.advance.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.netflix.ribbon.proxy.annotation.Http;
-import com.njcn.advance.pojo.dto.BalanceInfo;
-import com.njcn.advance.pojo.param.AdvanceBaseParam;
 import com.njcn.advance.pojo.po.PqsRelevanceLog;
 import com.njcn.advance.service.EventRelevantAnalysisService;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -18,19 +15,13 @@ import com.njcn.common.utils.PubUtils;
 import com.njcn.event.pojo.po.RmpEventDetailAssPO;
 import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
 import com.njcn.web.controller.BaseController;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.DataInputStream;
-import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java

@@ -10,7 +10,7 @@ import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDResultVO;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataIVO;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataQVO;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataVO;
-import com.njcn.advance.service.carrycapacity.CarryCapcityService;
+import com.njcn.advance.service.carrycapacity.CarryCapacityService;
 import com.njcn.advance.utils.EasyExcelUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -44,7 +44,7 @@ import java.util.List;
 public class CarryCapacityController extends BaseController {
 
 
-    private final CarryCapcityService carryCapcityService;
+    private final CarryCapacityService carryCapcityService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryCarryCapacityData")
@@ -72,8 +72,7 @@ public class CarryCapacityController extends BaseController {
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<CarryCapacityDataQVO> queryCarryCapacityQData(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
         String methodDescribe = getMethodDescribe("queryCarryCapacityQData");
-        CarryCapacityDataQVO carryCapacityDataQVO = carryCapcityService.queryCarryCapacityQData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityQData(queryParam), methodDescribe);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataQVO, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -82,8 +81,7 @@ public class CarryCapacityController extends BaseController {
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<CarryCapacityDataIVO> queryCarryCapacityIData(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
         String methodDescribe = getMethodDescribe("queryCarryCapacityIData");
-        CarryCapacityDataIVO carryCapacityDataIVO = carryCapcityService.queryCarryCapacityIData(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityIData(queryParam), methodDescribe);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataIVO, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -92,8 +90,7 @@ public class CarryCapacityController extends BaseController {
     @ApiImplicitParam(name = "calParam", value = "计算参数", required = true)
     public HttpResult<CarryCapacityDResultVO> carryCapacityCal(@RequestBody @Validated CarryCapacityCalParam calParam) {
         String methodDescribe = getMethodDescribe("carryCapacityCal");
-        CarryCapacityDResultVO carryCapacityDResultVO = carryCapcityService.carryCapacityCal(calParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.carryCapacityCal(calParam), methodDescribe);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDResultVO, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/harmonic/SgHarmonicFileController.java

@@ -1,12 +1,7 @@
 package com.njcn.advance.controller.govern.harmonic;
 
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.advance.enums.AdvanceResponseEnum;
-import com.njcn.advance.pojo.dto.govern.voltage.SgEventExcel;
 import com.njcn.advance.pojo.po.govern.harmonic.SgHarmonicFile;
 import com.njcn.advance.service.govern.harmonic.ISgHarmonicFileService;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -14,17 +9,14 @@ import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
-import com.njcn.poi.util.PoiUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -33,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -71,7 +62,7 @@ public class SgHarmonicFileController extends BaseController {
 
     @PostMapping(value = "/listHarmonicData")
     @ApiOperation("获取谐波数据数据")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     public HttpResult<List<SgHarmonicFile>> listHarmonicData() {
         String methodDescribe = getMethodDescribe("listHarmonicData");
         LambdaQueryWrapper<SgHarmonicFile> sgHarmonicFileLambdaQueryWrapper = new LambdaQueryWrapper<>();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SagGovernSchemeController.java

@@ -1,13 +1,10 @@
 package com.njcn.advance.controller.govern.voltage;
 
-
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.advance.pojo.param.govern.voltage.SgGovernSchemeHistoryParam;
-import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
 import com.njcn.advance.pojo.vo.govern.voltage.SgGovernSchemeHistoryAllVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgGovernSchemeHistoryVO;
-import com.njcn.advance.pojo.vo.govern.voltage.SgUserVO;
 import com.njcn.advance.service.govern.voltage.IGovernSchemeCalcService;
 import com.njcn.advance.service.govern.voltage.ISgGovernSchemeHistoryService;
 import com.njcn.common.pojo.annotation.OperateInfo;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SgEventController.java

@@ -68,7 +68,7 @@ public class SgEventController extends BaseController {
     @PostMapping("/getEventDataByProductLineId")
     @ApiOperation("查询生产线下时间范围内的暂降数据")
     @ApiImplicitParam(name = "sgEventParamQueryParam", value = "查询参数", required = true)
-    public  HttpResult<List<SgEventVO>> getEventDataByProductLineId(@RequestBody SgEventParam.SgEventParamQueryParam sgEventParamQueryParam) {
+    public HttpResult<List<SgEventVO>> getEventDataByProductLineId(@RequestBody SgEventParam.SgEventParamQueryParam sgEventParamQueryParam) {
         String methodDescribe = getMethodDescribe("getEventDataByProductLineId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sgEventParamQueryParam);
         List<SgEventVO> result = sgEventService.getEventDataByProductLineId(sgEventParamQueryParam);
@@ -104,7 +104,7 @@ public class SgEventController extends BaseController {
     @PostMapping(value = "/importEventData")
     @ApiOperation("批量导入暂降数据")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-    public HttpResult<String> importEventData(@RequestParam("file") MultipartFile file, @RequestParam("incomingLineId") String incomingLineId, @RequestParam("productLineId") String productLineId,HttpServletResponse response) {
+    public HttpResult<String> importEventData(@RequestParam("file") MultipartFile file, @RequestParam("incomingLineId") String incomingLineId, @RequestParam("productLineId") String productLineId, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importEventData");
         ImportParams params = new ImportParams();
         params.setHeadRows(1);
@@ -115,12 +115,13 @@ public class SgEventController extends BaseController {
             ExcelImportResult<SgEventExcel> sgEventExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SgEventExcel.class, params);
             //如果存在非法数据，将不合格的数据导出
             if (sgEventExcelExcelImportResult.isVerifyFail()) {
-//                PoiUtil.exportFileByWorkbook(sgEventExcelExcelImportResult.getFailWorkbook(), "非法暂降数据.xlsx", response);
+                // 此处到处前端要做特殊处理，具体可以参考技术监督的数据导入，todo...
+                PoiUtil.exportFileByWorkbook(sgEventExcelExcelImportResult.getFailWorkbook(), "非法暂降数据.xlsx", response);
                 throw new BusinessException(AdvanceResponseEnum.IMPORT_EVENT_DATA_FAIL);
             } else {
                 //批量录入暂降数据
                 List<SgEventExcel> sgEventExcels = sgEventExcelExcelImportResult.getList();
-                sgEventService.importEventData(sgEventExcels, incomingLineId,productLineId);
+                sgEventService.importEventData(sgEventExcels, incomingLineId, productLineId);
             }
         } catch (Exception e) {
             throw new BusinessException(AdvanceResponseEnum.IMPORT_EVENT_DATA_FAIL);
@@ -129,7 +130,6 @@ public class SgEventController extends BaseController {
     }
 
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/calcLoss")
     @ApiOperation("计算暂降损失")

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SgMachineController.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.advance.pojo.param.govern.voltage.SgMachineParam;
 import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
-import com.njcn.advance.pojo.vo.govern.voltage.SgProductLineVO;
 import com.njcn.advance.service.govern.voltage.ISgMachineService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SgProductLineController.java

@@ -4,7 +4,6 @@ package com.njcn.advance.controller.govern.voltage;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.advance.pojo.param.govern.voltage.SgProductLineParam;
-import com.njcn.advance.pojo.po.govern.voltage.SgProductLine;
 import com.njcn.advance.pojo.vo.govern.voltage.SgProductLineVO;
 import com.njcn.advance.service.govern.voltage.ISgProductLineService;
 import com.njcn.common.pojo.annotation.OperateInfo;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SgSensitiveUnitController.java

@@ -4,7 +4,6 @@ package com.njcn.advance.controller.govern.voltage;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.advance.pojo.param.govern.voltage.SgSensitiveUnitParam;
-import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgSensitiveUnitVO;
 import com.njcn.advance.service.govern.voltage.ISgSensitiveUnitService;
 import com.njcn.common.pojo.annotation.OperateInfo;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/UserDataController.java

@@ -102,6 +102,7 @@ public class UserDataController extends BaseController {
         if (fileSize > 3072) {
             throw new BusinessException(CommonResponseEnum.FILE_SIZE_ERROR);
         }
+        assert fileName != null;
         if (!fileName.matches("^.+\\.(?i)(xlsx)$") && !fileName.matches("^.+\\.(?i)(xls)$")) {
             throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
         }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityDataPOMapper.xml

@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityDataPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityDataPO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_data-->
-    <id column="line_id" jdbcType="VARCHAR" property="lineId" />
-    <id column="start_time" jdbcType="DATE" property="startTime" />
-    <id column="end_time" jdbcType="DATE" property="endTime" />
-    <result column="date_list" jdbcType="VARCHAR" property="dateList" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    line_id, start_time, end_time, date_list, create_by, create_time, update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityDevicePOMapper.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityDevicePOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityDevicePO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_device-->
-    <id column="dev_id" jdbcType="VARCHAR" property="devId" />
-    <result column="dev_name" jdbcType="VARCHAR" property="devName" />
-    <result column="protocol_capacity" jdbcType="DOUBLE" property="protocolCapacity" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    dev_id, dev_name, protocol_capacity, create_by, create_time, update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityResultPOMapper.xml

@@ -1,29 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityResultPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityResultPO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_result-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="line_id" jdbcType="VARCHAR" property="lineId" />
-    <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="start_time" jdbcType="DATE" property="startTime" />
-    <result column="end_time" jdbcType="DATE" property="endTime" />
-    <result column="u_t_level" jdbcType="INTEGER" property="uTLevel" />
-    <result column="pf_t_level" jdbcType="INTEGER" property="pfTLevel" />
-    <result column="b_t_level" jdbcType="INTEGER" property="bTLevel" />
-    <result column="i_level" jdbcType="INTEGER" property="iLevel" />
-    <result column="reslut_level" jdbcType="INTEGER" property="reslutLevel" />
-    <result column="evaluate_date" jdbcType="DATE" property="evaluateDate" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, line_id, user_id, start_time, end_time, u_t_level, pf_t_level, b_t_level, i_level, 
-    reslut_level, evaluate_date, `status`, create_by, create_time, update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityStrategyDhlPOMapper.xml

@@ -1,30 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityStrategyDhlPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityStrategyDhlPO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_strategy_dhl-->
-    <result column="id" jdbcType="INTEGER" property="id" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="comparison_operators_1" jdbcType="VARCHAR" property="comparisonOperators1" />
-    <result column="count_1" jdbcType="INTEGER" property="count1" />
-    <result column="comparison_operators_2" jdbcType="VARCHAR" property="comparisonOperators2" />
-    <result column="count_2" jdbcType="INTEGER" property="count2" />
-    <result column="comparison_operators_3" jdbcType="VARCHAR" property="comparisonOperators3" />
-    <result column="count_3" jdbcType="INTEGER" property="count3" />
-    <result column="proto_flag" jdbcType="INTEGER" property="protoFlag" />
-    <result column="comparison_operators_4" jdbcType="VARCHAR" property="comparisonOperators4" />
-    <result column="count_4" jdbcType="INTEGER" property="count4" />
-    <result column="user_flag" jdbcType="INTEGER" property="userFlag" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, `type`, comparison_operators_1, count_1, comparison_operators_2, count_2, comparison_operators_3, 
-    count_3, proto_flag, comparison_operators_4, count_4, user_flag, create_by, create_time, 
-    update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityStrategyPOMapper.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityStrategyPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityStrategyPO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_strategy-->
-    <result column="result" jdbcType="INTEGER" property="result" />
-    <result column="index_result" jdbcType="INTEGER" property="indexResult" />
-    <result column="comparison_operators" jdbcType="VARCHAR" property="comparisonOperators" />
-    <result column="count" jdbcType="INTEGER" property="count" />
-    <result column="proto_flag" jdbcType="INTEGER" property="protoFlag" />
-    <result column="user_flag" jdbcType="INTEGER" property="userFlag" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    `result`, index_result, comparison_operators, `count`, proto_flag, user_flag, create_by, 
-    create_time, update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/carrycapacity/mapping/CarryCapacityUserPOMapper.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.advance.mapper.carrycapacity.CarryCapacityUserPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO">
+
-    <!--@mbg.generated-->
-    <!--@Table carry_capacity_user-->
-    <id column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="user_type" jdbcType="VARCHAR" property="userType" />
-    <result column="voltage" jdbcType="VARCHAR" property="voltage" />
-    <result column="protocol_capacity" jdbcType="DOUBLE" property="protocolCapacity" />
-    <result column="area" jdbcType="VARCHAR" property="area" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    user_id, user_name, user_type, voltage, protocol_capacity, area, create_by, create_time, 
-    update_by, update_time
-  </sql>
 </mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/EventWaveAnalysisMapper.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.advance.mapper.RelevantLogMapper">
-
-    <select id="updateCause" resultType="EntityLogic">
-
-    </select>
-
-</mapper>

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/CarryCapacityService.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author clam
  * @version V1.0.0
  */
-public interface CarryCapcityService {
+public interface CarryCapacityService {
 
 
     CarryCapacityDataVO queryCarryCapacityData(CarryCapacityQueryDataParam queryParam);

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java

@@ -34,7 +34,6 @@ public class CarryCapacityDevicePOServiceImpl extends ServiceImpl<CarryCapacityD
     public Boolean add(CarryCapacityDeviceParam capacityDeviceParam) {
         CarryCapacityDevicePO carryCapacityDevicePO = new CarryCapacityDevicePO();
         BeanUtils.copyProperties(capacityDeviceParam,carryCapacityDevicePO);
-        boolean save = this.save(carryCapacityDevicePO);
+        return this.save(carryCapacityDevicePO);
-        return save;
     }
 }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java

@@ -59,7 +59,7 @@ public class CarryCapacityResultPOServiceImpl extends ServiceImpl<CarryCapacityR
                 CarryCapacityUserPO carryCapacityUserPO = carryCapacityUserPOService.queyDetailUserById(userId);
                 return carryCapacityUserPO.getUserName();
             }).collect(Collectors.toList());
-            vo.setUserName(collect1.stream().collect(Collectors.joining(",")));
+            vo.setUserName(String.join(",", collect1));
             if (ObjectUtils.isNotEmpty(temp.getIResultList()) ){
                 String iResultList = temp.getIResultList();
                 List<CarryCapacityDResultVO.CarryCapacityIResult> list = JSONUtil.toList(JSONUtil.toJsonStr(iResultList), CarryCapacityDResultVO.CarryCapacityIResult.class);

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityStrategyPOServiceImpl.java

@@ -58,8 +58,7 @@ public class CarryCapacityStrategyPOServiceImpl extends ServiceImpl<CarryCapacit
         //新增客户策略;
         carryCapacityStrategyPO.setProtoFlag(2);
         carryCapacityStrategyPO.setUserFlag(1);
-        boolean save = this.save(carryCapacityStrategyPO);
+        return this.save(carryCapacityStrategyPO);
-        return save;
     }
 
     @Override
@@ -133,7 +132,6 @@ public class CarryCapacityStrategyPOServiceImpl extends ServiceImpl<CarryCapacit
             po.setUserFlag(1);
             return po;
         }).collect(Collectors.toList());
-        boolean b = this.saveBatch(collect);
+        return this.saveBatch(collect);
-        return b;
     }
 }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java

@@ -75,7 +75,7 @@ public class CarryCapacityUserPOServiceImpl extends ServiceImpl<CarryCapacityUse
                 orderByDesc(CarryCapacityUserPO::getCreateTime);
 
         IPage<CarryCapacityUserPO> page = this.page (returnpage, queryWrapper);
-        page.getRecords().stream().forEach(temp->{
+        page.getRecords().forEach(temp->{
             UserVO user = userFeignClient.getUserById(temp.getCreateBy()).getData();
 
             temp.setCreateBy(Objects.isNull(user)? LogInfo.UNKNOWN_USER:user.getName());

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java

@@ -4,12 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.CharPool;
 import cn.hutool.core.text.StrPool;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.njcn.advance.enums.AdvanceResponseEnum;
 import com.njcn.advance.enums.GovernSchemeEnum;
 import com.njcn.advance.pojo.dto.govern.voltage.ProductLineComputeData;
@@ -32,6 +29,9 @@ import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * @author hongawen
+ */
 @Service
 @RequiredArgsConstructor
 public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
@@ -77,7 +77,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
         String startTime = sgGovernSchemeHistoryParam.getStartTime();
         String endTime = sgGovernSchemeHistoryParam.getEndTime();
         //这种区间计算损失不合适，经过平均后，特征幅值在40%以下，直接被平均为25%，故此处我准备按实际的暂态信息计算
-//        Map<Integer[], Integer> eventMap = eventService.getEventMap(sgIncomingLine.getId(), startTime, endTime);
+        //区间计算方式：Map<Integer[], Integer> eventMap = eventService.getEventMap(sgIncomingLine.getId(), startTime, endTime);
         List<SgEvent> sgEventList = eventService.getEventData(sgIncomingLine.getId(), startTime, endTime);
         if (CollectionUtil.isEmpty(sgEventList)) {
             throw new BusinessException(AdvanceResponseEnum.EVENT_DATA_MISS);
@@ -155,7 +155,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
         }
         List<Double> governEffectUPS = new ArrayList<>();
         for (int i = 0; i < allVO.getPayBackPeriod(); i++) {
-            governEffectUPS.add(allVO.getLoss()- upsVo.getLoss());
+            governEffectUPS.add(allVO.getLoss() - upsVo.getLoss());
         }
         upsVo.setGovernEffectArray(governEffectUPS);
         allVO.setUpsData(upsVo);
@@ -178,7 +178,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
         copyHistoryVo(avcResult, avcVo);
         List<Double> governEffectAVC = new ArrayList<>();
         for (int i = 0; i < allVO.getPayBackPeriod(); i++) {
-            governEffectAVC.add(allVO.getLoss()- avcVo.getLoss());
+            governEffectAVC.add(allVO.getLoss() - avcVo.getLoss());
         }
         avcVo.setGovernEffectArray(governEffectAVC);
         allVO.setAvcData(avcVo);
@@ -201,7 +201,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
         }
         List<Double> governEffectQuick = new ArrayList<>();
         for (int i = 0; i < allVO.getPayBackPeriod(); i++) {
-            governEffectQuick.add(allVO.getLoss()- quickVo.getLoss());
+            governEffectQuick.add(allVO.getLoss() - quickVo.getLoss());
         }
         quickVo.setGovernEffectArray(governEffectQuick);
         allVO.setQuickData(quickVo);
@@ -211,7 +211,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
         QuickSchemeParam quickParam = new QuickSchemeParam();
         BeanUtil.copyProperties(quickParamOne, quickParam);
         SgIncomingLine sgIncomingLine = incomingLineService.getById(quickParam.getIncomingLineId());
-        if(Objects.nonNull(sgIncomingLine)){
+        if (Objects.nonNull(sgIncomingLine)) {
             quickParam.setIncomingLineId(sgIncomingLine.getName());
         }
         allVO.setQuick(quickParam);
@@ -373,7 +373,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
                                         double yearRate, ProductLineComputeData productLineComputeData) {
         //为了数据好看点，除以年期望值
         Integer payBackPeriod = 1;
-//        Integer payBackPeriod = sgGovernSchemeHistoryAllVO.getPayBackPeriod();
+        //计算出来的方式：Integer payBackPeriod = sgGovernSchemeHistoryAllVO.getPayBackPeriod();
         SgGovernSchemeParam schemeParam;
         //总计暂降次数
         int eventCount = 0;
@@ -393,7 +393,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
                     Double[] eventEffect = eventService.getEventLossAndFailureRate(productLineComputeData, amplitude, durationTime);
                     Double singleLoss = eventEffect[0];
                     Double productLineFailureRate = eventEffect[1];
-//                    totalLoss = totalLoss + singleLoss * eventMap.get(sagData);
+                    //根据暂态区域分布计算：totalLoss = totalLoss + singleLoss * eventMap.get(sagData);
                     totalLoss = totalLoss + singleLoss;
                     if (amplitude < 0.9) {
                         eventCount++;
@@ -422,7 +422,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
                     Double[] eventEffect = eventService.getEventLossAndFailureRate(productLineComputeData, amplitude, durationTime);
                     Double singleLoss = eventEffect[0];
                     Double productLineFailureRate = eventEffect[1];
-//                    totalLoss = totalLoss + singleLoss * eventMap.get(sagData);
+                    //根据暂态区域分布计算出：totalLoss = totalLoss + singleLoss * eventMap.get(sagData);
                     totalLoss = totalLoss + singleLoss;
                     if (amplitude < 0.9) {
                         eventCount++;
@@ -541,7 +541,8 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
      * @param power             功率
      */
     private void calcEquipment(GovernSchemeEnum governSchemeEnum, CommonSchemeParam commonSchemeParam, QuickSchemeParam quickSchemeParam, Double power, SgGovernSchemeHistoryDetailVO resultVo) {
-        resultVo.setCount(0);//避免NULL时报错
+        // 避免NULL时报错
+        resultVo.setCount(0);
         double priceIndex;
         switch (governSchemeEnum) {
             case UPS:
@@ -564,7 +565,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
                 AVCInfo avcInfo = calcAvc(power);
                 resultVo.setSize(avcInfo.getSize());
                 resultVo.setCount(avcInfo.getCount());
-                resultVo.setPower(PubUtils.doubleRound(2, (double) avcInfo.getTotalPower()));
+                resultVo.setPower(PubUtils.doubleRound(2, avcInfo.getTotalPower()));
                 //根据新需求，总功率低于50kW时，按50kW一跳且价格上浮50%；高于50kW时每50kW一跳。
                 priceIndex = 1;
                 if (avcInfo.getTotalPower() < 50) {
@@ -740,7 +741,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
 
     @Setter
     @Getter
-    class AVCInfo implements Comparable<AVCInfo> {
+    static class AVCInfo implements Comparable<AVCInfo> {
         private int totalPower;
         private int power;
         private int count;
@@ -750,7 +751,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
             this.power = power;
             this.count = (int) Math.ceil(totalPower / this.power);
             this.size = size;
-            this.totalPower = this.power * this.count;
+            // 此处后续被覆盖了，this.totalPower = this.power * this.count;
             //根据新需求，总功率低于50kW时，按50kW一跳且价格上浮50%；高于50kW时每50kW一跳。
             double power4price;
             if (totalPower >= 50) {

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgEventServiceImpl.java

@@ -16,7 +16,6 @@ import com.njcn.advance.pojo.param.govern.voltage.SgEventParam;
 import com.njcn.advance.pojo.po.govern.voltage.SgEvent;
 import com.njcn.advance.pojo.po.govern.voltage.SgIncomingLine;
 import com.njcn.advance.pojo.vo.govern.voltage.*;
-import com.njcn.advance.service.govern.voltage.IGovernSchemeCalcService;
 import com.njcn.advance.service.govern.voltage.ISgEventService;
 import com.njcn.advance.service.govern.voltage.ISgIncomingLineService;
 import com.njcn.advance.service.govern.voltage.ISgProductLineService;
@@ -214,7 +213,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
      */
     @Override
     public Map<Integer[], Integer> getEventMap(String id, String startTime, String endTime) {
-        Map<Integer[], Integer> eventMap = new HashMap<>();
+        Map<Integer[], Integer> eventMap = new HashMap<>(16);
         LambdaQueryWrapper<SgEvent> lambdaQueryWrapper;
         for (double[] amplitudeRange : AMPLITUDE) {
             for (double[] durationTimeRange : DURATION_TIME) {
@@ -344,7 +343,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
             return null;
         }
         List<String> incomingLineIDList = imcomingLineList.stream().map(SgIncomingLine::getId).collect(Collectors.toList());
-        List<List<Object>> list = countEventTims(incomingLineIDList, beginDate, endDate);
+        List<List<Object>> list = countEventTimes(incomingLineIDList, beginDate, endDate);
         // 转换
         ArrayList<String> amplitudes = new ArrayList<>();
         ArrayList<String> durations = new ArrayList<>();
@@ -353,16 +352,19 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
         for (int i = 0; i < list.size(); i++) {
             List<Object> list1 = list.get(i);
             for (int j = 0; j < list1.size(); j++) {
-                if (i == 0 && j == 0)
+                if (i == 0 && j == 0) {
                     continue;
+                }
                 Object v = list1.get(j);
-                if (i == 0) {//第一行为持续时间
+                //第一行为持续时间
+                if (i == 0) {
                     durations.add(String.valueOf(v));
                 } else {
-                    if (j == 0) {//第一列为幅值
+                    //第一列为幅值
+                    if (j == 0) {
                         amplitudes.add(String.valueOf(v));
                     } else {
-                        ArrayList<String> vv = new ArrayList<String>();
+                        ArrayList<String> vv = new ArrayList<>();
                         String amplitude = amplitudes.get(i - 1);
                         vv.add(amplitude);
 
@@ -375,7 +377,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
                 }
             }
         }
-        String strTwo[][] = new String[value.size()][];
+        String[][] strTwo = new String[value.size()][];
         for (int i = 0; i < value.size(); i++) {
             ArrayList<String> v = value.get(i);
             String[] vv = v.toArray(new String[v.size()]);
@@ -420,7 +422,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
     @Override
     public Double[] getEventLossAndFailureRate(ProductLineComputeData productLineComputeData, double amplitude, double durationTime) {
         //总损失
-        Double totalLoss = 0.0;
+        double totalLoss = 0.0;
         //生产线故障率
         Double productFailureRate = 0.0;
         //如果是模式二，需要独立计算下设备损失+原料损失
@@ -570,20 +572,15 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
 
     /**
      * 统计暂降事件发生次数， 限定条件降幅范围和持续时间范围
-     *
-     * @param lineIds
-     * @param beginDate
-     * @param endDate
-     * @return
      */
-    public List<List<Object>> countEventTims(List<String> lineIds, String beginDate, String endDate) {
+    public List<List<Object>> countEventTimes(List<String> lineIds, String beginDate, String endDate) {
-        List<List<Object>> rList = new ArrayList();
+        List<List<Object>> rList = new ArrayList<>();
         List<Object> firstRow = new ArrayList<>();
         firstRow.add("幅值\\持续时间");
         rList.add(firstRow);
         boolean b = true;
         for (double[] amplitudeRange : AMPLITUDE) {
-            ArrayList<Object> row = getOneRowEventTimesData(b ? firstRow : null, amplitudeRange, DURATION_TIME, lineIds, beginDate, endDate);
+            ArrayList<Object> row = getOneRowEventTimesData(b ? firstRow : null, amplitudeRange, lineIds, beginDate, endDate);
             rList.add(row);
             b = false;
         }
@@ -592,18 +589,11 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
 
     /**
      * 获取一行事件次数统计数据
-     *
-     * @param amplitudeRange
-     * @param durationTime
-     * @param lineIds
-     * @param beginDate
-     * @param endDate
-     * @return
      */
-    private ArrayList<Object> getOneRowEventTimesData(List<Object> firstRow, double[] amplitudeRange, double[][] durationTime, List<String> lineIds, String beginDate, String endDate) {
+    private ArrayList<Object> getOneRowEventTimesData(List<Object> firstRow, double[] amplitudeRange, List<String> lineIds, String beginDate, String endDate) {
-        ArrayList<Object> rList = new ArrayList<Object>();
+        ArrayList<Object> rList = new ArrayList<>();
         rList.add(NumberUtil.format(amplitudeRange[0] * 0.01, "0.0") + "~" + NumberUtil.format(amplitudeRange[1] * 0.01, "0.0"));
-        for (double[] durationTimeRange : durationTime) {
+        for (double[] durationTimeRange : SgEventServiceImpl.DURATION_TIME) {
             if (firstRow != null) {
                 firstRow.add(NumberUtil.format(durationTimeRange[0] * 0.001, "0.00") + "~" + NumberUtil.format(durationTimeRange[1] * 0.001, "0.00"));
             }
@@ -657,11 +647,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
         LocalDateTime begin = mainEvent.getStartTime();
         LocalDateTime end = LocalDateTimeUtil.offset(begin, mainEvent.getDuration().longValue(), ChronoUnit.MILLIS);
         LocalDateTime target = backUpEvent.getStartTime();
-        if (!target.isBefore(begin) && !target.isAfter(end)) {
+        return !target.isBefore(begin) && !target.isAfter(end);
-            return true;
-        } else {
-            return false;
-        }
     }
 
     /**
@@ -674,11 +660,8 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
     private List<SgEvent> processTimeResponse(List<SgEvent> mainEvents, List<SgEvent> backupEvents, int timeResponse) {
         List<SgEvent> rList = new ArrayList<>();
         for (SgEvent a : mainEvents) {
-            boolean bol = false;
+            boolean bol = timeResponse > a.getDuration();
             // 考虑响应时间
-            if (timeResponse > a.getDuration()) {
-                bol = true;
-            }
             if (bol) {
                 rList.add(a);
             }
@@ -710,7 +693,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
      * @param eventList 暂降事件集合
      */
     private Map<Integer[], Integer> fillMap(List<SgEvent> eventList) {
-        Map<Integer[], Integer> rMap = new HashMap<>();
+        Map<Integer[], Integer> rMap = new HashMap<>(16);
         for (SgEvent event : eventList) {
             Integer[] key = getKey(event.getDuration(), event.getFeatureAmplitude());
             if (rMap.containsKey(key)) {
@@ -737,9 +720,8 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
                 key[0] = t2;
             }
         }
-        double eTime = eventDurationTime;
         for (double[] a : DURATION_TIME) {
-            if (eTime > a[0] && eTime <= a[1]) {
+            if (eventDurationTime > a[0] && eventDurationTime <= a[1]) {
                 Integer t1 = DURATION_TIME_KEY_MAP.get(a);
                 key[1] = t1;
             }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgGovernSchemeHistoryServiceImpl.java

@@ -10,9 +10,7 @@ import com.njcn.advance.mapper.govern.voltage.SgGovernSchemeHistoryMapper;
 import com.njcn.advance.pojo.param.govern.voltage.SgGovernSchemeHistoryParam;
 import com.njcn.advance.pojo.po.govern.voltage.SgGovernSchemeHistory;
 import com.njcn.advance.pojo.po.govern.voltage.SgProductLine;
-import com.njcn.advance.pojo.po.govern.voltage.SgUser;
 import com.njcn.advance.pojo.vo.govern.voltage.SgGovernSchemeHistoryVO;
-import com.njcn.advance.pojo.vo.govern.voltage.SgProductLineVO;
 import com.njcn.advance.service.govern.voltage.ISgGovernSchemeHistoryService;
 import com.njcn.advance.service.govern.voltage.ISgProductLineService;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -69,9 +67,7 @@ public class SgGovernSchemeHistoryServiceImpl extends ServiceImpl<SgGovernScheme
         }
         queryWrapper.eq("sg_govern_scheme_history.state", DataStateEnum.ENABLE.getCode());
         queryWrapper.orderByDesc("sg_govern_scheme_history.create_time");
-        Page<SgGovernSchemeHistoryVO> data = this.baseMapper.page(new Page<>(PageFactory.getPageNum(sgSchemeHistoryQueryParam), PageFactory.getPageSize(sgSchemeHistoryQueryParam)), queryWrapper);
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(sgSchemeHistoryQueryParam), PageFactory.getPageSize(sgSchemeHistoryQueryParam)), queryWrapper);
-
-        return data;
     }
 
     @Override

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgIncomingLineServiceImpl.java

@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.advance.enums.AdvanceResponseEnum;
 import com.njcn.advance.mapper.govern.voltage.SgIncomingLineMapper;
 import com.njcn.advance.pojo.param.govern.voltage.IncomingLineParam;
-import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
 import com.njcn.advance.pojo.po.govern.voltage.SgIncomingLine;
-import com.njcn.advance.pojo.po.govern.voltage.SgUser;
 import com.njcn.advance.pojo.vo.govern.voltage.IncomingLineVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgOption;
 import com.njcn.advance.service.govern.voltage.ISgIncomingLineService;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgProductLineServiceImpl.java

@@ -2,7 +2,6 @@ package com.njcn.advance.service.govern.voltage.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,15 +10,11 @@ import com.njcn.advance.enums.AdvanceResponseEnum;
 import com.njcn.advance.mapper.govern.voltage.SgProductLineMapper;
 import com.njcn.advance.pojo.dto.govern.voltage.ProductLineComputeData;
 import com.njcn.advance.pojo.param.govern.voltage.SgProductLineParam;
-import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
 import com.njcn.advance.pojo.po.govern.voltage.SgMachine;
 import com.njcn.advance.pojo.po.govern.voltage.SgProductLine;
-import com.njcn.advance.pojo.po.govern.voltage.SgSensitiveUnit;
-import com.njcn.advance.pojo.po.govern.voltage.SgUser;
 import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgProductLineVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgSensitiveUnitVO;
-import com.njcn.advance.pojo.vo.govern.voltage.SgUserVO;
 import com.njcn.advance.service.govern.voltage.ISgMachineService;
 import com.njcn.advance.service.govern.voltage.ISgProductLineService;
 import com.njcn.advance.service.govern.voltage.ISgSensitiveUnitService;
@@ -27,7 +22,6 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
-import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgSensitiveUnitServiceImpl.java

@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.advance.enums.AdvanceResponseEnum;
 import com.njcn.advance.mapper.govern.voltage.SgSensitiveUnitMapper;
 import com.njcn.advance.pojo.param.govern.voltage.SgSensitiveUnitParam;
-import com.njcn.advance.pojo.po.govern.voltage.SgMachine;
 import com.njcn.advance.pojo.po.govern.voltage.SgSensitiveUnit;
-import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
 import com.njcn.advance.pojo.vo.govern.voltage.SgSensitiveUnitVO;
 import com.njcn.advance.service.govern.voltage.ISgSensitiveUnitService;
 import com.njcn.common.pojo.enums.common.DataStateEnum;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java

@@ -3,11 +3,9 @@ package com.njcn.advance.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +26,6 @@ import com.njcn.common.utils.PubUtils;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
-import com.njcn.event.api.RmpEventDetailFeignClient;
 import com.njcn.event.pojo.po.RmpEventDetailAssPO;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
@@ -36,7 +33,6 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.system.pojo.po.Area;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
@@ -49,7 +45,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -67,7 +62,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanceMapper, RmpEventDetailPO> implements EventRelevantAnalysisService {
 
-    private final RmpEventDetailFeignClient rmpEventDetailFeignClient;
 
     private final DicDataFeignClient dicDataFeignClient;
 
@@ -100,7 +94,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
         HandleEvent handleEvent = new HandleEvent();
         // 分析的事件进行处理
         List<EntityGroupEvtData> baseList = handleEvent.getData(startTime, endTime);
-        if(CollectionUtil.isEmpty(baseList)){
+        if (CollectionUtil.isEmpty(baseList)) {
             throw new BusinessException("当前时间段暂无可分析事件");
         }
 
@@ -112,9 +106,9 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             List<SagEvent> listSagEvent = new ArrayList<>();
             List<EventAssObj> listEventAssObj = new ArrayList<>();
 
-            Map<String, List<String>> strategyToBusBarMap = new HashMap<>();
+            Map<String, List<String>> strategyToBusBarMap = new HashMap<>(32);
 
-            Map<String, EntityMtrans> mapRedis = new HashMap<>();
+            Map<String, EntityMtrans> mapRedis = new HashMap<>(32);
 
             Map<String, List<EntityLogic>> strategyMap = strategyList.stream().collect(Collectors.groupingBy(EntityLogic::getTPIndex));
             strategyMap.forEach((key, list) -> {
@@ -133,7 +127,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
             strategyToBusBarMap.forEach((lastKey, lastVal) -> {
                 int index = 1;
-                List<EntityGroupEvtData> list = new ArrayList<EntityGroupEvtData>();
+                List<EntityGroupEvtData> list = new ArrayList<>();
                 for (EntityGroupEvtData entityGroupEvtData : baseList) {
                     if (lastVal.contains(entityGroupEvtData.getNodePhysics()) && dictData.getId().equals(entityGroupEvtData.getSagReason())) {
                         entityGroupEvtData.setNode(index++);
@@ -158,8 +152,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
                                 : entityGroupEvtData.length / FinalData.MAX_EVT_NUM + 1;
 
                         for (int i = 0; i < circulation; i++) {
-                            int to = 0;
+                            int to;
-
                             if (i == circulation - 1) {
                                 to = entityGroupEvtData.length % FinalData.MAX_EVT_NUM > 0
                                         ? entityGroupEvtData.length
@@ -222,7 +215,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             entityPqsRelevance.setTimeId(date);
             relevantLogMapper.insert(entityPqsRelevance);
 
-        }else {
+        } else {
             throw new BusinessException("当前无变压器策略,请先配置策略");
         }
 
@@ -283,8 +276,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
         LambdaQueryWrapper<RmpEventDetailAssPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.between(RmpEventDetailAssPO::getTimeId, timeV.get(0), timeV.get(1))
                 .orderByAsc(RmpEventDetailAssPO::getTimeId);
-        Page<RmpEventDetailAssPO> page = rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
+        return rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
-        return page;
     }
 
     @Override
@@ -359,7 +351,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
     @Override
     public List<AdvanceEventDetailVO> queryEventList(List<String> eventId) {
         LambdaQueryWrapper<RmpEventDetailPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(RmpEventDetailPO::getEventId,eventId);
+        lambdaQueryWrapper.in(RmpEventDetailPO::getEventId, eventId);
         List<RmpEventDetailPO> rmpEventDetailPOList = eventAdvanceMapper.selectList(lambdaQueryWrapper);
         if (CollectionUtil.isEmpty(rmpEventDetailPOList)) {
             throw new BusinessException(AdvanceResponseEnum.EVENT_EMPTY);
@@ -477,24 +469,24 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
 
     class HandleEvent {
-        public EntityGroupData translate(EntityGroupEvtData entityGroupEvtData[], EntityMtrans entityMtrans) {
+        public EntityGroupData translate(EntityGroupEvtData[] entityGroupEvtData, EntityMtrans entityMtrans) {
             // 获取测试数据的数组长度
-            int test_log_num = entityGroupEvtData.length;
+            int testLogNum = entityGroupEvtData.length;
 
             // 实例化EntityGroupData，给其中的数组分配空间
-            EntityGroupData group_buf = new EntityGroupData();
+            EntityGroupData groupBuf = new EntityGroupData();
 
             // 填入日志
-            setMatrixcata(group_buf, entityMtrans);
+            setMatrixcata(groupBuf, entityMtrans);
-            create_evt_buf(entityGroupEvtData, group_buf, test_log_num);
+            create_evt_buf(entityGroupEvtData, groupBuf, testLogNum);
 
-            UtilNormalization.sort_Tstart(group_buf); // 根据时标进行划分
+            UtilNormalization.sort_Tstart(groupBuf); // 根据时标进行划分
             // 根据暂降类型进行划分
-            for (int i = 0; i < group_buf.getGrp_all_num(); i++) {
+            for (int i = 0; i < groupBuf.getGrp_all_num(); i++) {
-                UtilNormalization.sort_cata(group_buf, i);
+                UtilNormalization.sort_cata(groupBuf, i);
             }
 
-            return group_buf;
+            return groupBuf;
         }
 
         public List<EntityGroupEvtData> getData(LocalDateTime startTime, LocalDateTime endTime) {
@@ -506,52 +498,46 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             List<AdvanceEventDetailVO> advanceEventDetailVOLsit = querySagEventsAll(startTime, endTime);
 
 
-            for (int i = 0; i < advanceEventDetailVOLsit.size(); i++) { // 获取监测点线路序号
+            for (AdvanceEventDetailVO advanceEventDetailVO : advanceEventDetailVOLsit) { // 获取监测点线路序号
                 //母线id
-                String nodePhysics = advanceEventDetailVOLsit.get(i).getVoltageId();
+                String nodePhysics = advanceEventDetailVO.getVoltageId();
 
                 // 根据暂降类型获取高级算法对应的编号
-                int cata = 0;
+                int cata;
-                long ll = 0L;
+                long ll;
-                int start_time = 0;
+                int startTimeTemp;
 
-                if (Objects.isNull(advanceEventDetailVOLsit.get(i).getFirstType())) {
+                if (Objects.isNull(advanceEventDetailVO.getFirstType())) {
-                    cata = advanceMap.get(advanceEventDetailVOLsit.get(i).getAdvanceType()).getAlgoDescribe();
+                    cata = advanceMap.get(advanceEventDetailVO.getAdvanceType()).getAlgoDescribe();
-                    ll = (long) (Timestamp.valueOf(advanceEventDetailVOLsit.get(i).getStartTime()).getTime()
+                    ll = (long) (Timestamp.valueOf(advanceEventDetailVO.getStartTime()).getTime()
-                            + (advanceEventDetailVOLsit.get(i).getDuration() * 1000));
+                            + (advanceEventDetailVO.getDuration() * 1000));
-                    start_time = (int) (ll / 1000);
+                    startTimeTemp = (int) (ll / 1000);
                 } else {
-                    cata = advanceMap.get(advanceEventDetailVOLsit.get(i).getAdvanceType()).getAlgoDescribe(); // 获取类型
+                    cata = advanceMap.get(advanceEventDetailVO.getAdvanceType()).getAlgoDescribe(); // 获取类型
-                    ll = (long) (Timestamp.valueOf(advanceEventDetailVOLsit.get(i).getFirstTime()).getTime()
+                    ll = (long) (Timestamp.valueOf(advanceEventDetailVO.getFirstTime()).getTime()
-                            + (advanceEventDetailVOLsit.get(i).getFirstMs()));
+                            + (advanceEventDetailVO.getFirstMs()));
-                    start_time = (int) (ll / 1000);
+                    startTimeTemp = (int) (ll / 1000);
                 }
 
                 // 填充SagEvent对象数据
                 SagEvent sagEvent = new SagEvent();
 
-                sagEvent.setIndexEventDetail(advanceEventDetailVOLsit.get(i).getEventId());
+                sagEvent.setIndexEventDetail(advanceEventDetailVO.getEventId());
-                sagEvent.setSagTime(advanceEventDetailVOLsit.get(i).getStartTime());
+                sagEvent.setSagTime(advanceEventDetailVO.getStartTime());
                 sagEvent.setFirstTime(PubUtils.ms2Date(ll));// 必须增加，否则序列化出错
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                sagEvent.setTime(Timestamp.valueOf(advanceEventDetailVO.getStartTime()).getTime());
-
-                /*String tem = advanceEventDetailVOLsit.get(i).getFirstTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-                sagEvent.setStrTime(tem + "."
-                        + advanceEventDetailVOLsit.get(i).getFirstMs());*/
-                sagEvent.setTime(Timestamp.valueOf(advanceEventDetailVOLsit.get(i).getStartTime()).getTime());
                 sagEvent.setFirstTimeMills(ll);
-                sagEvent.setMsec(advanceEventDetailVOLsit.get(i).getDuration().intValue());
+                sagEvent.setMsec(advanceEventDetailVO.getDuration().intValue());
-                //sagEvent.setSagTime(PubUtils.ms2Date(Timestamp.valueOf(advanceEventDetailVOLsit.get(i).getFirstTime()).getTime()));
                 PlantInfo plantInfo = new PlantInfo();
-                plantInfo.setNameBD(advanceEventDetailVOLsit.get(i).getSubName());
+                plantInfo.setNameBD(advanceEventDetailVO.getSubName());
-                plantInfo.setNameGD(advanceEventDetailVOLsit.get(i).getGdName());
+                plantInfo.setNameGD(advanceEventDetailVO.getGdName());
-                plantInfo.setNamePoint(advanceEventDetailVOLsit.get(i).getLineId());
+                plantInfo.setNamePoint(advanceEventDetailVO.getLineId());
                 sagEvent.setPlantInfo(plantInfo);
-                sagEvent.setIndexPoint(advanceEventDetailVOLsit.get(i).getLineId());
+                sagEvent.setIndexPoint(advanceEventDetailVO.getLineId());
                 sagEvent.setCata(cata);
 
 
-                EntityGroupEvtData entityGroupEvtData = new EntityGroupEvtData(nodePhysics, start_time, cata, -1, sagEvent, advanceEventDetailVOLsit.get(i).getAdvanceReason());
+                EntityGroupEvtData entityGroupEvtData = new EntityGroupEvtData(nodePhysics, startTimeTemp, cata, -1, sagEvent, advanceEventDetailVO.getAdvanceReason());
                 entityGroupEvtDataList.add(entityGroupEvtData);
             }
 
@@ -589,7 +575,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             int i, j, k;
             for (i = 0; i < obj.getGrp_all_num(); i++) {
                 String strUUID = IdUtil.simpleUUID();
-                List<SagEvent> listTem = new ArrayList<SagEvent>();
+                List<SagEvent> listTem = new ArrayList<>();
 
                 for (j = 0; j < FinalData.MAX_CATA_NUM + 2; j++) {
                     if (obj.getGrp_cata_num()[i][j] != 0) {
@@ -602,7 +588,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
                     }
                 }
 
-                if (listTem.size() > 0) {
+                if (!listTem.isEmpty()) {
                     processing(listTem, assEvent, date);
                 }
             }
@@ -645,14 +631,15 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
     /*************************************************************************************
      * 获取变压器信息并生成矩阵
      *************************************************************************************/
+    @Deprecated
     public void getNodeInfo(HandleEvent handleEvent) {
         List<EntityLogic> list = relevantLogMapper.getLogic();
 
         if (CollectionUtil.isNotEmpty(list)) {
             Map<String, List<EntityLogic>> tfMap = list.stream().collect(Collectors.groupingBy(EntityLogic::getTPIndex));
-            Map<String, List<String>> tfBusBarMap = new HashMap<>();
+            Map<String, List<String>> tfBusBarMap = new HashMap<>(32);
 
-            Map<String, EntityMtrans> entityMtranMap = new HashMap<>();
+            Map<String, EntityMtrans> entityMtranMap = new HashMap<>(32);
 
             tfMap.forEach((key, val) -> {
                 List<String> tem = new ArrayList<>();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java

@@ -1,27 +1,18 @@
 package com.njcn.advance.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.njcn.advance.enums.EnumEvt;
 import com.njcn.advance.mapper.RmpEventAdvanceMapper;
 import com.njcn.advance.pojo.dto.waveAnalysis.*;
 
 import com.njcn.advance.service.EventWaveAnalysisService;
 import com.njcn.advance.utils.*;
-import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.FileUtil;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.device.pq.api.LineFeignClient;
-import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
-import com.njcn.event.api.RmpEventDetailFeignClient;
-import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.oss.constant.GeneralConstant;
 import com.njcn.oss.constant.OssPath;
@@ -32,12 +23,11 @@ import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -46,7 +36,6 @@ import java.time.ZoneOffset;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * pqs
@@ -59,15 +48,10 @@ import java.util.stream.Stream;
 @Slf4j
 public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
 
-    private final int MAXLENGTH = 128 * 3000; //波形最大值计算
-
-    private final RmpEventDetailFeignClient rmpEventDetailFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
 
     private final LineFeignClient lineFeignClient;
 
-    private final GeneralInfo generalInfo;
 
     private final FileStorageUtil fileStorageUtil;
 
@@ -81,20 +65,18 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
         TimeInterval timeInterval = new TimeInterval();
         //调用方法获取暂降事件详情
         RmpEventDetailPO rmpEventDetailPO = rmpEventAdvanceMapper.selectById(eventIndex);
-        EntityAdvancedData entityAdvancedData ;
+        EntityAdvancedData entityAdvancedData;
 
         //获取PT变比
         LineDetailDataVO lineDetailDataVO = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData();
 
 
-
         if (rmpEventDetailPO.getFileFlag() == 1) {
             //获取所有暂态原因
             List<DictData> dicDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData();
             Map<Integer, DictData> eventTypeMap = dicDataList.stream().collect(Collectors.toMap(DictData::getAlgoDescribe, Function.identity()));
-
+            InputStream inputStreamCfg;
-            InputStream inputStreamCfg = null;
+            InputStream inputStreamDat;
-            InputStream inputStreamDat = null;
             try {
                 inputStreamCfg = fileStorageUtil.getFileStream(OssPath.WAVE_DIR + lineDetailDataVO.getIp() + StrUtil.SLASH + rmpEventDetailPO.getWavePath() + GeneralConstant.CFG);
                 inputStreamDat = fileStorageUtil.getFileStream(OssPath.WAVE_DIR + lineDetailDataVO.getIp() + StrUtil.SLASH + rmpEventDetailPO.getWavePath() + GeneralConstant.DAT);
@@ -103,16 +85,16 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             }
 
             //读取
-            BufferedReader bufferedReader = null;
+            BufferedReader bufferedReader;
             InputStreamReader read = null;
-            String strFileLine = null;
+            String strFileLine;
             byte[] array = {};
             List<String> temCfgList = new ArrayList<>();
             try {
                 // 判断文件是否存在
                 array = IoUtil.readBytes(inputStreamDat);
-
+                // 考虑到编码格式
-                read = new InputStreamReader(inputStreamCfg, CharsetUtil.UTF_8);// 考虑到编码格式
+                read = new InputStreamReader(inputStreamCfg, StandardCharsets.UTF_8);
                 bufferedReader = new BufferedReader(read);
 
                 while ((strFileLine = bufferedReader.readLine()) != null) {
@@ -140,10 +122,11 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             entityAdvancedData = new EntityAdvancedData(originalList.size());
 
             for (int i = 0; i < originalList.size(); i++) {
-                entityAdvancedData.smp_x[i] = originalList.get(i).get(0).floatValue();//坐标轴
+                //坐标轴
-                entityAdvancedData.smp_a[i] = originalList.get(i).get(1).floatValue();
+                entityAdvancedData.smp_x[i] = originalList.get(i).get(0);
-                entityAdvancedData.smp_b[i] = originalList.get(i).get(2).floatValue();
+                entityAdvancedData.smp_a[i] = originalList.get(i).get(1);
-                entityAdvancedData.smp_c[i] = originalList.get(i).get(3).floatValue();
+                entityAdvancedData.smp_b[i] = originalList.get(i).get(2);
+                entityAdvancedData.smp_c[i] = originalList.get(i).get(3);
             }
             entityAdvancedData.smp_len = originalList.size();
 
@@ -156,19 +139,24 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             CauseStruct causeStruct = new CauseStruct();
 
             for (int i = 0; i < pitchList.size(); i++) {
-                rect.smp_va[i] = pitchList.get(i).get(1).floatValue();
+                rect.smp_va[i] = pitchList.get(i).get(1);
-                causeStruct.smp_va[i] = pitchList.get(i).get(1).floatValue();
+                causeStruct.smp_va[i] = pitchList.get(i).get(1);
 
-                rect.smp_vb[i] = pitchList.get(i).get(2).floatValue();
+                rect.smp_vb[i] = pitchList.get(i).get(2);
-                causeStruct.smp_vb[i] = pitchList.get(i).get(2).floatValue();
+                causeStruct.smp_vb[i] = pitchList.get(i).get(2);
 
-                rect.smp_vc[i] = pitchList.get(i).get(3).floatValue();
+                rect.smp_vc[i] = pitchList.get(i).get(3);
-                causeStruct.smp_vc[i] = pitchList.get(i).get(3).floatValue();
+                causeStruct.smp_vc[i] = pitchList.get(i).get(3);
             }
 
             rect.smp_len = pitchList.size();
 
-            if (rect.smp_len >= MAXLENGTH) { //超过60s的波形直接抛异常给上面处理
+            //超过60s的波形直接抛异常给上面处理
+            /*
+             * 波形最大值计算
+             */
+            int MAX_LENGTH = 128 * 3000;
+            if (rect.smp_len >= MAX_LENGTH) {
                 throw new BusinessException("波形超过60S");
             }
 
@@ -182,16 +170,14 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             translateData(jsonObject, rmpEventDetailPO.getStartTime(), entityAdvancedData);
 
 
-            if(rmpEventDetailPO.getDealFlag()!=1){
+            if (rmpEventDetailPO.getDealFlag() != 1) {
                 //如果存在三个文件但是没有调用dll/so计算
 
-                getDataFromDLL(rmpEventDetailPO,waveOriginalData,rect,entityAdvancedData,causeStruct);
+                getDataFromDLL(rmpEventDetailPO, waveOriginalData, rect, entityAdvancedData, causeStruct);
 
             }
 
 
-
-
             /****************************************************************
              * 根据返回的结果计算，获取暂降类型描述
              ****************************************************************/
@@ -210,7 +196,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                             entityAdvancedData.sagPhaseType[i] = "三相";
                             break;
                         default:
-                            ;
+                            break;
                     }
                 }
             }
@@ -223,25 +209,22 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
     }
 
 
-
-
     /**
-     * @return
+     * 事件未进行高级算法处理：系统调用dll处理并保存结果
-     * @事件未进行高级算法处理：系统调用dll处理并保存结果
      */
     @Transactional(rollbackFor = Exception.class)
-    public void getDataFromDLL(RmpEventDetailPO rmpEventDetailPOQuery,WaveData waveData, Rect rect, EntityAdvancedData entityAdvancedData, CauseStruct causeStruct) {
+    public void getDataFromDLL(RmpEventDetailPO rmpEventDetailPOQuery, WaveData waveData, Rect rect, EntityAdvancedData entityAdvancedData, CauseStruct causeStruct) {
 
-        if(StrUtil.isBlank(rmpEventDetailPOQuery.getAdvanceType())){
+        if (StrUtil.isBlank(rmpEventDetailPOQuery.getAdvanceType())) {
             JnaCallDllOrSo jnaCallDllOrSo = new JnaCallBalance("qvvr_dll");
             jnaCallDllOrSo.setPath();
-             // 计算暂降类
+            // 计算暂降类
             JnaCallBalance.Eventlibrary INSTANTCE = JnaCallBalance.Eventlibrary.INSTANTCE;
             INSTANTCE.qvvr_fun(rect);
 
             initBackData(rect.evt_num, entityAdvancedData);
 
-            /**
+            /*
              * @判断是否调用成功
              * @成功执行更新pqs_eventdetail操作:更新dq持续时间、暂降类型、暂降原因、总分段数目
              */
@@ -252,7 +235,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                 rmpEventDetailPO.setDqTime((double) rect.evt_buf[0].hold_time_dq);
                 rmpEventDetailPO.setFirstType((Integer.toString(rect.evt_buf[0].qvvr_cata_type[0])));
                 rmpEventDetailPO.setFirstTime(waveData.getFirstTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-                rmpEventDetailPO.setFirstMs((double)waveData.getFirstMs());
+                rmpEventDetailPO.setFirstMs((double) waveData.getFirstMs());
 
 
                 // 排序并获取多段中最小的数据
@@ -307,11 +290,11 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                             int pos = 0;
 
                             for (int kk = 0; kk <= i; kk++) {
-                                pose += list.get(kk).nSampleNum / list.get(kk).nOneSample * rate;
+                                pose += (int) (list.get(kk).nSampleNum / list.get(kk).nOneSample * rate);
 
                                 if (kk < i) {
-                                    posb += list.get(kk).nSampleNum / list.get(kk).nOneSample * rate;
+                                    posb += (int) (list.get(kk).nSampleNum / list.get(kk).nOneSample * rate);
-                                    pos += list.get(kk).nSampleNum;
+                                    pos += (int) list.get(kk).nSampleNum;
                                 }
                             }
 
@@ -329,11 +312,11 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                             int pos = 0;
 
                             for (int kk = 0; kk <= i; kk++) {
-                                pose += list.get(kk).nSampleNum / list.get(kk).nOneSample * rate;
+                                pose += (int) (list.get(kk).nSampleNum / list.get(kk).nOneSample * rate);
 
                                 if (kk < i) {
-                                    posb += list.get(kk).nSampleNum / list.get(kk).nOneSample * rate;
+                                    posb += (int) (list.get(kk).nSampleNum / list.get(kk).nOneSample * rate);
-                                    pos += list.get(kk).nSampleNum;
+                                    pos += (int) list.get(kk).nSampleNum;
                                 }
                             }
 
@@ -352,7 +335,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                 Map<Integer, DictData> eventTypeMap = dicDataList.stream().collect(Collectors.toMap(DictData::getAlgoDescribe, Function.identity()));
 
                 Integer tem = rect.evt_buf[index].qvvr_cata_type[0];
-                if(eventTypeMap.containsKey(tem)) {
+                if (eventTypeMap.containsKey(tem)) {
                     rmpEventDetailPO.setAdvanceType(eventTypeMap.get(tem).getId());
                 }
                 rmpEventDetailPO.setDealFlag(1);
@@ -384,7 +367,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             Map<Integer, DictData> eventReasonMap = dicDataList.stream().collect(Collectors.toMap(DictData::getAlgoDescribe, Function.identity()));
 
             // 暂降原因的结果更新到数据库
-            if(eventReasonMap.containsKey(causeStruct.cause)) {
+            if (eventReasonMap.containsKey(causeStruct.cause)) {
                 RmpEventDetailPO updateRmpEventDetailPO = new RmpEventDetailPO();
                 updateRmpEventDetailPO.setEventId(rmpEventDetailPOQuery.getEventId());
                 updateRmpEventDetailPO.setAdvanceReason(eventReasonMap.get(causeStruct.cause).getId());
@@ -430,8 +413,10 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             //获取波形的瞬时值、RMS值数据
             AnalyWave analyWave = new AnalyWave();
             AnalyWaveModel.tagDataValue tagDataValue = analyWave.readComtrade(temCfgList, array, flag);
-            List<List<Float>> shunWave = tagDataValue.getListWaveData();//获取瞬时波形值
+            //获取瞬时波形值
-            List<List<Float>> rmsWave = analyWave.showValidData(shunWave);//RMS值波形
+            List<List<Float>> shunWave = tagDataValue.getListWaveData();
+            //RMS值波形
+            List<List<Float>> rmsWave = analyWave.showValidData(shunWave);
             waveData.setnOneWaveNum(analyWave.getnOneWaveNum());
             waveData.setSunData(shunWave);
             waveData.setTmpWaveTitle(tagDataValue.getTmpWaveTitle());
@@ -445,13 +430,13 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             List<String> tmpWaveTitle = tagDataValue.getTmpWaveTitle();
             /*********** Modify by yexibao ---Start **************/
             for (int i = 0; i < tagDataValue.getiPhasic(); i++) {
-                if (tmpWaveTitle.get(i + 1).substring(1).indexOf("A") > -1) {
+                if (tmpWaveTitle.get(i + 1).substring(1).contains("A")) {
                     waveData.setA(tmpWaveTitle.get(i + 1).substring(1));
                 }
-                if (tmpWaveTitle.get(i + 1).substring(1).indexOf("B") > -1) {
+                if (tmpWaveTitle.get(i + 1).substring(1).contains("B")) {
                     waveData.setB(tmpWaveTitle.get(i + 1).substring(1));
                 }
-                if (tmpWaveTitle.get(i + 1).substring(1).indexOf("C") > -1) {
+                if (tmpWaveTitle.get(i + 1).substring(1).contains("C")) {
                     waveData.setC(tmpWaveTitle.get(i + 1).substring(1));
                 }
             }
@@ -478,7 +463,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
 
         for (int offset = 0; offset < len; offset++) {
             BackData backData = new BackData();
-            /**
+            /*
              * @波形起始点(3相)
              */
             backData.POW_a = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -488,7 +473,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             backData.POW_c = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
                     .getJSONObject(offset).get(EnumEvt.POW_C.getProperty()).toString(), 0.0f);
 
-            /**
+            /*
              * @跳变段电压变化
              */
             backData.Voltagechange_Va = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -498,7 +483,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             backData.Voltagechange_Vc = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
                     .getJSONObject(offset).get(EnumEvt.VOLTAGECHANGE_VC.getProperty()).toString(), 0.0f);
 
-            /**
+            /*
              * @持续时间
              */
             backData.hold_time_rms = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -506,7 +491,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             backData.hold_time_dq = Utils.getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
                     .getJSONObject(offset).get(EnumEvt.HOLD_TIME_DQ.getProperty()).toString(), 0.0f);
 
-            /**
+            /*
              * @分段信息
              */
             backData.SEG_T_num = Utils.getIntValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -519,7 +504,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                         -1);
             }
 
-            /**
+            /*
              * @特征幅值
              */
             backData.u_min_num = Utils.getIntValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -539,7 +524,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                         .getFloatValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty()).getJSONObject(offset)
                                 .getJSONObject(EnumEvt.U3_MIN.getProperty()).get(Integer.toString(j)).toString(), 0.0f);
 
-                /**
+                /*
                  * @相位跳变
                  */
                 backData.angle_diff_an[j] = Utils.getFloatValue(
@@ -567,7 +552,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.ANGLE_DIFF_CP.getProperty()).get(Integer.toString(j)).toString(),
                         0.0f);
 
-                /**
+                /*
                  * @不平衡度
                  */
                 backData.bph_max_value[j] = Utils.getFloatValue(
@@ -575,21 +560,21 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.BPH_MAX_VALUE.getProperty()).get(Integer.toString(j)).toString(),
                         0.0f);
 
-                /**
+                /*
                  * @暂降原因
                  */
                 backData.qvvr_cata_cause[j] = Utils.getIntValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
                         .getJSONObject(offset).getJSONObject(EnumEvt.QVVR_CATA_CAUSE.getProperty())
                         .get(Integer.toString(j)).toString(), -1);
 
-                /**
+                /*
                  * @暂降类型
                  */
                 backData.qvvr_cata_type[j] = Utils.getIntValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
                         .getJSONObject(offset).getJSONObject(EnumEvt.QVVR_CATA_TYPE.getProperty())
                         .get(Integer.toString(j)).toString(), -1);
 
-                /**
+                /*
                  * @暂降相别
                  */
                 backData.qvvr_phasetype[j] = Utils.getIntValue(jsonObject.getJSONArray(EnumEvt.EVT_BUF.getProperty())
@@ -604,7 +589,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             if (!jsonObject.getJSONArray(EnumEvt.POWER_QVVR_AFTER_BUF.getProperty()).isEmpty()) {
                 entityAdvancedData.power_after_buf = new PowerData[1];
                 PowerData power = new PowerData();
-                float fundP[] = new float[5];
+                float[] fundP = new float[5];
                 fundP[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.POWER_QVVR_AFTER_BUF.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.FUND_P.getProperty()).get("A").toString(), 0.0f);
@@ -622,7 +607,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.FUND_P.getProperty()).get("zero").toString(), 0.0f);
                 power.setFundP(fundP);
 
-                float fundQ[] = new float[5];
+                float[] fundQ = new float[5];
                 fundQ[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.POWER_QVVR_AFTER_BUF.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.FUND_Q.getProperty()).get("A").toString(), 0.0f);
@@ -640,7 +625,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.FUND_Q.getProperty()).get("zero").toString(), 0.0f);
                 power.setFundQ(fundQ);
 
-                float fundS[] = new float[5];
+                float[] fundS = new float[5];
                 fundS[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.POWER_QVVR_AFTER_BUF.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.FUND_S.getProperty()).get("A").toString(), 0.0f);
@@ -664,7 +649,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             if (!jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).isEmpty()) {
                 entityAdvancedData.qvvr_direction_info = new DirectionData[1];
                 DirectionData direction = new DirectionData();
-                int trigTime[] = new int[7];
+                int[] trigTime = new int[7];
                 trigTime[0] = Utils.getIntValue(
                         jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.TRIG_TIME.getProperty()).get("year").toString(), 0);
@@ -688,7 +673,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.TRIG_TIME.getProperty()).get("millisecond").toString(), 0);
                 direction.setTrigTime(trigTime);
 
-                float qvvrBeforeRms[] = new float[6];
+                float[] qvvrBeforeRms = new float[6];
                 qvvrBeforeRms[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.QVVR_BEFORE_RMS.getProperty()).get("Fund_Ua").toString(), 0.0f);
@@ -709,7 +694,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.QVVR_BEFORE_RMS.getProperty()).get("Fund_Ic").toString(), 0.0f);
                 direction.setQvvrBeforeRms(qvvrBeforeRms);
 
-                float qvvrBeforeZk[] = new float[6];
+                float[] qvvrBeforeZk = new float[6];
                 qvvrBeforeZk[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.QVVR_BEFORE_ZK.getProperty()).get("Za").toString(), 0.0f);
@@ -730,7 +715,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.QVVR_BEFORE_ZK.getProperty()).get("Zca").toString(), 0.0f);
                 direction.setQvvrBeforeZk(qvvrBeforeZk);
 
-                float qvvrOccurRms[] = new float[6];
+                float[] qvvrOccurRms = new float[6];
                 qvvrOccurRms[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.QVVR_OCCUR_RMS.getProperty()).get("Fund_Ua").toString(), 0.0f);
@@ -751,7 +736,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.QVVR_OCCUR_RMS.getProperty()).get("Fund_Ic").toString(), 0.0f);
                 direction.setQvvrOccurRms(qvvrOccurRms);
 
-                float qvvrOccurZk[] = new float[6];
+                float[] qvvrOccurZk = new float[6];
                 qvvrOccurZk[0] = Utils.getFloatValue(
                         jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                                 .getJSONObject(EnumEvt.QVVR_OCCUR_ZK.getProperty()).get("Za").toString(), 0.0f);
@@ -772,7 +757,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                                 .getJSONObject(EnumEvt.QVVR_OCCUR_ZK.getProperty()).get("Zca").toString(), 0.0f);
                 direction.setQvvrOccurZk(qvvrOccurZk);
 
-                String qvvrPosInfo[] = new String[1];
+                String[] qvvrPosInfo = new String[1];
                 qvvrPosInfo[0] = jsonObject.getJSONArray(EnumEvt.QVVR_DIRECTION_INFO.getProperty()).getJSONObject(0)
                         .getJSONObject(EnumEvt.QVVR_POS_INFO.getProperty()).get("direction").toString();
                 direction.setQvvrPosInfo(qvvrPosInfo);
@@ -784,7 +769,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             if (!jsonObject.getJSONArray(EnumEvt.QVVR_UTBL_INFO.getProperty()).isEmpty()) {
                 entityAdvancedData.qvvr_utbl_info = new UtblData[1];
                 UtblData direction = new UtblData();
-                long trigTime[] = new long[1];
+                long[] trigTime = new long[1];
                 String year = jsonObject.getJSONArray(EnumEvt.QVVR_UTBL_INFO.getProperty()).getJSONObject(0)
                         .getJSONObject(EnumEvt.TRIG_TIME.getProperty()).get("year").toString();
                 String month = jsonObject.getJSONArray(EnumEvt.QVVR_UTBL_INFO.getProperty()).getJSONObject(0)
@@ -806,7 +791,10 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
-                long between = utbl.getTime() - trigeTime.toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
+                long between = 0;
+                if (utbl != null) {
+                    between = utbl.getTime() - trigeTime.toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
+                }
                 trigTime[0] = between;
                 direction.setTrigTime(trigTime);
                 entityAdvancedData.qvvr_utbl_info[0] = direction;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataResultServiceImpl.java

@@ -5,12 +5,10 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.StrPool;
-import cn.hutool.core.util.CharsetUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.advance.mapper.responsibility.RespDataResultMapper;
-import com.njcn.advance.pojo.bo.responsibility.UserDataExcel;
 import com.njcn.advance.pojo.dto.responsibility.CustomerData;
 import com.njcn.advance.pojo.dto.responsibility.CustomerResponsibility;
 import com.njcn.advance.pojo.dto.responsibility.ResponsibilityResult;
@@ -19,7 +17,6 @@ import com.njcn.advance.pojo.po.responsibility.RespDataResult;
 import com.njcn.advance.service.responsibility.IRespDataResultService;
 import com.njcn.advance.service.responsibility.IRespDataService;
 import com.njcn.oss.utils.FileStorageUtil;
-import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -69,17 +66,17 @@ public class RespDataResultServiceImpl extends ServiceImpl<RespDataResultMapper,
                 responsibilityResult.setResponsibilityDataIndex(respDataResult.getResDataId());
                 //处理时间轴数据
                 InputStream timeDataStream = fileStorageUtil.getFileStream(respDataResult.getTimeData());
-                String timeDataStr = IoUtil.read(timeDataStream, CharsetUtil.UTF_8);
+                String timeDataStr = IoUtil.readUtf8(timeDataStream);
                 List<Long> timeData = JSONArray.parseArray(timeDataStr, Long.class);
                 responsibilityResult.setTimeDatas(timeData);
                 //处理用户详细数据
                 InputStream userDetailStream = fileStorageUtil.getFileStream(respDataResult.getUserDetailData());
-                String userDetailStr = IoUtil.read(userDetailStream, CharsetUtil.UTF_8);
+                String userDetailStr = IoUtil.readUtf8(userDetailStream);
                 List<CustomerData> customerData = JSONArray.parseArray(userDetailStr, CustomerData.class);
                 responsibilityResult.setDatas(customerData);
                 //处理排名前10数据
                 InputStream respStream = fileStorageUtil.getFileStream(respDataResult.getUserResponsibility());
-                String respStr = IoUtil.read(respStream, CharsetUtil.UTF_8);
+                String respStr = IoUtil.readUtf8(respStream);
                 List<CustomerResponsibility> respData = JSONArray.parseArray(respStr, CustomerResponsibility.class);
                 responsibilityResult.setResponsibilities(respData);
                 responsibilityResults.add(responsibilityResult);

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java

@@ -7,12 +7,10 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.StrPool;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +31,6 @@ import com.njcn.advance.service.responsibility.IRespDataResultService;
 import com.njcn.advance.service.responsibility.IRespDataService;
 import com.njcn.advance.service.responsibility.IRespUserDataService;
 import com.njcn.advance.utils.ResponsibilityAlgorithm;
-import com.njcn.advance.utils.ResponsibilityCallDllOrSo;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -45,7 +42,6 @@ import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pms.pojo.po.StatationStat;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.device.pq.pojo.vo.LineDetailVO;
@@ -82,7 +78,6 @@ import java.util.stream.Stream;
 @RequiredArgsConstructor
 public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> implements IRespDataService {
 
-    private final IRespUserDataService iRespUserDataService;
 
     private final FileStorageUtil fileStorageUtil;
 
@@ -96,6 +91,22 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
 
     private final CommTerminalGeneralClient commTerminalGeneralClient;
 
+    public final static int SORT_10 = 10;
+    public final static int INTERVAL_TIME_1 = 1;
+    public final static int INTERVAL_TIME_3 = 3;
+    public final static int INTERVAL_TIME_5 = 5;
+    public final static int INTERVAL_TIME_15 = 15;
+    public final static int INTERVAL_TIME_30 = 30;
+    public final static int WINDOW_96 = 96;
+    public final static int WINDOW_48 = 48;
+    public final static int WINDOW_4 = 4;
+
+    public final static int MINUS_2 = 2;
+    public final static int MINUS_3 = 3;
+    public final static int MINUS_4 = 4;
+    public final static int MINUS_5 = 5;
+
+
     @Override
     public Page<RespDataDTO> responsibilityList(BaseParam queryParam) {
         QueryWrapper<RespDataDTO> queryWrapper = new QueryWrapper<>();
@@ -122,7 +133,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, false, "pqs_resp_data.create_time");
             }
-            queryWrapper.between("pqs_resp_data.create_time",DateUtil.beginOfDay(DateUtil.parse(queryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(queryParam.getSearchEndTime())));
+            queryWrapper.between("pqs_resp_data.create_time", DateUtil.beginOfDay(DateUtil.parse(queryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(queryParam.getSearchEndTime())));
         }
         queryWrapper.eq("pqs_resp_data.state", DataStateEnum.ENABLE.getCode());
         Page<RespDataDTO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
@@ -174,13 +185,13 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         int lineInterval = pNumAndInterval.getLineInterval();
         //第三个参数win,根据起始时间和截止时间的间隔
         if (dateStr.size() > 1) {
-            if(userIntervalTime == 15){
+            if (userIntervalTime == INTERVAL_TIME_15) {
-                win = 96;
+                win = WINDOW_96;
-            }else{
+            } else {
-                win = 48;
+                win = WINDOW_48;
             }
         } else {
-            win = 4;
+            win = WINDOW_4;
         }
         //第四个参数harmMk，默认为0f
         harmMk = 0f;
@@ -191,7 +202,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         RespHarmData respHarmData = getRespHarmData(responsibilityCalculateParam, lineInterval);
         //harmData填充完毕后，开始组装功率数据
         //首先获取当前时间内的各个用户的数据
-        Map<String/*用户名*/, List<UserDataExcel>> originalPData = new HashMap<>();
+        Map<String/*用户名*/, List<UserDataExcel>> originalPData = new HashMap<>(16);
         List<String> names = new ArrayList<>();
         Set<String> userNamesFinal = finalData.keySet();
         for (String userName : userNamesFinal) {
@@ -231,15 +242,6 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         qvvrDataEntity.harmMk = harmMk;
         qvvrDataEntity.pData = pData;
         qvvrDataEntity.harmData = respHarmData.getHarmData();
-//        ResponsibilityCallDllOrSo responsibilityCallDllOrSo = new ResponsibilityCallDllOrSo("harm_response");
-//        responsibilityCallDllOrSo.setPath();
-//        ResponsibilityCallDllOrSo.ResponsibilityLibrary responsibilityLibrary = ResponsibilityCallDllOrSo.ResponsibilityLibrary.INSTANTCE;
-//        try {
-//            responsibilityLibrary.harm_response(qvvrStruct);
-//        } catch (Exception exception) {
-//            exception.printStackTrace();
-//        }
-
         ResponsibilityAlgorithm responsibilityAlgorithm = new ResponsibilityAlgorithm();
         qvvrDataEntity = responsibilityAlgorithm.getResponsibilityResult(qvvrDataEntity);
         //至此接口调用结束，开始组装动态责任数据和用户责任量化结果
@@ -278,13 +280,13 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             timeDatas.add(calendar.getTimeInMillis());
         }
         //OK拿到所有测量点的数据了，现在就是看如何将相同户号的动态数据进行算术和求值，之前的用户name为：户号@测量点号@用户名
-        Map<String/*用户名（户号）*/, List<CustomerData>> customerDataTemp = new HashMap<>();
+        Map<String/*用户名（户号）*/, List<CustomerData>> customerDataTemp = new HashMap<>(16);
-        for (int i = 0; i < customerDatas.length; i++) {
+        for (CustomerData data : customerDatas) {
-            String customerName = customerDatas[i].getCustomerName();
+            String customerName = data.getCustomerName();
             String[] customerInfo = customerName.split("@");
             String name = customerInfo[2] + "(" + customerInfo[0] + ")";
             List<CustomerData> customerData = customerDataTemp.get(name);
-            CustomerData temp = customerDatas[i];
+            CustomerData temp = data;
             temp.setCustomerName(name);
             if (CollectionUtils.isEmpty(customerData)) {
                 customerData = new ArrayList<>();
@@ -306,15 +308,15 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
                 //表示用户唯一的
                 customerData.add(customerData1.get(0));
             } else {
-                //表示用户可能包含多个监测点号，需要进行数据累加
+                // 表示用户可能包含多个监测点号，需要进行数据累加
                 CustomerData customerDataT = new CustomerData();
                 customerDataT.setCustomerName(cusName);
                 //进行数值累加
                 List<Float> valueDatas = new ArrayList<>();
                 for (int i = 0; i < customerData1.get(0).getValueDatas().size(); i++) {
                     float original = 0.0f;
-                    for (int k = 0; k < customerData1.size(); k++) {
+                    for (CustomerData data : customerData1) {
-                        original = original + customerData1.get(k).getValueDatas().get(i);
+                        original = original + data.getValueDatas().get(i);
                     }
                     valueDatas.add(original);
                 }
@@ -364,7 +366,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             this.baseMapper.updateById(responsibilityData);
         }
         //入库完毕之后，需要将必要数据进行序列化存储，方便后期的重复利用
-        /**
+        /*
          * 需要序列化三种数据结构 1 cal_flag置为1时需要的一些列参数的CacheQvvrData 2 cal_flag为0时的，动态结果。3 用户责任量化结果
          * 其中1/2都只需要一个文件即可
          * 3因为用户限值的变化调整，可能存在很多个文件，具体根据用户的选择而定
@@ -389,24 +391,23 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             respDataResult.setLimitValue(respHarmData.getOverLimit());
             //时间横轴数据 timeDatas
             JSONArray timeDataJson = JSONArray.parseArray(JSON.toJSONString(timeDatas));
-            InputStream timeDataStream = IoUtil.toStream(timeDataJson.toString(), CharsetUtil.UTF_8);
+            InputStream timeDataStream = IoUtil.toUtf8Stream(timeDataJson.toString());
             String timeDataPath = fileStorageUtil.uploadStream(timeDataStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setTimeData(timeDataPath);
             //用户每时刻对应的责任数据
             JSONArray customerDataJson = JSONArray.parseArray(JSON.toJSONString(customerData));
-            InputStream customerStream = IoUtil.toStream(customerDataJson.toString(), CharsetUtil.UTF_8);
+            InputStream customerStream = IoUtil.toUtf8Stream(customerDataJson.toString());
             String customerPath = fileStorageUtil.uploadStream(customerStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setUserDetailData(customerPath);
             //调用qvvr生成的中间数据
             CacheQvvrData cacheQvvrData = new CacheQvvrData(qvvrDataEntity.getPNode(), qvvrDataEntity.getHarmNum(), qvvrDataEntity.getHarmData(), qvvrDataEntity.fKData, qvvrDataEntity.hKData, names, userIntervalTime, qvvrDataEntity.win, userIntervalTime, respHarmData.getHarmTime());
-//            JSONObject cacheQvvrDataDataJson = (JSONObject) JSONObject.toJSON(cacheQvvrData);
             String cacheJson = PubUtils.obj2json(cacheQvvrData);
-            InputStream cacheQvvrDataStream = IoUtil.toStream(cacheJson, CharsetUtil.UTF_8);
+            InputStream cacheQvvrDataStream = IoUtil.toUtf8Stream(cacheJson);
             String cacheQvvrDataPath = fileStorageUtil.uploadStream(cacheQvvrDataStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setQvvrData(cacheQvvrDataPath);
             //用户前10数据存储
             JSONArray customerResJson = JSONArray.parseArray(JSON.toJSONString(customerResponsibilities));
-            InputStream customerResStream = IoUtil.toStream(customerResJson.toString(), CharsetUtil.UTF_8);
+            InputStream customerResStream = IoUtil.toUtf8Stream(customerResJson.toString());
             String customerResPath = fileStorageUtil.uploadStream(customerResStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setUserResponsibility(customerResPath);
             respDataResultService.save(respDataResult);
@@ -442,9 +443,8 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         CacheQvvrData cacheQvvrData;
         try {
             InputStream fileStream = fileStorageUtil.getFileStream(respDataResultTemp.getQvvrData());
-            String qvvrDataStr = IoUtil.read(fileStream, CharsetUtil.UTF_8);
+            String qvvrDataStr = IoUtil.readUtf8(fileStream);
-//            cacheQvvrData = JSONObject.parseObject(qvvrDataStr, CacheQvvrData.class);
+            cacheQvvrData = PubUtils.json2obj(qvvrDataStr, CacheQvvrData.class);
-            cacheQvvrData = PubUtils.json2obj(qvvrDataStr,CacheQvvrData.class);
 
         } catch (Exception exception) {
             throw new BusinessException(AdvanceResponseEnum.RESP_RESULT_DATA_NOT_FOUND);
@@ -486,34 +486,34 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             qvvrDataEntity.setHKData(cacheQvvrData.getHKData());
             qvvrDataEntity.harmData = cacheQvvrData.getHarmData();
         } else {
-            if (win == 4) {
+            if (win == WINDOW_4) {
                 //当窗口为4时,两个时间限制范围在最小公倍数为15时，最起码有5个有效时间点，在最小公倍数为30时，最起码有3个有效时间点
-                if (minMultiple == 15) {
+                if (minMultiple == INTERVAL_TIME_15) {
-                    if (minus < 5) {
+                    if (minus < MINUS_5) {
                         throw new BusinessException(AdvanceResponseEnum.WIN_TIME_ERROR);
                     }
-                    resNum = minus - 4;
+                    resNum = minus - MINUS_4;
 
-                } else if (minMultiple == 30) {
+                } else if (minMultiple == INTERVAL_TIME_30) {
-                    if (minus < 3) {
+                    if (minus < MINUS_3) {
                         throw new BusinessException(AdvanceResponseEnum.WIN_TIME_ERROR);
                     }
-                    resNum = minus - 2;
+                    resNum = minus - MINUS_2;
                 } else {
                     throw new BusinessException(AdvanceResponseEnum.CALCULATE_INTERVAL_ERROR);
                 }
-            } else if (win == 96) {
+            } else if (win == WINDOW_96) {
                 //当窗口为96时,两个时间限值范围在最小公倍数为15时，最起码有97个有效时间点，在最小公倍数为30时，最起码有49个有效时间点
-                if (minMultiple == 15) {
+                if (minMultiple == INTERVAL_TIME_15) {
-                    if (minus < 97) {
+                    if (minus <= WINDOW_96) {
                         throw new BusinessException(AdvanceResponseEnum.WIN_TIME_ERROR);
                     }
-                    resNum = minus - 96;
+                    resNum = minus - WINDOW_96;
-                } else if (minMultiple == 30) {
+                } else if (minMultiple == INTERVAL_TIME_30) {
-                    if (minus < 49) {
+                    if (minus <= WINDOW_48) {
                         throw new BusinessException(AdvanceResponseEnum.WIN_TIME_ERROR);
                     }
-                    resNum = minus - 48;
+                    resNum = minus - WINDOW_48;
                 } else {
                     throw new BusinessException(AdvanceResponseEnum.CALCULATE_INTERVAL_ERROR);
                 }
@@ -536,13 +536,6 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             qvvrDataEntity.setFKData(FKdata);
             qvvrDataEntity.setHKData(HKdata);
         }
-//        ResponsibilityCallDllOrSo responsibilityCallDllOrSo = new ResponsibilityCallDllOrSo("harm_response");
-//        responsibilityCallDllOrSo.setPath();
-//        ResponsibilityCallDllOrSo.ResponsibilityLibrary responsibilityLibrary = ResponsibilityCallDllOrSo.ResponsibilityLibrary.INSTANTCE;
-//        responsibilityLibrary.harm_response(qvvrStruct);
-//        if (qvvrStruct.cal_ok == 0) {
-//            throw new BusinessException(AdvanceResponseEnum.RESPONSIBILITY_PARAMETER_ERROR);
-//        }
         ResponsibilityAlgorithm responsibilityAlgorithm = new ResponsibilityAlgorithm();
         qvvrDataEntity = responsibilityAlgorithm.getResponsibilityResult(qvvrDataEntity);
         if (qvvrDataEntity.calOk == 0) {
@@ -582,13 +575,13 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             timeDatas.add(calendar.getTimeInMillis());
         }
         //OK拿到所有测量点的数据了，现在就是看如何将相同户号的动态数据进行算术和求值，之前的用户name为：户号@测量点号@用户名
-        Map<String/*用户名（户号）*/, List<CustomerData>> customerDataTemp = new HashMap<>();
+        Map<String/*用户名（户号）*/, List<CustomerData>> customerDataTemp = new HashMap<>(32);
-        for (int i = 0; i < customerDatas.length; i++) {
+        for (CustomerData data : customerDatas) {
-            String customerName = customerDatas[i].getCustomerName();
+            String customerName = data.getCustomerName();
             String[] customerInfo = customerName.split("@");
             String name = customerInfo[2] + "(" + customerInfo[0] + ")";
             List<CustomerData> customerData = customerDataTemp.get(name);
-            CustomerData customerTemp = customerDatas[i];
+            CustomerData customerTemp = data;
             customerTemp.setCustomerName(name);
             if (CollectionUtils.isEmpty(customerData)) {
                 customerData = new ArrayList<>();
@@ -612,15 +605,15 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
                 //表示用户唯一的
                 customerData.add(customerData1.get(0));
             } else {
-                //表示用户可能包含多个监测点号，需要进行数据累加
+                // 表示用户可能包含多个监测点号，需要进行数据累加
                 CustomerData customerDataT = new CustomerData();
                 customerDataT.setCustomerName(cusName);
                 //进行数值累加
                 List<Float> valueDatas = new ArrayList<>();
                 for (int i = 0; i < customerData1.get(0).getValueDatas().size(); i++) {
                     float original = 0.0f;
-                    for (int k = 0; k < customerData1.size(); k++) {
+                    for (CustomerData data : customerData1) {
-                        original = original + customerData1.get(k).getValueDatas().get(i);
+                        original = original + data.getValueDatas().get(i);
                     }
                     valueDatas.add(original);
                 }
@@ -650,17 +643,17 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             respDataResult.setLimitValue(responsibilitySecondCalParam.getLimitValue());
             //时间横轴数据 timeDatas
             JSONArray timeDataJson = JSONArray.parseArray(JSON.toJSONString(timeDatas));
-            InputStream timeDataStream = IoUtil.toStream(timeDataJson.toString(), CharsetUtil.UTF_8);
+            InputStream timeDataStream = IoUtil.toUtf8Stream(timeDataJson.toString());
             String timeDataPath = fileStorageUtil.uploadStream(timeDataStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setTimeData(timeDataPath);
             //用户每时刻对应的责任数据
             JSONArray customerDataJson = JSONArray.parseArray(JSON.toJSONString(customerData));
-            InputStream customerStream = IoUtil.toStream(customerDataJson.toString(), CharsetUtil.UTF_8);
+            InputStream customerStream = IoUtil.toUtf8Stream(customerDataJson.toString());
             String customerPath = fileStorageUtil.uploadStream(customerStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setUserDetailData(customerPath);
             //用户前10数据存储
             JSONArray customerResJson = JSONArray.parseArray(JSON.toJSONString(customerResponsibilities));
-            InputStream customerResStream = IoUtil.toStream(customerResJson.toString(), CharsetUtil.UTF_8);
+            InputStream customerResStream = IoUtil.toUtf8Stream(customerResJson.toString());
             String customerResPath = fileStorageUtil.uploadStream(customerResStream, OssPath.RESPONSIBILITY_USER_RESULT_DATA, FileUtil.generateFileName("json"));
             respDataResult.setUserResponsibility(customerResPath);
             respDataResultService.save(respDataResult);
@@ -681,19 +674,20 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         DecimalFormat decimalFormat = new DecimalFormat("0.0000");
         Map<String, Map<String, List<UserDataExcel>>> result;
         //当监测点测量间隔为10分钟时，功率数据需要调整为30分钟数据
-        result = new HashMap<>();
+        result = new HashMap<>(32);
         Set<String> userNames = finalData.keySet();
         for (String userName : userNames) {
-            Map<String, List<UserDataExcel>> temp = new HashMap<>();
+            Map<String, List<UserDataExcel>> temp = new HashMap<>(32);
             Map<String, List<UserDataExcel>> original = finalData.get(userName);
             Set<String> dates = original.keySet();
             for (String date : dates) {
-                List<UserDataExcel> single = original.get(date);//某当天的数据
+                //某当天的数据
+                List<UserDataExcel> single = original.get(date);
                 //先根据事时间排序
                 Collections.sort(single);
                 //此时根据当天所有的数据，重新计算出所有时间点的数据，担心这个过程会消耗过长时间
                 List<UserDataExcel> tempDatas = new ArrayList<>();
-                for (int i = 0; i < 96; i = i + 2) {
+                for (int i = 0; i < WINDOW_96; i = i + 2) {
                     //30分钟内的2个15分钟功率数据相加作平均计算30分钟内的功率数据，最终的数据序列时间间隔30分钟。by 友谊文档
                     UserDataExcel tempData = new UserDataExcel();
                     tempData.setUserName(single.get(i).getUserName());
@@ -720,7 +714,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
      * @param lineInterval 测量间隔
      */
     private List<HarmData> getDataWithLineInterval(List<HarmData> historyData, int lineInterval) {
-        List<HarmData> result = new ArrayList<>();
+        List<HarmData> result;
         switch (lineInterval) {
             case 1:
                 result = getHarmResultByTimes(historyData, 15);
@@ -728,8 +722,8 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
             case 3:
                 result = getHarmResultByTimes(historyData, 5);
                 break;
-            case 5:
+            // 间隔为5、10时，直接返回即可
-            case 10:
+            default:
                 result = getHarmResultByTimes(historyData, 3);
                 break;
         }
@@ -764,9 +758,10 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
      * 根据接口返回值组装需要显示的责任量化数据
      */
     private List<CustomerResponsibility> getCustomerResponsibilityData(List<String> names, float[] sumFKdata, int pNode) {
-        Map<String/*用户名（户号）*/, CustomerResponsibility> customerResponsibilityMap = new HashMap<>();
+        Map<String/*用户名（户号）*/, CustomerResponsibility> customerResponsibilityMap = new HashMap<>(16);
         for (int i = 0; i < pNode; i++) {
-            String[] customerInfo = names.get(i).split("@");/*用户ID 测量点ID 用户名*/
+            /*用户ID 测量点ID 用户名*/
+            String[] customerInfo = names.get(i).split("@");
             String name = customerInfo[2] + "(" + customerInfo[0] + ")";
             CustomerResponsibility customerResponsibility;
             if (customerResponsibilityMap.containsKey(name)) {
@@ -787,10 +782,10 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         }
         //取出前十的用户责任数据
         customerResponsibilities = customerResponsibilities.stream().sorted(Comparator.comparing(CustomerResponsibility::getResponsibilityData).reversed()).collect(Collectors.toList());
-        if (customerResponsibilities.size() > 10) {
+        if (customerResponsibilities.size() > SORT_10) {
             //当用户超出10，将前十用户保留，然后剩余归类为其他用户
             float tenTotal = 0.0f;
-            for (int i = 0; i < 10; i++) {
+            for (int i = 0; i < SORT_10; i++) {
                 float temp = PubUtils.floatRound(3, customerResponsibilities.get(i).getResponsibilityData());
                 tenTotal = tenTotal + temp;
             }
@@ -843,7 +838,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
                 tempe = i;
             } else if (times.get(i + 1).equals(limitEL)) {
                 tempe = i + 1;
-            } else if (times.get(i) < limitEL & times.get(i + 1) > limitEL) {//
+            } else if (times.get(i) < limitEL & times.get(i + 1) > limitEL) {
                 //当起始时间处于中间时，将前值赋值给temps
                 tempe = i;
             }
@@ -865,7 +860,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
      */
     private Map<String, Map<String, List<UserDataExcel>>> getFinalUserData(DealDataResult dealDataResult, List<String> dateStr) {
         Map<String/*户号@监测点号@户名*/, Map<String/*yyyy-MM-dd天日期*/, List<UserDataExcel>>> totalData = dealDataResult.getTotalListData();
-        Map<String/*户号@监测点号@户名*/, Map<String/*yyyy-MM-dd天日期*/, List<UserDataExcel>>> finalData = new HashMap<>();
+        Map<String/*户号@监测点号@户名*/, Map<String/*yyyy-MM-dd天日期*/, List<UserDataExcel>>> finalData = new HashMap<>(16);
         /*第一个参数pNode 如果时间范围内完整性不足90%的节点，不参与责任量化统计,因为之前处理过用采数据，此时只需要判断是否满足100%就可以判断*/
         int dueCounts = dateStr.size() * 96;
         Set<String> userNames = totalData.keySet();
@@ -893,12 +888,12 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         LineDetailDataVO lineDetailData = lineFeignClient.getLineDetailData(lineId).getData();
         int lineInterval = lineDetailData.getTimeInterval();
         int userIntervalTime;
-        if (lineInterval == 1 || lineInterval == 3 || lineInterval == 5) {
+        if (lineInterval == INTERVAL_TIME_1 || lineInterval == INTERVAL_TIME_3 || lineInterval == INTERVAL_TIME_5) {
-            userIntervalTime = 15;
+            userIntervalTime = INTERVAL_TIME_15;
-            pNum = dateStr.size() * 96;
+            pNum = dateStr.size() * WINDOW_96;
         } else {
-            userIntervalTime = 30;
+            userIntervalTime = INTERVAL_TIME_30;
-            pNum = dateStr.size() * 48;
+            pNum = dateStr.size() * WINDOW_48;
             finalData = dealFinalDataByLineInterval(finalData);
         }
         return new RespCommon(pNum, userIntervalTime, lineInterval);
@@ -918,9 +913,9 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         List<Long> harmTime = new ArrayList<>();
         for (int i = 0; i < historyData.size(); i++) {
             Float value = historyData.get(i).getValue();
-            if (value != null) {
+//            if (value != null) {
 //                value = value * 1000;
-            }
+//            }
             harmData[i] = value;
             harmTime.add(PubUtils.instantToDate(historyData.get(i).getTime()).getTime());
         }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/AdvanceEnumUtil.java

@@ -6,7 +6,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.EnumUtils;
-import com.njcn.device.biz.enums.DeviceResponseEnum;
 
 import javax.validation.constraints.NotNull;
 import java.util.Objects;

pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/GetBalanceUtils.java

@@ -38,7 +38,7 @@ public class GetBalanceUtils {
         filterData(list, newList);
 
         // 如果newList为空则不带入dll计算
-        if (newList.size() > 0) {
+        if (!newList.isEmpty()) {
             packageData(newList, qvvrDataStruct);
             JnaCallDllOrSo jnaCallDll = new JnaCallBalance("qvvr_balance");
             System.out.println("路径>>>>>>>"+jnaCallDll.getStrpath());
@@ -63,33 +63,41 @@ public class GetBalanceUtils {
             for (BalanceInfo balanceInfo : list2) {
                 if (balanceInfo.getAreaIndex().equals(list.get(i).getAreaIndex())) {
                     balanceInfo.setCi(qvvrDataStruct.sys_res[i].CI);
-                    balanceInfo.setIsCount(1); // 已计算
+                    // 已计算
+                    balanceInfo.setIsCount(1);
                 }
             }
 
             for (int j = 0; j < list.get(i).getList().size(); j++) {
-                list.get(i).getList().get(j).setCiv(qvvrDataStruct.sys_res[i].CIV[j]); // 设置监测点的评估数据
+                // 设置监测点的评估数据
-                list.get(i).getList().get(j).setL(qvvrDataStruct.sys_res[i].L[j]); // 设置监测点的评估等级
+                list.get(i).getList().get(j).setCiv(qvvrDataStruct.sys_res[i].CIV[j]);
+                // 设置监测点的评估等级
+                list.get(i).getList().get(j).setL(qvvrDataStruct.sys_res[i].L[j]);
             }
         }
     }
 
     public void packageData(List<BalanceInfo> list, QvvrDataStruct qvvrDataStruct) {
-        qvvrDataStruct.sys_num = list.size(); // 系统数目
+        // 系统数目
+        qvvrDataStruct.sys_num = list.size();
 
         for (int i = 0; i < qvvrDataStruct.sys_num; i++) {
-            qvvrDataStruct.line_num[i] = list.get(i).getList().size(); // 监测点数目
+            // 监测点数目
+            qvvrDataStruct.line_num[i] = list.get(i).getList().size();
             QtIdxArray qtIdxArray = new QtIdxArray();
 
             for (int j = 0; j < list.get(i).getList().size(); j++) {
-                qtIdxArray.qtIdxs[j] = list.get(i).getList().get(j).getQtIdx(); // 各监测点数据
+                // 各监测点数据
+                qtIdxArray.qtIdxs[j] = list.get(i).getList().get(j).getQtIdx();
             }
 
             qvvrDataStruct.line_idx[i] = qtIdxArray;
         }
     }
 
-    // 过滤掉没有监测点，没有暂降事件的数据
+    /**
+     * 过滤掉没有监测点，没有暂降事件的数据
+     */
     private void filterData(List<BalanceInfo> list, List<BalanceInfo> listResult) {
         for (BalanceInfo balanceInfo : list) {
             BalanceInfo balanceInfo2 = new BalanceInfo();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/RadarUtil.java

@@ -7,8 +7,8 @@ import com.njcn.common.utils.PubUtils;
  */
 public class RadarUtil {
 
-    private static double[] w = {0.565, 0.2622, 0.1175, 0.0553};
+    private static final double[] w = {0.565, 0.2622, 0.1175, 0.0553};
-    private static int[][] a = {{1, 0, 0, 0, 0}, {0, 1, 0, 0, 0}, {0, 0, 1, 0, 0}, {0, 0, 0, 1, 0}, {0, 0, 0, 0, 1}};
+    private static final int[][] a = {{1, 0, 0, 0, 0}, {0, 1, 0, 0, 0}, {0, 0, 1, 0, 0}, {0, 0, 0, 1, 0}, {0, 0, 0, 0, 1}};
 
     /**
      * 获取治理前后的风险评估等级
@@ -21,10 +21,10 @@ public class RadarUtil {
         double temp = 0d;
         double[] b = getB(lossAverage, coefficient);
 
-        for (int i = 0; i < a.length; i++) {
+        for (int[] ints : a) {
             int j = 0;
             for (; j < b.length; j++) {
-                temp = temp + Math.abs(a[i][j] - b[j]);
+                temp = temp + Math.abs(ints[j] - b[j]);
             }
             temp = 1 - temp / j;
             if (temp > n) {
@@ -45,10 +45,10 @@ public class RadarUtil {
         double temp = 0d;
         double[] b = getB(lossAverage, coefficient);
 
-        for (int i = 0; i < a.length; i++) {
+        for (int[] ints : a) {
             int j = 0;
             for (; j < b.length; j++) {
-                temp = temp + Math.abs(a[i][j] - b[j]);
+                temp = temp + Math.abs(ints[j] - b[j]);
             }
             temp = 1 - temp / j;
             if (temp > n) {
@@ -124,6 +124,7 @@ public class RadarUtil {
         } else if (y >= 1 && y < 2.5) {
             r[0] = (2.5 - y) / (2.5 - 1.0);
         }
+
         //1B1
         if (y >= 0.5 && y < 2.0) {
             r[1] = (y - 0.5) / (2.0 - 0.5);
@@ -185,7 +186,7 @@ public class RadarUtil {
         if (loss == 0D || yearLoss == 0) {
             return 0D;
         } else {
-            return PubUtils.doubleRound(2,loss / (Math.ceil(yearLoss / 100D) * 100));
+            return PubUtils.doubleRound(2, loss / (Math.ceil(yearLoss / 100D) * 100));
         }
     }
 

pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppInfoSetController.java

@@ -41,11 +41,11 @@ public class AppInfoSetController extends BaseController {
 
     private final IAppInfoSetService appInfoSetService;
 
+    @ApiIgnore
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/add")
     @ApiOperation("新增用户消息推送配置")
     @ApiImplicitParam(name = "appInfoSet", value = "参数实体", required = true)
-    @ApiIgnore
     public HttpResult<String> add(@RequestBody AppInfoSet appInfoSet){
         String methodDescribe = getMethodDescribe("add");
         appInfoSetService.save(appInfoSet);