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

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java

@@ -92,9 +92,15 @@ public class ESOrgUsrService {
     public ESOrgUsrDto saveAlertCalledToES(OrgUsr orgUsr) throws Exception
     {
     	ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
-    	esOrgUsrDto.setSequenceNbr(orgUsr.getSequenceNbr());
-    	esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());    	
-    	 esOrgUsrDtoRepository.save(esOrgUsrDto);
+    	String seqStr = String.valueOf(orgUsr.getSequenceNbr());
+    	try {
+			Long seq = Long.parseLong(seqStr);
+			esOrgUsrDto.setSequenceNbr(seq);
+			esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
+			esOrgUsrDtoRepository.save(esOrgUsrDto);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
     	return esOrgUsrDto;
     }
 

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

@@ -197,12 +197,13 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         //提交隐患
 //        jsonObject = remoteWorkFlowService.excute(instance.getString("id"), null);
 //        JSONObject task = jsonObject.getJSONObject("data");
-        latentDangerBo.setInstanceId(instance.getString("id"));
+        latentDangerBo.setInstanceId(instance.getString("id") == null ? " ":instance.getString("id"));
         JSONObject flowJson = new JSONObject();
         flowJson.put("photoUrls", latentDangerParam.getPhotoUrls());
         LatentDangerFlowRecordBo record = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId, flowJson, dangerId, role, LatentDangerExcuteTypeEnum.填写隐患完成.getName(), latentDangerParam.getRemark());
         latentDangerBo.setCurrentFlowRecordId(record.getId());
         latentDangerMapper.update(latentDangerBo);
+
         sendMessage(latentDangerBo, LatentDangerExcuteTypeEnum.填写隐患完成, null,
                 "隐患排查与治理", this.getNextExecuteUsers(latentDangerBo.getInstanceId()), userRealName, departmentName);
         try {
@@ -374,17 +375,17 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                            Integer level, String position, LatentDangerTypeEnum dangerTypeEnum,
                                            String photoUrls, Long checkInputId, Long structureId, String structureName, String instanceKey) {
         LatentDangerBo latentDangerBo = new LatentDangerBo();
-        latentDangerBo.setInstanceId(instanceId);
-        latentDangerBo.setProblemDescription(problemDescription);
-        latentDangerBo.setRemark(remark);
+        latentDangerBo.setInstanceId(instanceId == null ? " ":instanceId);
+        latentDangerBo.setProblemDescription(problemDescription == null ? " ":problemDescription);
+        latentDangerBo.setRemark(remark == null ? " ":remark);
         latentDangerBo.setDangerState(LatentDangerStateEnum.待评审.getCode());
-        latentDangerBo.setDiscovererUserId(userId);
-        latentDangerBo.setDiscovererDepartmentId(departmentId);
-        latentDangerBo.setBusinessKey(businessKey);
-        latentDangerBo.setOrgCode(orgCode);
-        latentDangerBo.setDangerName(dangerName);
+        latentDangerBo.setDiscovererUserId(userId == null ? " ": remark);
+        latentDangerBo.setDiscovererDepartmentId(departmentId == null ? " ": departmentId);
+        latentDangerBo.setBusinessKey(businessKey == null ? " ":businessKey);
+        latentDangerBo.setOrgCode(orgCode == null ? " ":orgCode);
+        latentDangerBo.setDangerName(dangerName == null ? " ":dangerName);
         latentDangerBo.setDangerLevel(level);
-        latentDangerBo.setDangerPosition(position);
+        latentDangerBo.setDangerPosition(position == null ? " ":position);
         latentDangerBo.setDangerType(dangerTypeEnum.getCode());
         StringBuilder photoUrlsB = new StringBuilder();
         if (org.apache.commons.lang3.StringUtils.isNotBlank(photoUrls)) {
@@ -396,11 +397,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 }
             }
         }
-        latentDangerBo.setPhotoUrls(photoUrlsB.toString());
+        latentDangerBo.setPhotoUrls(photoUrlsB.toString() == null ? " ":photoUrlsB.toString());
         latentDangerBo.setCheckInputId(checkInputId);
         latentDangerBo.setStructureId(structureId);
-        latentDangerBo.setStructureName(structureName);
-        latentDangerBo.setInstanceKey(instanceKey);
+        latentDangerBo.setStructureName(structureName == null ? " ":structureName);
+        latentDangerBo.setInstanceKey(instanceKey == null ? " ":instanceKey);
         latentDangerMapper.save(latentDangerBo);
         return latentDangerBo;
     }

amos-boot-system-tzs/src/main/resources/application.properties

@@ -58,4 +58,5 @@ control.fegin.name=JCS-API-CONTROL
 redis.cache.failure.time=10800
 failure.work.flow.processDefinitionKey=malfunction_repair
 video.fegin.name=video
-latentDanger.feign.name=AMOS-LATENT-DANGER
\ No newline at end of file
+latentDanger.feign.name=AMOS-LATENT-DANGER
+Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
\ No newline at end of file