Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-server-report

src/main/java/com/dk/report/controller/HomeReportController.java

@@ -1,5 +1,6 @@
 package com.dk.report.controller;
 
+import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.report.service.HomeReportService;
 import io.swagger.annotations.Api;
@@ -48,4 +49,18 @@ public class HomeReportController {
     public ResponseResultVO<List<Map<String, Object>>> getHomeWarningItem(@RequestBody Map<String, Object> param) {
         return homeReportService.getHomeWarningItem(param);
     }
+
+    /**
+     * @desc   : 查询检验缺陷TOP5
+     * @author : 洪旭东
+     * @date   : 2023-09-08 14:35
+     */
+    @ApiOperation(
+            value = "查询检验缺陷TOP5",
+            notes = "查询检验缺陷TOP5"
+    )
+    @PostMapping({"get_top_five_defect"})
+    public ResponseResultVO<List<Map<String, Object>>> getTopFiveDefect(@RequestBody Map<String, Object> map) {
+        return homeReportService.getTopFiveDefect(map);
+    }
 }

src/main/java/com/dk/report/mapper/HomeReportMapper.java

@@ -24,5 +24,13 @@ public interface HomeReportMapper{
      * @date   : 2023/9/1 11:21
      */
     List<Map<String, Object>> getHomeWarningItem(Map map);
+
+    /**
+     * @desc   : 查询检验缺陷TOP5
+     * @author : 洪旭东
+     * @date   : 2023-09-08 13:29
+     */
+    List<Map<String, Object>> getTopFiveDefect(Map map);
+
 }
 

src/main/java/com/dk/report/mapper/HomeReportMapper.xml

@@ -11,4 +11,12 @@
     <select id="getHomeWarningItem" resultType="java.util.Map">
         SELECT * FROM rpt.f_rpt_home_warning_item(#{ftyId},#{warningSetId}, #{date} ::date);
     </select>
+
+<!--    查询检验缺陷TOP5-->
+    <resultMap id="topDefectResultMap" type="Map">
+        <result property="res" column="res" typeHandler="JsonTypeHandler"/>
+    </resultMap>
+    <select id="getTopFiveDefect" resultMap="topDefectResultMap">
+        select * from rpt.f_rpt_top_five_defect(#{ftyId}, #{timeStart}, #{timeEnd}, #{nodeKind}) res
+    </select>
 </mapper>

src/main/java/com/dk/report/service/HomeReportService.java

@@ -41,4 +41,13 @@ public class HomeReportService  {
 	public ResponseResultVO<List<Map<String, Object>>> getHomeWarningItem(Map map) {
 		return ResponseResultUtil.success(homeReportMapper.getHomeWarningItem(map));
 	}
+
+	/**
+	 * @desc   : 查询检验缺陷TOP5
+	 * @author : 洪旭东
+	 * @date   : 2023-09-08 14:35
+	 */
+	public ResponseResultVO<List<Map<String, Object>>> getTopFiveDefect(Map map) {
+		return ResponseResultUtil.success(homeReportMapper.getTopFiveDefect(map));
+	}
 }