1111

src/main/java/com/project/hyb/biz/service/impl/MbArtArtworksServiceImpl.java

@@ -160,9 +160,17 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
 
     @Override
     public Map<String, List<String>> dictionary() {
+
+        List<String> grades = new ArrayList<>();
+        grades.add("一级");
+        grades.add("二级");
+        grades.add("三级");
+        grades.add("一般");
+        grades.add("未定级");
+
         Map<String, List<String>> result = new HashMap<>();
-        result.put("category", this.getBaseMapper().listCategory());
-        result.put("grade", this.getBaseMapper().listGrade());
+        result.put("category", this.getBaseMapper().listCategory().stream().filter(v->StrUtil.isNotEmpty(v)).collect(Collectors.toList()));
+        result.put("grade", grades);
         result.put("texture", this.getBaseMapper().listTexture());
         result.put("agetype", this.getBaseMapper().listAgetype());
         return result;

src/main/resources/application-local.yml

@@ -10,12 +10,22 @@ spring:
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            maximum-pool-size: 15
+            minimum-idle: 5
+            idle-timeout: 30000
         #第二个数据源配置
         artoffice_museum:
           url: jdbc:mysql://159.75.75.84:3306/artoffice_museum
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            maximum-pool-size: 15
+            minimum-idle: 5
+            idle-timeout: 30000
 
 pms:
   preview: false

src/main/resources/application-prod.yml

@@ -10,12 +10,22 @@ spring:
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            maximum-pool-size: 15
+            minimum-idle: 15
+            idle-timeout: 30000
         #第二个数据源配置
         artoffice_museum:
           url: jdbc:mysql://192.168.10.4:3306/artoffice_museum
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            maximum-pool-size: 15
+            minimum-idle: 15
+            idle-timeout: 30000
 
 pms:
   preview: false

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
   application:
     name: project-hyb
   profiles:
-    active: prod
+    active: local
   jackson:
     serialization:
       #关闭jackson转换 实体属性空值校验