贷后管理代码生成

dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java

@@ -1,13 +1,13 @@
-package com.daqing.financial.crms.config;
+//package com.daqing.financial.crms.config;
-
+//
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Configuration;
-
+//
-@Configuration
+//@Configuration
-public class IPageConfig {
+//public class IPageConfig {
-    @Bean
+//    @Bean
-    public PaginationInterceptor paginationInterceptor() {
+//    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+//        return new PaginationInterceptor();
-    }
+//    }
-}
+//}

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -1,20 +1,20 @@
 #服务名称
-#spring.application.name=dq-financial-crms
+spring.application.name=dq-financial-crms
-##配置中心地址
+#配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
+spring.cloud.nacos.config.file-extension=yml
-##redis配置
+#redis配置
-#spring.redis.host=127.0.0.1
+spring.redis.host=127.0.0.1
-#spring.redis.port=6379
+spring.redis.port=6379
-#spring.redis.password=
+spring.redis.password=
-#spring.redis.database=0
+spring.redis.database=0
-#spring.redis.timeout=30000
+spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
-##本地测试环境
+#本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -26,33 +26,34 @@
 ribbon.ReadTimeout: 120000
 #请求连接的超时时间
 ribbon.ConnectTimeout: 120000
+ribbon.eureka.enabled=true
 
 # 正式环境（prod）
 #服务名称
-spring.application.name=dq-financial-crms
+#spring.application.name=dq-financial-crms
-##配置中心地址
+###配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
-#spring.cloud.nacos.config.group=prod
+##spring.cloud.nacos.config.group=prod
-
+#
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
+#spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
+#spring.cloud.nacos.config.ext-config[1].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
+#spring.cloud.nacos.config.ext-config[2].refresh=true
-
+#
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=dq123456
+#spring.redis.password=dq123456
-spring.redis.database=0
+#spring.redis.database=0
-spring.redis.timeout=30000
+#spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 保后催收 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-collection")
+public class AlCollectionController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 保后管理列表 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-insurance-list")
+public class AlInsuranceListController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 还款记录表 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-repayment-entry")
+public class AlRepaymentEntryController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java

@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlCollection;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 保后催收 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlCollectionMapper extends BaseMapper<AlCollection> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java

@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 保后管理列表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlInsuranceListMapper extends BaseMapper<AlInsuranceList> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java

