Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerExcuteTypeEnum.java

@@ -109,7 +109,7 @@ public enum LatentDangerExcuteTypeEnum {
 
     public static LatentDangerExcuteTypeEnum getByCode(Integer code) {
         for (LatentDangerExcuteTypeEnum e : LatentDangerExcuteTypeEnum.values()) {
-            if (code.equals(e.getCode())) {
+            if (e.getCode().equals(code)) {
                 return e;
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -206,7 +206,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                      */
                     AlertCalledRo alertCalledRo = new AlertCalledRo();
 
-                    String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
+                    String replaceContent ="";
+                    if(null != alertCalled) {
+                        replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledVo);
+                    }
 
                     Map<String, String> definitions = new HashMap<>();
                     definitions.put("$type",alertCalled.getAlertType());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -411,7 +411,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		 * 构建警情报送规则对象
 		 */
 		AlertCalledRo alertCalledRo = new AlertCalledRo();
-		String replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
+		String replaceContent ="";
+		if(null != alertCalled) {
+			replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
+		}
 
 		definitions.put("rescueGrid", alertCalled.getAddress());
 		definitions.put("type", alertCalled.getAlertType());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -1240,14 +1240,14 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString());
                 latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
                 latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
-                latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis());
-                latentDangerBo.setReasonAnalysis(executeParam.getRemark());
+                latentDangerBo.setProblemDescription(executeParam.getRemark());
+                latentDangerBo.setReasonAnalysis(executeParam.getReasonAnalysis());
             } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) {
                 latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode().toString());
                 latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
                 latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
-                latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis());
-                latentDangerBo.setReasonAnalysis(executeParam.getRemark());
+                latentDangerBo.setProblemDescription(executeParam.getRemark());
+                latentDangerBo.setReasonAnalysis(executeParam.getReasonAnalysis());
                 latentDangerBo.setDelayLimitDate(DateUtil.str2Date(executeParam.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
             }
             if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {