更新脚本

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java

@@ -98,11 +98,23 @@ public class EquipmentIndex extends BaseEntity {
     @TableField(value = "perf_value")
     private String perfValue;
 
-
     /**
      * 性能指标(临时)
      */
     @Transient
     @TableField(exist = false)
     private String perfQuotaStr;
+
+    @TableField(value = "emergency_level_color")
+    private String emergencyLevelColor;
+
+    @TableField(value = "is_alarm")
+    private Integer isAlarm;
+
+    @TableField(value = "emergency_level")
+    private String emergencyLevel;
+
+    @TableField(value = "emergency_level_describe")
+    private String emergencyLevelDescribe;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentIndexController.java

@@ -170,7 +170,7 @@ public class EquipmentIndexController {
                 if (bool.get()) {
                     LambdaQueryWrapper<SignalClassify> queryWrapper = new LambdaQueryWrapper();
                     queryWrapper.inSql(SignalClassify::getTypeCode,
-                            "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode()+"'");
+                            "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
                     signalClassify = signalClassifyMapper.selectOne(queryWrapper);
                 }
                 QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentIndexImpl.java

@@ -107,7 +107,7 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
         if (bool.get()) {
             LambdaQueryWrapper<SignalClassify> queryWrapper = new LambdaQueryWrapper();
             queryWrapper.inSql(SignalClassify::getTypeCode,
-                    "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode()+"'");
+                    "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
             signalClassify = signalClassifyMapper.selectOne(queryWrapper);
         }
         QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1464,14 +1464,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecificIndex.setEquipmentSpecialName(equipName);
             equipmentSpecificIndex.setEquipmentIndexName(index.getPerfQuotaName());
             equipmentSpecificIndex.setEquipmentIndexKey(index.getPerfQuotaDefinitionId());
-            QueryWrapper<SignalClassify> wrapper = new QueryWrapper<>();
-            wrapper.inSql("type_code",
-                    "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + index.getTypeCode()+"'");
-            SignalClassify signalClassify = signalClassifyMapper.selectOne(wrapper);
-            equipmentSpecificIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
-            equipmentSpecificIndex.setIsAlarm(signalClassify.getIsAlarm());
-            equipmentSpecificIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
-            equipmentSpecificIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
+            equipmentSpecificIndex.setEmergencyLevelColor(index.getEmergencyLevelColor());
+            equipmentSpecificIndex.setIsAlarm(index.getIsAlarm());
+            equipmentSpecificIndex.setEmergencyLevel(index.getEmergencyLevel());
+            equipmentSpecificIndex.setEmergencyLevelDescribe(index.getEmergencyLevelDescribe());
             equipmentSpecificIndices.add(equipmentSpecificIndex);
         });
     }