@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 还款记录表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlRepaymentEntryMapper extends BaseMapper<AlRepaymentEntry> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlCollection;
+
+/**
+ * <p>
+ * 保后催收 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlCollectionService extends IService<AlCollection> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlInsuranceListService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+
+/**
+ * <p>
+ * 保后管理列表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlInsuranceListService extends IService<AlInsuranceList> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+
+/**
+ * <p>
+ * 还款记录表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlRepaymentEntryService extends IService<AlRepaymentEntry> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlCollectionMapper;
+import com.daqing.financial.guarantee.service.IAlCollectionService;
+import com.daqing.framework.domain.guarantee.AlCollection;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 保后催收 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlCollectionServiceImpl extends ServiceImpl<AlCollectionMapper, AlCollection> implements IAlCollectionService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlInsuranceListMapper;
+import com.daqing.financial.guarantee.service.IAlInsuranceListService;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 保后管理列表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlInsuranceListServiceImpl extends ServiceImpl<AlInsuranceListMapper, AlInsuranceList> implements IAlInsuranceListService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlRepaymentEntryMapper;
+import com.daqing.financial.guarantee.service.IAlRepaymentEntryService;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 还款记录表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMapper, AlRepaymentEntry> implements IAlRepaymentEntryService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java

@@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator {
     public static final String PACKAGE_NAME = "com.daqing.financial.guarantee";
 
     public static void main(String[] args) {
-        String[] tables = new String[] {"dg_customer_related"};//表名数组
+        String[] tables = new String[] {"al_collection","al_insurance_list","al_repayment_entry"};//表名数组
         String[] tablePrefixs = new String[] {""};//去掉前缀
         executeCode(PACKAGE_NAME,tables,tablePrefixs);
     }

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -1,21 +1,21 @@
 #服务名称
-#spring.application.name=dq-financial-guarantee
+spring.application.name=dq-financial-guarantee
-##配置中心地址
+#配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
+spring.cloud.nacos.config.file-extension=yml
-##redis配置
+#redis配置
-#spring.redis.host=127.0.0.1
+spring.redis.host=127.0.0.1
-#spring.redis.port=6379
+spring.redis.port=6379
-#spring.redis.password=
+spring.redis.password=
-#spring.redis.database=0
+spring.redis.database=0
-#spring.redis.timeout=30000
+spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
-#
+
-##本地测试环境
+#本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,6 +27,7 @@
 ribbon.ReadTimeout: 120000
 #请求连接的超时时间
 ribbon.ConnectTimeout: 120000
+ribbon.eureka.enabled=true
 
 
 # 上传文件总的最大值
@@ -36,29 +37,29 @@ spring.servlet.multipart.max-file-size=10MB
 #
 ##正式环境（prod）
 ##服务名称
-spring.application.name=dq-financial-guarantee
+#spring.application.name=dq-financial-guarantee
-#配置中心地址
+##配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
+#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
-
+#
-spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
+#spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
+#spring.cloud.nacos.config.ext-config[1].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
+#spring.cloud.nacos.config.ext-config[2].refresh=true
-
+#
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=dq123456
+#spring.redis.password=dq123456
-spring.redis.database=0
+#spring.redis.database=0
-spring.redis.timeout=30000
+#spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.daqing.financial.guarantee.mapper.AlCollectionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.AlCollection">
+        <id column="id" property="id" />
+        <result column="insurance_id" property="insuranceId" />
+        <result column="collection_method" property="collectionMethod" />
+        <result column="collection_time" property="collectionTime" />
+        <result column="collection_feedback" property="collectionFeedback" />
+        <result column="enclosure_file" property="enclosureFile" />
+    </resultMap>
+
+</mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.daqing.financial.guarantee.mapper.AlInsuranceListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.AlInsuranceList">
+        <id column="id" property="id" />
+        <result column="business_code" property="businessCode" />
+        <result column="customer_name" property="customerName" />
+        <result column="phone" property="phone" />
+        <result column="business_type" property="businessType" />
+        <result column="guarantee_amount" property="guaranteeAmount" />
+        <result column="guarantee_time" property="guaranteeTime" />
+        <result column="apply_time" property="applyTime" />
+        <result column="repayment_amount" property="repaymentAmount" />
+        <result column="remain_amount" property="remainAmount" />
+        <result column="repayment_time" property="repaymentTime" />
+        <result column="department" property="department" />
+        <result column="payment_status" property="paymentStatus" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.daqing.financial.guarantee.mapper.AlRepaymentEntryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.AlRepaymentEntry">
+        <id column="id" property="id" />
+        <result column="insurance_id" property="insuranceId" />
+        <result column="repayment_date" property="repaymentDate" />
+        <result column="actual_repayment_date" property="actualRepaymentDate" />
+        <result column="overdue_days" property="overdueDays" />
+        <result column="total_repayment" property="totalRepayment" />
+        <result column="current_repayment" property="currentRepayment" />
+        <result column="interest" property="interest" />
+        <result column="other_expenses" property="otherExpenses" />
+        <result column="deduction_amount" property="deductionAmount" />
+        <result column="repayment_notes" property="repaymentNotes" />
+        <result column="repayment_status" property="repaymentStatus" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/HrmsAccessRecordsLogController.java

@@ -37,7 +37,7 @@ public class HrmsAccessRecordsLogController {
      * @param
      * @return
      */
