互助组同步

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java

@@ -362,24 +362,37 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
 
-	/** 远程调用方法 */
-	public boolean groupDto(GroupDto groupDto){
-		TbGroup tbGroup = new TbGroup();
-		BeanUtils.copyProperties(groupDto,tbGroup);
-		//根据编号进行事务处理
-		List<TbGroup> tbGroupList = tbGroupMapper.selectList(new LambdaQueryWrapper<TbGroup>().eq(TbGroup::getPlatSeqNo, groupDto.getPlatSeqNo()));
-		if(tbGroupList.size() == 0){
-			//新增
-			tbGroup.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
-			tbGroup.setCreateTime(new Date());
-			boolean save = this.save(tbGroup);
-			return save;
-		}
-		//修改
-		BeanUtils.copyProperties(tbGroupList.get(0),tbGroup);
-		int i = tbGroupMapper.updateById(tbGroup);
-		return i == 1;
-	}
+    /**
+     * 远程调用方法
+     */
+    public boolean groupDto(GroupDto groupDto) {
+        TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(groupDto.getFieldCode(), "");
+        TbGroup tbGroup = new TbGroup();
+        BeanUtils.copyProperties(groupDto, tbGroup);
+        //根据编号进行事务处理
+        List<TbGroup> tbGroupList = tbGroupMapper.selectList(new LambdaQueryWrapper<TbGroup>().eq(TbGroup::getPlatSeqNo, groupDto.getPlatSeqNo()));
+        if (tbGroupList.size() == 0) {
+            //新增
+            tbGroup.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+            tbGroup.setCreateTime(new Date()).setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
+         this.save(tbGroup);
+        }
+        List<BorderDTO> borderDTOList = JSONUtil.toList(groupDto.getBorderList(), BorderDTO.class);
+        borderDTOList.forEach(borderDTO -> {
+            TbPeople tbPeople = tbPeopleService.findByIdCarNo(borderDTO.getCiphertextIdno());
+            if (tbPeople==null){
+                tbPeople=new TbPeople();
+            }
+            tbPeople.setGroupName(tbGroup.getOrgName()).setGroupId(tbGroup.getId()).setTradeAreaId(tbTradeArea.getId())
+                    .setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
+            tbPeopleService.saveOrUpdate(tbPeople);
+            //todo 继续同步边民信息
+        });
+        //修改
+        BeanUtils.copyProperties(tbGroupList.get(0), tbGroup);
+        int i = tbGroupMapper.updateById(tbGroup);
+        return i == 1;
+    }
 
 	/** 远程调用方法 获取边民组的基本信息*/
 	GroupDto getRpcById(String id) {