geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shunyi.kuang
2026-01-22 16:11:35 +08:00
parent 0b50834d08 f2b874fceb
commit 237a6e173d
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java
View File

@ -136,8 +136,8 @@ public class BankController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
codeRuleClient.useEncode(BANK_CODE); codeRuleClient.useEncode(BANK_CODE);
UpdateLngBBankDto obj =content.getObj(); UpdateLngBBankDto obj = content.getObj();
tranProvider.saveData(obj.getCode(), obj.getFullName()); tranProvider.saveData(obj.getCode(),obj);
return obj; return obj;
} }
})); }));
@ -162,7 +162,7 @@ public class BankController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngBBankDto obj =content.getObj(); UpdateLngBBankDto obj =content.getObj();
tranProvider.saveData(obj.getCode(), obj.getFullName()); tranProvider.saveData(obj.getCode(), obj);
return obj; return obj;
} }
})); }));

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -141,7 +141,7 @@ public class CountryRegionController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngBRegionDto obj = content.getObj(); UpdateLngBRegionDto obj = content.getObj();
tranProvider.saveData(obj.getCode(), obj.getFullName()); tranProvider.saveData(obj.getCode(), obj);
return content.getObj(); return content.getObj();
} }
})); }));
@ -177,7 +177,7 @@ public class CountryRegionController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngBRegionDto obj = content.getObj(); UpdateLngBRegionDto obj = content.getObj();
tranProvider.saveData(obj.getCode(), obj.getFullName()); tranProvider.saveData(obj.getCode(), obj);
return content.getObj(); return content.getObj();
} }
})); }));

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java
View File

@ -48,7 +48,7 @@ public class CurrencyServiceImpl extends ServiceImpl<LngBCurrencyMapper, LngBCur
this.checkParams(dto); this.checkParams(dto);
UpdateLngBCurrencyDto res = DataLogTools.insert(dto); UpdateLngBCurrencyDto res = DataLogTools.insert(dto);
this.addOrUpdateAfter(res.getId()); this.addOrUpdateAfter(res.getId());
tranProvider.saveData(dto.getCode(), dto.getFullName()); tranProvider.saveData(dto.getCode(), dto);
return res.getId(); return res.getId();
} }
@ -92,7 +92,7 @@ public class CurrencyServiceImpl extends ServiceImpl<LngBCurrencyMapper, LngBCur
this.checkParams(dto); this.checkParams(dto);
DataLogTools.update(dto); DataLogTools.update(dto);
this.addOrUpdateAfter(dto.getId()); this.addOrUpdateAfter(dto.getId());
tranProvider.saveData(dto.getCode(), dto.getFullName()); tranProvider.saveData(dto.getCode(), dto);
return true; return true;
} }

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/LNGStationServiceImpl.java
View File

@ -52,7 +52,7 @@ public class LNGStationServiceImpl extends ServiceImpl<LngBStationLngMapper, Lng
UpdateLngBStationLngDto res = DataLogTools.insert(dto); UpdateLngBStationLngDto res = DataLogTools.insert(dto);
codeRuleClient.useEncode(STATIONCODE); codeRuleClient.useEncode(STATIONCODE);
this.addOrUpdateAfter(res.getId()); this.addOrUpdateAfter(res.getId());
tranProvider.saveData(dto.getCode(), dto.getFullName()); tranProvider.saveData(dto.getCode(), dto);
return res.getId(); return res.getId();
} }
@ -86,7 +86,7 @@ public class LNGStationServiceImpl extends ServiceImpl<LngBStationLngMapper, Lng
this.checkParams(dto); this.checkParams(dto);
DataLogTools.update(dto); DataLogTools.update(dto);
this.addOrUpdateAfter(dto.getId()); this.addOrUpdateAfter(dto.getId());
tranProvider.saveData(dto.getCode(), dto.getFullName()); tranProvider.saveData(dto.getCode(), dto);
return true; return true;
} }

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java
View File

@ -126,7 +126,7 @@ public class CustomerController {
} }
codeRuleClient.useEncode(CUSTOMER_CODE); codeRuleClient.useEncode(CUSTOMER_CODE);
UpdateLngCustomerDto obj =content.getObj(); UpdateLngCustomerDto obj =content.getObj();
tranProvider.saveData(obj.getCuCode(), obj.getCuName()); tranProvider.saveData(obj.getCuCode(), obj);
return obj; return obj;
} }
})); }));
@ -153,7 +153,7 @@ public class CustomerController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngCustomerDto obj =content.getObj(); UpdateLngCustomerDto obj =content.getObj();
tranProvider.saveData(obj.getCuCode(), obj.getCuName()); tranProvider.saveData(obj.getCuCode(), obj);
return obj; return obj;
} }
})); }));

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java
View File

@ -124,7 +124,7 @@ public class GradeSystemController {
} }
codeRuleClient.useEncode(GS_CODE); codeRuleClient.useEncode(GS_CODE);
UpdateLngGradeSystemDto obj =content.getObj(); UpdateLngGradeSystemDto obj =content.getObj();
tranProvider.saveData(obj.getId().toString(), obj.getGsName()); tranProvider.saveData(obj.getId().toString(), obj);
return obj; return obj;
} }
}); });
@ -152,7 +152,7 @@ public class GradeSystemController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngGradeSystemDto obj =content.getObj(); UpdateLngGradeSystemDto obj =content.getObj();
tranProvider.saveData(obj.getId().toString(), obj.getGsName()); tranProvider.saveData(obj.getId().toString(), obj);
return obj; return obj;
} }
})); }));

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java
View File

@ -123,7 +123,7 @@ public class SupplierController {
} }
codeRuleClient.useEncode(SUPPLIER_CODE); codeRuleClient.useEncode(SUPPLIER_CODE);
UpdateLngSupplierDto obj =content.getObj(); UpdateLngSupplierDto obj =content.getObj();
tranProvider.saveData(obj.getSuCode(), obj.getSuName()); tranProvider.saveData(obj.getSuCode(), obj);
return obj; return obj;
} }
})); }));
@ -149,7 +149,7 @@ public class SupplierController {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
UpdateLngSupplierDto obj =content.getObj(); UpdateLngSupplierDto obj =content.getObj();
tranProvider.saveData(obj.getSuCode(), obj.getSuName()); tranProvider.saveData(obj.getSuCode(), obj);
return obj; return obj;
} }
})); }));

2
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ spring:
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
profiles: profiles:
active: local active: dev
cloud: cloud:
nacos: #nacos监控 nacos: #nacos监控
config: config: