elink-star
/
epdc-cloud-custom-yushan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

还原代码

feature/user_house_import
zhangyuan 3 years ago
parent
709b5f6395
commit
cf07d10344
3 changed files with 60 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
  2. 98
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
  3. 1
      epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml

20
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
View File

@ -121,16 +121,16 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
* @date 2022/6/9 17:24 * @date 2022/6/9 17:24
*/ */
int getRoomMaxCode(Long buildingId, String unit); int getRoomMaxCode(Long buildingId, String unit);
//
/** // /**
* 获取最大编码 // * 获取最大编码
* // *
* @param // * @param
* @return int // * @return int
* @author zhy // * @author zhy
* @date 2022/6/9 17:24 // * @date 2022/6/9 17:24
*/ // */
int getUnitNewCode(Long buildingId, String unit); // int getUnitNewCode(Long buildingId, String unit);
/** /**
* 更新编码 * 更新编码

98
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
View File

@ -185,8 +185,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
} }
checkData(dto); checkData(dto);
if (dto.getBuildingId() != null && dto.getUnit() != null) { if (dto.getBuildingId() != null && dto.getUnit() != null) {
int unitCode = getUnitNewCode(dto.getBuildingId(), dto.getUnit().trim().toUpperCase()); // int unitCode = getUnitNewCode(dto.getBuildingId(), dto.getUnit().trim().toUpperCase());
dto.setUnitMaCode(unitCode); // dto.setUnitMaCode(unitCode);
int roomCode = getRoomMaxCode(dto.getBuildingId(), dto.getUnit().trim().toUpperCase()); int roomCode = getRoomMaxCode(dto.getBuildingId(), dto.getUnit().trim().toUpperCase());
roomCode = roomCode + 1; roomCode = roomCode + 1;
dto.setRoomMaCode(roomCode); dto.setRoomMaCode(roomCode);
@ -339,26 +339,26 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
@Override @Override
public int getRoomMaxCode(Long buildingId, String unit) { public int getRoomMaxCode(Long buildingId, String unit) {
Integer maxCode = baseDao.getRoomMaxCode(buildingId, unit); Integer maxCode = baseDao.getRoomMaxCode(buildingId, null);
if (maxCode == null) { if (maxCode == null) {
maxCode = 0; maxCode = 0;
} }
return maxCode; return maxCode;
} }
@Override // @Override
public int getUnitNewCode(Long buildingId, String unit) { // public int getUnitNewCode(Long buildingId, String unit) {
Integer code = baseDao.getUnitCode(buildingId, unit); // Integer code = baseDao.getUnitCode(buildingId, unit);
if (code != null && code != NumConstant.ZERO) { // if (code != null && code != NumConstant.ZERO) {
return code; // return code;
} // }
Integer maxCode = baseDao.getUnitMaxCode(buildingId); // Integer maxCode = baseDao.getUnitMaxCode(buildingId);
if (maxCode == null || maxCode == NumConstant.ZERO) { // if (maxCode == null || maxCode == NumConstant.ZERO) {
maxCode = 0; // maxCode = 0;
} // }
maxCode = maxCode + 1; // maxCode = maxCode + 1;
return maxCode; // return maxCode;
} // }
@Override @Override
public void updateErrorRoom() { public void updateErrorRoom() {
@ -391,7 +391,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (!list.isEmpty()) { if (!list.isEmpty()) {
for (EpidemicBuildingUnitEntity epidemicBuildingUnitEntity : list) { for (EpidemicBuildingUnitEntity epidemicBuildingUnitEntity : list) {
if (epidemicBuildingUnitEntity.getBuildingId() != null && StringUtils.isNotBlank(epidemicBuildingUnitEntity.getUnit())) { if (epidemicBuildingUnitEntity.getBuildingId() != null && StringUtils.isNotBlank(epidemicBuildingUnitEntity.getUnit())) {
updateUnitMaCode(epidemicBuildingUnitEntity); // updateUnitMaCode(epidemicBuildingUnitEntity);
if (StringUtils.isNotBlank(epidemicBuildingUnitEntity.getRoomNo())) { if (StringUtils.isNotBlank(epidemicBuildingUnitEntity.getRoomNo())) {
updateRoomMaCode(epidemicBuildingUnitEntity); updateRoomMaCode(epidemicBuildingUnitEntity);
} }
@ -401,30 +401,30 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
} }
} }
private void updateUnitMaCode(EpidemicBuildingUnitEntity entity) { // private void updateUnitMaCode(EpidemicBuildingUnitEntity entity) {
String key = RedisKeys.getMaUnitCodeKey(entity.getBuildingId().toString(), entity.getUnit()); // String key = RedisKeys.getMaUnitCodeKey(entity.getBuildingId().toString(), entity.getUnit());
String nextKey = RedisKeys.getMaUnitNextCodeKey(entity.getBuildingId().toString()); // String nextKey = RedisKeys.getMaUnitNextCodeKey(entity.getBuildingId().toString());
Object obj = redisUtils.get(key); // Object obj = redisUtils.get(key);
Object nextObj = redisUtils.get(nextKey); // Object nextObj = redisUtils.get(nextKey);
if (null != obj) { // if (null != obj) {
int maCodeCache = (int) obj; // int maCodeCache = (int) obj;
entity.setUnitMaCode(maCodeCache); // entity.setUnitMaCode(maCodeCache);
redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE); // redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE);
return; // return;
} // }
if (null != nextObj) { // if (null != nextObj) {
int maCodeCache = (int) nextObj; // int maCodeCache = (int) nextObj;
entity.setUnitMaCode(maCodeCache); // entity.setUnitMaCode(maCodeCache);
redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE); // redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE);
redisUtils.set(nextKey, maCodeCache + 1, RedisUtils.HOUR_ONE_EXPIRE); // redisUtils.set(nextKey, maCodeCache + 1, RedisUtils.HOUR_ONE_EXPIRE);
return; // return;
} // }
//
int maCode = getUnitNewCode(entity.getBuildingId(), entity.getUnit()); // int maCode = getUnitNewCode(entity.getBuildingId(), entity.getUnit());
entity.setUnitMaCode(maCode); // entity.setUnitMaCode(maCode);
redisUtils.set(key, maCode, RedisUtils.HOUR_ONE_EXPIRE); // redisUtils.set(key, maCode, RedisUtils.HOUR_ONE_EXPIRE);
redisUtils.set(nextKey, maCode + 1, RedisUtils.HOUR_ONE_EXPIRE); // redisUtils.set(nextKey, maCode + 1, RedisUtils.HOUR_ONE_EXPIRE);
} // }
private void updateRoomMaCode(EpidemicBuildingUnitEntity entity) { private void updateRoomMaCode(EpidemicBuildingUnitEntity entity) {
String key = RedisKeys.getMaRoomCodeKey(entity.getBuildingId().toString(), entity.getUnit()); String key = RedisKeys.getMaRoomCodeKey(entity.getBuildingId().toString(), entity.getUnit());
@ -705,12 +705,12 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
unitEntity.setOwnerName(item.getUserName()); unitEntity.setOwnerName(item.getUserName());
unitEntity.setMobile(item.getMobile()); unitEntity.setMobile(item.getMobile());
unitEntity.setRoomType(NumConstant.ONE_STR); unitEntity.setRoomType(NumConstant.ONE_STR);
int unitCode = getUnitNewCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase()); // int unitCode = getUnitNewCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase());
unitEntity.setUnitMaCode(unitCode); // unitEntity.setUnitMaCode(unitCode);
int roomCode = getRoomMaxCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase()); int roomCode = getRoomMaxCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase());
roomCode = roomCode + 1; roomCode = roomCode + 1;
unitEntity.setRoomMaCode(roomCode); unitEntity.setRoomMaCode(roomCode);
unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getBuildingMaCode(), roomCode)); unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getPlotMaCode(), buildingOptional.get().getBuildingMaCode(), roomCode));
unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString()); unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString());
unitEntity.setGridName(parentAndAllDeptDTO.getGrid()); unitEntity.setGridName(parentAndAllDeptDTO.getGrid());
unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString()); unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString());
@ -765,12 +765,12 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
unitEntity.setOwnerName(item.getUserName()); unitEntity.setOwnerName(item.getUserName());
unitEntity.setMobile(item.getMobile()); unitEntity.setMobile(item.getMobile());
unitEntity.setRoomType(NumConstant.ONE_STR); unitEntity.setRoomType(NumConstant.ONE_STR);
int unitCode = getUnitNewCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase()); // int unitCode = getUnitNewCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase());
unitEntity.setUnitMaCode(unitCode); // unitEntity.setUnitMaCode(unitCode);
int roomCode = getRoomMaxCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase()); int roomCode = getRoomMaxCode(buildingOptional.get().getId(), item.getUnit().trim().toUpperCase());
roomCode = roomCode + 1; roomCode = roomCode + 1;
unitEntity.setRoomMaCode(roomCode); unitEntity.setRoomMaCode(roomCode);
unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getBuildingMaCode(), roomCode)); unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getPlotMaCode(), buildingOptional.get().getBuildingMaCode(), roomCode));
unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString()); unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString());
unitEntity.setGridName(parentAndAllDeptDTO.getGrid()); unitEntity.setGridName(parentAndAllDeptDTO.getGrid());
unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString()); unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString());
@ -793,9 +793,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
} }
private String getRoomCode(Integer buildingMaCode, Integer roomMaCode) { private String getRoomCode(Integer plotMaCode, Integer buildingMaCode, Integer roomMaCode) {
String orgId = "370211010042"; String orgId = "370211010042";
return orgId.concat(String.format("%05d", buildingMaCode).concat(String.format("%05d", roomMaCode))); return orgId.concat(String.format("%03d", plotMaCode)).concat(String.format("%03d", buildingMaCode).concat(String.format("%05d", roomMaCode)));
} }
@Override @Override

1
epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
View File

@ -179,6 +179,7 @@
p.id AS plotId, p.id AS plotId,
b.GRID_ID, b.GRID_ID,
b.BUILDING_MA_CODE, b.BUILDING_MA_CODE,
p.PLOT_MA_CODE,
p.PLOT_NAME p.PLOT_NAME
FROM FROM
epidemic_plot_building b epidemic_plot_building b

Write Preview
Loading…
Cancel
Save