修复bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentAlarmDownloadVO.java

@@ -34,18 +34,21 @@ public class EquipmentAlarmDownloadVO implements Serializable {
     @ExcelProperty(value = "告警时间", index = 6)
     private String alarmTime = "";
 
-    @ExcelProperty(value = "处理状态", index = 7)
+    @ExcelProperty(value = "消除状态", index = 7)
+    private String cleanStatus = "";
+
+    @ExcelProperty(value = "处理状态", index = 8)
     private String handleStatus = "";
 
-    @ExcelProperty(value = "处理类型", index = 8)
+    @ExcelProperty(value = "处理类型", index = 9)
     private String handleType = "";
     
-    @ExcelProperty(value = "处理时间", index = 9)
+    @ExcelProperty(value = "处理时间", index = 10)
     private String confirmDate = "";
     
-    @ExcelProperty(value = "报警原因", index = 10)
+    @ExcelProperty(value = "报警原因", index = 11)
     private String alarmReason = "";
     
-    @ExcelProperty(value = "处理情况", index = 11)
+    @ExcelProperty(value = "处理情况", index = 12)
     private String resolveResult = "";
 }

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

@@ -120,7 +120,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                             alarmDownloadVO.setAlarmPosition(StringUtil.isNotEmpty(alarm.get("warehouseStructureName")) ? alarm.get("warehouseStructureName").toString() : "");
                             alarmDownloadVO.setProtectObj(StringUtil.isNotEmpty(alarm.get("equipmentName")) ? alarm.get("equipmentName").toString() : "");
                             alarmDownloadVO.setAlarmTime(StringUtil.isNotEmpty(alarm.get("createDate")) ? alarm.get("createDate").toString().replace("T", " "):"");
-
+                            alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                             // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                             alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
                             alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
@@ -147,7 +147,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     alarmDownloadVO.setAlarmPosition(StringUtil.isNotEmpty(alarm.get("warehouseStructureName")) ? alarm.get("warehouseStructureName").toString() : "");
                     alarmDownloadVO.setProtectObj(StringUtil.isNotEmpty(alarm.get("equipmentName")) ? alarm.get("equipmentName").toString() : "");
                     alarmDownloadVO.setAlarmTime(StringUtil.isNotEmpty(alarm.get("createDate")) ? alarm.get("createDate").toString().replace("T", " "):"");
-
+                    alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                     // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                     alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
                     alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));

amos-boot-system-equip/pom.xml

@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>amos-boot-system-equip</artifactId>
-  <version>3.0.1.4</version>
+  <version>3.0.1.7</version>
   <dependencies>
       <dependency>
 			<groupId>com.amosframework.boot</groupId>

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -419,7 +419,11 @@
         wlesal.equipment_specific_name,
         wlesal.equipment_specific_index_name
         ) AS alarmContent,
-
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '已消除',
+        '未消除'
+        ) cleanStatus,
         IF (
         wlesal.confirm_type IS NULL,
         '未处理',