From 48af797f96e950ed11f8ca0e482e9c64085190e9 Mon Sep 17 00:00:00 2001 From: "xuetao.li" Date: Wed, 19 Apr 2023 17:32:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86mapper=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/AdcDaApplication.java | 3 +-- report-activity/pom.xml | 6 ++++++ .../business_activiti/task/TaskController.java | 15 ++++++++------- .../task/TempTestController.java | 2 +- .../task/TodoTaskController.java | 2 +- .../mapper/mysql}/BusProcessApproveMapper.xml | 0 .../mapper/mysql}/BusProcessEntrustMapper.xml | 0 .../mapper/mysql}/BusProcessNameMapper.xml | 0 .../mapper/mysql}/BusProcessNewMapper.xml | 0 9 files changed, 17 insertions(+), 11 deletions(-) rename report-activity/src/main/resources/{mapper => mybatis/mapper/mysql}/BusProcessApproveMapper.xml (100%) rename report-activity/src/main/resources/{mapper => mybatis/mapper/mysql}/BusProcessEntrustMapper.xml (100%) rename report-activity/src/main/resources/{mapper => mybatis/mapper/mysql}/BusProcessNameMapper.xml (100%) rename report-activity/src/main/resources/{mapper => mybatis/mapper/mysql}/BusProcessNewMapper.xml (100%) diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java index 9a68733..9648fc7 100644 --- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java +++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java @@ -11,12 +11,11 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class, org.activiti.spring.boot.SecurityAutoConfiguration.class }) -@ServletComponentScan @ComponentScan("com.adc") public class AdcDaApplication { public static void main(String[] args) { - ApplicationContext applicationContext = SpringApplication.run(AdcDaApplication.class, args); + SpringApplication.run(AdcDaApplication.class, args); } } \ No newline at end of file diff --git a/report-activity/pom.xml b/report-activity/pom.xml index 775cde1..165d0f4 100644 --- a/report-activity/pom.xml +++ b/report-activity/pom.xml @@ -29,6 +29,12 @@ lombok + + com.adc + adc-da-login + 2.5.0 + + com.adc adc-da-sys diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index e76c53d..a339f56 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -25,31 +25,32 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.*; import static com.adc.da.wkflow.util.date.DateTools.disposeApprovalTime; -@Api(description = "流程明细管理") +@Api(tags = "流程明细管理") @RestController @RequestMapping("/task") public class TaskController { - @Autowired + @Resource private HistoryService historyService; - @Autowired + @Resource IUserEoService userEoService; - @Autowired + @Resource private IBusProcessNameService iBusProcessNameService; - @Autowired + @Resource private IBusProcessNewService iBusProcessNewService; - @Autowired + @Resource private IBusProcessApproveService iBusProcessEntrustService; - @Autowired + @Resource private IBusProcessApproveService iBusProcessApproveService; @ApiOperation(value = "流程实例明细列表") diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TempTestController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TempTestController.java index 5c32064..439ee09 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TempTestController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TempTestController.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -@Api(description = "临时测试接口") +@Api(tags = "临时测试接口") @RestController @RequestMapping("/api/temp") public class TempTestController { diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 98bcea0..c81627a 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; import static com.adc.da.wkflow.util.date.DateTools.*; -@Api(description = "待办任务管理") +@Api(tags = "待办任务管理") @RestController @Slf4j public class TodoTaskController { diff --git a/report-activity/src/main/resources/mapper/BusProcessApproveMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml similarity index 100% rename from report-activity/src/main/resources/mapper/BusProcessApproveMapper.xml rename to report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml diff --git a/report-activity/src/main/resources/mapper/BusProcessEntrustMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessEntrustMapper.xml similarity index 100% rename from report-activity/src/main/resources/mapper/BusProcessEntrustMapper.xml rename to report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessEntrustMapper.xml diff --git a/report-activity/src/main/resources/mapper/BusProcessNameMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNameMapper.xml similarity index 100% rename from report-activity/src/main/resources/mapper/BusProcessNameMapper.xml rename to report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNameMapper.xml diff --git a/report-activity/src/main/resources/mapper/BusProcessNewMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml similarity index 100% rename from report-activity/src/main/resources/mapper/BusProcessNewMapper.xml rename to report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml