新增使用记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/SettledMerchantsController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -86,7 +87,7 @@ public class SettledMerchantsController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:merchants:add')")
     @Log(title = "入驻商家", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SettledMerchants settledMerchants)
+    public AjaxResult add(@Validated @RequestBody SettledMerchants settledMerchants)
     {
         return toAjax(settledMerchantsService.insertSettledMerchants(settledMerchants));
     }
@@ -97,7 +98,7 @@ public class SettledMerchantsController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:merchants:edit')")
     @Log(title = "入驻商家", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SettledMerchants settledMerchants)
+    public AjaxResult edit(@Validated @RequestBody SettledMerchants settledMerchants)
     {
         return toAjax(settledMerchantsService.updateSettledMerchants(settledMerchants));
     }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,3 +1,19 @@
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: 信用
+    # 版本
+    version: 3.8.2
+    # 版权年份
+    copyrightYear: 2022
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: D:/ruoyi/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
 # 数据源配置
 spring:
     datasource:
@@ -54,4 +70,26 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.101.10
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 8
+        # 密码
+        password: Boman123
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms

ruoyi-admin/src/main/resources/application-prod.yml

@@ -1,3 +1,19 @@
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: 信用
+    # 版本
+    version: 3.8.2
+    # 版权年份
+    copyrightYear: 2022
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /home/ruoyi/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
 # 数据源配置
 spring:
     datasource:
@@ -6,9 +22,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/qianshan_credit_interests?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/qianshan_credit_interests?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Boman123
+                password: UEB^RX$z
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -43,7 +59,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: xinyong
                 login-password: 123456
             filter:
                 stat:
@@ -54,4 +70,26 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 8
+        # 密码
+        password: 3r263Tr$
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms

ruoyi-admin/src/main/resources/application.yml

@@ -1,24 +1,7 @@
-# 项目相关配置
-ruoyi:
-  # 名称
-  name: RuoYi
-  # 版本
-  version: 3.8.2
-  # 版权年份
-  copyrightYear: 2022
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9000
   servlet:
     # 应用的访问路径
     context-path: /
@@ -36,7 +19,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.ruoyi: info
     org.springframework: warn
 
 # Spring配置
@@ -59,28 +42,7 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 192.168.101.10
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 8
-    # 密码
-    password: Boman123
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
+
 
 # token配置
 token:
@@ -109,7 +71,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /dev-api
 
@@ -118,14 +80,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice,/system/merchants
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
-
-#投资商小程序配置
-auth:
-  wechat:
-    phone_number_url: https://api.weixin.qq.com/wxa/business/getuserphonenumber
-    access_token_url: https://api.weixin.qq.com/cgi-bin/token
-    appId: wxf556d2b0c34da8cf
-    secret: 8f90a52972268f82d5017a2ac29650c4
+  urlPatterns: /system/*,/monitor/*,/tool/*

ruoyi-system/src/main/java/com/ruoyi/system/domain/SettledMerchants.java

@@ -35,7 +35,6 @@ public class SettledMerchants extends BaseEntity
     private String businessPhone;
 
     /** 商家政策 */
-    @Excel(name = "商家政策")
     private String businessPolicy;
     /**
      * 分类id

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsageRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -110,7 +111,7 @@ public class UsageRecordServiceImpl implements IUsageRecordService
     public AjaxResult selectUsageRecordListByRecordId(Long recordId) {
         startPage();
         List<UsageRecord> usageRecords = usageRecordMapper.selectUsageRecordListByRecordId(recordId);
-        Map<String, List<UsageRecord>> collect = usageRecords.stream().collect(Collectors.groupingBy(UsageRecord::getRecordYear));
+        Map<String, List<UsageRecord>> collect = usageRecords.stream().sorted(Comparator.comparing(UsageRecord::getRecordYear,Comparator.reverseOrder())).collect(Collectors.groupingBy(UsageRecord::getRecordYear, LinkedHashMap::new, Collectors.toList()));
         return AjaxResult.success(collect);
     }
 }

ruoyi-system/src/main/resources/mapper/system/CreditUserMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CreditUserMapper">
     
-    <resultMap type="CreditUser" id="CreditUserResult">
+    <resultMap type="com.ruoyi.system.domain.CreditUser" id="CreditUserResult">
         <result property="id"    column="id"    />
         <result property="userName"    column="user_name"    />
         <result property="creditScore"    column="credit_score"    />