代码调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -91,11 +91,14 @@ public class CwProjectReportController {
     @ApiLog(value = "签章附件保存", type = LogTypeEnum.SAVE)
     @PostMapping("saveSignFiles")
     public ResponseEntity saveSignFiles(@RequestBody CwProjectReportData reportData) {
+        System.out.println("进入controller前");
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (CollectionUtil.isEmpty(reportData.getCwFileInfoList())) {
             reportData.setCwFileInfoList(new ArrayList<>());
         }
+        System.out.println("进入controller中");
         projectReportService.updateSignatureFiles(reportData.getCwFileInfoList(),userDTO,reportData.getId());
+        System.out.println("进入controller后");
         return ResponseEntity.ok("操作成功");
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -353,6 +353,9 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
     }
 
     public String add(CwProjectReportData dto) throws Exception{
+
+        long l1 = System.currentTimeMillis();
+
         //生成主键id值
         String id = UUID.randomUUID().toString().replace("-", "");
         //获取当前登录人信息
@@ -360,6 +363,9 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         //保存基本信息
         CwProjectReview info = new CwProjectReview();
         BeanUtils.copyProperties(dto, info);
+
+        long l2 = System.currentTimeMillis();
+        System.out.println("addservice1:" + (l2 -l1));
         //报告编号生成
         String documentNo = "";
         String currentToken = TokenProvider.getCurrentToken();
@@ -374,6 +380,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         } else if (info.getReportType().equals("5")){
             documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE5,currentToken);
         }
+        long l3 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l3 -l2));
         info.setId(id);
         info.setReportReviewNo(documentNo);
         info.setCreateById(userDTO.getId());
@@ -382,6 +390,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         info.setUpdateTime(new Date());
         info.setReportId(dto.getId());
         mapper.insert(info);
+        long l4 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l4 -l3));
 //        CwProjectRecords records = new CwProjectRecords();
 //        records.setId(dto.getProjectId());
 //        records.setReportReview("1"); // 已开始报告复核
@@ -399,6 +409,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                 detailMapper.insert(detail);
             }
         }
+        long l5 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l5 -l4));
         return info.getId();
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -2436,14 +2436,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateSignatureFiles(List<ProjectReportWorkAttachmentDTO> list, UserDTO userDTO, String id) {
+        System.out.println("进入service1");
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
         for (ProjectReportWorkAttachmentDTO dto : list) {
             names = names + "," +dto.getUrl();
         }
+        System.out.println("进入service2");
         //查询保存的附件信息
         List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
+        System.out.println("进入service3");
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
@@ -2457,7 +2460,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 }
             }
         }
+        System.out.println("进入service4");
         reportMapper.deleteAttachement(id,"cwReportSignature");
+        System.out.println("进入service5");
         //保存信息
         for (ProjectReportWorkAttachmentDTO dto : list) {
             WorkAttachmentInfo i = new WorkAttachmentInfo();
@@ -2506,6 +2511,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 attachmentMapper.insert(reportFile);
                 j++;
         }
+        System.out.println("进入service6");
     }
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwWorkClientController.java

@@ -104,7 +104,10 @@ public class CwWorkClientController {
     @GetMapping("list_tree")
     public ResponseEntity<IPage<CwWorkClientBaseDTO>> dataTree(CwWorkClientBaseDTO cwWorkClientBaseDTO, Page<CwWorkClientBaseDTO> page) throws Exception {
         IPage<CwWorkClientBaseDTO> result = new Page<CwWorkClientBaseDTO>();
+        long l1 = System.currentTimeMillis();
         result = cwWorkClientService.findListTree (page,cwWorkClientBaseDTO);
+        long l2 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeController:" + (l2-l1));
         return ResponseEntity.ok (result);
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -53,6 +53,8 @@ public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
 
     // 根据客户的id数组查询客户的no(编号)集合
     List<String> getNoByIdArray(@Param("idArray") String[] idArray);
+
+    public IPage<CwWorkClientBaseDTO> getInfoList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -384,4 +384,25 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="getInfoList" resultType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO">
+        select
+        <include refid="Base_Column_List"></include>,
+        su.name as user_name,
+        cw_wct.is_listed as is_listed,
+        cw_wct.ownership_type as ownership_type,
+        cw_wct.final_status_type as final_status_type,
+        cw_mlt.name as manage_level_type_name,
+        cw_ot.name as organization_type_name,
+        su1.name as update_user_name,
+        art.ID_ as task_id
+        from cw_work_client_base cw_wcb
+        left join sys_user su on su.id = cw_wcb.create_by_id and su.del_flag = '0'
+        left join cw_work_client_type cw_wct on cw_wct.client_id = cw_wcb.id and cw_wct.del_flag = '0'
+        left join cw_manage_level_type cw_mlt on cw_mlt.id = cw_wcb.manage_level_type and cw_mlt.del_flag = '0'
+        left join cw_organization_type cw_ot on cw_ot.id = cw_wcb.organization_type and cw_ot.del_flag = '0'
+        left join sys_user su1 on su1.id = cw_wcb.update_user and su1.del_flag = '0'
+        left join act_ru_task art on cw_wcb.proc_ins_id = art.PROC_INST_ID_
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/CwWorkClientService.java

@@ -147,6 +147,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     }
 
     public IPage<CwWorkClientBaseDTO> findListTree(Page<CwWorkClientBaseDTO> page, CwWorkClientBaseDTO cwWorkClientBaseDTO) throws Exception{
+        long l1 = System.currentTimeMillis();
         QueryWrapper<CwWorkClientBase> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("cw_wcb.del_flag","0");
         queryWrapper.orderByDesc("cw_wcb.create_time");
@@ -213,7 +214,12 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
                 }
             }
         }
