1.户用光伏运检工单处置空指针问题处理。

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

@@ -117,9 +117,6 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 //业主姓名
                 hygfMaintenanceTickets.setOwnerName(jpStation.getUserName());
 
-
-
-
                 if (ObjectUtil.isEmpty(hygfMaintenanceTickets.getStationContact())) {
                     hygfMaintenanceTickets.setStationContact(jpStation.getUserName());
                 }
@@ -145,6 +142,9 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
 
             if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
                 hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
+                if(ObjectUtil.isEmpty(hygfMaintenanceTickets.getWarningLevel())){
+                    hygfMaintenanceTickets.setWarningLevel("一般");
+                }
                 hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
                 hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
                 //告警等级

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

@@ -120,6 +120,7 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
             }
             HYGFMaintenanceTickets fMaintenanceTickets=new HYGFMaintenanceTickets();
             BeanUtils.copyProperties(hygfMaintenanceTicketsDto,fMaintenanceTickets);
+            fMaintenanceTickets.setWarningId(0l);
             this.save(fMaintenanceTickets);
 
         }else{
@@ -235,7 +236,7 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
 
     public HYGFMaintenanceTicketsDto updateHYGFMaintenanceTicketsDto(HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
         hygfMaintenanceTicketsDto.setHandlerStatus("已处理");
-        if(hygfMaintenanceTicketsDto.getWarningId()>0){
+        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())&&hygfMaintenanceTicketsDto.getWarningId()>0){
             hygfMaintenanceTicketsDto.setTaskEndTime(new Date());
             Long day = DateUtil.between(hygfMaintenanceTicketsDto.getWarningStartTime(),hygfMaintenanceTicketsDto.getTaskEndTime(), DateUnit.DAY);
             Long hour = DateUtil.between(hygfMaintenanceTicketsDto.getWarningStartTime(),hygfMaintenanceTicketsDto.getTaskEndTime(), DateUnit.HOUR)-day*24;