feats

src/main/java/com/yunzhi/inte/controller/ImgVidController.java

@@ -1,6 +1,7 @@
 package com.yunzhi.inte.controller;
 
 import com.yunzhi.inte.common.ResponseBean;
+import com.yunzhi.inte.common.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,8 +52,9 @@ public class ImgVidController {
         File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
         fileUpload.transferTo(upFile);
 
+        String url = String.format("%s/%s", staticPrefix, newFileName);
         return ResponseBean.success(new HashMap<String, Object>(){{
-            put("url", String.format("%s/%s/%s", serverBase, staticPrefix, newFileName));
+            put("url", url);
         }});
     }
 

src/main/java/com/yunzhi/inte/mapper/EvaluateMapper.java

@@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.Evaluate;
 
- /**
+import java.util.Map;
+
+/**
  * 评价表;(evaluate)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-10-13
@@ -13,5 +15,5 @@ import com.yunzhi.inte.entity.Evaluate;
 @Mapper
 public interface EvaluateMapper  extends BaseMapper<Evaluate>{
 
-     String getTop1();
+     Map<String, Object> getTop1();
  }

src/main/java/com/yunzhi/inte/mapper/GuaranteeTaskMapper.java

@@ -16,7 +16,7 @@ import java.util.Map;
 @Mapper
 public interface GuaranteeTaskMapper  extends BaseMapper<GuaranteeTask>{
 
-    int sumPerson(@Param("status") int status);
+    Integer sumPerson(@Param("status") int status);
 
     List<Map<String, Object>> countByDays(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("days") Long days);
 

src/main/java/com/yunzhi/inte/service/impl/EvaluateServiceImpl.java

@@ -6,6 +6,8 @@ import com.yunzhi.inte.entity.Evaluate;
 import com.yunzhi.inte.mapper.EvaluateMapper;
 import com.yunzhi.inte.service.EvaluateService;
 
+import java.util.Map;
+
 /**
  * 评价表;(evaluate)表服务实现类
  *
@@ -17,6 +19,35 @@ public class EvaluateServiceImpl extends BaseServiceImpl<EvaluateMapper, Evaluat
 
     @Override
     public String getTop1() {
-        return baseMapper.getTop1();
+        Map<String, Object> top1 = baseMapper.getTop1();
+        if (null == top1) return "暂无";
+
+        Double t0 = (Double) top1.get("t0");
+        Double t1 = (Double) top1.get("t1");
+        Double t2 = (Double) top1.get("t2");
+        String max = "t0";
+
+        if (t1 > t0) {
+            if (t2 > t1) {
+                max = "t2";
+            } else {
+                max = "t1";
+            }
+        } else {
+            if (t2 > t0) {
+                max = "t2";
+            } else {
+                max = "t0";
+            }
+        }
+
+        switch (max) {
+            case "t0":
+                return "差";
+            case "t1":
+                return "一般";
+            default:
+                return "满意";
+        }
     }
 }

src/main/resources/mapper/EvaluateMapper.xml

@@ -3,7 +3,54 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.EvaluateMapper">
 
-    <select id="getTop1" resultType="java.lang.String">
-
+    <select id="getTop1" resultType="java.util.Map">
+        SELECT
+            sum( t0 ) as t0,
+            sum( t1 ) as t1,
+            sum( t2 ) as t2
+        FROM
+            (
+                SELECT
+                    @t0 := 0,
+                    @t1 := 0,
+                    @t2 := 0,
+                CASE item1
+                    WHEN 1 THEN @t1 := @t1 + 1
+                    WHEN 2 THEN @t2 := @t2 + 1
+                    ELSE @t0 := @t0 + 1
+                END,
+                CASE
+                    item2
+                    WHEN 1 THEN
+                    @t1 := @t1 + 1
+                    WHEN 2 THEN
+                    @t2 := @t2 + 1 ELSE @t0 := @t0 + 1
+                    END,
+                CASE item3
+                    WHEN 1 THEN @t1 := @t1 + 1
+                    WHEN 2 THEN @t2 := @t2 + 1
+                    ELSE @t0 := @t0 + 1
+                END,
+                CASE item4
+                    WHEN 1 THEN @t1 := @t1 + 1
+                    WHEN 2 THEN @t2 := @t2 + 1
+                    ELSE @t0 := @t0 + 1
+                END,
+                CASE item5
+                    WHEN 1 THEN @t1 := @t1 + 1
+                    WHEN 2 THEN @t2 := @t2 + 1
+                    ELSE @t0 := @t0 + 1
+                END,
+                CASE item6
+                    WHEN 1 THEN @t1 := @t1 + 1
+                    WHEN 2 THEN @t2 := @t2 + 1
+                    ELSE @t0 := @t0 + 1
+                END,
+                @t0 AS t0,
+                @t1 AS t1,
+                @t2 AS t2
+                FROM
+                    evaluate t
+            ) a
     </select>
 </mapper>

src/main/resources/mapper/PostsFilesMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.PostsFilesMapper">
     <delete id="deleteNotIn">
-        DELETE
+        DELETE t
         FROM
             posts_files t
         WHERE

src/main/resources/mapper/PurchaseItemsMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.PurchaseItemsMapper">
     <delete id="deleteNotIn">
-        DELETE
+        DELETE t
         FROM
             purchase_items t
         WHERE

src/main/resources/mapper/RoleResourcesMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.RoleResourcesMapper">
     <delete id="deleteNotIn">
-        DELETE
+        DELETE t
         FROM
             role_resources t
         WHERE

src/main/resources/mapper/StoreMapper.xml

@@ -49,17 +49,24 @@
     </select>
     <select id="countDeviceTypeOut" resultType="java.util.Map">
         SELECT
-            c.`name`,
-            count( * ) AS cnt
+            t.`name`,
+            IFNULL( s.cnt, 0 ) AS cnt
         FROM
-            store_log a
-            INNER JOIN store b ON a.store_id = b.id
-            INNER JOIN store_type c ON b.type_id = c.id
+            store_type t
+                LEFT JOIN (
+                SELECT
+                    b.type_id,
+                    COUNT( * ) AS cnt
+                FROM
+                    store_log a
+                        INNER JOIN store b ON a.store_id = b.id
+                WHERE
+                    a.opt_type = 'out'
+                    AND DATE( a.create_date ) BETWEEN #{startDate} AND #{endDate}
+                GROUP BY
+                    b.type_id
+            ) s ON t.id = s.type_id
         WHERE
-            a.opt_type = 'out'
-            AND DATE( a.create_date ) &gt;= #{startDate}
-            AND DATE( a.create_date ) &lt;= #{endDate}
-            GROUP BY
-                c.`name`
+            t.`status` = 1
     </select>
 </mapper>

src/main/resources/mapper/UserRolesMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.UserRolesMapper">
     <delete id="deleteNotIn">
-        DELETE
+        DELETE t
         FROM
             user_roles t
         WHERE