-        return cwWorkClientBaseMapper.findList(page, queryWrapper);
+        long l2 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeService1:" + (l2-l1));
+        IPage<CwWorkClientBaseDTO> list = cwWorkClientBaseMapper.getInfoList(page, queryWrapper);
+        long l3 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeService2:" + (l3-l2));
+        return list;
     }
 
     public CwWorkClientBaseDTO queryById(String id) {

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance.yml

@@ -1,2 +1,2 @@
-#active: development
-active: production
+active: development
+#active: production

jeeplus-modules/jeeplus-wps/target/classes/bootstrap.yml

@@ -36,6 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
+        username: nacos
+        password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -46,6 +48,8 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocCategoryWrapperImpl.java

@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-16T08:58:29+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
+    date = "2023-08-18T09:17:57+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
 )
 @Component
 public class DocCategoryWrapperImpl implements DocCategoryWrapper {

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocTemplateWrapperImpl.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-16T08:58:29+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
+    date = "2023-08-18T09:17:57+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
 )
 @Component
 public class DocTemplateWrapperImpl implements DocTemplateWrapper {

jeeplus-modules/jeeplus-wps/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon May 22 14:22:17 GMT+08:00 2023
-version=9.0
-groupId=org.jeeplus
-artifactId=jeeplus-wps

jeeplus-modules/jeeplus-wps/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,23 +0,0 @@
-com\jeeplus\wps\ApplicationProperties.class
-com\jeeplus\wps\model\FileModel.class
-com\jeeplus\office\mapper\DocCategoryMapper.class
-com\jeeplus\wps\controller\WebOfficeController.class
-com\jeeplus\office\conroller\DocCategoryController.class
-com\jeeplus\office\conroller\DocTemplateController.class
-com\jeeplus\wps\controller\WpsOfficeController.class
-com\jeeplus\wps\utils\WpsUtils.class
-com\jeeplus\office\service\dto\DocTemplateDTO.class
-com\jeeplus\office\service\DocCategoryService.class
-com\jeeplus\office\mapper\DocTemplateMapper.class
-com\jeeplus\office\domain\DocCategory.class
-com\jeeplus\office\service\DocTemplateService.class
-com\jeeplus\office\service\dto\DocCategoryDTO.class
-com\jeeplus\wps\model\UrlModel.class
-com\jeeplus\office\service\mapstruct\DocTemplateWrapperImpl.class
-com\jeeplus\office\service\mapstruct\DocTemplateWrapper.class
-com\jeeplus\office\service\mapstruct\DocCategoryWrapper.class
-com\jeeplus\wps\controller\OauthController.class
-com\jeeplus\office\service\mapstruct\DocCategoryWrapperImpl.class
-com\jeeplus\wps\utils\WpsUtils$1.class
-com\jeeplus\JeeplusWpsApplication.class
-com\jeeplus\office\domain\DocTemplate.class

jeeplus-modules/jeeplus-wps/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,20 +0,0 @@
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\conroller\DocTemplateController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\mapstruct\DocCategoryWrapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\DocTemplateService.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\domain\DocCategory.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\ApplicationProperties.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\domain\DocTemplate.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\model\FileModel.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\mapper\DocTemplateMapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\model\UrlModel.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\mapstruct\DocTemplateWrapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\conroller\DocCategoryController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\JeeplusWpsApplication.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\DocCategoryService.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\WebOfficeController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\WpsOfficeController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\dto\DocCategoryDTO.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\mapper\DocCategoryMapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\utils\WpsUtils.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\dto\DocTemplateDTO.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\OauthController.java

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/xxl/job/executor/XxlJobExecutorApplication.java

@@ -1,15 +1,17 @@
 package com.xxl.job.executor;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author xuxueli 2018-10-28 00:38:13
  */
 @SpringBootApplication
 @EnableFeignClients
+@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class XxlJobExecutorApplication {
 
     public static void main(String[] args) {