From 8cb0ac9b09f5e778d13d20520784fa6c54a2f12f Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 21 Aug 2024 10:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ptController.java => BpmPurchaseAcceptController.java} | 6 +++--- ...haseAcceptMapper.java => BpmPurchaseAcceptMapper.java} | 2 +- ...seAcceptService.java => BpmPurchaseAcceptService.java} | 2 +- ...ServiceImpl.java => BpmPurchaseAcceptServiceImpl.java} | 8 ++++---- .../src/main/resources/bootstrap.yml | 2 +- ...rchaseAcceptMapper.xml => BpmPurchaseAcceptMapper.xml} | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/{PurchaseAcceptController.java => BpmPurchaseAcceptController.java} (93%) rename bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/{PurchaseAcceptMapper.java => BpmPurchaseAcceptMapper.java} (96%) rename bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/{PurchaseAcceptService.java => BpmPurchaseAcceptService.java} (94%) rename bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/{PurchaseAcceptServiceImpl.java => BpmPurchaseAcceptServiceImpl.java} (97%) rename bonus-modules/{bonus-purchase => bonus-task}/src/main/resources/bootstrap.yml (96%) rename bonus-modules/bonus-task/src/main/resources/mapper/{PurchaseAcceptMapper.xml => BpmPurchaseAcceptMapper.xml} (98%) diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java similarity index 93% rename from bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java index 6d2fc79..69794fd 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java @@ -6,7 +6,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.purchase.dto.PurchaseDto; -import com.bonus.purchase.service.PurchaseAcceptService; +import com.bonus.purchase.service.BpmPurchaseAcceptService; import com.bonus.purchase.vo.PurchaseVo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -22,10 +22,10 @@ import java.util.List; */ @RestController @RequestMapping("/acceptance") -public class PurchaseAcceptController extends BaseController { +public class BpmPurchaseAcceptController extends BaseController { @Resource - private PurchaseAcceptService purchaseAcceptService; + private BpmPurchaseAcceptService purchaseAcceptService; /** * 分页查询数据 diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java similarity index 96% rename from bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java index 37fc481..8a3a9eb 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java @@ -10,7 +10,7 @@ import java.util.List; * @Author ma_sh * @create 2024/8/19 16:13 */ -public interface PurchaseAcceptMapper { +public interface BpmPurchaseAcceptMapper { /** * 查询 diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java similarity index 94% rename from bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java index bfccf9c..7a8e3a5 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java @@ -10,7 +10,7 @@ import java.util.List; * @Author ma_sh * @create 2024/8/19 16:13 */ -public interface PurchaseAcceptService { +public interface BpmPurchaseAcceptService { /** * 查询所有 diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java similarity index 97% rename from bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java index 9a4d177..a83d30e 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java @@ -3,8 +3,8 @@ package com.bonus.purchase.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.purchase.dto.PurchaseDto; -import com.bonus.purchase.mapper.PurchaseAcceptMapper; -import com.bonus.purchase.service.PurchaseAcceptService; +import com.bonus.purchase.mapper.BpmPurchaseAcceptMapper; +import com.bonus.purchase.service.BpmPurchaseAcceptService; import com.bonus.purchase.utils.Constants; import com.bonus.purchase.vo.PurchaseVo; import org.springframework.stereotype.Service; @@ -21,10 +21,10 @@ import java.util.stream.Collectors; * @create 2024/8/19 16:48 */ @Service -public class PurchaseAcceptServiceImpl implements PurchaseAcceptService { +public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { @Resource - private PurchaseAcceptMapper mapper; + private BpmPurchaseAcceptMapper mapper; /** * 查询采购单 diff --git a/bonus-modules/bonus-purchase/src/main/resources/bootstrap.yml b/bonus-modules/bonus-task/src/main/resources/bootstrap.yml similarity index 96% rename from bonus-modules/bonus-purchase/src/main/resources/bootstrap.yml rename to bonus-modules/bonus-task/src/main/resources/bootstrap.yml index 3aae338..2d35c48 100644 --- a/bonus-modules/bonus-purchase/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-task/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: bonus-purchase + name: bonus-task profiles: # 环境配置 active: dev diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/PurchaseAcceptMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml similarity index 98% rename from bonus-modules/bonus-task/src/main/resources/mapper/PurchaseAcceptMapper.xml rename to bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml index a8fb26b..ee03191 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/PurchaseAcceptMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml @@ -2,7 +2,7 @@ - + UPDATE bpm_task bt SET bt.`status` = #{purchaseDto.status}