1、添加pom引用

2、注释无用代码

code/pom.xml

@@ -18,12 +18,12 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fly</groupId>
-            <artifactId>fly-generator</artifactId>
-            <version>1.0.hx</version>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fly</groupId>-->
+<!--            <artifactId>fly-generator</artifactId>-->
+<!--            <version>1.0.hx</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

code/src/test/java/BaseDataSource.java

@@ -1,17 +1,17 @@
-import fly.generator.GeneratorApplication;
-
-public class BaseDataSource {
-
-    public static void main(String[] args) {
-        GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("fjhx2012mysql")
-                .password("3PN-Mzn#vnP&q6d")
-                .port(9989)
-                .module("hx-area")
-                .parent("com.fjhx.area")
-                .superServiceClass("com.ruoyi.common.core.service.BaseService")
-                .build();
-    }
-
-}
+//import fly.generator.GeneratorApplication;
+//
+//public class BaseDataSource {
+//
+//    public static void main(String[] args) {
+//        GeneratorApplication.builder()
+//                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+//                .username("fjhx2012mysql")
+//                .password("3PN-Mzn#vnP&q6d")
+//                .port(9989)
+//                .module("hx-area")
+//                .parent("com.fjhx.area")
+//                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+//                .build();
+//    }
+//
+//}

hx-admin/pom.xml

@@ -20,6 +20,14 @@
         </dependency>
 
 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -27,11 +35,30 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

hx-common/pom.xml

@@ -22,6 +22,47 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-base</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!-- 动态数据源 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.3.27</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M2</version>
+        </dependency>
+
     </dependencies>
 
 </project>

hx-common/src/main/java/com/fjhx/common/controller/coding/CodingRuleController.java

