Skip to content

A
amos-boot-biz
Commit 8f9aa4dc authored by tianbo's avatar tianbo
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_register

parents 34935434 d0500ecc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 201 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/EquipSourceEnum.java
View file @ 8f9aa4dc
......@@ -54,4 +54,17 @@ public enum EquipSourceEnum {
return EquipSourceEnum.jg_his.getName();
}
}
public static String getDataSourceType(String dataSource) {
if(StringUtils.isEmpty(dataSource)){
return EquipSourceEnum.jg_his.getType();
}
if(EquipSourceEnum.jg.getCode().equals(dataSource) || (dataSource.startsWith(EquipSourceEnum.jg.getCode()) && !dataSource.startsWith(EquipSourceEnum.jg_his.getCode()))){
return EquipSourceEnum.jg.getType();
} else if(dataSource.startsWith(EquipSourceEnum.jg_his_black.getCode())){
return EquipSourceEnum.jg_his_black.getType();
} else {
return EquipSourceEnum.jg_his.getType();
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java
View file @ 8f9aa4dc
......@@ -130,6 +130,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
Set<Long> queryListByEqsAndStatus(@Param("records") Set<String> records, @Param("status") String status, @Param("applyNo") String applyNo);
Page<ReminderItemDto> queryForUnitVehiclePageForReminder(Page<?> page, @Param("records") List<String> records);
List<ReminderItemDto> queryForUnitVehiclePageForReminder(@Param("records") List<String> records);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java
View file @ 8f9aa4dc
......@@ -54,5 +54,5 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
List<Map<String, Object>> getVehicleInfoOfPassWithEquId();
Page<ReminderItemDto> queryForUnitVehiclePageForReminder(Page<ReminderItemDto> page, List<String> records);
List<ReminderItemDto> queryUnitVehiclesForReminderList(List<String> records);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 8f9aa4dc
......@@ -1539,6 +1539,5 @@
<foreach collection="records" item="record" open="(" close=")" separator=",">
#{record}
</foreach>
ORDER BY ri.REC_DATE DESC
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
View file @ 8f9aa4dc
......@@ -351,7 +351,7 @@
AND u.estate_unit_credit_code is not null
ORDER BY u.audit_pass_date
</select>
<select id="queryForUnitVehiclePageForReminder" resultType="com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto">
<select id="queryUnitVehiclesForReminderList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto">
SELECT
ri."PRODUCT_NAME" AS equipName,
fi."FACTORY_NUM" AS equipNo,
......@@ -363,6 +363,5 @@
<foreach collection="records" item="record" open="(" close=")" separator=",">
#{record}
</foreach>
ORDER BY ri.REC_DATE DESC
</select>
</mapper>
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 @ 8f9aa4dc
......@@ -50,6 +50,7 @@ public class DataHandlerController extends BaseController {
/**
* 向新增的工程装置表刷入数据(补充使用单位code为空的)
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -61,9 +62,9 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "使用登记表属地监管部门历史数据处理",notes = "supervisionOrgCode在history表json数据写入，气瓶导入页面无此字段，使用单位的属地监管部门写入")
@ApiOperation(value = "使用登记表属地监管部门历史数据处理", notes = "supervisionOrgCode在history表json数据写入，气瓶导入页面无此字段，使用单位的属地监管部门写入")
@PutMapping(value = "/useRegistration/supervisionOrgCode")
public ResponseModel<Boolean> writeSupervisionOrgCode2UseRegister(){
public ResponseModel<Boolean> writeSupervisionOrgCode2UseRegister() {
dataHandlerService.writeSupervisionOrgCode2UseRegister();
return ResponseHelper.buildResponse(true);
}
......@@ -72,7 +73,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "安装告知缺少装置id、装置未创建、安装告知完成但是设备状态为未纳管数据处理", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/notice")
public ResponseModel<Boolean> projectContraptionNoticeDataDealV3(){
public ResponseModel<Boolean> projectContraptionNoticeDataDealV3() {
dataHandlerService.projectContraptionNoticeDataDeal();
return ResponseHelper.buildResponse(true);
}
......@@ -80,7 +81,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "使用登记缺少装置id数据处理", notes = "历史数据处理,依赖/v3/projectContraption/notice作为基础数据")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/useRegister")
public ResponseModel<Boolean> projectContraptionUseRegisterDataDealV3(){
public ResponseModel<Boolean> projectContraptionUseRegisterDataDealV3() {
dataHandlerService.projectContraptionUseRegisterDataDeal();
return ResponseHelper.buildResponse(true);
}
......@@ -88,7 +89,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "由于前期设备纳管状态不对，导致的1220上线时 创建的装置纳管状态不对，刷库", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v2/projectContraption/info")
public ResponseModel<Boolean> projectContraptionInfoUpdateV2(){
public ResponseModel<Boolean> projectContraptionInfoUpdateV2() {
dataHandlerService.projectContraptionInfoUpdateV2();
return ResponseHelper.buildResponse(true);
}
......@@ -97,7 +98,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250108-刷管道，设备使用信息表装置id未更新，导致的错误数据处理，已es为准", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV3(){
public ResponseModel<Boolean> projectUseInfoUpdateV3() {
dataHandlerService.projectUseInfoUpdateV3();
return ResponseHelper.buildResponse(true);
}
......@@ -105,7 +106,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250108-1220上线时, 已完成安装告知管道未写入装置的施工信息表（导致使用登记不能回显施工信息），刷库", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/info")
public ResponseModel<Boolean> projectContraptionInfoUpdateV3(){
public ResponseModel<Boolean> projectContraptionInfoUpdateV3() {
dataHandlerService.projectContraptionInfoUpdateV3();
return ResponseHelper.buildResponse(true);
}
......@@ -113,7 +114,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250109-之前刷库问题导致的管道的装置id与安装告知不一样，已安装告知为准，刷使用信息表的装置id、es的装置id【只处理未做过使用登记或者使用登记未完成的】", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v4/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV4(){
public ResponseModel<Boolean> projectUseInfoUpdateV4() {
dataHandlerService.projectUseInfoUpdateV4();
return ResponseHelper.buildResponse(true);
}
......@@ -121,7 +122,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250110-处理一个管道在多个安装告知里，刷管道的use_info、es的装置id,已最新安装告知为准", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v5/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV5(){
public ResponseModel<Boolean> projectUseInfoUpdateV5() {
dataHandlerService.projectUseInfoUpdateV5();
return ResponseHelper.buildResponse(true);
}
......@@ -181,7 +182,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "补充西安导入数据的使用信用代码，压力管道除外", notes = "补充西安导入数据的使用信用代码，压力管道除外")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v1/xa/useInfo")
public ResponseModel<Boolean> updateUseInfoOfCompanyV1(){
public ResponseModel<Boolean> updateUseInfoOfCompanyV1() {
dataHandlerService.updateUseInfoOfCompanyV1();
return ResponseHelper.buildResponse(true);
}
......@@ -189,7 +190,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "恢复单位变更数据", notes = "恢复单位变更数据")
@GetMapping(value = "/restore")
public ResponseModel<Boolean> restore(){
public ResponseModel<Boolean> restore() {
dataHandlerService.restore();
return ResponseHelper.buildResponse(true);
}
......@@ -198,7 +199,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "存量数据刷属地监管部门到证管理表", notes = "存量数据刷属地监管部门到证管理表")
@PutMapping(value = "/supervise2UseRegManage")
public ResponseModel<Long> saveSupervise2UseRegManage(){
public ResponseModel<Long> saveSupervise2UseRegManage() {
return ResponseHelper.buildResponse(dataHandlerService.saveSupervise2UseRegManage());
}
......@@ -206,7 +207,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "历史安全追溯问题闭环【维保备案】【检验超期】", notes = "历史安全追溯问题闭环【维保备案】【检验超期】")
@PutMapping(value = "/safeTraceabilityClosedLoop")
public ResponseModel<String> safeTraceabilityClosedLoop(){
public ResponseModel<String> safeTraceabilityClosedLoop() {
return ResponseHelper.buildResponse(dataHandlerService.safeTraceabilityClosedLoop());
}
......@@ -224,9 +225,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "put", value = "历史设备装置初始化数据质量等级", notes = "车用气瓶登记产权单位信息刷入useInfo表")
@PutMapping(value = "/initDataQualityScore")
public ResponseModel<String> initDataQualityScore(){
// todo
return null;
public ResponseModel<String> initDataQualityScore() {
return ResponseHelper.buildResponse(dataHandlerService.initDataQualityScore());
}
}
}
\ 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/edit/process/equip/PieLineDataChangeServiceImpl.java
View file @ 8f9aa4dc
......@@ -330,6 +330,8 @@ public class PieLineDataChangeServiceImpl {
private Double calTotalPieLineLength(String projectContraptionId) {
List<String> records = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).select(IdxBizJgUseInfo::getRecord)).stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
// 如果没有记录，直接返回 0.0
if (records.isEmpty()) return 0.0;
List<IdxBizJgTechParamsPipeline> techParamsPipelines = idxBizJgTechParamsPipelineService.list(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records).select(IdxBizJgTechParamsPipeline::getRecord, IdxBizJgTechParamsPipeline::getPipeLength));
return techParamsPipelines.stream().filter(i -> i.getPipeLength() != null).map(e -> new BigDecimal(e.getPipeLength()))
.reduce(BigDecimal.ZERO, BigDecimal::add)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/editEquip/EditEquipReminderAdapter.java
View file @ 8f9aa4dc
......@@ -30,14 +30,6 @@ public class EditEquipReminderAdapter extends DefaultReminder {
this.editEquipParseService = editEquipParseService;
}
@Override
public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
ReminderItemDto reminderItemDto = setRealTimeReminderItem(bizId);
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
}
private ReminderItemDto setRealTimeReminderItem(String bizId) {
IdxBizJgRegisterInfo registerInfo = editEquipParseService.getIdxBizJgRegisterInfoService().getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, bizId).select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getProductName));
ReminderItemDto reminderItemDto = new ReminderItemDto();
......@@ -53,7 +45,7 @@ public class EditEquipReminderAdapter extends DefaultReminder {
}
@Override
public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgRegisterInfo.class);
IdxBizJgUseInfo bizJgUseInfo = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgUseInfo.class);
ReminderItemDto reminderItemDto = new ReminderItemDto();
......@@ -61,9 +53,7 @@ public class EditEquipReminderAdapter extends DefaultReminder {
reminderItemDto.setEquipNo(bizJgUseInfo.getUseInnerCode());
reminderItemDto.setEquipName(registerInfo.getProductName());
reminderItemDto.setDetailData(formData);
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
return Collections.singletonList(reminderItemDto);
}
@Override
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/editProject/EditProjectReminderAdapter.java
View file @ 8f9aa4dc
......@@ -29,11 +29,6 @@ public class EditProjectReminderAdapter extends DefaultReminder {
this.editProjectParseService = editProjectParseService;
}
@Override
protected IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
// 创建后，详情使用
return CommonReminderService.setProjectReminderItemPage(bizId, page, editProjectParseService.getIdxBizJgProjectContraptionServiceImpl());
}
@Override
protected List<ReminderItemDto> realtimeParse(String bizId) {
......@@ -43,10 +38,10 @@ public class EditProjectReminderAdapter extends DefaultReminder {
@Override
protected IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
protected List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
// 新增 + 编辑的保存使用
IdxBizJgProjectContraption projectContraption = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgProjectContraption.class);
return CommonReminderService.setProjectReminderItemPageJson(bizId, page, projectContraption);
return CommonReminderService.setProjectReminderItemPageJson(bizId, projectContraption);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/newEquip/NewEquipReminderAdapter.java
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.newEquip;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
......@@ -16,6 +14,7 @@ import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
* 设备/气瓶创建编辑-提醒处理器
*/
......@@ -30,19 +29,6 @@ public class NewEquipReminderAdapter extends DefaultReminder {
}
@Override
public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
IdxBizJgRegisterInfo registerInfo = newEquipParseService.getIdxBizJgRegisterInfoService().getOneData(bizId);
ReminderItemDto reminderItemDto = new ReminderItemDto();
reminderItemDto.setEquipId(bizId);
reminderItemDto.setEquipNo(registerInfo.getEquCode());
reminderItemDto.setEquipName(registerInfo.getProductName());
reminderItemDto.setDetailData(newEquipParseService.getEquipDetailByRecord(bizId));
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
}
@Override
protected List<ReminderItemDto> realtimeParse(String bizId) {
IdxBizJgRegisterInfo registerInfo = newEquipParseService.getIdxBizJgRegisterInfoService().getOneData(bizId);
ReminderItemDto reminderItemDto = new ReminderItemDto();
......@@ -54,7 +40,7 @@ public class NewEquipReminderAdapter extends DefaultReminder {
}
@Override
public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
IdxBizJgRegisterInfo registerInfo = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgRegisterInfo.class);
IdxBizJgUseInfo bizJgUseInfo = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgUseInfo.class);
ReminderItemDto reminderItemDto = new ReminderItemDto();
......@@ -62,9 +48,7 @@ public class NewEquipReminderAdapter extends DefaultReminder {
reminderItemDto.setEquipNo(bizJgUseInfo.getUseInnerCode());
reminderItemDto.setEquipName(registerInfo.getProductName());
reminderItemDto.setDetailData(newEquipParseService.getDetailInfoFromJson(formData));
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
return Collections.singletonList(reminderItemDto);
}
@Override
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/newProject/NewProjectReminderAdapter.java
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.newProject;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
......@@ -30,12 +28,6 @@ public class NewProjectReminderAdapter extends DefaultReminder {
this.newProjectParseService = newProjectParseService;
}
@Override
protected IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
// 创建后，详情使用
return CommonReminderService.setProjectReminderItemPage(bizId, page, newProjectParseService.getIdxBizJgProjectContraptionServiceImpl());
}
@Override
protected List<ReminderItemDto> realtimeParse(String bizId) {
......@@ -44,7 +36,7 @@ public class NewProjectReminderAdapter extends DefaultReminder {
}
@Override
protected IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
protected List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
// 新增 + 编辑的保存使用
IdxBizJgProjectContraption projectContraption = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgProjectContraption.class);
ReminderItemDto reminderItemDto = new ReminderItemDto();
......@@ -52,9 +44,7 @@ public class NewProjectReminderAdapter extends DefaultReminder {
reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
reminderItemDto.setEquipName(projectContraption.getProjectContraption());
reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
return Collections.singletonList(reminderItemDto);
}
@Override
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/vehicleInformation/VehicleInformationReminderAdapter.java
View file @ 8f9aa4dc
......@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformationEq;
......@@ -17,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -39,24 +36,18 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
}
@Override
public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
public List<ReminderItemDto> realtimeParse(String bizId) {
// 创建后, 监管通过时使用
JgVehicleInformation vehicleInformation = vehicleInformationReminderParse.getVehicleInformationMapper().selectById(bizId);
LambdaQueryWrapper<JgVehicleInformationEq> lambda = new QueryWrapper<JgVehicleInformationEq>().lambda();
lambda.eq(JgVehicleInformationEq::getVehicleId, vehicleInformation.getSequenceNbr());
lambda.select(JgVehicleInformationEq::getEquId);
List<String> records = vehicleInformationReminderParse.getVehicleInformationEqMapper().selectList(lambda).stream().map(JgVehicleInformationEq::getEquId).collect(Collectors.toList());
Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(vehicleInformation, item.getEquipId())));
return page;
List<ReminderItemDto> itemDtoList = vehicleInformationReminderParse.getVehicleInformationMapper().queryUnitVehiclesForReminderList(records);
itemDtoList.forEach(item -> item.setDetailData(this.buildCompareData(vehicleInformation, item.getEquipId())));
return itemDtoList;
}
@Override
protected List<ReminderItemDto> realtimeParse(String bizId) {
// 创建后，评分使用
// todo 气瓶时不显示评分，在列表上显示
return Collections.emptyList();
}
private Map<String, Object> buildCompareData(JgVehicleInformation vehicleInformation, String record) {
Map<String, Object> re = BeanUtil.beanToMap(vehicleInformation);
......@@ -72,14 +63,14 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
@Override
public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
// 气瓶--气瓶分页
JSONObject data = getSummitDataFromJson(formData);
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) data.get("equipmentLists");
List<String> records = equipmentLists.stream().map(item -> item.get("record").toString()).collect(Collectors.toList());
Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(data, item.getEquipId())));
return page;
List<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryUnitVehiclesForReminderList(records);
mapPage.forEach(item -> item.setDetailData(this.buildCompareData(data, item.getEquipId())));
return mapPage;
}
private static JSONObject getSummitDataFromJson(Map<String, Object> formData) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/DefaultReminder.java
View file @ 8f9aa4dc
......@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.biz.reminder.core;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import org.springframework.context.ApplicationContext;
import java.util.List;
......@@ -18,13 +18,13 @@ public abstract class DefaultReminder implements IReminderHandler {
}
@Override
public IPage<ReminderItemDto> remindersPage(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
IPage<ReminderItemDto> params = parse(page, bizId, sourceType, formData);
public IPage<ReminderItemDto> getReminderList(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
List<ReminderItemDto> params = parse(bizId, sourceType, formData);
ReminderFieldDiff reminderFieldDiff = applicationContext.getBean(ReminderFieldDiff.class);
MatchItemDto matchItemDto = setMatchItemBySourceType(sourceType, bizId, formData);
matchItemDto.setBizType(supportBizType());
matchItemDto.setPage(page);
return reminderFieldDiff.getReminderItemsPage(params, matchItemDto);
return reminderFieldDiff.getReminderItemsPage(params, page, matchItemDto);
}
private MatchItemDto setMatchItemBySourceType(SourceType sourceType, String bizId, Map<String, Object> formData) {
......@@ -46,25 +46,17 @@ public abstract class DefaultReminder implements IReminderHandler {
return strategyFactory.getStrategy(activeStrategy).calculateGrade(realtimeParse(bizId), matchItemDto);
}
private IPage<ReminderItemDto> parse(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
private List<ReminderItemDto> parse(String bizId, SourceType sourceType, Map<String, Object> formData) {
switch (sourceType) {
case realTime:
return realtimeParse(bizId, page);
return realtimeParse(bizId);
case json:
return jsonParse(bizId, formData, page);
return jsonParse(bizId, formData);
default:
throw new RuntimeException("no support type for " + sourceType);
}
}
/**
* 获取指定分页的设备、装置、单据下的设备、管道，详情使用
*
* @param bizId 唯一标识
* @return 分页的设备/管道
*/
protected abstract IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page);
/**
* 获取指定设备、装置、单据下的设备、管道列表-评分使用;台套-台套设备；气瓶-气瓶；装置-装置
......@@ -80,10 +72,9 @@ public abstract class DefaultReminder implements IReminderHandler {
*
* @param bizId 唯一标识
* @param formData 表单数据
* @param page 分页信息
* @return 解析后的分页数据
*/
protected abstract IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page);
protected abstract List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData);
/**
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/IReminderHandler.java
View file @ 8f9aa4dc
......@@ -8,7 +8,7 @@ import java.util.Map;
public interface IReminderHandler {
IPage<ReminderItemDto> remindersPage(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData);
IPage<ReminderItemDto> getReminderList(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData);
Integer getReminderLevel(String bizId, String activeStrategy);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/ReminderFieldDiff.java
View file @ 8f9aa4dc
......@@ -7,7 +7,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import java.util.List;
public interface ReminderFieldDiff {
IPage<ReminderItemDto> getReminderItemsPage(IPage<ReminderItemDto> equips, MatchItemDto matchItem);
IPage<ReminderItemDto> getReminderItemsPage(List<ReminderItemDto> params, IPage<ReminderItemDto> equips, MatchItemDto matchItem);
List<ReminderItemDto> getReminderItemList(List<ReminderItemDto> equips, MatchItemDto matchItem);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/CommonReminderService.java
View file @ 8f9aa4dc
......@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
......@@ -82,19 +80,9 @@ public class CommonReminderService {
matchItemDto.setEquDefine(registerInfo.getEquDefine());
}
public static IPage<ReminderItemDto> setProjectReminderItemPage(String bizId, Page<ReminderItemDto> page, IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionServiceImpl) {
IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(bizId);
return setProjectReminderItemPageJson(bizId, page, projectContraption);
}
public static List<ReminderItemDto> setProjectReminderItemRealTime(String bizId, IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionServiceImpl) {
IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(bizId);
ReminderItemDto reminderItemDto = new ReminderItemDto();
reminderItemDto.setEquipId(bizId);
reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
reminderItemDto.setEquipName(projectContraption.getProjectContraption());
reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
return Collections.singletonList(reminderItemDto);
return setProjectReminderItemPageJson(bizId, projectContraption);
}
public static MatchItemDto setMatchItemForProject(MatchItemDto matchItemDto, IdxBizJgProjectContraption projectContraption) {
......@@ -123,15 +111,13 @@ public class CommonReminderService {
return re;
}
public static IPage<ReminderItemDto> setProjectReminderItemPageJson(String bizId, Page<ReminderItemDto> page, IdxBizJgProjectContraption projectContraption) {
public static List<ReminderItemDto> setProjectReminderItemPageJson(String bizId, IdxBizJgProjectContraption projectContraption) {
ReminderItemDto reminderItemDto = new ReminderItemDto();
reminderItemDto.setEquipId(bizId);
reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
reminderItemDto.setEquipName(projectContraption.getProjectContraption());
reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
page.setRecords(Collections.singletonList(reminderItemDto));
page.setTotal(1L);
return page;
return Collections.singletonList(reminderItemDto);
}
public void setEquCateInfoForEdit(String record, MatchItemDto matchItemDto) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/RemindServiceImpl.java
View file @ 8f9aa4dc
......@@ -22,7 +22,7 @@ public class RemindServiceImpl {
private final ReminderFactory reminderFactory;
public IPage<ReminderItemDto> getReminderItems(Page<ReminderItemDto> page, String bizId, String bizType, IReminderHandler.SourceType sourceType, Map<String, Object> formData) {
return reminderFactory.getReminderHandler(bizType).remindersPage(page, StringUtils.isEmpty(bizId) ? null : bizId, sourceType, formData);
return reminderFactory.getReminderHandler(bizType).getReminderList(page, StringUtils.isEmpty(bizId) ? null : bizId, sourceType, formData);
}
public Integer getReminderLevel(String bizId, String bizType) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/ReminderFieldDiffImpl.java
View file @ 8f9aa4dc
......@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.TzsJgColumnReminderRule;
import com.yeejoin.amos.boot.module.jg.biz.reminder.core.ReminderFieldDiff;
import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.TzsJgColumnReminderRuleServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.utils.MemoryPageUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -26,11 +27,12 @@ public class ReminderFieldDiffImpl implements ReminderFieldDiff {
private final TzsJgColumnReminderRuleServiceImpl reminderRuleService;
@Override
public IPage<ReminderItemDto> getReminderItemsPage(IPage<ReminderItemDto> page, MatchItemDto matchItem) {
page.getRecords().forEach(reminderItemDto -> {
public IPage<ReminderItemDto> getReminderItemsPage(List<ReminderItemDto> reminderItemDtos, IPage<ReminderItemDto> page, MatchItemDto matchItem) {
reminderItemDtos.forEach(reminderItemDto -> {
reminderItemDto.setItems(this.buildRemindItem(reminderItemDto, matchItem));
});
return page;
List<ReminderItemDto> itemDtoListMissing = reminderItemDtos.stream().filter(item -> !item.getItems().isEmpty()).collect(Collectors.toList());
return MemoryPageUtils.paginate(itemDtoListMissing, page.getCurrent(), page.getSize());
}
@Override
......
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 @ 8f9aa4dc
......@@ -1471,6 +1471,7 @@ public class CommonServiceImpl implements ICommonService {
Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode"));
jsonObject.put("historySubmitType", historySubmitType);
jsonObject.put("historyEquType", historyEquType);
Map<String, Function<JSONObject, Object>> handlerMap = new HashMap<>();
handlerMap.put("unit", jgUseRegistrationServiceImpl::handleUnitHistoryEquip);
......
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 @ 8f9aa4dc
......@@ -164,6 +164,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 新增修改标识
private static final String OPERATESAVE = "save";
private static final String OPERATEEDIT = "edit";
private static final String ADD = "add";
private static final String EDIT = "edit";
//市区县
private static final String CITY = "CITY";
private static final String COUNTY = "COUNTY";
......@@ -550,6 +554,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
projectContraption.setUscUnitCreditCode(companyInfoMap.get("creditCode").toString());
}
projectContraption.setIsFirstMerge(false);
if ("add".equals(submitType)) {
projectContraption.setCreateDate(date);
}
idxBizJgProjectContraptionService.saveOrUpdateData(projectContraption);
List<IdxBizJgUseInfo> useInfoList = initializeList();
......@@ -604,6 +611,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
useInfo.setRecord(record);
useInfo.setSequenceNbr(null);
useInfo.setRecDate(date);
useInfo.setCreateDate(date);
useInfo.setDataSource(dataSource);
useInfo.setIsIntoManagement(Boolean.FALSE);
if (companyTypeStr.contains(CompanyTypeEnum.USE.getCode()) || companyTypeStr.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
......@@ -1106,9 +1114,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 设备注册信息
Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "");
if (!ValidationUtil.isEmpty(equIpClassMap)) {
equIpClassMap.put(DATA_SOURCE,equipInfoMap.get(DATA_SOURCE));
resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
}
equipInfoMap.put("companyLevel", companyLevel);
equipInfoMap.put("type", equIpClassMap.get("type"));
// 设备参数
if (equIpClassMap.containsKey(EQU_LIST) && !ValidationUtil.isEmpty(equIpClassMap.get(EQU_LIST).toString())) {
Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get(EQU_LIST).toString());
......@@ -1469,6 +1479,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
}
objMap.put(DATA_SOURCE_NAME, EquipSourceEnum.getDataSourceName(useInfo.getDataSource()));
objMap.put(DATA_SOURCE, EquipSourceEnum.getDataSourceType(useInfo.getDataSource()));
// 设计制造
IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(designInfo)) {
......@@ -3299,7 +3310,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 其他信息
IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
// 检验检测 【新增时】 固定式压力容器（2100）和 气瓶（2300）可以添加检验检测信息
if ("add".equals(submitType) || isCopy) {
if (ADD.equals(submitType) || isCopy) {
// 历史无证设备创建且是检验信息齐全时才创建检验信息
if (dataSource.contains("jg_his_black") && InspectIsInPeriodEnum.IN_PERIOD_YES.getValue().equals(registerInfo.getInInspectionPeriod())) {
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
......@@ -3363,6 +3374,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
useInfo.setUseUnitCreditCode(companyInfoMap.get("creditCode").toString());
useInfo.setUseUnitName(companyInfoMap.get("companyName").toString());
}
if (OPERATESAVE.equals(operateType)) {
useInfo.setCreateDate(date);
}
if (isCopy) {
// 设备状态置空
......@@ -3629,11 +3643,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
private String getDataSource(String operateType, LinkedHashMap equipmentInfoForm) {
// 数据来源 历史数据his 新数据new
String equipSource = String.valueOf(equipmentInfoForm.get(DATA_SOURCE));
if(OPERATESAVE.equals(operateType)){
return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
} else {
return equipSource;
}
return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
}
public void checkEsData(String id) {
......@@ -3880,6 +3890,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
orgBranchName = "";
orgBranchCode = "";
}
Set<String> recordSet = new HashSet<>();
equipInfoCylinderExcelDtoList.forEach(data -> {
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
if ("his".equals(equipInfoDto.getDataSource()) && "1".equals(data.getWhetherVehicleCylinder())) {
......@@ -3894,6 +3905,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
this.checkUseRegistrationCode(equipInfoDto.getUseOrgCode(), "cylinder");
}
String record = UUID.randomUUID().toString();
recordSet.add(record);
jgRelationEquip.setEquId(record);
jgRelationEquip.setSequenceNbr(sequence.nextId());
jgRelationEquipList.add(jgRelationEquip);
......@@ -3914,6 +3926,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
BeanUtils.copyProperties(data, useInfo);
useInfo.setRecord(record);
useInfo.setRecDate(new Date());
useInfo.setCreateDate(new Date());
useInfo.setDataSource("his".equals(equipInfoDto.getDataSource()) ? "jg_his" : "jg");// 区分历史设备和新增设备
useInfo.setEquState(null);
useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));// 历史气瓶导入为已纳管设备
......@@ -4187,6 +4200,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Optional.of(paramsVesselList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgTechParamsVesselService::saveBatch);
Optional.of(inspectionDetectionInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgInspectionDetectionInfoService::saveBatch);
Optional.of(esEquipmentCategoryList).filter(list -> !list.isEmpty()).ifPresent(esEquipmentCategory::saveAll);
eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), recordSet, EquipCreateOrEditEvent.EquipType.equip));
return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/MemoryPageUtils.java 0 → 100644
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.jg.biz.utils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.Comparator;
import java.util.List;
public class MemoryPageUtils {
/**
* 内存分页（支持排序）
*
* @param dataList 数据列表
* @param current 当前页（从1开始）
* @param size 每页大小
* @param comparator 排序规则（可选，传null表示不排序）
*/
public static <T> IPage<T> paginate(List<T> dataList, long current, long size, Comparator<T> comparator) {
// 1. 参数校验
if (current < 1 || size <= 0) {
throw new IllegalArgumentException("分页参数错误：current >= 1 && size > 0");
}
// 2. 避免空指针
if (dataList == null || dataList.isEmpty()) {
return new Page<>(current, size, 0);
}
// 3. 排序（如果传入了comparator）
if (comparator != null) {
dataList.sort(comparator);
}
// 4. 计算分页区间
long total = dataList.size();
long fromIndex = (current - 1) * size;
if (fromIndex >= total) {
return new Page<>(current, size, total); // 超出范围返回空页
}
// 5. 手动分页
List<T> pageRecords = dataList.subList(
(int) fromIndex,
(int) Math.min(fromIndex + size, total)
);
// 6. 构造IPage对象
IPage<T> page = new Page<>(current, size, total);
page.setRecords(pageRecords);
return page;
}
// 简化版（不排序）
public static <T> IPage<T> paginate(List<T> dataList, long current, long size) {
return paginate(dataList, current, size, null);
}
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/EquipWaitRefreshDataQualityScore.java 0 → 100644
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.ymt.api.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class EquipWaitRefreshDataQualityScore {
private String record;
private Integer dataQualityScore;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ProjectWaitRefreshDataQualityScore.java 0 → 100644
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.ymt.api.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
public class ProjectWaitRefreshDataQualityScore {
private Long projectContraptionId;
private Integer dataQualityScore;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/RefreshDataDto.java 0 → 100644
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.ymt.api.dto;
import lombok.Data;
@Data
public class RefreshDataDto {
private String record;
private Boolean isIntoManagement;
private String useInnerCode;
private String factoryNum;
private String useOrgCode;
private String equList;
private String equCategory;
private String equDefine;
private String whetherVehicleCylinder;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java
View file @ 8f9aa4dc
......@@ -3,10 +3,11 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 管道工程装置表
*
......@@ -306,4 +307,9 @@ public class IdxBizJgProjectContraption extends BaseEntity {
@TableField("data_quality_score")
private String dataQualityScore;
/**
* 创建日期
*/
@TableField("create_date")
private Date createDate;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java
View file @ 8f9aa4dc
......@@ -326,4 +326,11 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
*/
@TableField("\"DATA_QUALITY_SCORE\"")
private Integer dataQualityScore;
/**
* 刷库专用字段
*/
@TableField("\"VERSION\"")
private String version;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java
View file @ 8f9aa4dc
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ymt.api.dto.ProjectWaitRefreshDataQualityScore;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import org.apache.ibatis.annotations.Param;
......@@ -110,4 +111,5 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
List<Map<String, Object>> selectPipelineList(@Param("equIds") List<String> equIds);
void updateDataQualityScoreBatch(@Param("projectContraptions") List<ProjectWaitRefreshDataQualityScore> projectContraptions);
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java
View file @ 8f9aa4dc
package com.yeejoin.amos.boot.module.ymt.api.mapper;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipWaitRefreshDataQualityScore;
import com.yeejoin.amos.boot.module.ymt.api.dto.RefreshDataDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
......@@ -15,4 +18,10 @@ public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
void batchUpdateUseInfo(@Param("records") List<String> records, Integer code);
List<IdxBizJgUseInfo> selectXAList();
List<RefreshDataDto> selectUseInfoOfOneVersion(Integer version);
Integer selectMaxVersion();
void updateDataQualityScoreBatch(@Param("equips") List<EquipWaitRefreshDataQualityScore> refreshDataQualityScores, @Param("version") int version);
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml
View file @ 8f9aa4dc
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper">
<select id="getDetail" resultType="java.util.Map">
SELECT
SEQUENCE_NBR,
......@@ -610,4 +609,10 @@
GROUP BY a.project_contraption_id
) GROUP BY project_contraption_id
</select>
<update id="updateDataQualityScoreBatch">
<foreach collection="projectContraptions" separator=";" item="projectContraption" open="" close="">
UPDATE idx_biz_jg_project_contraption SET data_quality_score = #{projectContraption.dataQualityScore} WHERE sequence_nbr = #{projectContraption.projectContraptionId}
</foreach>
</update>
</mapper>
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml
View file @ 8f9aa4dc
......@@ -8,6 +8,11 @@
#{record}
</foreach>
</update>
<update id="updateDataQualityScoreBatch">
<foreach collection="equips" separator=";" item="equip" open="" close="">
UPDATE idx_biz_jg_use_info SET "DATA_QUALITY_SCORE" = #{equip.dataQualityScore} , "VERSION"=#{version} WHERE record = #{equip.record}
</foreach>
</update>
<select id="selectXAList" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo">
select
u."SEQUENCE_NBR",
......@@ -23,4 +28,31 @@
)
and u."USE_UNIT_NAME" <![CDATA[ <> ]]> ''
</select>
<select id="selectUseInfoOfOneVersion" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.RefreshDataDto">
SELECT
ui.record,
ui.is_into_management,
ui.use_inner_code,
fi.factory_num,
jri.use_org_code,
jri.equ_list,
jri.EQU_CATEGORY,
jri.EQU_DEFINE,
jri.WHETHER_VEHICLE_CYLINDER
from
"idx_biz_jg_use_info" ui
LEFT JOIN idx_biz_jg_register_info jri ON jri.RECORD = ui.RECORD
LEFT JOIN idx_biz_jg_factory_info fi on fi."RECORD" = ui."RECORD"
where
jri.EQU_LIST !='8000'
AND (ui.VERSION <![CDATA[ <> ]]> 1 or ui.VERSION is null)
and jri.EQU_CATEGORY <![CDATA[ <> ]]> ''
and ui.is_into_management is not null
limit 10000
</select>
<select id="selectMaxVersion" resultType="java.lang.Integer">
SELECT
COALESCE(MAX(version),0) as version
FROM "idx_biz_jg_use_info"
</select>
</mapper>
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