解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -15,11 +16,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallInfoDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanWarningRecordMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthLevelMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRuleSetServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRuleSetServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -72,6 +72,13 @@ public class BigScreenAnalyseController extends BaseController {
     @Autowired
     RiskWarningFeign riskWarningFeign;
 
+
+    @Autowired
+    private IdxBizFanWarningRuleSetServiceImpl idxBizFanWarningRuleSetService;
+
+    @Autowired
+    private IdxBizPvWarningRuleSetServiceImpl idxBizPvWarningRuleSetService;
+
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "场站设备健康状态指数与趋势 - 仪表盘", notes = "场站设备健康状态指数与趋势 - 仪表盘")
     @GetMapping(value = "/getHealthScoreInfo")
@@ -1019,4 +1026,87 @@ public class BigScreenAnalyseController extends BaseController {
         return ResponseHelper.buildResponse(map);
     }
 
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "修改业务事实表的一条数据")
+    @PutMapping("/updateRowAndManyTable")
+    public ResponseModel<Boolean> updateRowAndManyTable(@RequestBody Map<String, Object> kv) {
+        if ("安全".equals(kv.get("HEALTH_LEVEL").toString())
+                && (!"100.0".equals(kv.get("GROUP_UPPER_LIMIT").toString())
+                && !"100".equals(kv.get("GROUP_UPPER_LIMIT").toString()))) {
+            throw new RuntimeException("安全的分数上限只能是100");
+        }
+        if ("危险".equals(kv.get("HEALTH_LEVEL").toString())
+                && (!"0.0".equals(kv.get("GROUP_LOWER_LIMIT").toString())
+                && !"0".equals(kv.get("GROUP_LOWER_LIMIT").toString()))) {
+            throw new RuntimeException("危险的分数下限只能是0");
+        }
+
+        idxBizFanHealthLevelMapper.updateByInfo(
+                "idx_biz_pv_health_level",
+                kv.get("GROUP_UPPER_LIMIT").toString(),
+                kv.get("GROUP_LOWER_LIMIT").toString(),
+                kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                kv.get("HEALTH_LEVEL").toString());
+        idxBizFanHealthLevelMapper.updateByInfo(
+                "idx_biz_fan_health_level",
+                kv.get("GROUP_UPPER_LIMIT").toString(),
+                kv.get("GROUP_LOWER_LIMIT").toString(),
+                kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                kv.get("HEALTH_LEVEL").toString());
+
+        if ("安全".equals(kv.get("HEALTH_LEVEL").toString())) {
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_fan_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "注意");
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_pv_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "注意");
+        } else if ("注意".equals(kv.get("HEALTH_LEVEL").toString())) {
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_fan_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "警告");
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_pv_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "警告");
+        } else if ("警告".equals(kv.get("HEALTH_LEVEL").toString())) {
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_fan_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "危险");
+            idxBizFanHealthLevelMapper.updateByInfoIsNull(
+                    "idx_biz_pv_health_level",
+                    kv.get("GROUP_LOWER_LIMIT").toString(),
+                    null,
+                    kv.get("ANALYSIS_OBJ_TYPE").toString(),
+                    "危险");
+        }
+        if ("测点".equals(kv.get("ANALYSIS_OBJ_TYPE").toString())) {
+            LambdaUpdateWrapper<IdxBizFanWarningRuleSet> lambda1 = new LambdaUpdateWrapper<>();
+            lambda1.set(IdxBizFanWarningRuleSet::getWarningIf, "<=" + kv.get("GROUP_UPPER_LIMIT").toString());
+            lambda1.eq(IdxBizFanWarningRuleSet::getWarningName, kv.get("HEALTH_LEVEL").toString());
+            idxBizFanWarningRuleSetService.update(lambda1);
+
+            LambdaUpdateWrapper<IdxBizPvWarningRuleSet> lambda2 = new LambdaUpdateWrapper<>();
+            lambda2.set(IdxBizPvWarningRuleSet::getWarningIf, "<=" + kv.get("GROUP_UPPER_LIMIT").toString());
+            lambda2.eq(IdxBizPvWarningRuleSet::getWarningName, kv.get("HEALTH_LEVEL").toString());
+            idxBizPvWarningRuleSetService.update(lambda2);
+        }
+        return ResponseHelper.buildResponse(true);
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthLevelMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -11,4 +12,18 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
  */
 public interface IdxBizFanHealthLevelMapper extends BaseMapper<IdxBizFanHealthLevel> {
 
+    int updateByInfo(@Param("tableName") String tableName,
+                     @Param("groupUpperLimit") String groupUpperLimit,
+                     @Param("groupLowerLimit") String groupLowerLimit,
+                     @Param("analysisObjType") String analysisObjType,
+                     @Param("healthLevel") String healthLevel);
+
+    /**
+     * 可以为空的情况
+     */
+    int updateByInfoIsNull(@Param("tableName") String tableName,
+                           @Param("groupUpperLimit") String groupUpperLimit,
+                           @Param("groupLowerLimit") String groupLowerLimit,
+                           @Param("analysisObjType") String analysisObjType,
+                           @Param("healthLevel") String healthLevel);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -275,6 +275,7 @@ public class HealthStatusIndicatorServiceImpl {
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按小时");
         wrapper.ne(IdxBizPvHealthIndex::getHealthLevel,"安全");
+        wrapper.eq(IdxBizPvHealthIndex::getAnalysisObjType,"测点");
         wrapper.ge(IdxBizPvHealthIndex::getRecDate,df.format(calendar.getTime()));
         wrapper.orderByDesc(IdxBizPvHealthIndex::getRecDate);
         List<IdxBizPvHealthIndex> healthIndices = idxBizPvHealthIndexMapper.selectList(wrapper);
@@ -712,6 +713,7 @@ public class HealthStatusIndicatorServiceImpl {
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按小时");
+        wrapper.eq(IdxBizFanHealthIndex::getAnalysisObjType,"测点");
         wrapper.ne(IdxBizFanHealthIndex::getHealthLevel,"安全");
         wrapper.ge(IdxBizFanHealthIndex::getRecDate,df.format(calendar.getTime()));
         wrapper.orderByDesc(IdxBizFanHealthIndex::getRecDate);
@@ -722,7 +724,7 @@ public class HealthStatusIndicatorServiceImpl {
         List<String> collect = healthIndices.stream().map(IdxBizFanHealthIndex::getAnalysisObjSeq).collect(Collectors.toList());
 
         LambdaQueryWrapper<IdxBizFanWarningRuleSet> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisType,"小时");
+        queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisType,"按小时");
         queryWrapper.in(IdxBizFanWarningRuleSet::getAnalysisPointId,collect);
         List<IdxBizFanWarningRuleSet> idxBizPvWarningRules = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -292,7 +292,8 @@
         count(1) as num,
         (select count(1) from ${tableName} as tb
         <where>
-            tb.DISPOSOTION_STATE = '未处置'
+            ((tb.DISPOSOTION_STATE = '未处置')
+            or (tb.DISPOSOTION_STATE = '已处置' and tb.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
             and tb.POINT_NAME = a.POINT_NAME
             <if test="areaCode != null and areaCode != ''">
                 and tb.ARAE like concat('%', #{areaCode}, '%')

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthLevelMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper">
 
+<update id="updateByInfo">
+    UPDATE ${tableName}
+    <if test="groupLowerLimit != null and groupLowerLimit != ''">
+        set GROUP_LOWER_LIMIT = #{groupLowerLimit}
+    </if>
+    <if test="groupUpperLimit != null and groupUpperLimit != ''">
+        , GROUP_UPPER_LIMIT = #{groupUpperLimit}
+    </if>
+    WHERE
+        ANALYSIS_OBJ_TYPE = #{analysisObjType}
+      AND HEALTH_LEVEL = #{healthLevel}
+    </update>
+
+<update id="updateByInfoIsNull">
+    UPDATE ${tableName}
+    <if test="groupLowerLimit != null and groupLowerLimit != ''">
+        set GROUP_LOWER_LIMIT = #{groupLowerLimit}
+    </if>
+    <if test="groupUpperLimit != null and groupUpperLimit != ''">
+        set GROUP_UPPER_LIMIT = #{groupUpperLimit}
+    </if>
+    WHERE
+    ANALYSIS_OBJ_TYPE = #{analysisObjType}
+    AND HEALTH_LEVEL = #{healthLevel}
+    </update>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.xml

@@ -198,7 +198,7 @@
         POINT_NAME ,
         STATION,
         CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
-        CAST(HEALTH_INDEX AS UNSIGNED) as value
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         SUBARRAY,
         REC_DATE,