改了一堆乱七八糟的东西

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java

@@ -124,8 +124,10 @@ public class SystemSendMsgHandle implements ISendMsgHandle {
                 obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
                 obj.put(WebsocketConst.MSG_ID, announcement.getId());
                 obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
-                webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+                webSocket.pushMessage(sysUser.getId(), obj.toJSONString());
+                // 下面的语句推送不成功
+//                webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
             }
         }
     }
-}
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/impl/CmmsInspectTcontentItemServiceImpl.java

@@ -77,9 +77,11 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
             if ("1".equals(inspectTcontentItemList.get(i).getIresult())){
                 inspectTcontentItemList.get(i).setUnusualstatus("0");
             }
-            inspectTcontentItemList.get(i).setIstatus("1");
-            inspectTcontentItemList.get(i).setHandleuser(userName);
-            inspectTcontentItemList.get(i).setItime(DateUtils.getDate());
+            if (!"".equals(inspectTcontentItemList.get(i).getIresult()) && inspectTcontentItemList.get(i).getIresult() != null) {
+                inspectTcontentItemList.get(i).setIstatus("1");
+                inspectTcontentItemList.get(i).setHandleuser(userName);
+                inspectTcontentItemList.get(i).setItime(DateUtils.getDate());
+            }
         }
 
         boolean b = this.updateBatchById(inspectTcontentItemList);
@@ -90,7 +92,7 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
         List<CmmsInspectTcontentItem> list = mapper.getInspectItemByInspectId(inspectTcontentItemList.get(0).getInspectid());
         boolean flag = true;
         for (CmmsInspectTcontentItem item : list) {
-            if ("0".equals(item.getIstatus())){
+            if ("".equals(item.getIstatus()) || "0".equals(item.getIstatus()) || item.getIstatus() == null){
                 flag = false;
                 break;
             }

module_tpm/src/main/java/org/jeecg/modules/equipmentHealth/entity/EquipmentHealth.java

@@ -44,6 +44,10 @@ public class EquipmentHealth implements Serializable {
 	@Excel(name = "设备名称", width = 15)
     @ApiModelProperty(value = "设备名称")
     private java.lang.String equipmentname;
+    /**健康值*/
+    @Excel(name = "健康值")
+    @ApiModelProperty(value = "健康值")
+    private java.lang.Float score;
 	/**设备状态：1健康、2亚健康、3高危、4离线*/
 	@Excel(name = "设备状态：1健康、2亚健康、3高危、4离线", width = 15)
     @ApiModelProperty(value = "设备状态：1健康、2亚健康、3高危、4离线")

module_tpm/src/main/java/org/jeecg/modules/equipmentHealth/mapper/xml/EquipmentHealthMapper.xml

@@ -6,6 +6,7 @@
         <result property="id"    column="id"    />
         <result property="equipmentid"    column="equipmentid"    />
         <result property="equipmentname"    column="equipmentname"    />
+        <result property="score"    column="score"    />
         <result property="status"    column="status"    />
         <result property="logtime"    column="logtime"    />
         <result property="year"    column="year"    />

module_tpm/src/main/java/org/jeecg/modules/healthStatistics/service/Impl/HealthStatisticsServiceImpl.java

@@ -1,20 +1,16 @@
 package org.jeecg.modules.healthStatistics.service.Impl;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.equipmentHealth.entity.EquipmentHealth;
 import org.jeecg.modules.equipmentHealth.mapper.EquipmentHealthMapper;
 import org.jeecg.modules.equipmentHealthSection.entity.EquipmentHealthSection;
 import org.jeecg.modules.equipmentHealthSection.mapper.EquipmentHealthSectionMapper;
 import org.jeecg.modules.healthStatistics.service.IHealthStatisticsService;
-import org.jeecg.modules.tpmMessageAlarm.mapper.TpmMessageAlarmMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
 import java.time.YearMonth;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;