Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

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

@@ -222,14 +222,16 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (!ObjectUtils.isEmpty(bean)) {
             equipmentSpecific.setEquipmentCode(bean.getCode());
         }
-        Long warehouseStructureId = ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())?null:equipmentSpecific.getStockDetail().getWarehouseStructureId();
+        Long warehouseStructureId = ObjectUtils.isEmpty(equipmentSpecific.getStockDetail()) ? null : equipmentSpecific.getStockDetail().getWarehouseStructureId();
         if (warehouseStructureId != null) {
             WarehouseStructure warehouseStructure = warehouseStructureService.getById(warehouseStructureId);
             if (!ObjectUtils.isEmpty(warehouseStructure)) {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
+        if (!ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())) {
             equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        }
         equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         // TODO 后续判断成功，执行同步
         // 编辑同步redis装备iotcode数据

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

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.service.*;
+import liquibase.pro.packaged.x;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageImpl;
@@ -131,7 +132,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                             alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                             // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                             alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
-                            alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
+                            if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
+                                alarmDownloadVO.setHandleType("");
+                            } else {
+                                String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
+                                alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
+                                        ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
+                            }
                             alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
                             alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                             alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
@@ -157,7 +164,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                     // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                     alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
-                    alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
+                    if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
+                        alarmDownloadVO.setHandleType("");
+                    } else {
+                        String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
+                        alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
+                                ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
+                    }
                     alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
                     alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                     alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");