From 2cb153b332b0514474ce567ab08cb6999e5295a2 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 21 Nov 2025 16:51:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DatalogServiceImpl.java | 32 ++-- .../module/sales/dto/AddLngCustomerDto.java | 6 + .../module/sales/dto/AddLngFileUploadDto.java | 86 +++++++++++ .../sales/dto/UpdateLngCustomerDocDto.java | 3 +- .../sales/dto/UpdateLngCustomerDto.java | 11 ++ .../sales/dto/UpdateLngFileUploadDto.java | 107 ++++++++++++++ .../module/sales/vo/LngCustomerVo.java | 6 + .../module/sales/vo/LngFileUploadVo.java | 135 +++++++++++++++++ .../mdm/controller/DocCpController.java | 24 +++ .../impl/CountryRegionServiceImpl.java | 2 +- .../module/sales/entity/LngCustomer.java | 31 +++- .../module/sales/entity/LngFileUpload.java | 138 ++++++++++++++++++ .../sales/mapper/LngFileUploadMapper.java | 17 +++ .../service/impl/CustomerServiceImpl.java | 131 ++++++++++++----- .../src/main/resources/bootstrap-dev.yml | 2 +- 15 files changed, 669 insertions(+), 62 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java index 9fcfdec..9868ee2 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java @@ -18,21 +18,21 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity) { return DataLogTools.insert(entity); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity, DataOperationListener listener) { return DataLogTools.insert(entity,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys) { List res = Lists.newArrayList(); @@ -43,7 +43,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys, DataOperationListener listener) { List res = Lists.newArrayList(); @@ -54,7 +54,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity) { DataLogTools.update(entity); @@ -62,7 +62,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity, DataOperationListener listener) { DataLogTools.update(entity,listener); @@ -70,7 +70,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T delete(T entity) { return DataLogTools.delete(entity); @@ -78,7 +78,7 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id) { return DataLogTools.deleteById(klazz, id); @@ -86,28 +86,28 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id, DataOperationListener listener) { return DataLogTools.deleteById(klazz,id,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids) { return DataLogTools.deleteByIds(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.deleteByIds(klazz,ids,listener); } @Transactional(readOnly = true) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List findLogsByEntityId(Class klazz, long dataId) { return DataLogTools.findLogsByEntityId(klazz, dataId); @@ -115,28 +115,28 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids) { return DataLogTools.enable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.enable(klazz,ids,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids) { return DataLogTools.disable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.disable(klazz,ids,listener); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java index bf0740b..4248ef2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java @@ -226,4 +226,10 @@ public class AddLngCustomerDto implements Serializable { */ @ApiModelProperty("lngCustomerContact子表") private List lngCustomerContactList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java new file mode 100644 index 0000000..787cf18 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java @@ -0,0 +1,86 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-21 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_file_upload",name="客户") +public class AddLngFileUploadDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String tableName; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Long tableId; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String columnName; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String fileOrg; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String filePath; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Long filesize; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String docDesc; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Short sort; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java index a0a5721..4dc1f3b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java @@ -96,5 +96,6 @@ public class UpdateLngCustomerDocDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; - + + private String filePath; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java index b93f067..1987055 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -288,4 +288,15 @@ public class UpdateLngCustomerDto implements Serializable { }, caseType = JoinCaseType.FULL, target = UpdateLngCustomerContactDto.class, type = JoinType.MANY) private List lngCustomerContactList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogJoin(name = "lngFileUpload子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY) + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java new file mode 100644 index 0000000..e230d7a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java @@ -0,0 +1,107 @@ +package com.xjrsoft.module.sales.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-21 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_file_upload",name="客户") +public class UpdateLngFileUploadDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @LogField(name="",index=0) + @ApiModelProperty("") + private Long id; + + /** + * + */ + @LogField(name="",index=1) + @ApiModelProperty("") + private String tableName; + + /** + * + */ + @LogField(name="",index=2) + @ApiModelProperty("") + private Long tableId; + + /** + * + */ + @LogField(name="",index=3) + @ApiModelProperty("") + private String columnName; + + /** + * + */ + @LogField(name="",index=4) + @ApiModelProperty("") + private String fileOrg; + + /** + * + */ + @LogField(name="",index=5) + @ApiModelProperty("") + private String filePath; + + /** + * + */ + @LogField(name="",index=6) + @ApiModelProperty("") + private Long filesize; + + /** + * + */ + @LogField(name="",index=7) + @ApiModelProperty("") + private String docDesc; + + /** + * + */ + @LogField(name="",index=8) + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @LogField(name="",index=9) + @ApiModelProperty("") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java index 863df61..fa10322 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java @@ -297,5 +297,11 @@ public class LngCustomerVo { */ @ApiModelProperty("lngCustomerContact子表") private List lngCustomerContactList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java new file mode 100644 index 0000000..1fa1b60 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java @@ -0,0 +1,135 @@ +package com.xjrsoft.module.sales.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-11-21 +* @Version 1.0 +*/ +@Data +public class LngFileUploadVo { + + /** + * + */ + @ApiModelProperty("") + private Long id; + + + /** + * + */ + @ApiModelProperty("") + private String tableName; + + + /** + * + */ + @ApiModelProperty("") + private Long tableId; + + + /** + * + */ + @ApiModelProperty("") + private String columnName; + + + /** + * + */ + @ApiModelProperty("") + private String fileOrg; + + + /** + * + */ + @ApiModelProperty("") + private String filePath; + + + /** + * + */ + @ApiModelProperty("") + private Long filesize; + + + /** + * + */ + @ApiModelProperty("") + private String docDesc; + + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + + /** + * + */ + @ApiModelProperty("") + private Long createUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime createDate; + + + /** + * + */ + @ApiModelProperty("") + private Long modifyUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime modifyDate; + + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + + /** + * + */ + @ApiModelProperty("") + private Long deptId; + + + /** + * + */ + @ApiModelProperty("") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java index 940ac0e..90a89b7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.utils.CollectionUtils; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -24,9 +25,11 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBDocCpPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBDocCpDto; import com.xjrsoft.module.mdm.entity.LngBDocCp; +import com.xjrsoft.module.mdm.entity.LngBRegion; import com.xjrsoft.module.mdm.service.IDocCpService; import com.xjrsoft.module.mdm.vo.LngBDocCpPageVo; import com.xjrsoft.module.mdm.vo.LngBDocCpVo; +import com.xjrsoft.module.mdm.vo.LngBRegionVo; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -122,4 +125,25 @@ public class DocCpController { public R disable(@Valid @RequestBody List ids){ return R.ok(dataService.disable(UpdateLngBDocCpDto.class,ids)); } + + @GetMapping(value = "/queryList") + @ApiOperation(value="LngBDocCp列表(不分页)") + public R list(UpdateLngBDocCpDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()), LngBDocCp::getFullName, dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()), LngBDocCp::getValid, dto.getValid()) + .orderByDesc(LngBDocCp::getCode); + List voList = CollectionUtils.newArrayList(); + List docList = docCpService.list(queryWrapper); + if(docList != null && docList.size() > 0) { + for(LngBDocCp doc:docList) { + LngBDocCpVo vo = new LngBDocCpVo(); + BeanUtil.copyProperties(doc, vo); + voList.add(vo); + } + } + return R.ok(voList); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index cfa30d0..6bc2297 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -148,7 +148,7 @@ public class CountryRegionServiceImpl extends ServiceImpl voList = CollectionUtils.newArrayList(); - if(voList != null && regionList.size() > 0) { + if(regionList != null && regionList.size() > 0) { for(LngBRegion br:regionList) { LngBRegionVo vo = new LngBRegionVo(); BeanUtil.copyProperties(br, vo); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index 0eac77e..aea74c0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -15,6 +15,7 @@ import com.pictc.annotations.datalog.JoinType; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.sales.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -272,8 +273,8 @@ public class LngCustomer implements Serializable { @EntityMapping(thisField = "cuCode", joinField = "cuCode") @LogJoin(name = "客户业务信息", columns = { - @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) - }, caseType = JoinCaseType.NONE, target = LngCustomerAttrPower.class, type = JoinType.MANY) + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngCustomerAttrPower.class, type = JoinType.MANY) private List lngCustomerAttrPowerList; /** * lngCustomerBank @@ -283,8 +284,8 @@ public class LngCustomer implements Serializable { @EntityMapping(thisField = "cuCode", joinField = "cuCode") @LogJoin(name = "客户银行信息", columns = { - @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) - }, caseType = JoinCaseType.NONE, target = LngCustomerBank.class, type = JoinType.MANY) + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngCustomerBank.class, type = JoinType.MANY) private List lngCustomerBankList; /** @@ -295,8 +296,8 @@ public class LngCustomer implements Serializable { @EntityMapping(thisField = "cuCode", joinField = "cuCode") @LogJoin(name = "客户证书信息", columns = { - @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) - }, caseType = JoinCaseType.NONE, target = LngCustomerDoc.class, type = JoinType.MANY) + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngCustomerDoc.class, type = JoinType.MANY) private List lngCustomerDocList; /** @@ -307,9 +308,23 @@ public class LngCustomer implements Serializable { @EntityMapping(thisField = "cuCode", joinField = "cuCode") @LogJoin(name = "客户联系人信息", columns = { - @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.LEFT) - }, caseType = JoinCaseType.NONE, target = LngCustomerContact.class, type = JoinType.MANY) + @LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngCustomerContact.class, type = JoinType.MANY) private List lngCustomerContactList; + + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "tableId") + @LogJoin(name = "lngFileUpload子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY) + private List lngFileUploadList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java new file mode 100644 index 0000000..06de11d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java @@ -0,0 +1,138 @@ +package com.xjrsoft.module.sales.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 客户 +* @Author 管理员 +* @Date: 2025-11-21 +* @Version 1.0 +*/ +@Data +@TableName("lng_file_upload") +@ApiModel(value = "客户对象", description = "客户") +public class LngFileUpload implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @TableId + private Long id; + + /** + * + */ + @ApiModelProperty("") + private String tableName; + + /** + * + */ + @ApiModelProperty("") + private Long tableId; + + /** + * + */ + @ApiModelProperty("") + private String columnName; + + /** + * + */ + @ApiModelProperty("") + private String fileOrg; + + /** + * + */ + @ApiModelProperty("") + private String filePath; + + /** + * + */ + @ApiModelProperty("") + private Long filesize; + + /** + * + */ + @ApiModelProperty("") + private String docDesc; + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java new file mode 100644 index 0000000..191daa8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.sales.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.entity.LngFileUpload; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-11-21 +* @Version 1.0 +*/ +@Mapper +public interface LngFileUploadMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index bd63a71..2c9d2d9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -2,11 +2,13 @@ package com.xjrsoft.module.sales.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.utils.StringUtils; import com.xjrsoft.module.sales.entity.LngCustomerAttrPower; import com.xjrsoft.module.sales.mapper.LngCustomerAttrPowerMapper; import com.xjrsoft.module.sales.entity.LngCustomerBank; import com.xjrsoft.module.sales.mapper.LngCustomerBankMapper; import com.xjrsoft.module.sales.entity.LngCustomerDoc; +import com.xjrsoft.module.sales.entity.LngFileUpload; import com.xjrsoft.module.sales.mapper.LngCustomerDocMapper; import com.xjrsoft.module.sales.entity.LngCustomerContact; import com.xjrsoft.module.sales.mapper.LngCustomerContactMapper; @@ -15,8 +17,10 @@ import com.xjrsoft.module.sales.dto.UpdateLngCustomerBankDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerContactDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerDocDto; import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; +import com.xjrsoft.module.sales.dto.UpdateLngFileUploadDto; import com.xjrsoft.module.sales.entity.LngCustomer; import com.xjrsoft.module.sales.mapper.LngCustomerMapper; +import com.xjrsoft.module.sales.mapper.LngFileUploadMapper; import com.xjrsoft.module.sales.service.ICustomerService; import cn.hutool.core.bean.BeanUtil; @@ -37,12 +41,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class CustomerServiceImpl extends MPJBaseServiceImpl implements ICustomerService { - private final LngCustomerMapper customerLngCustomerMapper; + private final LngCustomerMapper lngCustomerMapper; - private final LngCustomerAttrPowerMapper customerLngCustomerAttrPowerMapper; - private final LngCustomerBankMapper customerLngCustomerBankMapper; - private final LngCustomerDocMapper customerLngCustomerDocMapper; - private final LngCustomerContactMapper customerLngCustomerContactMapper; + private final LngCustomerAttrPowerMapper lngCustomerAttrPowerMapper; + private final LngCustomerBankMapper lngCustomerBankMapper; + private final LngCustomerDocMapper lngCustomerDocMapper; + private final LngCustomerContactMapper lngCustomerContactMapper; + private final LngFileUploadMapper lngFileUploadMapper; @Override @@ -51,32 +56,47 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerAttrPowerList = customerLngCustomerAttrPowerMapper.selectList(Wrappers.lambdaQuery(LngCustomerAttrPower.class).eq(LngCustomerAttrPower::getCuCode, lngCustomer.getCuCode()).select(LngCustomerAttrPower::getId)); + List lngCustomerAttrPowerList = lngCustomerAttrPowerMapper.selectList(Wrappers.lambdaQuery(LngCustomerAttrPower.class).eq(LngCustomerAttrPower::getCuCode, lngCustomer.getCuCode()).select(LngCustomerAttrPower::getId)); List lngCustomerAttrPowerIds = lngCustomerAttrPowerList.stream().map(LngCustomerAttrPower::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 List lngCustomerAttrPowerOldIds = updateLngCustomerDto.getLngCustomerAttrPowerList().stream().map(UpdateLngCustomerAttrPowerDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); @@ -102,18 +122,18 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl 0){ - customerLngCustomerAttrPowerMapper.deleteBatchIds(lngCustomerAttrPowerRemoveIds); + lngCustomerAttrPowerMapper.deleteBatchIds(lngCustomerAttrPowerRemoveIds); } } //********************************* LngCustomerAttrPower 增删改 结束 *******************************************/ @@ -121,7 +141,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerBankList = customerLngCustomerBankMapper.selectList(Wrappers.lambdaQuery(LngCustomerBank.class).eq(LngCustomerBank::getCuCode, lngCustomer.getCuCode()).select(LngCustomerBank::getId)); + List lngCustomerBankList = lngCustomerBankMapper.selectList(Wrappers.lambdaQuery(LngCustomerBank.class).eq(LngCustomerBank::getCuCode, lngCustomer.getCuCode()).select(LngCustomerBank::getId)); List lngCustomerBankIds = lngCustomerBankList.stream().map(LngCustomerBank::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 List lngCustomerBankOldIds = updateLngCustomerDto.getLngCustomerBankList().stream().map(UpdateLngCustomerBankDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); @@ -133,18 +153,18 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl 0){ - customerLngCustomerBankMapper.deleteBatchIds(lngCustomerBankRemoveIds); + lngCustomerBankMapper.deleteBatchIds(lngCustomerBankRemoveIds); } } //********************************* LngCustomerBank 增删改 结束 *******************************************/ @@ -152,7 +172,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerDocList = customerLngCustomerDocMapper.selectList(Wrappers.lambdaQuery(LngCustomerDoc.class).eq(LngCustomerDoc::getCuCode, lngCustomer.getCuCode()).select(LngCustomerDoc::getId)); + List lngCustomerDocList = lngCustomerDocMapper.selectList(Wrappers.lambdaQuery(LngCustomerDoc.class).eq(LngCustomerDoc::getCuCode, lngCustomer.getCuCode()).select(LngCustomerDoc::getId)); List lngCustomerDocIds = lngCustomerDocList.stream().map(LngCustomerDoc::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 List lngCustomerDocOldIds = updateLngCustomerDto.getLngCustomerDocList().stream().map(UpdateLngCustomerDocDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); @@ -162,20 +182,31 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl 0){ - customerLngCustomerDocMapper.deleteBatchIds(lngCustomerDocRemoveIds); + lngCustomerDocMapper.deleteBatchIds(lngCustomerDocRemoveIds); + lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableName, "lng_customer_doc").in(LngFileUpload::getTableId, lngCustomerDocRemoveIds)); + } } //********************************* LngCustomerDoc 增删改 结束 *******************************************/ @@ -183,7 +214,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl lngCustomerContactList = customerLngCustomerContactMapper.selectList(Wrappers.lambdaQuery(LngCustomerContact.class).eq(LngCustomerContact::getCuCode, lngCustomer.getCuCode()).select(LngCustomerContact::getId)); + List lngCustomerContactList = lngCustomerContactMapper.selectList(Wrappers.lambdaQuery(LngCustomerContact.class).eq(LngCustomerContact::getCuCode, lngCustomer.getCuCode()).select(LngCustomerContact::getId)); List lngCustomerContactIds = lngCustomerContactList.stream().map(LngCustomerContact::getId).collect(Collectors.toList()); //原有子表单 没有被删除的主键 List lngCustomerContactOldIds = updateLngCustomerDto.getLngCustomerContactList().stream().map(UpdateLngCustomerContactDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); @@ -195,34 +226,64 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl 0){ - customerLngCustomerContactMapper.deleteBatchIds(lngCustomerContactRemoveIds); + lngCustomerContactMapper.deleteBatchIds(lngCustomerContactRemoveIds); } } //********************************* LngCustomerContact 增删改 结束 *******************************************/ + //********************************* LngFileUpload 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngFileUploadList = lngFileUploadMapper.selectList(Wrappers.lambdaQuery(LngFileUpload.class).eq(LngFileUpload::getTableName, "lng_customer").eq(LngFileUpload::getTableId, lngCustomer.getId()).select(LngFileUpload::getId)); + List lngFileUploadIds = lngFileUploadList.stream().map(LngFileUpload::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngFileUploadOldIds = updateLngCustomerDto.getLngFileUploadList().stream().map(UpdateLngFileUploadDto::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngFileUploadRemoveIds = lngFileUploadIds.stream().filter(item -> !lngFileUploadOldIds.contains(item)).collect(Collectors.toList()); + + for (UpdateLngFileUploadDto lngFileUploadDto : updateLngCustomerDto.getLngFileUploadList()) { + LngFileUpload lngFileUpload = new LngFileUpload(); + BeanUtil.copyProperties(lngFileUploadDto, lngFileUpload); + lngFileUpload.setTableName("lng_customer"); + //如果不等于空则修改 + if (lngFileUpload.getId() != null) { + lngFileUploadMapper.updateById(lngFileUpload); + } + //如果等于空 则新增 + else { + lngFileUpload.setTableId(lngCustomer.getId()); + lngFileUploadMapper.insert(lngFileUpload); + } + } + //已经不存在的id 删除 + if(lngFileUploadRemoveIds.size() > 0){ + lngFileUploadMapper.deleteBatchIds(lngFileUploadRemoveIds); + } + } + //********************************* LngFileUpload 增删改 结束 *******************************************/ return true; } @Override @Transactional(rollbackFor = Exception.class) public Boolean delete(List ids) { - customerLngCustomerMapper.deleteBatchIds(ids); - customerLngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, ids)); - customerLngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, ids)); - customerLngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, ids)); - customerLngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, ids)); - + lngCustomerMapper.deleteBatchIds(ids); + lngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, ids)); + lngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, ids)); + lngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, ids)); + lngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, ids)); + lngFileUploadMapper.delete(Wrappers.lambdaQuery(LngFileUpload.class).in(LngFileUpload::getTableId, ids)); return true; } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml index ac06c3b..dd09976 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml @@ -45,7 +45,7 @@ spring: group: DNE discovery: - ip: 10.0.0.2 + ip: 10.0.0.4 #network-interface: net7 xjrsoft: From 2d3311932841d8664ac8b31392c5555f4b02c08f Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 21 Nov 2025 16:53:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DatalogServiceImpl.java | 32 +++++++++---------- .../src/main/resources/bootstrap-dev.yml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java index 9868ee2..9fcfdec 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java @@ -18,21 +18,21 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity) { return DataLogTools.insert(entity); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity, DataOperationListener listener) { return DataLogTools.insert(entity,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys) { List res = Lists.newArrayList(); @@ -43,7 +43,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys, DataOperationListener listener) { List res = Lists.newArrayList(); @@ -54,7 +54,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity) { DataLogTools.update(entity); @@ -62,7 +62,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity, DataOperationListener listener) { DataLogTools.update(entity,listener); @@ -70,7 +70,7 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T delete(T entity) { return DataLogTools.delete(entity); @@ -78,7 +78,7 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id) { return DataLogTools.deleteById(klazz, id); @@ -86,28 +86,28 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id, DataOperationListener listener) { return DataLogTools.deleteById(klazz,id,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids) { return DataLogTools.deleteByIds(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.deleteByIds(klazz,ids,listener); } @Transactional(readOnly = true) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List findLogsByEntityId(Class klazz, long dataId) { return DataLogTools.findLogsByEntityId(klazz, dataId); @@ -115,28 +115,28 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids) { return DataLogTools.enable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.enable(klazz,ids,listener); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids) { return DataLogTools.disable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 + @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.disable(klazz,ids,listener); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml index dd09976..ac06c3b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml @@ -45,7 +45,7 @@ spring: group: DNE discovery: - ip: 10.0.0.4 + ip: 10.0.0.2 #network-interface: net7 xjrsoft: From a36ab70458705ddd299f6e2f33ddb7d291c118b4 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 21 Nov 2025 18:11:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java index 191daa8..1706efb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngFileUploadMapper.java @@ -1,9 +1,10 @@ package com.xjrsoft.module.sales.mapper; +import org.apache.ibatis.annotations.Mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.sales.entity.LngFileUpload; -import org.apache.ibatis.annotations.Mapper; /** * @title: mapper @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngFileUploadMapper extends MPJBaseMapper { +public interface LngFileUploadMapper extends MPJBaseMapper,BaseMapper { }