@@ -1,44 +1,44 @@
-package com.fjhx.common.controller.coding;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
-import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
-import com.fjhx.common.entity.coding.dto.CodingRuleDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.common.service.coding.CodingRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 编码规则 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-13
- */
-@RestController
-@RequestMapping("/codingRule")
-public class CodingRuleController {
-
-    @Autowired
-    private CodingRuleService codingRuleService;
-
-    /**
-     * 编码规则分页
-     */
-    @PostMapping("/page")
-    public Page<CodingRulePageVo> page(@RequestBody CodingRuleSelectDto dto) {
-        return codingRuleService.getPage(dto);
-    }
-
-    /**
-     * 编码规则编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody CodingRuleDto codingRuleDto) {
-        codingRuleService.edit(codingRuleDto);
-    }
-
-}
+//package com.fjhx.common.controller.coding;
+//
+//import org.springframework.web.bind.annotation.*;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
+//import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
+//import com.fjhx.common.entity.coding.dto.CodingRuleDto;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import com.fjhx.common.service.coding.CodingRuleService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//
+///**
+// * <p>
+// * 编码规则 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-04-13
+// */
+//@RestController
+//@RequestMapping("/codingRule")
+//public class CodingRuleController {
+//
+//    @Autowired
+//    private CodingRuleService codingRuleService;
+//
+//    /**
+//     * 编码规则分页
+//     */
+//    @PostMapping("/page")
+//    public Page<CodingRulePageVo> page(@RequestBody CodingRuleSelectDto dto) {
+//        return codingRuleService.getPage(dto);
+//    }
+//
+//    /**
+//     * 编码规则编辑
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody CodingRuleDto codingRuleDto) {
+//        codingRuleService.edit(codingRuleDto);
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/contract/ContractTemplateController.java

@@ -1,72 +1,72 @@
-package com.fjhx.common.controller.contract;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
-import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
-import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
-import com.fjhx.common.service.contract.ContractTemplateService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 合同模板 前端控制器
- * </p>
- *
- * @author
- * @since 2023-04-14
- */
-@RestController
-@RequestMapping("/contractTemplate")
-public class ContractTemplateController {
-
-    @Autowired
-    private ContractTemplateService contractTemplateService;
-
-    /**
-     * 合同模板分页
-     */
-    @PostMapping("/page")
-    public Page<ContractTemplateVo> page(@Validated @RequestBody ContractTemplateSelectDto dto) {
-        return contractTemplateService.getPage(dto);
-    }
-
-    /**
-     * 合同模板明细
-     */
-    @PostMapping("/detail")
-    public ContractTemplateVo detail(@RequestBody BaseSelectDto dto) {
-        return contractTemplateService.detail(dto.getId());
-    }
-
-    /**
-     * 合同模板新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody ContractTemplateDto contractTemplateDto) {
-        contractTemplateService.add(contractTemplateDto);
-    }
-
-    /**
-     * 合同模板编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody ContractTemplateDto contractTemplateDto) {
-        contractTemplateService.edit(contractTemplateDto);
-    }
-
-    /**
-     * 合同模板删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        contractTemplateService.delete(dto.getId());
-    }
-
-}
+//package com.fjhx.common.controller.contract;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+//import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+//import com.fjhx.common.service.contract.ContractTemplateService;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+///**
+// * <p>
+// * 合同模板 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-04-14
+// */
+//@RestController
+//@RequestMapping("/contractTemplate")
+//public class ContractTemplateController {
+//
+//    @Autowired
+//    private ContractTemplateService contractTemplateService;
+//
+//    /**
+//     * 合同模板分页
+//     */
+//    @PostMapping("/page")
+//    public Page<ContractTemplateVo> page(@Validated @RequestBody ContractTemplateSelectDto dto) {
+//        return contractTemplateService.getPage(dto);
+//    }
+//
+//    /**
+//     * 合同模板明细
+//     */
+//    @PostMapping("/detail")
+//    public ContractTemplateVo detail(@RequestBody BaseSelectDto dto) {
+//        return contractTemplateService.detail(dto.getId());
+//    }
+//
+//    /**
+//     * 合同模板新增
+//     */
+//    @PostMapping("/add")
+//    public void add(@RequestBody ContractTemplateDto contractTemplateDto) {
+//        contractTemplateService.add(contractTemplateDto);
+//    }
+//
+//    /**
+//     * 合同模板编辑
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody ContractTemplateDto contractTemplateDto) {
+//        contractTemplateService.edit(contractTemplateDto);
+//    }
+//
+//    /**
+//     * 合同模板删除
+//     */
+//    @PostMapping("/delete")
+//    public void delete(@RequestBody BaseSelectDto dto) {
+//        contractTemplateService.delete(dto.getId());
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java

@@ -1,71 +1,71 @@
-package com.fjhx.common.controller.corporation;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.corporation.dto.CorporationDto;
-import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
-import com.fjhx.common.entity.corporation.vo.CorporationVo;
-import com.fjhx.common.service.corporation.CorporationService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 多公司配置 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-10
- */
-@RestController
-@RequestMapping("/corporation")
-public class CorporationController {
-
-    @Autowired
-    private CorporationService corporationService;
-
-    /**
-     * 多公司配置分页
-     */
-    @PostMapping("/page")
-    public Page<CorporationVo> page(@RequestBody CorporationSelectDto dto) {
-        return corporationService.getPage(dto);
-    }
-
-    /**
-     * 多公司配置明细
-     */
-    @PostMapping("/detail")
-    public CorporationVo detail(@RequestBody BaseSelectDto dto) {
-        return corporationService.detail(dto.getId());
-    }
-
-    /**
-     * 多公司配置新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody CorporationDto corporationDto) {
-        corporationService.add(corporationDto);
-    }
-
-    /**
-     * 多公司配置编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody CorporationDto corporationDto) {
-        corporationService.edit(corporationDto);
-    }
-
-    /**
-     * 多公司配置删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        corporationService.delete(dto.getId());
-    }
-
-}
+//package com.fjhx.common.controller.corporation;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.corporation.dto.CorporationDto;
+//import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
+//import com.fjhx.common.entity.corporation.vo.CorporationVo;
+//import com.fjhx.common.service.corporation.CorporationService;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+///**
+// * <p>
+// * 多公司配置 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-04-10
+// */
+//@RestController
+//@RequestMapping("/corporation")
+//public class CorporationController {
+//
+//    @Autowired
+//    private CorporationService corporationService;
+//
+//    /**
+//     * 多公司配置分页
+//     */
+//    @PostMapping("/page")
+//    public Page<CorporationVo> page(@RequestBody CorporationSelectDto dto) {
+//        return corporationService.getPage(dto);
+//    }
+//
+//    /**
+//     * 多公司配置明细
+//     */
+//    @PostMapping("/detail")
+//    public CorporationVo detail(@RequestBody BaseSelectDto dto) {
+//        return corporationService.detail(dto.getId());
+//    }
+//
+//    /**
+//     * 多公司配置新增
+//     */
+//    @PostMapping("/add")
+//    public void add(@RequestBody CorporationDto corporationDto) {
+//        corporationService.add(corporationDto);
+//    }
+//
+//    /**
+//     * 多公司配置编辑
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody CorporationDto corporationDto) {
+//        corporationService.edit(corporationDto);
+//    }
+//
+//    /**
+//     * 多公司配置删除
+//     */
+//    @PostMapping("/delete")
+//    public void delete(@RequestBody BaseSelectDto dto) {
+//        corporationService.delete(dto.getId());
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/documentary/DocumentaryController.java

@@ -1,68 +1,68 @@
-package com.fjhx.common.controller.documentary;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
-import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
-import com.fjhx.common.entity.documentary.dto.DocumentaryDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.common.service.documentary.DocumentaryService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 跟单配置 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-19
- */
-@RestController
-@RequestMapping("/documentary")
-public class DocumentaryController {
-
-    @Autowired
-    private DocumentaryService documentaryService;
-
-    /**
-     * 跟单配置分页
-     */
-    @PostMapping("/page")
-    public Page<DocumentaryVo> page(@RequestBody DocumentarySelectDto dto) {
-        return documentaryService.getPage(dto);
-    }
-
-    /**
-     * 跟单配置明细
-     */
-    @PostMapping("/detail")
-    public DocumentaryVo detail(@RequestBody BaseSelectDto dto) {
-        return documentaryService.detail(dto.getId());
-    }
-
-    /**
-     * 跟单配置新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody DocumentaryDto documentaryDto) {
-        documentaryService.add(documentaryDto);
-    }
-
-    /**
-     * 跟单配置编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody DocumentaryDto documentaryDto) {
-        documentaryService.edit(documentaryDto);
-    }
-
-    /**
-     * 跟单配置删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        documentaryService.delete(dto.getId());
-    }
-
-}
+//package com.fjhx.common.controller.documentary;
+//
+//import org.springframework.web.bind.annotation.*;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
+//import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
+//import com.fjhx.common.entity.documentary.dto.DocumentaryDto;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import com.fjhx.common.service.documentary.DocumentaryService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//
+///**
+// * <p>
+// * 跟单配置 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-04-19
+// */
+//@RestController
+//@RequestMapping("/documentary")
+//public class DocumentaryController {
+//
+//    @Autowired
+//    private DocumentaryService documentaryService;
+//
+//    /**
+//     * 跟单配置分页
+//     */
+//    @PostMapping("/page")
+//    public Page<DocumentaryVo> page(@RequestBody DocumentarySelectDto dto) {
+//        return documentaryService.getPage(dto);
+//    }
+//
+//    /**
+//     * 跟单配置明细
+//     */
+//    @PostMapping("/detail")
+//    public DocumentaryVo detail(@RequestBody BaseSelectDto dto) {
+//        return documentaryService.detail(dto.getId());
+//    }
+//
+//    /**
+//     * 跟单配置新增
+//     */
+//    @PostMapping("/add")
+//    public void add(@RequestBody DocumentaryDto documentaryDto) {
+//        documentaryService.add(documentaryDto);
+//    }
+//
+//    /**
+//     * 跟单配置编辑
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody DocumentaryDto documentaryDto) {
+//        documentaryService.edit(documentaryDto);
+//    }
+//
+//    /**
+//     * 跟单配置删除
+//     */
+//    @PostMapping("/delete")
+//    public void delete(@RequestBody BaseSelectDto dto) {
+//        documentaryService.delete(dto.getId());
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/documentary/DocumentaryRecordController.java

@@ -1,63 +1,63 @@
-package com.fjhx.common.controller.documentary;
-
-import com.fjhx.common.entity.documentary.dto.DocumentaryRecordDto;
-import com.fjhx.common.entity.documentary.dto.DocumentaryRecordSelectDto;
-import com.fjhx.common.entity.documentary.vo.DocumentaryRecordInfoVo;
-import com.fjhx.common.service.documentary.DocumentaryRecordService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 跟单记录 前端控制器
- * </p>
- *
- * @author
- * @since 2023-04-20
- */
-@RestController
-@RequestMapping("/documentaryRecord")
-public class DocumentaryRecordController {
-
-    @Autowired
-    private DocumentaryRecordService documentaryRecordService;
-
-    /**
-     * 跟单记录信息
-     */
-    @PostMapping("/info")
-    public DocumentaryRecordInfoVo page(@RequestBody DocumentaryRecordSelectDto dto) {
-        return documentaryRecordService.getInfo(dto);
-    }
-
-    /**
-     * 添加跟单记录
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody DocumentaryRecordDto dto) {
-        documentaryRecordService.add(dto);
-    }
-
-    /**
-     * 编辑跟单记录
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody DocumentaryRecordDto dto) {
-        documentaryRecordService.edit(dto);
-    }
-
-    /**
-     * 删除跟单记录
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        documentaryRecordService.delete(dto.getId());
-    }
-
-}
+//package com.fjhx.common.controller.documentary;
+//
+//import com.fjhx.common.entity.documentary.dto.DocumentaryRecordDto;
+//import com.fjhx.common.entity.documentary.dto.DocumentaryRecordSelectDto;
+//import com.fjhx.common.entity.documentary.vo.DocumentaryRecordInfoVo;
+//import com.fjhx.common.service.documentary.DocumentaryRecordService;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+///**
+// * <p>
+// * 跟单记录 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-04-20
+// */
+//@RestController
+//@RequestMapping("/documentaryRecord")
+//public class DocumentaryRecordController {
+//
+//    @Autowired
+//    private DocumentaryRecordService documentaryRecordService;
+//
+//    /**
+//     * 跟单记录信息
+//     */
+//    @PostMapping("/info")
+//    public DocumentaryRecordInfoVo page(@RequestBody DocumentaryRecordSelectDto dto) {
+//        return documentaryRecordService.getInfo(dto);
+//    }
+//
+//    /**
+//     * 添加跟单记录
+//     */
+//    @PostMapping("/add")
+//    public void add(@Validated @RequestBody DocumentaryRecordDto dto) {
+//        documentaryRecordService.add(dto);
+//    }
+//
+//    /**
+//     * 编辑跟单记录
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody DocumentaryRecordDto dto) {
+//        documentaryRecordService.edit(dto);
+//    }
+//
+//    /**
+//     * 删除跟单记录
+//     */
+//    @PostMapping("/delete")
+//    public void delete(@RequestBody BaseSelectDto dto) {
+//        documentaryRecordService.delete(dto.getId());
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/multilingual/MultilingualController.java

@@ -1,58 +1,58 @@
-package com.fjhx.common.controller.multilingual;
-
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.common.constant.SourceConstant;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/open/multilingual")
-public class MultilingualController {
-
-    @Autowired
-    private ISysConfigService sysConfigService;
-
-    @GetMapping("/getJson")
-    public String getJson() {
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-        SysConfig config = sysConfigService.getOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getConfigKey, "multilingualJson"));
-        if (config == null) {
-            config = new SysConfig();
-            config.setConfigName("多语言json");
-            config.setConfigKey("multilingualJson");
-            config.setConfigValue("");
-            config.setConfigType("Y");
-            config.setRemark("多语言json");
-            sysConfigService.save(config);
-        }
-        DynamicDataSourceContextHolder.poll();
-        return config.getConfigValue();
-    }
-
-    @PostMapping("/setJson")
-    public void setJson(@RequestBody SysConfig sysConfig) {
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-        LoginUser loginUser;
-        try {
-            loginUser = SecurityUtils.getLoginUser();
-        } catch (Exception e) {
-            throw new ServiceException("无操作权限");
-        }
-        if (loginUser == null) {
-            throw new ServiceException("无操作权限");
-        }
-
-        sysConfigService.update(Wrappers.<SysConfig>lambdaUpdate()
-                .eq(SysConfig::getConfigKey, "multilingualJson")
-                .set(SysConfig::getConfigValue, sysConfig.getConfigValue())
-        );
-        DynamicDataSourceContextHolder.poll();
-    }
-
-}
+//package com.fjhx.common.controller.multilingual;
+//
+//import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.fjhx.common.constant.SourceConstant;
+//import com.ruoyi.common.core.domain.model.LoginUser;
+//import com.ruoyi.common.exception.ServiceException;
+//import com.ruoyi.common.utils.SecurityUtils;
+//import com.ruoyi.system.domain.SysConfig;
+//import com.ruoyi.system.service.ISysConfigService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//@RestController
+//@RequestMapping("/open/multilingual")
+//public class MultilingualController {
+//
+//    @Autowired
+//    private ISysConfigService sysConfigService;
+//
+//    @GetMapping("/getJson")
+//    public String getJson() {
+//        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//        SysConfig config = sysConfigService.getOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getConfigKey, "multilingualJson"));
+//        if (config == null) {
+//            config = new SysConfig();
+//            config.setConfigName("多语言json");
+//            config.setConfigKey("multilingualJson");
+//            config.setConfigValue("");
+//            config.setConfigType("Y");
+//            config.setRemark("多语言json");
+//            sysConfigService.save(config);
+//        }
+//        DynamicDataSourceContextHolder.poll();
+//        return config.getConfigValue();
+//    }
+//
+//    @PostMapping("/setJson")
+//    public void setJson(@RequestBody SysConfig sysConfig) {
+//        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+//        LoginUser loginUser;
+//        try {
+//            loginUser = SecurityUtils.getLoginUser();
+//        } catch (Exception e) {
+//            throw new ServiceException("无操作权限");
+//        }
+//        if (loginUser == null) {
+//            throw new ServiceException("无操作权限");
+//        }
+//
+//        sysConfigService.update(Wrappers.<SysConfig>lambdaUpdate()
+//                .eq(SysConfig::getConfigKey, "multilingualJson")
+//                .set(SysConfig::getConfigValue, sysConfig.getConfigValue())
+//        );
+//        DynamicDataSourceContextHolder.poll();
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/controller/problem/ProblemFeedbackController.java

@@ -1,62 +1,62 @@
-package com.fjhx.common.controller.problem;
-
-import com.ruoyi.common.annotation.TenantIgnore;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
-import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
-import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.common.service.problem.ProblemFeedbackService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 问题反馈 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/problemFeedback")
-public class ProblemFeedbackController {
-
-    @Autowired
-    private ProblemFeedbackService problemFeedbackService;
-
-    /**
-     * 问题反馈分页
-     */
-    @TenantIgnore
-    @PostMapping("/page")
-    public Page<ProblemFeedbackVo> page(@RequestBody ProblemFeedbackSelectDto dto) {
-        return problemFeedbackService.getPage(dto);
-    }
-
-    /**
-     * 问题反馈明细
-     */
-    @PostMapping("/detail")
-    public ProblemFeedbackVo detail(@RequestBody BaseSelectDto dto) {
-        return problemFeedbackService.detail(dto.getId());
-    }
-
-    /**
-     * 问题反馈新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
-        problemFeedbackService.add(problemFeedbackDto);
-    }
-
-    /**
-     * 问题反馈编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
-        problemFeedbackService.edit(problemFeedbackDto);
-    }
-
-}
+//package com.fjhx.common.controller.problem;
+//
+//import com.ruoyi.common.annotation.TenantIgnore;
+//import org.springframework.web.bind.annotation.*;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
+//import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
+//import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import com.fjhx.common.service.problem.ProblemFeedbackService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//
+///**
+// * <p>
+// * 问题反馈 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2023-05-04
+// */
+//@RestController
+//@RequestMapping("/problemFeedback")
+//public class ProblemFeedbackController {
+//
+//    @Autowired
+//    private ProblemFeedbackService problemFeedbackService;
+//
+//    /**
+//     * 问题反馈分页
+//     */
+//    @TenantIgnore
+//    @PostMapping("/page")
+//    public Page<ProblemFeedbackVo> page(@RequestBody ProblemFeedbackSelectDto dto) {
+//        return problemFeedbackService.getPage(dto);
+//    }
+//
+//    /**
+//     * 问题反馈明细
+//     */
+//    @PostMapping("/detail")
+//    public ProblemFeedbackVo detail(@RequestBody BaseSelectDto dto) {
+//        return problemFeedbackService.detail(dto.getId());
+//    }
+//
+//    /**
+//     * 问题反馈新增
+//     */
+//    @PostMapping("/add")
+//    public void add(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
+//        problemFeedbackService.add(problemFeedbackDto);
+//    }
+//
+//    /**
+//     * 问题反馈编辑
+//     */
+//    @PostMapping("/edit")
+//    public void edit(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
+//        problemFeedbackService.edit(problemFeedbackDto);
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateSelectDto.java

@@ -1,22 +1,22 @@
-package com.fjhx.common.entity.contract.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 合同模板列表查询入参实体
- *
- * @author 
- * @since 2023-04-14
- */
-@Getter
-@Setter
-public class ContractTemplateSelectDto extends BaseSelectDto {
-
-    /**
-     * 公司id
-     */
-    private Long corporationId;
-
-}
+//package com.fjhx.common.entity.contract.dto;
+//
+//import com.ruoyi.common.core.domain.BaseSelectDto;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+///**
+// * 合同模板列表查询入参实体
+// *
+// * @author
+// * @since 2023-04-14
+// */
+//@Getter
+//@Setter
+//public class ContractTemplateSelectDto extends BaseSelectDto {
+//
+//    /**
+//     * 公司id
+//     */
+//    private Long corporationId;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/eums/DocumentaryTypeEnum.java

@@ -1,57 +1,57 @@
-package com.fjhx.common.entity.documentary.eums;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Getter
-@AllArgsConstructor
-public enum DocumentaryTypeEnum {
-
-    sales(1, "销售跟单", "contractServiceImpl"),
-
-    purchase(2, "采购跟单", "purchaseServiceImpl");
-
-    /**
-     * 跟单类型
-     */
-    private final Integer key;
-
-    /**
-     * 类型名称
-     */
-    private final String name;
-
-    /**
-     * 实现bean名称
-     */
-    private final String beanName;
-
-    private final static Map<Integer, DocumentaryTypeEnum> map = new HashMap<>();
-
-    static {
-        for (DocumentaryTypeEnum value : DocumentaryTypeEnum.values()) {
-            map.put(value.key, value);
-        }
-    }
-
-    public static DocumentaryTypeEnum getEnum(Integer key) {
-        return map.computeIfAbsent(key, item -> {
-            throw new ServiceException("未知跟单类型");
-        });
-    }
-
-    public GetDocumentaryBusinessTemplate getBusinessBean() {
-        GetDocumentaryBusinessTemplate bean = SpringUtil.getBean(beanName, GetDocumentaryBusinessTemplate.class);
-        if (bean == null) {
-            throw new ServiceException("未配置 " + name + " 跟单业务bean");
-        }
-        return bean;
-    }
-
-}
+//package com.fjhx.common.entity.documentary.eums;
+//
+//import cn.hutool.extra.spring.SpringUtil;
+//import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
+//import com.ruoyi.common.exception.ServiceException;
+//import lombok.AllArgsConstructor;
+//import lombok.Getter;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Getter
+//@AllArgsConstructor
+//public enum DocumentaryTypeEnum {
+//
+//    sales(1, "销售跟单", "contractServiceImpl"),
+//
+//    purchase(2, "采购跟单", "purchaseServiceImpl");
+//
+//    /**
+//     * 跟单类型
+//     */
+//    private final Integer key;
+//
+//    /**
+//     * 类型名称
+//     */
+//    private final String name;
+//
+//    /**
+//     * 实现bean名称
+//     */
+//    private final String beanName;
+//
+//    private final static Map<Integer, DocumentaryTypeEnum> map = new HashMap<>();
+//
+//    static {
+//        for (DocumentaryTypeEnum value : DocumentaryTypeEnum.values()) {
+//            map.put(value.key, value);
+//        }
+//    }
+//
+//    public static DocumentaryTypeEnum getEnum(Integer key) {
+//        return map.computeIfAbsent(key, item -> {
+//            throw new ServiceException("未知跟单类型");
+//        });
+//    }
+//
+//    public GetDocumentaryBusinessTemplate getBusinessBean() {
+//        GetDocumentaryBusinessTemplate bean = SpringUtil.getBean(beanName, GetDocumentaryBusinessTemplate.class);
+//        if (bean == null) {
+//            throw new ServiceException("未配置 " + name + " 跟单业务bean");
+//        }
+//        return bean;
+//    }
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/po/Documentary.java

@@ -1,47 +1,47 @@
-package com.fjhx.common.entity.documentary.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 跟单配置
- * </p>
- *
- * @author 
- * @since 2023-04-19
- */
-@Getter
-@Setter
-@TableName("documentary")
-public class Documentary extends BasePo {
-
-    /**
-     * 跟单类型 字典documentary_type
-     */
-    private Integer type;
-
-    /**
-     * 节点名称
-     */
-    private String name;
-
-    /**
-     * 节点排序
-     */
-    private Integer sort;
-
-    /**
-     * 绑定类型 字典 documentary_bind
-     */
-    private Integer bind;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}
+//package com.fjhx.common.entity.documentary.po;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.ruoyi.common.core.domain.BasePo;
+//import java.util.Date;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+///**
+// * <p>
+// * 跟单配置
+// * </p>
+// *
+// * @author
+// * @since 2023-04-19
+// */
+//@Getter
+//@Setter
+//@TableName("documentary")
+//public class Documentary extends BasePo {
+//
+//    /**
+//     * 跟单类型 字典documentary_type
+//     */
+//    private Integer type;
+//
+//    /**
+//     * 节点名称
+//     */
+//    private String name;
+//
+//    /**
+//     * 节点排序
+//     */
+//    private Integer sort;
+//
+//    /**
+//     * 绑定类型 字典 documentary_bind
+//     */
+//    private Integer bind;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/po/DocumentaryRecord.java

@@ -1,46 +1,49 @@
-package com.fjhx.common.entity.documentary.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * <p>
- * 跟单记录
- * </p>
- *
- * @author
- * @since 2023-04-20
- */
-@Getter
-@Setter
-@TableName("documentary_record")
-public class DocumentaryRecord extends BasePo {
-
-    /**
-     * 跟单id
-     */
-    @NotNull(message = "跟单id不能为空")
-    private Long documentaryId;
-
-    /**
-     * 业务id
-     */
-    @NotNull(message = "业务id不能为空")
-    private Long businessId;
-
-    /**
-     * 完成时间
-     */
-    private Date completionTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}
+//package com.fjhx.common.entity.documentary.po;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.ruoyi.common.core.domain.BasePo;
+//import lombok.Getter;
+//import lombok.Setter;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//
+//import javax.validation.constraints.NotNull;
+//import java.util.Date;
+//
+///**
+// * <p>
+// * 跟单记录
+// * </p>
+// *
+// * @author
+// * @since 2023-04-20
+// */
+//@Getter
+//@Setter
+//@TableName("documentary_record")
+//public class DocumentaryRecord extends BasePo {
+//
+//    /**
+//     * 跟单id
+//     */
+//    @NotNull(message = "跟单id不能为空")
+//    private Long documentaryId;
+//
+//    /**
+//     * 业务id
+//     */
+//    @NotNull(message = "业务id不能为空")
+//    private Long businessId;
+//
+//    /**
+//     * 完成时间
+//     */
+//    private Date completionTime;
+//
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/vo/DocumentaryRecordInfoVo.java

@@ -1,24 +1,24 @@
-package com.fjhx.common.entity.documentary.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.documentary.bo.DocumentaryData;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Getter
-@Setter
-public class DocumentaryRecordInfoVo {
-
-    /**
-     * 跟单配置
-     */
-    private List<DocumentaryVo> documentaryList;
-
-    /**
-     * 分页
-     */
-    private Page<? extends DocumentaryData> page;
-
-}
+//package com.fjhx.common.entity.documentary.vo;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.documentary.bo.DocumentaryData;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+//import java.util.List;
+//
+//@Getter
+//@Setter
+//public class DocumentaryRecordInfoVo {
+//
+//    /**
+//     * 跟单配置
+//     */
+//    private List<DocumentaryVo> documentaryList;
+//
+//    /**
+//     * 分页
+//     */
+//    private Page<? extends DocumentaryData> page;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/vo/DocumentaryRecordVo.java

@@ -1,22 +1,22 @@
-package com.fjhx.common.entity.documentary.vo;
-
-import com.fjhx.common.entity.documentary.po.DocumentaryRecord;
-import com.fjhx.file.entity.FileInfoVo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 跟单记录列表查询返回值实体
- *
- * @author
- * @since 2023-04-20
- */
-@Getter
-@Setter
-public class DocumentaryRecordVo extends DocumentaryRecord {
-
-    private List<FileInfoVo> fileList;
-
-}
+//package com.fjhx.common.entity.documentary.vo;
+//
+//import com.fjhx.common.entity.documentary.po.DocumentaryRecord;
+//import com.fjhx.file.entity.FileInfoVo;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+//import java.util.List;
+//
+///**
+// * 跟单记录列表查询返回值实体
+// *
+// * @author
+// * @since 2023-04-20
+// */
+//@Getter
+//@Setter
+//public class DocumentaryRecordVo extends DocumentaryRecord {
+//
+//    private List<FileInfoVo> fileList;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/documentary/vo/DocumentaryVo.java

@@ -1,22 +1,22 @@
-package com.fjhx.common.entity.documentary.vo;
-
-import com.fjhx.common.entity.documentary.po.Documentary;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 跟单配置列表查询返回值实体
- *
- * @author
- * @since 2023-04-19
- */
-@Getter
-@Setter
-public class DocumentaryVo extends Documentary {
-
-    /**
-     * 数量
-     */
-    private Long count;
-
-}
+//package com.fjhx.common.entity.documentary.vo;
+//
+//import com.fjhx.common.entity.documentary.po.Documentary;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+///**
+// * 跟单配置列表查询返回值实体
+// *
+// * @author
+// * @since 2023-04-19
+// */
+//@Getter
+//@Setter
+//public class DocumentaryVo extends Documentary {
+//
+//    /**
+//     * 数量
+//     */
+//    private Long count;
+//
+//}

hx-common/src/main/java/com/fjhx/common/entity/on/po/OnLineInfo.java

@@ -1,48 +1,48 @@
-package com.fjhx.common.entity.on.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * <p>
- * 在线时长信息
- * </p>
- *
- * @author
- * @since 2023-08-08
- */
-@Getter
-@Setter
-@TableName("on_line_info")
-public class OnLineInfo extends BasePo {
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 每日在线时长（秒）
-     */
-    private Long onLineDuration;
-
-    /**
-     * 在线日期
-     */
-    private Date onLineDate;
-
-    /**
-     * 最后一次在线时间
-     */
-    private Date lastOnlineTime;
-
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
-}
+//package com.fjhx.common.entity.on.po;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.ruoyi.common.core.domain.BasePo;
+//import lombok.Getter;
+//import lombok.Setter;
+//
+//import java.util.Date;
+//
+///**
+// * <p>
+// * 在线时长信息
+// * </p>
+// *
+// * @author
+// * @since 2023-08-08
+// */
+//@Getter
+//@Setter
+//@TableName("on_line_info")
+//public class OnLineInfo extends BasePo {
+//
+//    /**
+//     * 用户id
+//     */
+//    private Long userId;
+//
+//    /**
+//     * 每日在线时长（秒）
+//     */
+//    private Long onLineDuration;
+//
+//    /**
+//     * 在线日期
+//     */
+//    private Date onLineDate;
+//
+//    /**
+//     * 最后一次在线时间
+//     */
+//    private Date lastOnlineTime;
+//
+//    /**
+//     * 租户id
+//     */
+//    private String tenantId;
+//
+//}

hx-common/src/main/java/com/fjhx/common/service/contract/ContractTemplateService.java

@@ -1,46 +1,46 @@
-package com.fjhx.common.service.contract;
-
-import com.fjhx.common.entity.contract.po.ContractTemplate;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
-import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
-import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
-
-
-/**
- * <p>
- * 合同模板 服务类
- * </p>
- *
- * @author 
- * @since 2023-04-14
- */
-public interface ContractTemplateService extends BaseService<ContractTemplate> {
-
-    /**
-     * 合同模板分页
-     */
-    Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto);
-
-    /**
-     * 合同模板明细
-     */
-    ContractTemplateVo detail(Long id);
-
-    /**
-     * 合同模板新增
-     */
-    void add(ContractTemplateDto contractTemplateDto);
-
-    /**
-     * 合同模板编辑
-     */
-    void edit(ContractTemplateDto contractTemplateDto);
-
-    /**
-     * 合同模板删除
-     */
-    void delete(Long id);
-
-}
+//package com.fjhx.common.service.contract;
+//
+//import com.fjhx.common.entity.contract.po.ContractTemplate;
+//import com.ruoyi.common.core.service.BaseService;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+//
+//
+///**
+// * <p>
+// * 合同模板 服务类
+// * </p>
+// *
+// * @author
+// * @since 2023-04-14
+// */
+//public interface ContractTemplateService extends BaseService<ContractTemplate> {
+//
+//    /**
+//     * 合同模板分页
+//     */
+//    Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto);
+//
+//    /**
+//     * 合同模板明细
+//     */
+//    ContractTemplateVo detail(Long id);
+//
+//    /**
+//     * 合同模板新增
+//     */
+//    void add(ContractTemplateDto contractTemplateDto);
+//
+//    /**
+//     * 合同模板编辑
+//     */
+//    void edit(ContractTemplateDto contractTemplateDto);
+//
+//    /**
+//     * 合同模板删除
+//     */
+//    void delete(Long id);
+//
+//}

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -1,60 +1,60 @@
-package com.fjhx.common.service.contract.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
-import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
-import com.fjhx.common.entity.contract.po.ContractTemplate;
-import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
-import com.fjhx.common.mapper.contract.ContractTemplateMapper;
-import com.fjhx.common.service.contract.ContractTemplateService;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 合同模板 服务实现类
- * </p>
- *
- * @author
- * @since 2023-04-14
- */
-@Service
-public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMapper, ContractTemplate> implements ContractTemplateService {
-
-    @Override
-    public Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto) {
-        IWrapper<ContractTemplate> wrapper = getWrapper();
-        wrapper.eq("ct", ContractTemplate::getCorporationId, dto.getCorporationId());
-        wrapper.keyword(dto, new SqlField("ct", ContractTemplate::getTemplateName));
-        wrapper.orderByDesc("ct", ContractTemplate::getId);
-
-        return this.baseMapper.getPage(dto.getPage(), wrapper);
-    }
-
-    @Override
-    public ContractTemplateVo detail(Long id) {
-        ContractTemplate ContractTemplate = this.getById(id);
-        ContractTemplateVo result = BeanUtil.toBean(ContractTemplate, ContractTemplateVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(ContractTemplateDto contractTemplateDto) {
-        this.save(contractTemplateDto);
-    }
-
-    @Override
-    public void edit(ContractTemplateDto contractTemplateDto) {
-        this.updateById(contractTemplateDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-}
+//package com.fjhx.common.service.contract.impl;
+//
+//import cn.hutool.core.bean.BeanUtil;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+//import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+//import com.fjhx.common.entity.contract.po.ContractTemplate;
+//import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+//import com.fjhx.common.mapper.contract.ContractTemplateMapper;
+//import com.fjhx.common.service.contract.ContractTemplateService;
+//import com.ruoyi.common.utils.wrapper.IWrapper;
+//import com.ruoyi.common.utils.wrapper.SqlField;
+//import org.springframework.stereotype.Service;
+//
+//
+///**
+// * <p>
+// * 合同模板 服务实现类
+// * </p>
+// *
+// * @author
+// * @since 2023-04-14
+// */
+//@Service
+//public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMapper, ContractTemplate> implements ContractTemplateService {
+//
+//    @Override
+//    public Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto) {
+//        IWrapper<ContractTemplate> wrapper = getWrapper();
+//        wrapper.eq("ct", ContractTemplate::getCorporationId, dto.getCorporationId());
+//        wrapper.keyword(dto, new SqlField("ct", ContractTemplate::getTemplateName));
+//        wrapper.orderByDesc("ct", ContractTemplate::getId);
+//
+//        return this.baseMapper.getPage(dto.getPage(), wrapper);
+//    }
+//
+//    @Override
+//    public ContractTemplateVo detail(Long id) {
+//        ContractTemplate ContractTemplate = this.getById(id);
+//        ContractTemplateVo result = BeanUtil.toBean(ContractTemplate, ContractTemplateVo.class);
+//        return result;
+//    }
+//
+//    @Override
+//    public void add(ContractTemplateDto contractTemplateDto) {
+//        this.save(contractTemplateDto);
+//    }
+//
+//    @Override
+//    public void edit(ContractTemplateDto contractTemplateDto) {
+//        this.updateById(contractTemplateDto);
+//    }
+//
+//    @Override
+//    public void delete(Long id) {
+//        this.removeById(id);
+//    }
+//
+//}

pom.xml

@@ -47,6 +47,16 @@
                 <artifactId>hx-common</artifactId>
                 <version>${hx.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.26</version>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>3.5.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>