状态显示错误问题处理

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -73,7 +73,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             HYGFMaintenanceTickets hygfMaintenanceTickets = new HYGFMaintenanceTickets();
             String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
             Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
-            String sncode = specialMap.get("inverterSncode").toString();
+            String sncode = specialMap.containsKey("inverterSncode")?specialMap.get("inverterSncode").toString():"";
             String mantainancePersonId = specialMap.get("maintenancePersonId").toString();
             JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_station_id", stationid));
             if (ObjectUtil.isEmpty(jpStation)) {
@@ -113,8 +113,13 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 }
             }
             hygfMaintenanceTickets.setInverterSn(sncode);
-            hygfMaintenanceTickets.setWarningLevel(specialMap.get("warningLevel").toString());
-            hygfMaintenanceTickets.setWarningContent(specialMap.get("warningContent").toString());
+            if(specialMap.containsKey("warningLevel")){
+                hygfMaintenanceTickets.setWarningLevel(specialMap.get("warningLevel").toString());
+            }
+            if(specialMap.containsKey("warningContent")){
+                hygfMaintenanceTickets.setWarningContent(specialMap.get("warningContent").toString());
+
+            }
             if(ObjectUtil.isNotNull(specialMap.get("taskStartTime"))){
                 hygfMaintenanceTickets.setTaskStartTime(new Date( Long.valueOf(specialMap.get("taskStartTime").toString())));
             }

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

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper
 import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
 import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -134,7 +135,7 @@ public class TdHygfJpInverterWarnServiceImpl
 		}
 		if(hygfMaintenanceTickets.size()>0){
 			HYGFMaintenanceTickets hygfMaintenanceTickets1 =hygfMaintenanceTickets.get(0);
-			BeanUtil.copyProperties(hygfMaintenanceTickets1,tdHygfJpInverterWarnDto);
+			BeanUtil.copyProperties(hygfMaintenanceTickets1,tdHygfJpInverterWarnDto, "handlerStatus");
 		}
 		return tdHygfJpInverterWarnDto;
 	}