Skip to content

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

feat(大编辑)：管道增减功能开发

1.使用登记支持管道的增减保存及详情展示
parent b83d0441
Hide whitespace changes
Inline Side-by-side
Showing with 721 additions and 93 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/FieldChangeMeta.java
View file @ 245cb21d
......@@ -36,11 +36,6 @@ public class FieldChangeMeta implements Serializable {
private String changeId;
/**
* 非必须字段-业务数据分类：如使用登记、安装告知等
*/
private String bizType;
/**
* 非必须字段-变更数据的分类：如使用信息、制造信息、设计信息、技术参数 - key
*/
private String columnFamily;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/IdxBizJgPipelineOperationHistDto.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 管道删除历史表
*
* @author system_generator
* @date 2025-06-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgPipelineOperationHistDto", description="管道删除历史表")
public class IdxBizJgPipelineOperationHistDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "业务类型枚举")
private String bizType;
@ApiModelProperty(value = "当前单据Id")
private String bizId;
@ApiModelProperty(value = "原始的管道数据")
private String oData;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/PipelineChangeItemDto.java
View file @ 245cb21d
......@@ -34,6 +34,9 @@ public class PipelineChangeItemDto extends TechParamsPipelineChangeFieldDto {
@FieldDisplayDefine(value = "安装单位名称")
private String uscUnitName;
@FieldDisplayDefine(value = "安装日期")
private Date uscDate;
@FieldDisplayDefine(value ="检验类型", dictCode = "JYJC")
private String inspectType;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/IdxBizJgPipelineOperationHist.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.ibatis.type.JdbcType;
import java.util.List;
/**
* 管道删除历史表
*
* @author system_generator
* @date 2025-06-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName(value = "idx_biz_jg_pipeline_operation_hist", autoResultMap = true)
public class IdxBizJgPipelineOperationHist extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 业务类型枚举
*/
@TableField("biz_type")
private String bizType;
/**
* 当前单据Id
*/
@TableField("biz_id")
private String bizId;
/**
* 原始的数据
*/
@TableField("o_data")
private String oData;
/**
* 插入的管道数据
*/
@TableField(value = "insert_pipelines", typeHandler = JacksonTypeHandler.class, jdbcType = JdbcType.VARCHAR)
private List<String> insertPipelines;
/**
* 删除的管道数据
*/
@TableField(value = "delete_pipelines", typeHandler = JacksonTypeHandler.class, jdbcType = JdbcType.VARCHAR)
private List<String> deletedPipelines;
/**
* 版本号
*/
@TableField(value = "version")
private Integer version;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/IdxBizJgPipelineOperationHistMapper.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 管道删除历史表 Mapper 接口
*
* @author system_generator
* @date 2025-06-03
*/
public interface IdxBizJgPipelineOperationHistMapper extends BaseMapper<IdxBizJgPipelineOperationHist> {
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IIdxBizJgPipelineOperationHistService.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.api.service;
/**
* 管道删除历史表接口类
*
* @author system_generator
* @date 2025-06-03
*/
public interface IIdxBizJgPipelineOperationHistService {
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/IdxBizJgPipelineDeleteHistoryMapper.xml 0 → 100644
View file @ 245cb21d
<?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.jg.api.mapper.IdxBizJgPipelineDeleteHistoryMapper">
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 245cb21d
......@@ -872,6 +872,34 @@
ORDER BY ui.REC_DATE DESC
</select>
<select id="queryForUnitPipelineEquipmentForEdit" resultType="java.util.Map">
WITH
-- 获取每个RECORD最新的施工信息
latest_construction AS (
SELECT
"RECORD",
SEQUENCE_NBR AS constructionInfoSeq,
USC_UNIT_NAME AS uscUnitName,
USC_DATE AS uscDate,
ROW_NUMBER() OVER(PARTITION BY "RECORD" ORDER BY USC_DATE DESC) AS rn
FROM idx_biz_jg_construction_info
),
-- 获取每个RECORD最新的检测信息
latest_inspection AS (
SELECT
"RECORD",
SEQUENCE_NBR AS jySeq,
INSPECT_ORG_NAME AS inspectOrgName,
INSPECT_ORG_CODE AS inspectOrgCode,
INSPECT_CONCLUSION AS inspectConclusion,
NEXT_INSPECT_DATE AS nextInspectDate,
INSPECT_REPORT AS inspectReport,
INSPECT_TYPE AS inspectType,
INSPECT_STAFF AS inspectStaff,
INSPECT_DATE AS inspectDate,
INSPECT_REPORT_NO as inspectReportNo,
ROW_NUMBER() OVER(PARTITION BY "RECORD" ORDER BY INSPECT_DATE DESC) AS rn
FROM idx_biz_jg_inspection_detection_info
)
SELECT
ibjtpp."PIPE_NAME" AS pipeName,
ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
......@@ -889,23 +917,29 @@
ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
ibjui."USE_DATE" AS useDate,
ibjui."RECORD" AS record,
(SELECT SEQUENCE_NBR from idx_biz_jg_construction_info where "RECORD" = ibjui."RECORD" ORDER BY USC_DATE DESC limit 1) constructionInfoSeq,
(SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ibjui."RECORD" ORDER BY USC_DATE DESC limit 1) uscUnitName,
to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ibjui."RECORD" ORDER BY USC_DATE DESC limit 1), 'YYYY-MM') uscDate,
(select SEQUENCE_NBR from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) jySeq,
(select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
(select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate,
(select INSPECT_REPORT from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectReport
lc.constructionInfoSeq,
lc.uscUnitName,
to_char(lc.uscDate, 'YYYY-MM-DD') AS uscDate,
li.jySeq,
li.inspectOrgName,
li.inspectOrgCode,
li.inspectConclusion,
li.inspectReport,
li.inspectType,
li.inspectStaff,
to_char(li.inspectDate, 'YYYY-MM-DD') AS inspectDate,
to_char(li.nextInspectDate, 'YYYY-MM-DD') AS nextInspectDate
FROM idx_biz_jg_use_info ibjui
LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
LEFT JOIN latest_construction lc ON lc."RECORD" = ibjui."RECORD" AND lc.rn = 1
LEFT JOIN latest_inspection li ON li."RECORD" = ibjui."RECORD" AND li.rn = 1
WHERE
ibjui.record in
<foreach collection="records" item="record" open="(" close=")" separator=",">
#{record}
</foreach>
ORDER BY ibjui.REC_DATE DESC
ibjui.record in
<foreach collection="records" item="record" open="(" close=")" separator=",">
#{record}
</foreach>
ORDER BY ibjui.REC_DATE DESC
</select>
<sql id="page-list-vessel">
SELECT
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJgPipelineOperationHistController.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgPipelineOperationHistServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.IdxBizJgPipelineOperationHistDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 管道删除历史表
*
* @author system_generator
* @date 2025-06-03
*/
@RestController
@Api(tags = "管道删除历史表Api")
@RequestMapping(value = "/idx-biz-jg-pipeline-delete-history")
public class IdxBizJgPipelineOperationHistController extends BaseController {
@Autowired
IdxBizJgPipelineOperationHistServiceImpl IdxBizJgPipelineOperationHistServiceImpl;
/**
* 新增管道删除历史表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增管道删除历史表", notes = "新增管道删除历史表")
public ResponseModel<IdxBizJgPipelineOperationHistDto> save(@RequestBody IdxBizJgPipelineOperationHistDto model) {
model = IdxBizJgPipelineOperationHistServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新管道删除历史表", notes = "根据sequenceNbr更新管道删除历史表")
public ResponseModel<IdxBizJgPipelineOperationHistDto> updateBySequenceNbrIdxBizJgPipelineOperationHist(@RequestBody IdxBizJgPipelineOperationHistDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(IdxBizJgPipelineOperationHistServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除管道删除历史表", notes = "根据sequenceNbr删除管道删除历史表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(IdxBizJgPipelineOperationHistServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个管道删除历史表", notes = "根据sequenceNbr查询单个管道删除历史表")
public ResponseModel<IdxBizJgPipelineOperationHistDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(IdxBizJgPipelineOperationHistServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "管道删除历史表分页查询", notes = "管道删除历史表分页查询")
public ResponseModel<Page<IdxBizJgPipelineOperationHistDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<IdxBizJgPipelineOperationHistDto> page = new Page<IdxBizJgPipelineOperationHistDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(IdxBizJgPipelineOperationHistServiceImpl.queryForIdxBizJgPipelineOperationHistPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "管道删除历史表列表全部数据查询", notes = "管道删除历史表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<IdxBizJgPipelineOperationHistDto>> selectForList() {
return ResponseHelper.buildResponse(IdxBizJgPipelineOperationHistServiceImpl.queryForIdxBizJgPipelineOperationHistList());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/backup/DefaultEquipBackupManager.java
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl;
import org.springframework.context.ApplicationContext;
import java.util.List;
import java.util.stream.Collectors;
public abstract class DefaultEquipBackupManager implements DataBackupManager {
......@@ -13,15 +17,31 @@ public abstract class DefaultEquipBackupManager implements DataBackupManager {
}
public void backup(String bizId) {
EquipBackupHandler handler= applicationContext.getBean(EquipBackupHandler.class);
handler.compressBackup(getBizType(), getRecords(bizId));
EquipBackupHandler handler = applicationContext.getBean(EquipBackupHandler.class);
handler.backup2Db(getBizType(), bizId, getRecords(bizId));
}
public void restore(String bizId) {
EquipBackupHandler handler= applicationContext.getBean(EquipBackupHandler.class);
EquipBackupHandler handler = applicationContext.getBean(EquipBackupHandler.class);
handler.restoreFormBackup(getBizType(), bizId);
}
public void updateLastOne(String bizId, List<FieldChangeMeta> changeMetas) {
List<String> insertRecord = changeMetas.stream().filter(e -> e.getColumnKey().equals(PieLineDataChangeServiceImpl.PIE_LINE_KEY) && e.getColumnFamily().equals(PieLineDataChangeServiceImpl.PIE_LINE_CREATE)).map(FieldChangeMeta::getColumnNewValue).collect(Collectors.toList());
List<String> deleteRecords = changeMetas.stream().filter(e -> e.getColumnKey().equals(PieLineDataChangeServiceImpl.PIE_LINE_KEY) && e.getColumnFamily().equals(PieLineDataChangeServiceImpl.PIE_LINE_DELETE)).map(FieldChangeMeta::getColumnOldValue).collect(Collectors.toList());
insertRecord.remove(null);
insertRecord.remove("");
deleteRecords.remove(null);
deleteRecords.remove("");
EquipBackupHandler handler = applicationContext.getBean(EquipBackupHandler.class);
handler.updateOperateRecords(bizId, getBizType(), insertRecord, deleteRecords);
}
public List<IdxBizJgPipelineOperationHist> listAll(String bizId){
EquipBackupHandler handler = applicationContext.getBean(EquipBackupHandler.class);
return handler.listBackup(getBizType(), bizId);
}
public abstract List<String> getRecords(String bizId);
public abstract String getBizType();
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/backup/EquipBackupHandler.java
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
@Component
@RequiredArgsConstructor
public class EquipBackupHandler {
public void compressBackup(String bizType, List<String> records) {
private final IdxBizJgPipelineOperationHistServiceImpl pipelineDeleteHistoryService;
private final IdxBizJgOtherInfoServiceImpl otherInfoService;
private final IdxBizJgUseInfoServiceImpl useInfoService;
private final IdxBizJgRegisterInfoServiceImpl registerInfoService;
private final IdxBizJgSupervisionInfoServiceImpl supervisionInfoService;
private final IdxBizJgFactoryInfoServiceImpl factoryInfoService;
private final ESEquipmentCategory equipmentCategory;
public void backup2Db(String bizType, String bizId, List<String> records) {
IdxBizJgPipelineOperationHist deleteHistory = pipelineDeleteHistoryService.getOne(new LambdaQueryWrapper<IdxBizJgPipelineOperationHist>().eq(IdxBizJgPipelineOperationHist::getBizType, bizType).eq(IdxBizJgPipelineOperationHist::getBizId, bizId).orderByDesc(IdxBizJgPipelineOperationHist::getVersion).last("limit 1"));
if (deleteHistory != null) {
// 后续编辑
IdxBizJgPipelineOperationHist newHistory = new IdxBizJgPipelineOperationHist();
BeanUtil.copyProperties(deleteHistory, newHistory);
newHistory.setBizId(bizId);
newHistory.setBizType(bizType);
newHistory.setSequenceNbr(null);
newHistory.setRecDate(new Date());
newHistory.setRecUserId(RequestContext.getExeUserId());
newHistory.setVersion(newHistory.getVersion() + 1);
newHistory.setOData(this.buildDeleteData(records));
pipelineDeleteHistoryService.save(newHistory);
} else {
// 首次编辑
IdxBizJgPipelineOperationHist pipelineDeleteHistory = new IdxBizJgPipelineOperationHist();
pipelineDeleteHistory.setBizType(bizType);
pipelineDeleteHistory.setBizId(bizId);
pipelineDeleteHistory.setRecUserId(RequestContext.getExeUserId());
pipelineDeleteHistory.setRecDate(new Date());
pipelineDeleteHistory.setOData(this.buildDeleteData(records));
pipelineDeleteHistory.setVersion(1);
pipelineDeleteHistoryService.save(pipelineDeleteHistory);
}
}
private String buildDeleteData(List<String> records) {
List<Map<String, Object>> data = records.stream().map(record -> {
Map<String, Object> item = new HashMap<>();
item.put("otherInfo", otherInfoService.getOneData(record));
item.put("registerInfo", registerInfoService.getOneData(record));
item.put("supervisionInfo", supervisionInfoService.getOneData(record));
item.put("factoryInfo", factoryInfoService.getOneData(record));
item.put("useInfo", useInfoService.getOneData(record));
Optional<ESEquipmentCategoryDto> op = equipmentCategory.findById(record);
op.ifPresent(e -> item.put("esInfo", e));
return item;
}).collect(Collectors.toList());
return JSONObject.toJSONString(data);
}
/**
* 在最小版本中恢复数据
*
* @param bizType 业务类型
* @param bizId 业务唯一标识
*/
public void restoreFormBackup(String bizType, String bizId) {
List<IdxBizJgPipelineOperationHist> opHisList = pipelineDeleteHistoryService.list(new LambdaQueryWrapper<IdxBizJgPipelineOperationHist>()
.eq(IdxBizJgPipelineOperationHist::getBizType, bizType)
.eq(IdxBizJgPipelineOperationHist::getBizId, bizId).orderByAsc(IdxBizJgPipelineOperationHist::getVersion));
if (!opHisList.isEmpty()) {
IdxBizJgPipelineOperationHist deleteHistory = opHisList.get(0);
Optional.ofNullable(deleteHistory.getOData()).ifPresent(oData -> {
List<JSONObject> deleteEqs = JSONObject.parseArray(deleteHistory.getOData(), JSONObject.class);
deleteEqs.forEach(eq -> {
IdxBizJgOtherInfo otherInfo = JSONObject.parseObject(eq.getString("otherInfo"), IdxBizJgOtherInfo.class);
IdxBizJgRegisterInfo registerInfo = JSONObject.parseObject(eq.getString("registerInfo"), IdxBizJgRegisterInfo.class);
IdxBizJgSupervisionInfo supervisionInfo = JSONObject.parseObject(eq.getString("supervisionInfo"), IdxBizJgSupervisionInfo.class);
IdxBizJgFactoryInfo factoryInfo = JSONObject.parseObject(eq.getString("factoryInfo"), IdxBizJgFactoryInfo.class);
IdxBizJgUseInfo useInfo = JSONObject.parseObject(eq.getString("useInfo"), IdxBizJgUseInfo.class);
otherInfoService.save(otherInfo);
registerInfoService.save(registerInfo);
supervisionInfoService.save(supervisionInfo);
factoryInfoService.save(factoryInfo);
useInfoService.save(useInfo);
equipmentCategory.save(JSONObject.parseObject(eq.getString("esInfo"), ESEquipmentCategoryDto.class));
});
});
}
}
public void updateOperateRecords(String bizId, String bizType, List<String> insertRecord, List<String> deleteRecords) {
IdxBizJgPipelineOperationHist operationHist = pipelineDeleteHistoryService.getOne(new LambdaQueryWrapper<IdxBizJgPipelineOperationHist>().eq(IdxBizJgPipelineOperationHist::getBizType, bizType).eq(IdxBizJgPipelineOperationHist::getBizId, bizId).orderByDesc(IdxBizJgPipelineOperationHist::getVersion).last("limit 1"));
if (operationHist != null) {
operationHist.setInsertPipelines(insertRecord);
operationHist.setDeletedPipelines(deleteRecords);
pipelineDeleteHistoryService.updateById(operationHist);
}
}
public List<IdxBizJgPipelineOperationHist> listBackup(String bizType, String bizId) {
return pipelineDeleteHistoryService.list(new LambdaQueryWrapper<IdxBizJgPipelineOperationHist>()
.eq(IdxBizJgPipelineOperationHist::getBizType, bizType)
.eq(IdxBizJgPipelineOperationHist::getBizId, bizId).orderByAsc(IdxBizJgPipelineOperationHist::getVersion));
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java
View file @ 245cb21d
......@@ -149,7 +149,7 @@ public class ChangeLogInsertListener {
changeLogDto.setRequestDate(DateUtil.formatDateTime(date));
changeLogDto.setChangeId(changeDataDto.getChangeId());
changeLogDto.setColumnFamily(changeDataDto.getColumnFamily());
changeLogDto.setBizType(changeDataDto.getBizType());
changeLogDto.setBizType(changeLog.getBizType());
changeLogDto.setDisplayOldValue(changeDataDto.getDisplayOldValue());
changeLogDto.setDisplayNewValue(changeDataDto.getDisplayNewValue());
changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
......
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/biz/DefaultBizDataChangeHandler.java
View file @ 245cb21d
......@@ -38,6 +38,7 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
@Override
public final void doSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
if (beforeCheck(bizId, applyNo, model, changeData)) {
preSave(bizId, applyNo, model, changeData);
JSONObject oData = new JSONObject();
BeanUtil.copyProperties(changeData, oData);
// 删除原始提交的变更说明及附件放置后续存放到json
......@@ -45,13 +46,15 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
changeData.remove("changeAttachment");
IEquipChangeDataProcessStrategy dataProcessor = EquipDataProcessStrategyContext.getStrategy(model);
List<FieldChangeMeta> allChangeColumns = dataProcessor.handle(changeData, bizId);
List<FieldChangeMeta> bizEditColumns = updBizData(bizId, applyNo, model, changeData);
List<FieldChangeMeta> bizEditColumns = postSave(bizId, applyNo, model, changeData, allChangeColumns);
allChangeColumns.addAll(bizEditColumns);
// 发送数据变更消息
publish2OtherBiz(allChangeColumns, applyNo, oData, selectedOrgInfo);
}
}
public abstract void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData);
private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject oData, ReginParams selectedOrgInfo) {
// 重复行数据不记录日志（如行政区划编码、行政区划名称，只记录一个字段即可）
List<FieldChangeMeta> noPeatChangeFields = allChangeColumns.stream().filter(f-> !f.getIsRepeatColumn()).collect(Collectors.toList());
......@@ -61,7 +64,7 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
bizRelationDataDto.setBizType(canHandleBizType());
bizRelationDataDto.setRecords(getEqs(applyNo));
bizRelationDataDto.setChangeReason(oData.getString("changeReason"));
bizRelationDataDto.setChangeAttachment(JSONObject.toJSONString(oData.get("changeAttachment")));
bizRelationDataDto.setChangeAttachment(oData.get("changeAttachment") != null ? JSONObject.toJSONString(oData.get("changeAttachment")) : null);
bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
bizRelationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getRealName());
bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
......
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/biz/changeRegistrationReform/ChangeRegistrationReformDataChangeHandler.java
View file @ 245cb21d
......@@ -33,7 +33,7 @@ public class ChangeRegistrationReformDataChangeHandler extends DefaultBizDataCha
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -63,4 +63,9 @@ public class ChangeRegistrationReformDataChangeHandler extends DefaultBizDataCha
projectContraptionIds.remove("");
return projectContraptionIds;
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/changeRegistrationTransfer/ChangeRegistrationTransferDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class ChangeRegistrationTransferDataChangeHandler extends DefaultBizDataC
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class ChangeRegistrationTransferDataChangeHandler extends DefaultBizDataC
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/changeRegistrationUnit/ChangeRegistrationUnitDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class ChangeRegistrationUnitDataChangeHandler extends DefaultBizDataChang
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -64,4 +64,9 @@ public class ChangeRegistrationUnitDataChangeHandler extends DefaultBizDataChang
pIds.remove("");
return pIds;
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/changeVehicleRegistrationUnit/ChangeVehicleRegistrationUnitDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class ChangeVehicleRegistrationUnitDataChangeHandler extends DefaultBizDa
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class ChangeVehicleRegistrationUnitDataChangeHandler extends DefaultBizDa
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/enableDisable/EnableDisableDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class EnableDisableDataChangeHandler extends DefaultBizDataChangeHandler<
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class EnableDisableDataChangeHandler extends DefaultBizDataChangeHandler<
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/equipTransfer/EquipTransferDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class EquipTransferDataChangeHandler extends DefaultBizDataChangeHandler<
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -64,4 +64,9 @@ public class EquipTransferDataChangeHandler extends DefaultBizDataChangeHandler<
pIds.remove("");
return pIds;
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/installNotice/InstallNoticeDataChangeHandler.java
View file @ 245cb21d
......@@ -33,7 +33,7 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -62,4 +62,9 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
projectContraptionIds.remove("");
return projectContraptionIds;
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/maintainNotice/MaintainNoticeDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class MaintainNoticeDataChangeHandler extends DefaultBizDataChangeHandler
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class MaintainNoticeDataChangeHandler extends DefaultBizDataChangeHandler
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/maintenanceContract/MaintenanceContractDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class MaintenanceContractDataChangeHandler extends DefaultBizDataChangeHa
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class MaintenanceContractDataChangeHandler extends DefaultBizDataChangeHa
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/newEquip/NewEquipDataChangeHandler.java
View file @ 245cb21d
......@@ -29,7 +29,7 @@ public class NewEquipDataChangeHandler extends DefaultBizDataChangeHandler<BaseB
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -52,4 +52,9 @@ public class NewEquipDataChangeHandler extends DefaultBizDataChangeHandler<BaseB
public Set<String> getProjectContraptionIds(String record) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/newProject/NewProjectDataChangeHandler.java
View file @ 245cb21d
......@@ -29,7 +29,7 @@ public class NewProjectDataChangeHandler extends DefaultBizDataChangeHandler<Bas
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -52,4 +52,9 @@ public class NewProjectDataChangeHandler extends DefaultBizDataChangeHandler<Bas
public Set<String> getProjectContraptionIds(String projectContraptionId) {
return Collections.singleton(projectContraptionId);
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/reformNotice/ReformNoticeDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class ReformNoticeDataChangeHandler extends DefaultBizDataChangeHandler<B
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class ReformNoticeDataChangeHandler extends DefaultBizDataChangeHandler<B
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/scrapCancel/ScrapCancelDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class ScrapCancelDataChangeHandler extends DefaultBizDataChangeHandler<Ba
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -60,4 +60,9 @@ public class ScrapCancelDataChangeHandler extends DefaultBizDataChangeHandler<Ba
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/biz/strategy/IBizDataChangeHandleStrategy.java
View file @ 245cb21d
......@@ -42,12 +42,13 @@ public interface IBizDataChangeHandleStrategy {
/**
* 保存
*
* @param bizId 设备record或者装置id
* @param applyNo 单据编号
* @param model @see ModelType
* @param changeData 变更数据
* @param bizId 设备record或者装置id
* @param applyNo 单据编号
* @param model @see ModelType
* @param changeData 变更数据
* @param allChangeColumns 变化的字段
*/
List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData);
List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns);
/**
......
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/biz/transferNotice/TransferNoticeDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class TransferNoticeDataChangeHandler extends DefaultBizDataChangeHandler
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class TransferNoticeDataChangeHandler extends DefaultBizDataChangeHandler
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/backup/UseRegisterBackupManager.java → 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/biz/useRegister/UseRegisterBackupManager.java
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.edit.backup.DefaultEquipBackupManager;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
......@@ -21,8 +23,8 @@ public class UseRegisterBackupManager extends DefaultEquipBackupManager {
@Override
public List<String> getRecords(String bizId) {
List<JgUseRegistrationEqDto> eqDtoList = jgUseRegistrationEqService.queryForJgUseRegistrationEqList(bizId);
return eqDtoList.stream().map(JgUseRegistrationEqDto::getEquId).collect(Collectors.toList());
List<JgUseRegistrationEq> eqDtoList = jgUseRegistrationEqService.list(new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, bizId));
return eqDtoList.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
}
@Override
......
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/biz/useRegister/UseRegisterDataChangeHandler.java
View file @ 245cb21d
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
......@@ -10,15 +11,18 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 使用登记编辑处理器
*/
@Slf4j
@Service
public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<BaseBizDataChangeEvent> {
......@@ -40,20 +44,21 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
/**
* 保存
*
* @param applyNo 单据编号
* @param model @see IBizDataChangeHandleStrategy.ModelType
* @param changeData 前端不支持分组-目前为平铺数据结构
* @param applyNo 单据编号
* @param model @see IBizDataChangeHandleStrategy.ModelType
* @param changeData 前端不支持分组-目前为平铺数据结构
* @param allChangeColumns 变化的字段集合
*/
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
List<FieldChangeMeta> bizEditColumns = new ArrayList<>();
// 1.流程中时-更新单据-业务冗余的字段
this.updateBizInfo(bizId, applyNo, model);
// 流程中时-更新单据-业务冗余的字段、eq表、管道状态,记录本次新增、编辑的管道record集合
this.updateBizInfo(allChangeColumns, bizId, applyNo, model);
return bizEditColumns;
}
private void updateBizInfo(String bizId, String applyNo, ModelType model) {
useRegisterUpdateService.updateBizInfo(bizId, applyNo, model);
private void updateBizInfo(List<FieldChangeMeta> allChangeColumns, String bizId, String applyNo, ModelType model) {
useRegisterUpdateService.updateBizInfo(allChangeColumns, bizId, applyNo, model);
}
@Override
......@@ -63,9 +68,20 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
@Override
public Set<String> getEqs(String applyNo) {
JgUseRegistration useRegistration = useRegisterUpdateService.getJgUseRegistrationService().getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr).eq(JgUseRegistration::getApplyNo, applyNo));
JgUseRegistration useRegistration = useRegisterUpdateService.getJgUseRegistrationService().getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus).eq(JgUseRegistration::getApplyNo, applyNo));
List<JgUseRegistrationEq> eqs = useRegisterUpdateService.getUseRegistrationEqService().list(new LambdaQueryWrapper<JgUseRegistrationEq>().select(JgUseRegistrationEq::getEquId).eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
return eqs.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toSet());
if (useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) { // todo 已完成时查询eq + 流水表记录的通过该业务增加的管道+删除的管道查缉,新增的管道不在eq表，导致管道查询数量少
List<IdxBizJgPipelineOperationHist> backups = useRegisterUpdateService.getUseRegisterBackupManager().listAll(useRegistration.getSequenceNbr() + "");
List<String> insertRecords = backups.stream().flatMap(e -> e.getInsertPipelines().stream()).collect(Collectors.toList());
List<String> deleteRecords = backups.stream().flatMap(e -> e.getDeletedPipelines().stream()).collect(Collectors.toList());
List<String> result = insertRecords.stream()
.filter(record -> !deleteRecords.contains(record))
.collect(Collectors.toList());
List<String> exists = eqs.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
return Stream.concat(result.stream(), exists.stream()).collect(Collectors.toSet());
} else { // todo 流水中时回同步更新eq表 索引无需取流水数据
return eqs.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toSet());
}
}
......@@ -86,4 +102,8 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
useRegisterUpdateService.backupOPipelineData(bizId, applyNo, model);
}
}
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/biz/useRegister/UseRegisterUpdateService.java
View file @ 245cb21d
......@@ -2,24 +2,30 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.ListUtils;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
......@@ -33,54 +39,117 @@ public class UseRegisterUpdateService {
private final JgUseRegistrationEqServiceImpl useRegistrationEqService;
public void updateBizInfo(String bizId, String applyNo, IBizDataChangeHandleStrategy.ModelType model) {
if(model.equals(IBizDataChangeHandleStrategy.ModelType.singleEquip)){
private final UseRegisterBackupManager useRegisterBackupManager;
public void updateBizInfo(List<FieldChangeMeta> allChangeColumns, String bizId, String applyNo, IBizDataChangeHandleStrategy.ModelType model) {
if (model.equals(IBizDataChangeHandleStrategy.ModelType.singleEquip)) {
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus).eq(JgUseRegistration::getApplyNo, applyNo));
// 非管道类设备且非已完成状态时，在编辑后进行内部设备代码的更新
if(!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
if (!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
JSONObject jsonObject = jgUseRegistrationService.getHisData(useRegistration);
IdxBizJgUseInfo bizJgUseInfo = commonEquipDataProcessService.getIdxBizJgUseInfoService().getOneData(bizId);
String useInnerCode = bizJgUseInfo.getUseInnerCode();
jsonObject.put("useInnerCode", useInnerCode);
jgUseRegistrationService.updateHistory(jsonObject, bizId, useRegistration.getSequenceNbr() + "", null );
jgUseRegistrationService.updateHistory(jsonObject, bizId, useRegistration.getSequenceNbr() + "", null);
}
}
// 压力管道的使用登记，在页面进行管道增减后，更新eq表
if(model.equals(IBizDataChangeHandleStrategy.ModelType.singleProject)){
// 压力管道在使用登记页面进行管道增减后，更新eq表、修改管道的状态
if (model.equals(IBizDataChangeHandleStrategy.ModelType.singleProject)) {
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus, JgUseRegistration::getProjectContraptionId, JgUseRegistration::getOriginProjectContraptionIds).eq(JgUseRegistration::getApplyNo, applyNo));
// 仅限于流程中才更新,已完成状态编辑，不操作单据
if(!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
// {非必须，记录一次}首次记录json，用于作废时数据的恢复
this.bakEquipData(useRegistration.getSequenceNbr());
// {必须，公共}按照装置id+非纳管+无使用登记证，查询新增的管道
if (!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) { // 非完成状态更新eq表
// 1.按照装置id+非纳管状态，查询新增的管道
List<JgUseRegistrationEq> eqsNew = this.getNewPieLines(useRegistration);
// {非必须，合并的才有}按照原装置id
// 2.按照原装置id,查询剩余的管道
List<JgUseRegistrationEq> eqsRemained = this.getRemainedPieLines(useRegistration);
// eq表删除按照equip_transfer_id = useRegistration.id
// 3.eq表删除按照equip_transfer_id = useRegistration.id
this.deleteRelationEq(useRegistration.getSequenceNbr());
// 插入eq表
this.insertRelationEq(useRegistration.getSequenceNbr(), eqsNew.addAll(eqsRemained));
// 4.插入eq表
List<JgUseRegistrationEq> registrationEqs = ListUtils.union(eqsNew, eqsRemained);
this.insertRelationEq(useRegistration.getSequenceNbr(), registrationEqs);
} else { // 完成时，把管道更新为已纳管状态
// 按照装置id查询装置下管道，更新为已纳管状态
List<IdxBizJgUseInfo> useInfos = jgUseRegistrationService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, useRegistration.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr));
useInfos.parallelStream().forEach(e -> {
LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TzsBaseEntity::getSequenceNbr, e.getSequenceNbr());
updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, true);
jgUseRegistrationService.getIdxBizJgUseInfoService().update(updateWrapper);
});
}
// 记录本次维护管道的日志
this.updatePipelineData(allChangeColumns, applyNo, model);
}
}
private void insertRelationEq(Long sequenceNbr, boolean b) {
/**
* 备份原始数据
*
* @param bizId 装置id
* @param applyNo 单据号
* @param model 类型
*/
public void backupOPipelineData(String bizId, String applyNo, IBizDataChangeHandleStrategy.ModelType model) {
if (model.equals(IBizDataChangeHandleStrategy.ModelType.singleProject)) {
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus, JgUseRegistration::getProjectContraptionId, JgUseRegistration::getOriginProjectContraptionIds).eq(JgUseRegistration::getApplyNo, applyNo));
// 记录json，用于作废时数据的恢复
useRegisterBackupManager.backup(useRegistration.getSequenceNbr() + "");
}
}
private void deleteRelationEq(Long sequenceNbr) {
/**
* 更新删除、新增的管道
*
* @param changeMetas 记录
* @param applyNo 单据号
* @param model 类型
*/
public void updatePipelineData(List<FieldChangeMeta> changeMetas, String applyNo, IBizDataChangeHandleStrategy.ModelType model) {
// 压力管道的使用登记，在页面进行管道增减后，更新eq表
if (model.equals(IBizDataChangeHandleStrategy.ModelType.singleProject)) {
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus, JgUseRegistration::getProjectContraptionId, JgUseRegistration::getOriginProjectContraptionIds).eq(JgUseRegistration::getApplyNo, applyNo));
// 更新本次新增或者编辑的管道record
useRegisterBackupManager.updateLastOne(useRegistration.getSequenceNbr() + "", changeMetas);
}
}
private void insertRelationEq(Long sequenceNbr, List<JgUseRegistrationEq> eqs) {
eqs.forEach(e -> {
e.setRecDate(new Date());
e.setRecUserId(RequestContext.getExeUserId());
e.setEquipTransferId(sequenceNbr + "");
});
jgUseRegistrationService.getJgUseRegistrationEqService().saveBatch(eqs);
}
private void deleteRelationEq(Long sequenceNbr) {
jgUseRegistrationService.getJgUseRegistrationEqService().remove(new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr));
}
private List<JgUseRegistrationEq> getRemainedPieLines(JgUseRegistration useRegistration) {
return null;
String pIds = useRegistration.getOriginProjectContraptionIds();
if (pIds != null && !pIds.isEmpty()) {
List<IdxBizJgUseInfo> useInfos = jgUseRegistrationService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().in(IdxBizJgUseInfo::getProjectContraptionId, Arrays.asList(pIds.split(","))));
return buildEqs(useRegistration, useInfos);
}
return new ArrayList<>();
}
private List<JgUseRegistrationEq> getNewPieLines(JgUseRegistration useRegistration) {
return null;
private List<JgUseRegistrationEq> buildEqs(JgUseRegistration useRegistration, List<IdxBizJgUseInfo> useInfos) {
return useInfos.stream().map(u -> {
JgUseRegistrationEq useEq = new JgUseRegistrationEq();
useEq.setEquId(u.getRecord());
useEq.setEquipTransferId(useRegistration.getSequenceNbr() + "");
useEq.setOriginProjectContraptionId(useRegistration.getProjectContraptionId());
return useEq;
}).collect(Collectors.toList());
}
private void bakEquipData(Long sequenceNbr) {
private List<JgUseRegistrationEq> getNewPieLines(JgUseRegistration useRegistration) {
List<IdxBizJgUseInfo> useInfos = jgUseRegistrationService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, useRegistration.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false));
return buildEqs(useRegistration, useInfos);
}
}
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/biz/vehicleInformation/VehicleInformationDataChangeHandler.java
View file @ 245cb21d
......@@ -36,7 +36,7 @@ public class VehicleInformationDataChangeHandler extends DefaultBizDataChangeHan
}
@Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> postSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, List<FieldChangeMeta> allChangeColumns) {
return Collections.emptyList();
}
......@@ -61,4 +61,9 @@ public class VehicleInformationDataChangeHandler extends DefaultBizDataChangeHan
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
@Override
public void preSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
}
}
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/CommonEquipDataProcessService.java
View file @ 245cb21d
......@@ -507,7 +507,7 @@ public class CommonEquipDataProcessService {
public void savePieLineTechParam(String record, List<FieldChangeMeta> allChange, TechParamsPipelineChangeFieldDto newPipeline) {
IdxBizJgTechParamsPipeline techParamsPipeline = iIdxBizJgTechParamsPipelineService.getOneData(record);
// 技术参数对象转换为全部技术参数 ，其他无用字段去掉
TechParamsPipelineChangeFieldDto oldPipeline = BeanUtil.copyProperties(techParamsPipeline, TechParamsPipelineChangeFieldDto.class);
TechParamsPipelineChangeFieldDto oldPipeline = techParamsPipeline != null ? BeanUtil.copyProperties(techParamsPipeline, TechParamsPipelineChangeFieldDto.class) : new TechParamsPipelineChangeFieldDto();
// 字段行转列
List<FieldChangeMeta> newPipelineChangeData = convertBeanField2Column2(newPipeline, record);
List<FieldChangeMeta> oldPipelineChangeData = convertBeanField2Column2(oldPipeline, record);
......
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/EquipChangeDataUpdateServiceImpl.java
View file @ 245cb21d
......@@ -364,8 +364,10 @@ public class EquipChangeDataUpdateServiceImpl {
Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
if (optional.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
esEquipmentCategoryDto.setNEXT_INSPECT_DATE(DateUtil.parse(DateUtil.format(equipUseInfoChangeDataDto.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)).getTime());
esEquipmentCategory.save(esEquipmentCategoryDto);
if(equipUseInfoChangeDataDto.getNextInspectDate() != null) {
esEquipmentCategoryDto.setNEXT_INSPECT_DATE(DateUtil.parse(DateUtil.format(equipUseInfoChangeDataDto.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)).getTime());
esEquipmentCategory.save(esEquipmentCategoryDto);
}
}
}
......
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 @ 245cb21d
......@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgSupervisionInfoServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgTechParamsPipelineServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import lombok.RequiredArgsConstructor;
......@@ -25,9 +26,15 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class PieLineDataChangeServiceImpl {
public static final String PIE_LINE_DELETE = "pie_line_delete";
public static final String PIE_LINE_CREATE = "pie_line_create";
public static final String PIE_LINE_KEY = "record";
private final IdxBizJgSupervisionInfoServiceImpl supervisionInfoService;
private ESEquipmentCategory esEquipmentCategory;
private final ESEquipmentCategory esEquipmentCategory;
private final SuperviseInfoMapper superviseInfoMapper;
......@@ -37,6 +44,8 @@ public class PieLineDataChangeServiceImpl {
private final EquipChangeDataUpdateServiceImpl equipChangeDataUpdateServiceImpl;
private final IdxBizJgTechParamsPipelineServiceImpl idxBizJgTechParamsPipelineService;
private final SnowflakeIdUtil idUtil;
......@@ -110,12 +119,14 @@ public class PieLineDataChangeServiceImpl {
recordsForDeleted.forEach(record -> {
FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
fieldChangeMeta.setChangeId(projectContraptionId);
fieldChangeMeta.setColumnKey("record");
fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
fieldChangeMeta.setChangeId(projectContraptionId + "/" + record);
fieldChangeMeta.setColumnLabel("管道删除");
fieldChangeMeta.setColumnType("String");
fieldChangeMeta.setFieldDisplayDefine(null);
fieldChangeMeta.setColumnFamily("pie_line_delete");
fieldChangeMeta.setColumnFamily(PIE_LINE_DELETE);
fieldChangeMeta.setColumnNewValue(null);
fieldChangeMeta.setIsRepeatColumn(false);
fieldChangeMeta.setDisplayNewValue(null);
fieldChangeMeta.setColumnOldValue(record);
fieldChangeMeta.setDisplayOldValue(record);
......@@ -210,6 +221,7 @@ public class PieLineDataChangeServiceImpl {
pipelineInfo.setRecDate(new Date());
pipelineInfo.setSequenceNbr(null);
}
idxBizJgTechParamsPipelineService.save(pipelineInfo);
registerInfo.setProductName(pipelineInfo.getPipeName());
commonEquipDataProcessService.getJgRegisterInfoService().save(registerInfo);
......@@ -228,6 +240,7 @@ public class PieLineDataChangeServiceImpl {
esEquipmentDto.setEQU_DEFINE_CODE(projectContraptionChangeDataDto.getEquDefine());
esEquipmentDto.setEQU_DEFINE(projectContraptionChangeDataDto.getEquDefineName());
esEquipmentDto.setSTATUS("已认领");
esEquipmentDto.setIS_INTO_MANAGEMENT(false);
esEquipmentDto.setUSC_UNIT_CREDIT_CODE(projectContraptionChangeDataDto.getUscUnitCreditCode());
esEquipmentDto.setUSC_UNIT_NAME(projectContraptionChangeDataDto.getUscUnitName());
esEquipmentDto.setUSE_UNIT_CREDIT_CODE(projectContraptionChangeDataDto.getUseUnitCreditCode());
......@@ -244,13 +257,16 @@ public class PieLineDataChangeServiceImpl {
private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns) {
FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId());
fieldChangeMeta.setColumnKey("record");
fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
fieldChangeMeta.setColumnLabel("管道新增");
fieldChangeMeta.setColumnType("String");
fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId() + "/" + record);
fieldChangeMeta.setFieldDisplayDefine(null);
fieldChangeMeta.setColumnFamily("pie_line_create");
fieldChangeMeta.setColumnFamily(PIE_LINE_CREATE);
fieldChangeMeta.setColumnNewValue(record);
fieldChangeMeta.setDisplayNewValue(record);
fieldChangeMeta.setIsRepeatColumn(false);
fieldChangeMeta.setDisplayNewValue(record);
fieldChangeMeta.setColumnOldValue(null);
fieldChangeMeta.setDisplayOldValue(null);
allChangeColumns.add(fieldChangeMeta);
......
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/IdxBizJgPipelineOperationHistServiceImpl.java 0 → 100644
View file @ 245cb21d
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.yeejoin.amos.boot.module.jg.api.mapper.IdxBizJgPipelineOperationHistMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IIdxBizJgPipelineOperationHistService;
import com.yeejoin.amos.boot.module.jg.api.dto.IdxBizJgPipelineOperationHistDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 管道删除历史表服务实现类
*
* @author system_generator
* @date 2025-06-03
*/
@Service
public class IdxBizJgPipelineOperationHistServiceImpl extends BaseService<IdxBizJgPipelineOperationHistDto,IdxBizJgPipelineOperationHist,IdxBizJgPipelineOperationHistMapper> implements IIdxBizJgPipelineOperationHistService {
/**
* 分页查询
*/
public Page<IdxBizJgPipelineOperationHistDto> queryForIdxBizJgPipelineOperationHistPage(Page<IdxBizJgPipelineOperationHistDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgPipelineOperationHistDto> queryForIdxBizJgPipelineOperationHistList() {
return this.queryForList("" , false);
}
}
\ 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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 245cb21d
......@@ -305,6 +305,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
@Autowired
private CommonServiceImpl commonServiceImpl;
public IdxBizJgRegisterInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
}
/**
* 将对象的属性由驼峰转为纯大写下划线格式
*
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsPipeline.java
View file @ 245cb21d
......@@ -2,6 +2,7 @@ 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.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
......
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