更新

src/main/java/com/taauav/admin/entity/TauvInspectImage.java

@@ -29,6 +29,11 @@ public class TauvInspectImage extends Entity {
      */
     private String name;
 
+    /**
+     * 一级分类ID
+     */
+    private Integer pCategoryId;
+
     /**
      * 二级分类ID
      */

src/main/java/com/taauav/admin/mapper/TauvInspectImageMapper.xml

@@ -8,7 +8,12 @@
         <if test=" param.name != null and param.name != ''">
             and name like CONCAT('%',#{param.name},'%')
         </if>
-        <if test="param.categoryId != null and param.categoryId != ''">
+        <!-- 一级分类筛选 -->
+        <if test="param.pCategoryId != null and param.pCategoryId != '' and param.pCategoryId>0">
+            and p_category_id={#param.pCategoryId}
+        </if>
+        <!-- 二级分类筛选 -->
+        <if test="param.categoryId != null and param.categoryId != '' and param.categoryId>0">
             and find_in_set(category_id,#{param.categoryId})
         </if>
         order by id desc

src/main/java/com/taauav/admin/query/TauvInspectImageQuery.java

@@ -15,7 +15,12 @@ public class TauvInspectImageQuery extends BaseQuery {
     private String name;
 
     /**
-     * 分类ID
+     * 一级分类ID
+     */
+    private String pCategoryId;
+
+    /**
+     * 二级分类ID
      */
     private String categoryId;
 

src/main/resources/config/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9012
+  port: 9015
   UPLOAD_URL: http://upload.taauav.com/
   AVATAR_URL: /data/webroot/taauav/public/uploads/
   IMAGE_URL: http://img.taauav.com/
@@ -7,7 +7,7 @@ server:
     context-path: /api
 spring:
   datasource:
-    url: jdbc:mysql://172.17.0.11:3306/taauav_nanjing?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://172.17.0.11:3306/taauav_highway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
     username: root
     password: taauav@2019
     driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/config/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9012
+  port: 9015
   UPLOAD_URL: http://imagesnanjing.yunhengwang.com/
   AVATAR_URL: /data/webroot/taauav/public/uploads/
   IMAGE_URL: http://imagesnanjing.yunhengwang.com/
@@ -7,7 +7,7 @@ server:
     context-path: /api
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/taauav_app?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://localhost:3306/taauav_highway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
     username: root
     password: idontcare
     driver-class-name: com.mysql.cj.jdbc.Driver