-    @Scheduled(cron ="0 */5 * * * ?")
+    //@Scheduled(cron ="0 */5 * * * ?")
     @GetMapping("/queryAccessRecords")
     public ResponseResult queryAccessRecords() {
         List<HrmsAccessRecordsLog> list = iHrmsAccessRecordsLogService.queryAccessRecords();
@@ -48,7 +48,7 @@ public class HrmsAccessRecordsLogController {
      * 访问次数
      * @return
      */
-    @Scheduled(cron ="0 */5 * * * ?")
+    //@Scheduled(cron ="0 */5 * * * ?")
     @GetMapping("/queryVisitNum")
     public ResponseResult queryVisitNum() {
         Map map = iHrmsAccessRecordsLogService.queryVisitNum();

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java

@@ -70,7 +70,7 @@ public class UserLoginController implements UserLoginControllerApi {
         return ResponseResult.SUCCESS(result);
     }
 
-    @Log(detail = "重置密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
+    //@Log(detail = "重置密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
     @PostMapping("/getBackPwd")
     @ApiOperation(value = "重置密码")
     public ResponseResult getBackPwd(@RequestBody @Valid ResetPwdRequest user){
@@ -78,7 +78,7 @@ public class UserLoginController implements UserLoginControllerApi {
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }
 
-    @Log(detail = "用户登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+//    @Log(detail = "用户登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
     @PostMapping(value = "/login")
     @ApiOperation(value = "用户登录")
     /*@SysLog(MODULE = "登录日志", REMARK = "登录日志")*/
@@ -122,7 +122,7 @@ public class UserLoginController implements UserLoginControllerApi {
      * @param response
      * @throws IOException
      */
-    @Log(detail = "微信扫码登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+//    @Log(detail = "微信扫码登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
     @GetMapping("/user/callback")
     public void wechatUserCallback(@RequestParam(value = "code",required = true) String code,
                                    String state, HttpServletResponse response) throws IOException {
@@ -210,7 +210,7 @@ public class UserLoginController implements UserLoginControllerApi {
      * @param
      * @return
      */
-    @Log(detail = "微信小程序授权登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+//    @Log(detail = "微信小程序授权登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
     @PostMapping(value = "/wxAuthLogin")
     public ResponseResult wxAuthLogin(@RequestBody XccLoginReq xccLoginReq){
 

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 这是一个声明式的远程调用
  */
 @Component
-@FeignClient(name="dq-financial-hrms", value = "dq-financial-hrms",contextId = "hrms")
+@FeignClient(name="dq-financial-hrms",contextId = "hrms")
 public interface HrmsFeignService {
 
     @RequestMapping(method = RequestMethod.GET, value = "/hrms/employee/getEmployeeByUserId")
@@ -33,6 +33,6 @@ public interface HrmsFeignService {
     @PostMapping("hrms/employee/getAccountAndDeptNameById")
     ResponseResult getAccountAndDeptNameById(@RequestBody List<Integer> ids);
 
-    @PostMapping("hrms/employee/getEmpmsgById")
+    @GetMapping("hrms/employee/getEmpmsgById")
     EmployeeEntity getEmpmsgById(@RequestParam("id") Long id);
 }

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,21 +1,21 @@
 #服务名称
-#spring.application.name=dq-financial-hrms-auth
+spring.application.name=dq-financial-hrms-auth
-##配置中心地址
+#配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
+spring.cloud.nacos.config.file-extension=yml
-##redis配置
+#redis配置
-#spring.redis.host=127.0.0.1
+spring.redis.host=127.0.0.1
-#spring.redis.port=6379
+spring.redis.port=6379
-#spring.redis.password=
+spring.redis.password=
-#spring.redis.database=0
+spring.redis.database=0
-#spring.redis.timeout=30000
+spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
-#
+
-##本地测试环境
+#本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,33 +27,36 @@
 ribbon.ReadTimeout: 120000
 #请求连接的超时时间
 ribbon.ConnectTimeout: 30000
+#ribbon.eureka.enabled: true
+#eureka.client.fetch-registry: false
+#feign.hystrix.enabled=true
 
 
 #正式环境（prod）
-spring.application.name=dq-financial-hrms-auth
+#spring.application.name=dq-financial-hrms-auth
-
+#
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
+#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
-#spring.cloud.nacos.config.group=prod
+##spring.cloud.nacos.config.group=prod
-
+#
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
+#spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
+#spring.cloud.nacos.config.ext-config[1].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
+#spring.cloud.nacos.config.ext-config[2].refresh=true
-
+#
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=dq123456
+#spring.redis.password=dq123456
-spring.redis.database=0
+#spring.redis.database=0
-spring.redis.timeout=30000
+#spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0

dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml

@@ -22,7 +22,7 @@
                 AND create_time <= #{sysLog.endTime}
             </if>
         </where>
-        order by create_time desc limit 1000
+        order by create_time desc
     </select>
 
 </mapper>

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -1,21 +1,21 @@
 #服务名称
-#spring.application.name=dq-financial-hrms
+spring.application.name=dq-financial-hrms
-##配置中心地址
+#配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
+spring.cloud.nacos.config.file-extension=yml
-##redis配置
+#redis配置
-#spring.redis.host=127.0.0.1
+spring.redis.host=127.0.0.1
-#spring.redis.port=6379
+spring.redis.port=6379
-#spring.redis.password=
+spring.redis.password=
-#spring.redis.database=0
+spring.redis.database=0
-#spring.redis.timeout=30000
+spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
-#
+
-##本地测试环境
+#本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,36 +27,39 @@
 ribbon.ReadTimeout: 120000
 #请求连接的超时时间
 ribbon.ConnectTimeout: 30000
+#ribbon.eureka.enabled: true
+#eureka.client.fetch-registry: false
+#feign.hystrix.enabled=true
 
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
 
 # 正式环境（prod）
 #服务名称
-spring.application.name=dq-financial-hrms
+#spring.application.name=dq-financial-hrms
-#配置中心地址
+##配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
+#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
-#spring.cloud.nacos.config.group=prod
+##spring.cloud.nacos.config.group=prod
-
+#
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
+#spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
+#spring.cloud.nacos.config.ext-config[1].refresh=true
-
+#
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
+#spring.cloud.nacos.config.ext-config[2].refresh=true
-
+#
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=dq123456
+#spring.redis.password=dq123456
-spring.redis.database=0
+#spring.redis.database=0
-spring.redis.timeout=30000
+#spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0

dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml

@@ -641,7 +641,7 @@
         LEFT JOIN hrms_user u
         ON e.user_id = u.id
         WHERE u.del_or_not = 0
-        AND e.id = #{id}
+        AND e.user_id = #{id}
     </select>
 
 </mapper>

dq-framework-common/pom.xml

@@ -111,6 +111,7 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.1.2.RELEASE</version>
         </dependency>
         <!--配置中心来做配置管理-->
         <dependency>

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java

@@ -0,0 +1,55 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 保后催收
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_collection")
+public class AlCollection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 保后主键id
+     */
+    private Integer insuranceId;
+
+    /**
+     * 催收方式：1->电话催收；2->上门/外访；
+     */
+    private Integer collectionMethod;
+
+    /**
+     * 催收时间
+     */
+    private Date collectionTime;
+
+    /**
+     * 催收反馈
+     */
+    private String collectionFeedback;
+
+    /**
+     * 附件
+     */
+    private String enclosureFile;
+}

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java

@@ -0,0 +1,101 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 保后管理列表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_insurance_list")
+public class AlInsuranceList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 业务编号
+     */
+    private String businessCode;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 业务类别
+     */
+    private String businessType;
+
+    /**
+     * 担保额度（元）
+     */
+    private BigDecimal guaranteeAmount;
+
+    /**
+     * 担保期限
+     */
+    private String guaranteeTime;
+
+    /**
+     * 申请日期
+     */
+    private Date applyTime;
+
+    /**
+     * 还款额度（元）
+     */
+    private BigDecimal repaymentAmount;
+
+    /**
+     * 剩余额度（元）
+     */
+    private BigDecimal remainAmount;
+
+    /**
+     * 还款期数
+     */
+    private String repaymentTime;
+
+    /**
+     * 所属部门
+     */
+    private String department;
+
+    /**
+     * 还款状态：1->还款中；2->已逾期；3->已还清；4->已结项；
+     */
+    private Integer paymentStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+}

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java

@@ -0,0 +1,96 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 还款记录表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_repayment_entry")
+public class AlRepaymentEntry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 保后外键id
+     */
+    private Integer insuranceId;
+
+    /**
+     * 应还款日
+     */
+    private Date repaymentDate;
+
+    /**
+     * 实际还款日
+     */
+    private Date actualRepaymentDate;
+
+    /**
+     * 逾期天数
+     */
+    private String overdueDays;
+
+    /**
+     * 还款总额（元）
+     */
+    private BigDecimal totalRepayment;
+
+    /**
+     * 本次还款（元）
+     */
+    private BigDecimal currentRepayment;
+
+    /**
+     * 利息（元）
+     */
+    private BigDecimal interest;
+
+    /**
+     * 其他费用（元）
+     */
+    private BigDecimal otherExpenses;
+
+    /**
+     * 减免金额（元）
+     */
+    private BigDecimal deductionAmount;
+
+    /**
+     * 还款备注
+     */
+    private String repaymentNotes;
+
+    /**
+     * 还款状态：1->待还款；2->已还款；3->已逾期；4->未到期；
+     */
+    private Integer repaymentStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+}

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -1,21 +1,21 @@
 #服务名称
-#spring.application.name=dq-govern-gateway
+spring.application.name=dq-govern-gateway
-##配置中心地址
+#配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
+spring.cloud.nacos.config.file-extension=yml
-##redis配置
+#redis配置
-#spring.redis.host=127.0.0.1
+spring.redis.host=127.0.0.1
-#spring.redis.port=6379
+spring.redis.port=6379
-#spring.redis.password=
+spring.redis.password=
-#spring.redis.database=0
+spring.redis.database=0
-#spring.redis.timeout=30000
+spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
-#
+
-##本地测试环境
+#本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -23,26 +23,27 @@
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
 
+ribbon.eureka.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
 
 # 正式环境（prod）
 #服务名称
-spring.application.name=dq-govern-gateway
+#spring.application.name=dq-govern-gateway
-#配置中心地址
+##配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
+#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
-
+#
-spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
+#spring.cloud.nacos.config.ext-config[0].refresh=true
-
+#
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=dq123456
+#spring.redis.password=dq123456
-spring.redis.database=0
+#spring.redis.database=0
-spring.redis.timeout=30000
+#spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.jedis.pool.min-idle=0