feat: 调整对接saas区划表

project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfoEntity.java

@@ -14,11 +14,11 @@ public class MapBlockInfoEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
-    @Column(name = "block_id", length = 50, nullable = false)
-    private String blockId;
+    @Column(name = "area_ids", length = 1024, nullable = false)
+    private String areaIds;
 
-    @Column(name = "block_name", length = 20, nullable = false)
-    private String blockName;
+    @Column(name = "area_name", length = 50, nullable = false)
+    private String areaName;
 
     @Column(name = "branch_id", length = 50, nullable = false)
     private String branchId;
@@ -26,26 +26,32 @@ public class MapBlockInfoEntity {
     @Column(name = "group_id", length = 50, nullable = false)
     private String groupId;
     
+    @Column(name = "team_id", length = 50, nullable = false)
+    private String teamId;
+
     @Column(name = "city_code", nullable = true)
     private String cityCode;
     
-    @Column(name = "area")
-    private Long area;
+    @Column(name = "areaCount")
+    private Long areaCount;
 
     @Column(name = "area_data", nullable = true, columnDefinition = "json")
     private String areaData;
 
     @Column(nullable = true)
-    private Boolean kind;
-
-    @Column(name = "team_id", length = 50, nullable = false)
-    private String teamId;
+    private Integer type;
 
     @Column(name = "layer_id", length = 50, nullable = false)
     private String layerId;
 
-    @Column(length = 50, nullable = false)
-    private String layer;
+    @Column(name = "layer_name", length = 50, nullable = false)
+    private String layerName;
+    
+    @Column(name = "saas_layercode", length = 50, nullable = false)
+    private String saasLayercode;
+    
+    @Column(name = "saas_layer_id", length = 50, nullable = false)
+    private String saasLayerName;
 
     @Column(nullable = false)
     private Boolean status;

project-order/src/main/java/com/dituhui/pea/order/service/impl/BlockServiceImpl.java

@@ -27,7 +27,7 @@ public class BlockServiceImpl implements IBlockService {
 			return Result.failure(blockId + " blockId不存在");
 		}
 		mapBlockInfoEntity.setAreaData(gson.toJson(region));
-		mapBlockInfoEntity.setArea(area);
+		// mapBlockInfoEntity.setArea(area);
 		mapBlockInfoEntity.setUpdateTime(LocalDateTime.now());
 		mapBlockInfoDao.save(mapBlockInfoEntity);
 		mapBlockInfoDao.flush();

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java

@@ -120,14 +120,14 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 			String groupId = team.getGroupId();
 			String groupName = groupMapping.get(groupId);
 
-			block.setId(b.getBlockId());
+			block.setId(b.getAreaIds());
 			block.setGroupId(groupId);
 			block.setGroupName(groupName);
 			block.setLayerId(b.getLayerId());
-			block.setLayerName(b.getLayer());
+			block.setLayerName(b.getLayerName());
 			block.setTeamId(b.getTeamId());
 			block.setTeamName(team.getTeamName());
-			block.setArea(b.getArea().toString());
+			// block.setArea(b.getArea().toString());
 			if(null != b.getUpdateTime()) {
 				block.setUpdateTime(TimeUtils.IsoLocalDateTime2String(b.getUpdateTime()));
 			}
@@ -194,15 +194,15 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称
 
 		MapBlockInfoEntity block = new MapBlockInfoEntity();
-		block.setBlockId(blockId);
-		block.setBlockName(blockName);
+		block.setAreaIds(blockId);
+		block.setAreaName(blockName);
 		block.setBranchId(team.getBranchId());
 		block.setGroupId(team.getGroupId());
 		block.setTeamId(teamId);
 		block.setLayerId(layerId);
-		block.setLayer(layerName);
+		block.setLayerName(layerName);
 		block.setStatus(true);
-		block.setArea(0L);
+		//block.setArea(0L);
 		block.setCreateTime(LocalDateTime.now());
 		block.setUpdateTime(block.getCreateTime());
 		entityManager.persist(block);
@@ -271,7 +271,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		String saasLayerId = getSaaSLayerId(block.getBranchId(), block.getLayerId());
 		HashMap<String, String> res = new HashMap<>();
 		res.put("url", url + "/mlAutoLogin?userAccount=" + userAccount + "&password=" + password
-				+ "&jump=basedata&navHidden=true&layerId=" + saasLayerId + "&areaId=" + block.getBlockId());
+				+ "&jump=basedata&navHidden=true&layerId=" + saasLayerId + "&areaId=" + block.getAreaIds());
 		return Result.success(res);
 	}
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerBusinessServiceImpl.java

@@ -121,8 +121,8 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
 
         return blockInfoList.stream().map(item -> {
             EngineerBusinessDTO.Blocks block = new EngineerBusinessDTO.Blocks();
-            block.setBlockId(item.getBlockId());
-            block.setBlockName(item.getBlockName());
+            block.setBlockId(item.getAreaIds());
+            block.setBlockName(item.getAreaName());
             block.setBlockData(item.getAreaData());
             block.setTeamId(item.getTeamId());
             return block;