From 17ebe4463c01bb2967e08211c530b1cacb3e07ea Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 4 Nov 2025 18:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B9=E7=94=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/UpdateLngBBankDto.java | 20 +++------- .../module/mdm/dto/UpdateLngBRegionDto.java | 20 +++------- ...NameController.java => FeeController.java} | 38 +++++++++---------- ...penseNameService.java => IFeeService.java} | 2 +- ...meServiceImpl.java => FeeServiceImpl.java} | 4 +- 5 files changed, 32 insertions(+), 52 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/{ExpenseNameController.java => FeeController.java} (79%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/{IExpenseNameService.java => IFeeService.java} (87%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/{ExpenseNameServiceImpl.java => FeeServiceImpl.java} (95%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java index c5f3fbd..5fec267 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java @@ -1,22 +1,12 @@ package com.xjrsoft.module.mdm.dto; +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + 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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java index 89d47f4..b64e7d5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java @@ -1,22 +1,12 @@ package com.xjrsoft.module.mdm.dto; +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + 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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java similarity index 79% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java index 72d9b5e..2449164 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java @@ -24,7 +24,7 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBFeePageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; -import com.xjrsoft.module.mdm.service.IExpenseNameService; +import com.xjrsoft.module.mdm.service.IFeeService; import com.xjrsoft.module.mdm.vo.LngBFeePageVo; import com.xjrsoft.module.mdm.vo.LngBFeeVo; @@ -42,18 +42,18 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/expenseName") -@Api(value = "/mdm" + "/expenseName",tags = "费用名称代码") +@RequestMapping("/mdm" + "/fee") +@Api(value = "/mdm" + "/fee",tags = "费用名称代码") @AllArgsConstructor -public class ExpenseNameController { +public class FeeController { - private final IExpenseNameService expenseNameService; + private final IFeeService feeService; private final DatalogService dataService; @GetMapping(value = "/page") @ApiOperation(value="LngBFee列表(分页)") - @SaCheckPermission("expenseName:list") + @SaCheckPermission("fee:list") public R page(@Valid LngBFeePageDto dto){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -64,16 +64,16 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) .orderByAsc(LngBFee::getSort,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); - IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); + IPage page = feeService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); return R.ok(pageOutput); } @GetMapping(value = "/info") @ApiOperation(value="根据id查询LngBFee信息") - @SaCheckPermission("expenseName:detail") + @SaCheckPermission("fee:detail") public R info(@RequestParam Long id){ - LngBFee lngBFee = expenseNameService.getById(id); + LngBFee lngBFee = feeService.getById(id); if (lngBFee == null) { return R.error("找不到此数据！"); } @@ -83,21 +83,21 @@ public class ExpenseNameController { @PostMapping @ApiOperation(value = "新增LngBFee") - @SaCheckPermission("expenseName:add") + @SaCheckPermission("fee:add") public R add(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(expenseNameService.add(dto)); + return R.ok(feeService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBFee") - @SaCheckPermission("expenseName:edit") + @SaCheckPermission("fee:edit") public R update(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(expenseNameService.update(dto)); + return R.ok(feeService.update(dto)); } @DeleteMapping @ApiOperation(value = "删除") - @SaCheckPermission("expenseName:delete") + @SaCheckPermission("fee:delete") public R delete(@Valid @RequestBody List ids){ return R.ok(dataService.deleteByIds(UpdateLngBFeeDto.class, ids)); @@ -105,7 +105,7 @@ public class ExpenseNameController { @GetMapping(value = "/datalog") @ApiOperation(value="根据id查询LngBFee数据详细日志") - @SaCheckPermission("expenseName:datalog") + @SaCheckPermission("fee:datalog") public R datalog(@RequestParam Long id){ List logs = dataService.findLogsByEntityId(UpdateLngBFeeDto.class,id); return R.ok(logs); @@ -113,17 +113,17 @@ public class ExpenseNameController { @PostMapping("/enable") @ApiOperation(value = "启用") - @SaCheckPermission("expenseName:enable") + @SaCheckPermission("fee:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(expenseNameService.enable(ids)); + return R.ok(feeService.enable(ids)); } @PostMapping("/disable") @ApiOperation(value = "禁用") - @SaCheckPermission("expenseName:disable") + @SaCheckPermission("fee:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(expenseNameService.disable(ids)); + return R.ok(feeService.disable(ids)); } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java similarity index 87% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java index ca8c26e..e5edff6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java @@ -13,7 +13,7 @@ import com.xjrsoft.module.mdm.entity.LngBFee; * @Version 1.0 */ -public interface IExpenseNameService extends IService { +public interface IFeeService extends IService { Boolean enable(List ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java similarity index 95% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java index 38ca4dc..ecbbb8b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java @@ -19,7 +19,7 @@ import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; import com.xjrsoft.module.mdm.mapper.LngBFeeMapper; -import com.xjrsoft.module.mdm.service.IExpenseNameService; +import com.xjrsoft.module.mdm.service.IFeeService; import lombok.AllArgsConstructor; @@ -31,7 +31,7 @@ import lombok.AllArgsConstructor; */ @Service @AllArgsConstructor -public class ExpenseNameServiceImpl extends ServiceImpl implements IExpenseNameService { +public class FeeServiceImpl extends ServiceImpl implements IFeeService { private final CommonCallService commonCallService;