Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 6a8c296f by 刘鑫
Options

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

2 parents 025f1c3c 1795b64d
Inline Side-by-side
Showing with 29 additions and 23 deletions
project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfoEntity.java
...@@ -14,38 +14,44 @@ public class MapBlockInfoEntity { ...@@ -14,38 +14,44 @@ public class MapBlockInfoEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@Column(name = "block_id", length = 50, nullable = false) @Column(name = "area_ids", length = 1024, nullable = false)
private String blockId; private String areaIds;
@Column(name = "block_name", length = 20, nullable = false) @Column(name = "area_name", length = 50, nullable = false)
private String blockName; private String areaName;
@Column(name = "branch_id", length = 50, nullable = false) @Column(name = "branch_id", length = 50, nullable = false)
private String branchId; private String branchId;
@Column(name = "group_id", length = 50, nullable = false) @Column(name = "group_id", length = 50, nullable = false)
private String groupId; private String groupId;
@Column(name = "team_id", length = 50, nullable = false)
private String teamId;
@Column(name = "city_code", nullable = true) @Column(name = "city_code", nullable = true)
private String cityCode; private String cityCode;
@Column(name = "area") @Column(name = "areaCount")
private Long area; private Long areaCount;
@Column(name = "area_data", nullable = true, columnDefinition = "json") @Column(name = "area_data", nullable = true, columnDefinition = "json")
private String areaData; private String areaData;
@Column(nullable = true) @Column(nullable = true)
private Boolean kind; private Integer type;
@Column(name = "team_id", length = 50, nullable = false)
private String teamId;
@Column(name = "layer_id", length = 50, nullable = false) @Column(name = "layer_id", length = 50, nullable = false)
private String layerId; private String layerId;
@Column(length = 50, nullable = false) @Column(name = "layer_name", length = 50, nullable = false)
private String layer; 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) @Column(nullable = false)
private Boolean status; 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 { ...@@ -27,7 +27,7 @@ public class BlockServiceImpl implements IBlockService {
return Result.failure(blockId + " blockId不存在"); return Result.failure(blockId + " blockId不存在");
} }
mapBlockInfoEntity.setAreaData(gson.toJson(region)); mapBlockInfoEntity.setAreaData(gson.toJson(region));
mapBlockInfoEntity.setArea(area); // mapBlockInfoEntity.setArea(area);
mapBlockInfoEntity.setUpdateTime(LocalDateTime.now()); mapBlockInfoEntity.setUpdateTime(LocalDateTime.now());
mapBlockInfoDao.save(mapBlockInfoEntity); mapBlockInfoDao.save(mapBlockInfoEntity);
mapBlockInfoDao.flush(); mapBlockInfoDao.flush();
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java
...@@ -120,14 +120,14 @@ public class BusinessBlockServiceImpl implements BusinessBlockService { ...@@ -120,14 +120,14 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
String groupId = team.getGroupId(); String groupId = team.getGroupId();
String groupName = groupMapping.get(groupId); String groupName = groupMapping.get(groupId);
block.setId(b.getBlockId()); block.setId(b.getAreaIds());
block.setGroupId(groupId); block.setGroupId(groupId);
block.setGroupName(groupName); block.setGroupName(groupName);
block.setLayerId(b.getLayerId()); block.setLayerId(b.getLayerId());
block.setLayerName(b.getLayer()); block.setLayerName(b.getLayerName());
block.setTeamId(b.getTeamId()); block.setTeamId(b.getTeamId());
block.setTeamName(team.getTeamName()); block.setTeamName(team.getTeamName());
block.setArea(b.getArea().toString()); // block.setArea(b.getArea().toString());
if(null != b.getUpdateTime()) { if(null != b.getUpdateTime()) {
block.setUpdateTime(TimeUtils.IsoLocalDateTime2String(b.getUpdateTime())); block.setUpdateTime(TimeUtils.IsoLocalDateTime2String(b.getUpdateTime()));
} }
...@@ -194,15 +194,15 @@ public class BusinessBlockServiceImpl implements BusinessBlockService { ...@@ -194,15 +194,15 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称 String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称
MapBlockInfoEntity block = new MapBlockInfoEntity(); MapBlockInfoEntity block = new MapBlockInfoEntity();
block.setBlockId(blockId); block.setAreaIds(blockId);
block.setBlockName(blockName); block.setAreaName(blockName);
block.setBranchId(team.getBranchId()); block.setBranchId(team.getBranchId());
block.setGroupId(team.getGroupId()); block.setGroupId(team.getGroupId());
block.setTeamId(teamId); block.setTeamId(teamId);
block.setLayerId(layerId); block.setLayerId(layerId);
block.setLayer(layerName); block.setLayerName(layerName);
block.setStatus(true); block.setStatus(true);
block.setArea(0L); //block.setArea(0L);
block.setCreateTime(LocalDateTime.now()); block.setCreateTime(LocalDateTime.now());
block.setUpdateTime(block.getCreateTime()); block.setUpdateTime(block.getCreateTime());
entityManager.persist(block); entityManager.persist(block);
...@@ -271,7 +271,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService { ...@@ -271,7 +271,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
String saasLayerId = getSaaSLayerId(block.getBranchId(), block.getLayerId()); String saasLayerId = getSaaSLayerId(block.getBranchId(), block.getLayerId());
HashMap<String, String> res = new HashMap<>(); HashMap<String, String> res = new HashMap<>();
res.put("url", url + "/mlAutoLogin?userAccount=" + userAccount + "&password=" + password 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); 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 { ...@@ -121,8 +121,8 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
return blockInfoList.stream().map(item -> { return blockInfoList.stream().map(item -> {
EngineerBusinessDTO.Blocks block = new EngineerBusinessDTO.Blocks(); EngineerBusinessDTO.Blocks block = new EngineerBusinessDTO.Blocks();
block.setBlockId(item.getBlockId()); block.setBlockId(item.getAreaIds());
block.setBlockName(item.getBlockName()); block.setBlockName(item.getAreaName());
block.setBlockData(item.getAreaData()); block.setBlockData(item.getAreaData());
block.setTeamId(item.getTeamId()); block.setTeamId(item.getTeamId());
return block; return block;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!