Skip to content

A
amos-boot-biz
Commit fd338117 authored by suhuiguang's avatar suhuiguang
Browse files
Options

fix(jg): 修改设备品种

1.无动力游乐设施设备品种错误，进行修改3个
parent 2cc199a2
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 11 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/EquDefineConverter.java
View file @ fd338117
......@@ -60,9 +60,9 @@ public class EquDefineConverter implements Converter<String> {
equipmentMap.put("水滑梯系列", "6D20");
equipmentMap.put("碰碰船系列", "6D40");
equipmentMap.put("蹦极系列", "6E10");
equipmentMap.put("滑索系列", "6E20");
equipmentMap.put("空中飞人系列", "6E30");
equipmentMap.put("系留式观光气球系列", "6E40");
equipmentMap.put("滑索系列", "6E40");
equipmentMap.put("空中飞人系列", "6E50");
equipmentMap.put("系留式观光气球系列", "6E60");
equipmentMap.put("工艺管道", "8310");
equipmentMap.put("动力管道", "8320");
equipmentMap.put("制冷管道", "8330");
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RidesTechParamDefine.java
View file @ fd338117
......@@ -21,15 +21,15 @@ public class RidesTechParamDefine implements ITechParamDefine {
private BigDecimal trackHeight;
@TechnicalParameter(key = "runningSpeed", label = "运行速度", equCategory = {"6B00", "6300", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6D10", "6D20", "6D40", "6E20"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "km/h (m/s)")
@TechnicalParameter(key = "runningSpeed", label = "运行速度", equCategory = {"6B00", "6300", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6D10", "6D20", "6D40", "6E40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "km/h (m/s)")
private BigDecimal runningSpeed;
@TechnicalParameter(key = "numberOfPassengers", label = "承载人数", equCategory = {"6B00", "6A00", "6300", "6900", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6E20", "6E30", "6D10", "6D40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "人")
@TechnicalParameter(key = "numberOfPassengers", label = "承载人数", equCategory = {"6B00", "6A00", "6300", "6900", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6E40", "6E50", "6D10", "6D40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "人")
private BigDecimal numberOfPassengers;
@TechnicalParameter(key = "slideLength", label = "滑索(道)/蹦极绳长度", equCategory = {"6B00", "6E00"}, equDefine = {"6E20","6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
@TechnicalParameter(key = "slideLength", label = "滑索(道)/蹦极绳长度", equCategory = {"6B00", "6E00"}, equDefine = {"6E40","6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal slideLength;
......@@ -41,11 +41,11 @@ public class RidesTechParamDefine implements ITechParamDefine {
private BigDecimal slideHeight;
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", equCategory = {"6100", "6700", "6500", "6600", "6400", "6E00"}, equDefine = {"6E30"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", equCategory = {"6100", "6700", "6500", "6600", "6400", "6E00"}, equDefine = {"6E50"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal rotaryDiameter;
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", equCategory = {"6E00"}, equDefine = {"6E30"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "°")
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", equCategory = {"6E00"}, equDefine = {"6E50"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "°")
private BigDecimal unilateralSwingAngle;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/EquDefineConverter.java
View file @ fd338117
......@@ -60,9 +60,9 @@ public class EquDefineConverter implements Converter<String> {
equipmentMap.put("水滑梯系列", "6D20");
equipmentMap.put("碰碰船系列", "6D40");
equipmentMap.put("蹦极系列", "6E10");
equipmentMap.put("滑索系列", "6E20");
equipmentMap.put("空中飞人系列", "6E30");
equipmentMap.put("系留式观光气球系列", "6E40");
equipmentMap.put("滑索系列", "6E40");
equipmentMap.put("空中飞人系列", "6E50");
equipmentMap.put("系留式观光气球系列", "6E60");
equipmentMap.put("往复式客运架空索道", "9110");
equipmentMap.put("循环式客运架空索道", "9120");
equipmentMap.put("往复式客运缆车", "9210");
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java
View file @ fd338117
......@@ -390,4 +390,12 @@ public class DataHandlerController extends BaseController {
public ResponseModel<String> handleDataQualityScore() {
return ResponseHelper.buildResponse(dataHandlerService.handleDataQualityScore2());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/fixEquipOfErrorDefine")
@ApiOperation(httpMethod = "PUT", value = "修复无动力游乐设施设备品种错误的设备", notes = "修复无动力游乐设施设备品种错误的设备")
public ResponseModel<Boolean> fixEquipOfErrorDefine(){
return ResponseHelper.buildResponse(dataHandlerService.equDefineChangeFix());
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
View file @ fd338117
......@@ -183,6 +183,8 @@ public class DataHandlerServiceImpl {
@Autowired
private EventPublisher eventPublisher;
@Autowired
private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
/**
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
......@@ -2464,4 +2466,53 @@ public class DataHandlerServiceImpl {
meBuilder1.minimumShouldMatch(1);
boolQuery.must(meBuilder1);
}
public Boolean equDefineChangeFix() {
String equCategory = "6E00";
Map<String, String> oldFixEquDefineCodeMap = new HashMap<>();
oldFixEquDefineCodeMap.put("6E20", "6E40");
oldFixEquDefineCodeMap.put("6E30", "6E50");
oldFixEquDefineCodeMap.put("6E40", "6E60");
List<IdxBizJgRegisterInfo> regs = registerInfoService.list(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getEquCategory, equCategory)
.select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getEquDefine));
log.info("需要更新设备的品种的无动力游乐设施设备数量：{}", regs.size());
regs.parallelStream().forEach(re -> {
if (oldFixEquDefineCodeMap.containsKey(re.getEquDefine())) {
// 1.idx_biz_jg_register_info 更新
LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(IdxBizJgRegisterInfo::getEquDefine, oldFixEquDefineCodeMap.get(re.getEquDefine()));
lambdaUpdateWrapper.eq(IdxBizJgRegisterInfo::getRecord, re.getRecord());
registerInfoService.update(lambdaUpdateWrapper);
// 2.设备老索引修改
Optional<ESEquipmentCategoryDto> op1 = esEquipmentCategory.findById(re.getRecord());
if (op1.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = op1.get();
esEquipmentCategoryDto.setEQU_DEFINE_CODE(oldFixEquDefineCodeMap.get(re.getEquDefine()));
esEquipmentCategory.save(esEquipmentCategoryDto);
}
// 3.设备新索引修改
Optional<ESEquipmentInfo> op2 = esEquipmentDao.findById(re.getRecord());
if (op2.isPresent()) {
ESEquipmentInfo esEquipmentInfo = op2.get();
esEquipmentInfo.setEQU_DEFINE_CODE(oldFixEquDefineCodeMap.get(re.getEquDefine()));
esEquipmentDao.save(esEquipmentInfo);
}
}
});
// 4.证tzs_jg_use_registration_manage更新
List<JgUseRegistrationManage> manages = jgUseRegistrationManageMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
.eq(JgUseRegistrationManage::getEquCategory, equCategory)
.select(JgUseRegistrationManage::getEquDefine, BaseEntity::getSequenceNbr));
log.info("需要更新设备的品种的无动力游乐设施证数量：{}", regs.size());
manages.parallelStream().forEach(m -> {
if (oldFixEquDefineCodeMap.containsKey(m.getEquDefine())) {
LambdaUpdateWrapper<JgUseRegistrationManage> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(JgUseRegistrationManage::getEquDefine, oldFixEquDefineCodeMap.get(m.getEquDefine()));
lambdaUpdateWrapper.eq(JgUseRegistrationManage::getSequenceNbr, m.getSequenceNbr());
jgUseRegistrationManageMapper.update(null, lambdaUpdateWrapper);
}
});
return Boolean.TRUE;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment