Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskController.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelation;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
@@ -105,20 +106,35 @@ public class EmergencyTaskController extends BaseController{
     @PostMapping(value = "/savePerson", produces = "application/json;charset=UTF-8")
     public CommonResponse savePerson(@RequestBody EmergencyRelationVo vo){
         List<Long> personIds = vo.getPersonIds();
+        List<Long> oldPersonIds = iEmergencyTaskService.getPersonIds(vo.getObligationId());
+
+        String ids = StringUtils.join(oldPersonIds, ",");
+
+
         List<Object> objects = jcsFeign.listCompanyByIds(personIds);
-        objects.forEach(e->
-                {
-                    String json = JSONObject.toJSONString(e);
-                    JSONObject jsonObject = JSONObject.parseObject(json);
-                    EmergencyRelation emergencyRelation = new EmergencyRelation();
-                    emergencyRelation.setObligationId(vo.getObligationId());
-                    emergencyRelation.setPersonId(Long.valueOf(jsonObject.get("sequenceNbr").toString()));
-                    emergencyRelation.setPersonName(jsonObject.get("bizOrgName").toString());
-                    emergencyRelation.setAmosOrgId(Long.valueOf(jsonObject.get("amosOrgId").toString()));
-                    emergencyRelation.setCreateDate(new Date());
-                    iEmergencyTaskService.save(emergencyRelation);
-                }
-                );
+        StringBuffer stringBuffer = new StringBuffer();
+        for (Object e : objects) {
+            String json = JSONObject.toJSONString(e);
+            JSONObject jsonObject = JSONObject.parseObject(json);
+            if (ids.contains(jsonObject.get("sequenceNbr").toString())){
+                stringBuffer.append(jsonObject.get("bizOrgName").toString()+" ");
+                continue;
+            }
+            EmergencyRelation emergencyRelation = new EmergencyRelation();
+            emergencyRelation.setObligationId(vo.getObligationId());
+            emergencyRelation.setPersonId(Long.valueOf(jsonObject.get("sequenceNbr").toString()));
+            emergencyRelation.setPersonName(jsonObject.get("bizOrgName").toString());
+            emergencyRelation.setAmosOrgId(Long.valueOf(jsonObject.get("amosOrgId").toString()));
+            emergencyRelation.setCreateDate(new Date());
+            iEmergencyTaskService.save(emergencyRelation);
+        }
+        if (stringBuffer.length()>0){
+            stringBuffer.append("已存在");
+            return CommonResponseUtil.failure(stringBuffer.toString());
+        }
+
+
+
         return CommonResponseUtil.success();
     }