Skip to content

A
amos-boot-biz
Commit 6ac4d2c6 authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):西安电梯历史数据导入接口修改

parent 2e894106
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 23 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/DictParamsConverter.java
View file @ 6ac4d2c6
......@@ -81,6 +81,17 @@ public class DictParamsConverter implements Converter<String> {
dictMap.put("其他控制方式", "4");
dictMap.put("直接顶升", "1");
dictMap.put("间接顶升", "2");
dictMap.put("游乐场所", "6532");
dictMap.put("商业单位", "6009");
dictMap.put("学校", "6010");
dictMap.put("政府机关", "6012");
dictMap.put("医疗机构", "6011");
dictMap.put("公共场所", "6013");
dictMap.put("旅游景区", "6531");
dictMap.put("住宅小区", "6008");
dictMap.put("养老机构", "6530");
dictMap.put("工业场所", "6528");
dictMap.put("工业场所（户外）", "6529");
}
@Override
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/dto/XiAnElevatorExcelDto.java
View file @ 6ac4d2c6
......@@ -110,7 +110,7 @@ public class XiAnElevatorExcelDto extends BaseDto {
private String longitudeLatitude;
@ApiModelProperty(value = "使用场所")
@ExcelProperty(value = "使用场所")
@ExcelProperty(value = "使用场所", converter = DictParamsConverter.class)
private String usePlace;
@ApiModelProperty(value = "安全管理员")
......@@ -365,7 +365,7 @@ public class XiAnElevatorExcelDto extends BaseDto {
@ApiModelProperty(value = "创建时间")
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private String createDate;
@ApiModelProperty(value = "创建人名称")
......@@ -382,6 +382,6 @@ public class XiAnElevatorExcelDto extends BaseDto {
@ApiModelProperty(value = "审批通过时间")
@ExcelProperty(value = "审批通过时间")
@DateTimeFormat("yyyy-MM-dd")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private String approvalDate;
}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java
View file @ 6ac4d2c6
......@@ -115,4 +115,13 @@ public interface TzsJgServiceFeignClient {
*/
@RequestMapping(value = "/dataDock/xi-an/saveElevatorData", method = RequestMethod.POST)
Object saveElevatorData(@RequestBody List<XiAnElevatorExcelDto> elevatorExcelDtos);
/**
* record唯一性检查
*
* @param record
* @return
*/
@RequestMapping(value = "/common/checkRecordUniqueness", method = RequestMethod.GET)
Boolean selectByRecordAndClaimStatus(@RequestParam("record") String record);
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
View file @ 6ac4d2c6
......@@ -50,6 +50,7 @@ public class XiAnDataDockServiceImpl {
List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
List<String> equCodeList = new ArrayList<>();// 设备代码集合
List<String> factoryNumList = new ArrayList<>();// 出厂编码集合
List<String> recordList = new ArrayList<>();// 注册代码集合
/**
......@@ -464,6 +465,15 @@ public class XiAnDataDockServiceImpl {
}
/**
* 根据record检查唯一性
*
* @param record record
*/
private boolean checkRecordUniqueness(String record) {
return jgServiceFeignClient.selectByRecordAndClaimStatus(record);
}
/**
* 起重机械----技术参数 检查
*
* @param data
......@@ -570,6 +580,7 @@ public class XiAnDataDockServiceImpl {
useInnerCodeList.clear();
equCodeList.clear();
factoryNumList.clear();
recordList.clear();
try {
InputStream inputStream = file.getInputStream();
ExcelReader excelReader = EasyExcel.read(inputStream).build();
......@@ -588,6 +599,7 @@ public class XiAnDataDockServiceImpl {
checkElevatorExcelData(sheetName, data, context, sheetError);
useInnerCodeList.add(data.getUseInnerCode());
equCodeList.add(data.getEquCode());
recordList.add(data.getRecord());
dataList.add(data);
}
......@@ -631,7 +643,7 @@ public class XiAnDataDockServiceImpl {
} else {
checkResumeInfo(data, rowError);
}
// data.setIsCompleteXa(this.checkIsComplete(data) ? 0 : 1);
data.setIsCompleteXa(1);
if (!StringUtils.isBlank(rowError)) {
sheetError.put(String.format(excelErrorStr, rowIndex), rowError);
}
......@@ -645,12 +657,12 @@ public class XiAnDataDockServiceImpl {
checkNotBlank(data.getResumeSeq(), "监管履历主键不能为空；", rowError);
checkNotBlank(data.getBusinessType(), "业务类型不能为空；", rowError);
checkNotBlank(data.getCreateDate(), "创建时间不能为空；", rowError);
Optional.ofNullable(data.getCreateDate()).ifPresent(v -> checkDateFormatCorrect(v, "创建时间格式不正确；", rowError));
// Optional.ofNullable(data.getCreateDate()).ifPresent(v -> checkDateFormatCorrect(v, "创建时间格式不正确；", rowError));
checkNotBlank(data.getCreateUserName(), "创建人名称不能为空；", rowError);
checkNotBlank(data.getBusinessId(), "业务单号不能为空；", rowError);
checkNotBlank(data.getApprovalUnit(), "审批单位不能为空；", rowError);
checkNotBlank(data.getApprovalDate(), "审批通过时间不能为空；", rowError);
Optional.ofNullable(data.getApprovalDate()).ifPresent(v -> checkDateFormatCorrect(v, "审批通过时间格式不正确；", rowError));
// Optional.ofNullable(data.getApprovalDate()).ifPresent(v -> checkDateFormatCorrect(v, "审批通过时间格式不正确；", rowError));
}
private void checkCommonInfo(XiAnElevatorExcelDto data, StringBuffer rowError) {
......@@ -662,6 +674,12 @@ public class XiAnDataDockServiceImpl {
if (useInnerCodeList.contains(data.getUseInnerCode())) {
rowError.append("单位内编号不能重复；");
}
if (recordList.contains(data.getRecord())) {
rowError.append("模板中注册代码不能重复；").append(data.getRecord());
}
if (this.checkRecordUniqueness(data.getRecord())){
rowError.append("系统中存在注册代码；").append(data.getRecord());
}
checkNotBlank(data.getEquType(), "设备型号不能为空；", rowError);
checkNotBlank(data.getEquCodeType(), "有无设备代码不能为空；", rowError);
if ("1".equals(data.getEquCodeType())) {
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java
View file @ 6ac4d2c6
......@@ -184,4 +184,10 @@ public class ESEquipmentCategoryDto {
*/
@Field(type = FieldType.Boolean, name = "IS_COMPLETE_XA")
private Boolean IS_COMPLETE_XA;
/**
* 是否可以做业务-西安电梯导入用（false-否，true-是）
*/
@Field(type = FieldType.Boolean)
private Boolean IS_DO_BUSINESS;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java
View file @ 6ac4d2c6
......@@ -288,5 +288,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
* @return 公司对象集合
*/
List<KeyValueDto> queryAllCompanyDict();
Integer checkRecordUniqueness(String record);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ 6ac4d2c6
......@@ -2782,4 +2782,8 @@
WHERE ui."IS_INTO_MANAGEMENT" = true and (ri."EQU_LIST" = '6000' OR ri."EQU_LIST" = '2000') and di."DELAY_SERVICE_LIFE_DATE" > 0
) tt where tt.isExpired = true;
</select>
<select id="checkRecordUniqueness" resultType="java.lang.Integer">
SELECT COUNT(*) FROM idx_biz_jg_use_info jui WHERE jui.record = #{record}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 6ac4d2c6
......@@ -63,6 +63,9 @@
<if test="dto.isCyl != null and dto.isCyl == 1 ">
AND tjurm.reg_type != '车用气瓶登记'
</if>
<if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
and tjurm.is_do_business = #{dto.isDoBusiness}
</if>
<if test="dto.regType != null and dto.regType != '' ">
AND EXISTS (
SELECT 1
......@@ -136,6 +139,9 @@
<if test="dto.isScrap != null and dto.isScrap != ''">
and tjurm.is_scrap = #{dto.isScrap}
</if>
<if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
and tjurm.is_do_business = #{dto.isDoBusiness}
</if>
<if test="dto.cityName != null and dto.cityName != ''">
and tjurm.equ_use_address LIKE CONCAT('%', #{dto.cityName}, '%')
</if>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ 6ac4d2c6
......@@ -797,6 +797,13 @@ public class CommonController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/checkRecordUniqueness")
@ApiOperation(httpMethod = "GET", value = "检查record的唯一性", notes = "检查record的唯一性")
public Boolean checkRecordUniqueness(@RequestParam("record") String record) {
return commonService.checkRecordUniqueness(record);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/checkFactoryNumUniquenessForVehicleCylinder")
@ApiOperation(httpMethod = "GET", value = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）", notes = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）")
public Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationNameController.java
View file @ 6ac4d2c6
......@@ -163,6 +163,7 @@ public class JgChangeRegistrationNameController extends BaseController {
}
}
dto.setCertificateStatus("已登记");
dto.setIsDoBusiness("1");
return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getTableData(dto));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java
View file @ 6ac4d2c6
......@@ -205,6 +205,7 @@ public class JgChangeRegistrationReformController extends BaseController {
}
//区外移装查询已注销状态的证
dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
dto.setIsDoBusiness("1");//默认可以做业务
return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java
View file @ 6ac4d2c6
......@@ -159,6 +159,7 @@ public class JgUseRegistrationManageController extends BaseController {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
}
dto.setIsDoBusiness(ValidationUtil.isEmpty(dto.getIsDoBusiness()) ? "1" : "");
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
}
......@@ -224,6 +225,7 @@ public class JgUseRegistrationManageController extends BaseController {
} else {
dto.setReceiveCompanyCode(company.getCompanyCode());
}
dto.setIsDoBusiness("1");
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
}
......@@ -357,6 +359,7 @@ public class JgUseRegistrationManageController extends BaseController {
} else {
return ResponseHelper.buildResponse(page);
}
dto.setIsDoBusiness("1");
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java
View file @ 6ac4d2c6
......@@ -268,4 +268,11 @@ public interface ICommonService {
Map<String, Object> getRegistrationChangeCertificateUrl(JSONObject formData);
void getRegistrationChangeCertificateFormStream(JSONObject jsonObject, HttpServletResponse response);
/**
* 检查record的唯一性
* @param record
* @return
*/
Boolean checkRecordUniqueness(String record);
}
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/CommonServiceImpl.java
View file @ 6ac4d2c6
......@@ -3002,6 +3002,18 @@ public class CommonServiceImpl implements ICommonService {
}
/**
* 检查record的唯一性
*
* @param record record
* @return
*/
@Override
public Boolean checkRecordUniqueness(String record) {
Integer count = commonMapper.checkRecordUniqueness(record);
return count > 0 ? Boolean.TRUE : Boolean.FALSE;
}
/**
* 使用登记证编号的全库唯一校验
*
* @param useRegistrationCode 登记证编号
......
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/DataDockServiceImpl.java
View file @ 6ac4d2c6
......@@ -128,6 +128,7 @@ public class DataDockServiceImpl {
Map<String, List<String>> projectContraptionMap = new HashMap<>();// 工程装置名称集合
private static final String DEFINITION_KEY = "useRegistration";
private final JgVehicleInformationMapper jgVehicleInformationMapper;
private final IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
/**
* 西安数据对接-保存设备信息
......@@ -280,16 +281,23 @@ public class DataDockServiceImpl {
if (!ValidationUtil.isEmpty(districtName)) {
districtCode = getRegionCode(districtName, "REGION");
}
String streetName = Objects.toString(equ.get("factoryUseSiteStreet"),"");
String streetCode = "";
if (!ValidationUtil.isEmpty(streetName)) {
districtCode = getRegionCode(streetName, "STREET");
}
useInfo.setProvince(provinceCode);
useInfo.setProvinceName(provinceName);
useInfo.setCity(cityCode);
useInfo.setCityName(cityName);
useInfo.setCounty(districtCode);
useInfo.setCountyName(districtName);
useInfo.setStreetName(Objects.toString(equ.get("factoryUseSiteStreet")));
useInfo.setStreetName(streetName);
useInfo.setFactoryUseSiteStreet(streetCode);
equ.put("province",useInfo.getProvince());
equ.put("city",useInfo.getCity());
equ.put("county",useInfo.getCounty());
equ.put("factoryUseSiteStreet", streetCode);
if (!ValidationUtil.isEmpty(Objects.toString(equ.get("longitudeLatitude")))) {
String[] parts = Objects.toString(equ.get("longitudeLatitude"), "").split(",", -1);
String latitude = parts.length > 0 ? parts[0].trim() : "";
......@@ -304,8 +312,14 @@ public class DataDockServiceImpl {
useInfo.setUseUnitCreditCode(Objects.toString(equ.get("useUnitCode"), "").trim());
useInfo.setUseUnitName(Objects.toString(equ.get("useUnit"), "").trim());
useInfo.setRemark(remark);
useInfo.setEquState(EquimentEnum.ZAIYONG.getCode()+"");
useInfo.setProjectContraptionId(Objects.toString(equ.get("projectContraptionId"), ""));
useInfo.setIsNotXiXian("0");
idxBizJgUseInfoService.save(useInfo);
equ.put("longitudeLatitude", useInfo.getLongitudeLatitude());
equ.put("useUnitCreditCode", useInfo.getUseUnitCreditCode());
equ.put("useUnitName", useInfo.getUseUnitName());
equ.put("isNotXiXian", "0");
}
}
......@@ -337,6 +351,7 @@ public class DataDockServiceImpl {
if (!ValidationUtil.isEmpty(factoryInfo)) {
factoryInfo.setRecord(record);
factoryInfo.setRecDate(new Date());
factoryInfo.setFactoryIsComplete("2");
idxBizJgFactoryInfoService.save(factoryInfo);
}
}
......@@ -354,10 +369,7 @@ public class DataDockServiceImpl {
registerInfo.setRecord(record);
registerInfo.setRecDate(new Date());
registerInfo.setRegisterState("6045");
if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
registerInfo.setEquCodeType("2");
registerInfo.setProductName((String) equ.get("pipeName"));
}
registerInfo.setIsCompleteXa("1");
idxBizJgRegisterInfoServiceImpl.save(registerInfo);
}
}
......@@ -447,7 +459,7 @@ public class DataDockServiceImpl {
otherInfo.setClaimStatus("已认领");
otherInfo.setRecDate(new Date());
if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
otherInfo.setCode96333Type("2");
otherInfo.setCode96333Type("1");
}
idxBizJgOtherInfoService.save(otherInfo);
}
......@@ -632,6 +644,8 @@ public class DataDockServiceImpl {
if (!ObjectUtils.isEmpty(equipmentCategoryDto)) {
long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
equipmentCategoryDto.setREC_DATE(time);
equipmentCategoryDto.setSTATUS("已认领");
equipmentCategoryDto.setIS_DO_BUSINESS(false);
equipmentCategoryDto.setIS_COMPLETE_XA(Objects.equals("0", isCompleteXa));
esEquipmentCategory.save(equipmentCategoryDto);
}
......@@ -1623,10 +1637,9 @@ public class DataDockServiceImpl {
"单号【" + useReg.getApplyNo() + "】，办理日期" + simpleDateFormat.format(new Date());
}
private String buildRecordContent(JgUseRegistration useReg, String businessName) {
private String buildRecordContent(JgUseRegistration useReg) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return useReg.getUseUnitName() + "的" + useReg.getCreateUserName() + "办理了【" + "历史设备登记" + "】，" +
return useReg.getUseUnitName() + "的管理员" + "办理了【" + "历史设备登记" + "】，" +
"单号【" + useReg.getApplyNo() + "】，办理日期" + simpleDateFormat.format(new Date());
}
......@@ -2175,6 +2188,7 @@ public class DataDockServiceImpl {
String record = Optional.ofNullable(equ.get("record")).map(String::valueOf).orElse(UUID.randomUUID().toString());
String equList = Optional.ofNullable(equ.get("equList")).map(String::valueOf).orElse("");
String isCompleteXa = Optional.ofNullable(equ.get("isCompleteXa")).map(String::valueOf).orElse("");
String useRegistrationCode = Optional.ofNullable(equ.get("useOrgCode")).map(String::valueOf).orElse("").trim();
try {
if (!equList.isEmpty()) {
saveUseInfo(equ, record, dataSource, remark);
......@@ -2187,7 +2201,9 @@ public class DataDockServiceImpl {
saveEquInfoToEs(record, isCompleteXa);
this.saveInstallInfo(equ, record, equList);//安装信息
this.historyEquUpdateMaintenanceInfo(equ);//维保信息
this.handleHistoryEquip(equ);//历史登记
if (!useRegistrationCode.isEmpty()){
this.handleHistoryEquip(equ);//历史登记
}
} else {
this.saveResumeInfo(equ);
}
......@@ -2313,8 +2329,19 @@ public class DataDockServiceImpl {
otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("record"));
IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
this.createCode(map, jgUseRegistration, otherInfo);
// 注册信息
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equipId);
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
registerInfo.setEquCodeType("2");
String equCode = this.getEquCode(map);
registerInfo.setEquCode(equCode);
registerInfo.setInstallationIsComplete("2");
idxBizJgRegisterInfoMapper.updateById(registerInfo);
map.put("equCode", equCode);
// 更新es
this.updateEsData2(map, otherInfo);
jgUseRegistrationServiceImpl.save(jgUseRegistration);
......@@ -2365,7 +2392,7 @@ public class DataDockServiceImpl {
changeRecord.setAuditPassDate(new Date());
changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
changeRecord.setRegDate(jgUseRegistration.getCreateDate());
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()));//变更内容
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration));//变更内容
changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
// 流水表不需要再次生成唯一编号，使用证管理表对应值
......@@ -2429,6 +2456,7 @@ public class DataDockServiceImpl {
manage.setManageType(jgUseRegistration.getManageType());
manage.setIsDoBusiness("0"); // 不可做业务
// 生成证书编号
equType.put("equDefineCode",Objects.toString(map.get("equDefine")));
manage.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), (String) map.get("county")));
// 设置监管机构信息
this.setSuperviseOrgInfo(manage, jgUseRegistration);
......@@ -2456,20 +2484,15 @@ public class DataDockServiceImpl {
HashMap<String, Object> param = new HashMap<>();
param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
param.put("CODE96333", otherInfo.getCode96333());
param.put("STATUS", "已认领");
param.put("EQU_STATE", 1);
param.put("IS_DO_BUSINESS", false);
param.put("IS_INTO_MANAGEMENT", true);
param.put("USC_UNIT_CREDIT_CODE", "");
param.put("EQU_CODE", dataMap.get("equCode"));
objMap.put((String) dataMap.get("record"), param);
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
}
private void rollBackForDelRedisData() {
FlowingEquipRedisContext.getContext().forEach(e -> {
EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
});
FlowingEquipRedisContext.getContext().forEach(e -> EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey()));
}
/**
......@@ -2546,6 +2569,8 @@ public class DataDockServiceImpl {
inspectionDetectionInfo.setInspectType(InspectTypeConverter.dictMap.get(inspectionDetectionInfo.getInspectType()));
inspectionDetectionInfo.setInspectConclusion(InspectConclusionConverter.dictMap.get(inspectionDetectionInfo.getInspectConclusion()));
inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
equ.put("inspectType",inspectionDetectionInfo.getInspectType());
equ.put("inspectConclusion",inspectionDetectionInfo.getInspectConclusion());
}
}
}
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 6ac4d2c6
......@@ -134,6 +134,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
// 设备纳管 纳管：true 未纳管：false
public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
public static final String IS_DO_BUSINESS = "IS_DO_BUSINESS";
// 设备来源 jg：新设备录入 jg_his：历史数据录入
public static final String DATA_SOURCE = "DATA_SOURCE";
// 设备来源名称 jg：新设备 jg_his：历史数据
......@@ -2353,6 +2354,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
meBuilder.minimumShouldMatch(1);
boolMust.must(meBuilder);
//默认条件 限制西安电梯隶属导入数据不可做业务
if (ObjectUtils.isEmpty(map.getString(IS_DO_BUSINESS))) {
BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
tBuilder.should(QueryBuilders.matchQuery(IS_DO_BUSINESS, true));
tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(IS_DO_BUSINESS)));
tBuilder.minimumShouldMatch(1);
boolMust.must(tBuilder);
}
// DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
// 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 6ac4d2c6
......@@ -1294,6 +1294,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
map.put("USE_UNIT_CREDIT_CODE", companyCode);
}
//默认条件 限制西安电梯隶属导入数据不可做业务
BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
tBuilder.should(QueryBuilders.matchQuery("IS_DO_BUSINESS", true));
tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("IS_DO_BUSINESS")));
tBuilder.minimumShouldMatch(1);
boolMust.must(tBuilder);
// 使用单位 //安装改造维修单位
if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
......
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