From ba66d2d48a0c2f62144e38625c670662f94c64c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Thu, 23 Oct 2025 17:41:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B8=B8=E9=87=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/controller/CurrencyController.java | 30 +++++++++---------- .../mdm/controller/PriceTermsController.java | 9 ++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java index d633561..6181980 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java @@ -1,37 +1,28 @@ package com.xjrsoft.module.mdm.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.mdm.dto.*; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.mdm.dto.LngBCurrencyPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBCurrencyDto; import com.xjrsoft.module.mdm.entity.LngBCurrency; -import com.xjrsoft.module.mdm.entity.LngBPriceTerm; import com.xjrsoft.module.mdm.service.ICurrencyService; import com.xjrsoft.module.mdm.vo.LngBCurrencyPageVo; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.entity.DataChangeLog; -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBCurrencyVo; -import com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo; -import com.xjrsoft.module.mdm.vo.LngBPriceTermVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -97,8 +88,15 @@ public class CurrencyController { @ApiOperation(value = "删除") @SaCheckPermission("currency:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); + } + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBCurrency数据详细日志") + @SaCheckPermission("currency:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); + return R.ok(logs); } @PostMapping("/enable") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 93a289e..0052d2e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -10,6 +10,7 @@ import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBPriceTermPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBPriceTermDto; import com.xjrsoft.module.mdm.entity.LngBPriceTerm; @@ -90,6 +91,14 @@ public class PriceTermsController { return R.ok(dataService.deleteByIds(UpdateLngBPriceTermDto.class, ids)); } + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBPriceTerm数据详细日志") + @SaCheckPermission("priceTerms:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); + return R.ok(logs); + } + @PostMapping("/enable") @ApiOperation(value = "启用LngBPriceTerm") @SaCheckPermission("priceTerms:enable") From 33a4051e9030e27fdafe42d287405d82fd14f21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Thu, 23 Oct 2025 17:50:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?--=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=B8=BB=E9=94=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pictc/utils/DataLogTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index 55a9634..f4f6967 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -136,7 +136,7 @@ public class DataLogTools { public static final String SQL_LIST = "SELECT * FROM ${TBL_NAME} WHERE entity_id = ? ORDER BY operation_time DESC, flow_id DESC"; - public static final Set excludeFields = SetUtils.of("tenantId","dataVersion","createUserId","createDate","modifyUserId","modifyDate","modifyDate","deleteMark"); + public static final Set excludeFields = SetUtils.of("id","tenantId","dataVersion","createUserId","createDate","modifyUserId","modifyDate","modifyDate","deleteMark"); public static DataChangeLog createLog(Class klazz,OperationType type) { From abc5174f3ad0f32e74e326f5c96a1766fdc56d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Thu, 23 Oct 2025 23:28:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?---=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=B1=9E=E6=80=A7=E5=90=8D=E7=A7=B0=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pictc/utils/DataLogTools.java | 2 +- itc-pcitc-mdm/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index f4f6967..3820877 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -910,7 +910,7 @@ public class DataLogTools { DataChangeLogVo fvo = new DataChangeLogVo(); fvo.setId(obj.getId()+"_"+fieldChange.getField()); fvo.setPid(obj.getId()); - fvo.setName(fvo.getName()); + fvo.setName(fieldChange.getName()); fvo.setOldValue(fieldChange.getOldValue()); fvo.setNewValue(fieldChange.getNewValue()); diff --git a/itc-pcitc-mdm/pom.xml b/itc-pcitc-mdm/pom.xml index 974bbc4..fb7a0ec 100644 --- a/itc-pcitc-mdm/pom.xml +++ b/itc-pcitc-mdm/pom.xml @@ -18,6 +18,7 @@ itc-pcitc-mdm-service itc-pcitc-mdm-api + itc-pcitc-mdm-start From 140c2ae87c7a836921f95218b4c92acb00bb232e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Fri, 24 Oct 2025 00:23:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?---=E4=BF=AE=E5=A4=8D=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E5=9C=A8=E4=BF=AE=E6=94=B9=E6=97=B6=E8=A2=AB=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pictc/utils/DataLogTools.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index 3820877..a3c2eea 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -649,8 +649,11 @@ public class DataLogTools { Object newVal = BeanUtils.getFieldValue(item.getField(),entity); Object oldVal = BeanUtils.getFieldValue(item.getField(),old); boolean flag = false; - if((newVal==null && oldVal!=null) || (newVal!=null && oldVal==null)) { - flag = true; + boolean isString = String.class.equals(item.getJavaType()); + if(newVal==null && oldVal!=null) { + flag = isString?StringUtils.isNotEmpty((String)oldVal):true; + }else if(newVal!=null && oldVal==null) { + flag = isString?StringUtils.isNotEmpty((String)newVal):true; }else if(newVal!=null && oldVal!=null && !newVal.equals(oldVal)) { flag = true; } From d00165d58219f133dc1693e1442e7b7ba4696842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Fri, 24 Oct 2025 08:29:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?---=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pictc/utils/DataLogTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index a3c2eea..335a968 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -645,8 +645,8 @@ public class DataLogTools { FieldChange change = new FieldChange(); change.setField(item.getFieldName()); change.setName(item.getName()); + Object newVal = BeanUtils.getFieldValue(item.getField(),entity); if(old!=null) { - Object newVal = BeanUtils.getFieldValue(item.getField(),entity); Object oldVal = BeanUtils.getFieldValue(item.getField(),old); boolean flag = false; boolean isString = String.class.equals(item.getJavaType());