From 8f069a80ed15dd431450f58304513aa3985e62ba Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 14 十一月 2023 16:48:16 +0800
Subject: [PATCH] 1. 新增风险值的查询逻辑；

---
 src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt          |   13 ++++
 src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt   |    1 
 src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java         |   31 ++++++++++
 src/main/java/com/flightfeather/monitor/pojo/Result.java                               |   14 ++--
 src/main/java/com/flightfeather/monitor/MonitorApplication.java                        |    2 
 src/main/java/com/flightfeather/monitor/service/RiskValueService.java                  |   16 +++++
 src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java       |   28 +++++---
 src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt        |    2 
 src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt                         |    4 
 /dev/null                                                                              |   21 -------
 src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt    |    2 
 src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt |    1 
 src/main/resources/application.yml                                                     |   13 ++--
 13 files changed, 97 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/MonitorApplication.java b/src/main/java/com/flightfeather/monitor/MonitorApplication.java
index 1360808..a1f81db 100644
--- a/src/main/java/com/flightfeather/monitor/MonitorApplication.java
+++ b/src/main/java/com/flightfeather/monitor/MonitorApplication.java
@@ -18,7 +18,7 @@
         return new ApplicationRunner() {
             @Override
             public void run(ApplicationArguments args) throws Exception {
-//                taskController.run();
+                taskController.run();
             }
         };
     }
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.java b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.java
deleted file mode 100644
index d4f6e42..0000000
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.flightfeather.monitor.analysis.dust;
-
-import com.flightfeather.monitor.service.AnalysisDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 鏁版嵁椋庨櫓鍒嗘瀽鎺у埗鍣�
- */
-public class RiskAnalysisController {
-
-    @Autowired
-    private AnalysisDataService analysisDataService;
-}
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
index fb01c98..d43c341 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
@@ -96,7 +96,7 @@
         dustSiteStatusRep.select(listOf(DeviceStatus.ONLINE, DeviceStatus.STOP)).forEach { s ->
             s?.let {
                 taskMonthly?.roundInit(s.mnCode, date)
-                val riskValueList = riskValueRep.select(s.mnCode, date)
+                val riskValueList = riskValueRep.select(s.mnCode, date, "day")
                 taskMonthly?.roundCal(riskValueList)
             }
         }
diff --git a/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java b/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
index 3808351..f88eb3e 100644
--- a/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
@@ -2,16 +2,11 @@
 
 
 import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
-import com.flightfeather.monitor.pojo.AnalysisData;
 import com.flightfeather.monitor.pojo.Result;
-import com.flightfeather.monitor.service.AnalysisDataService;
-import com.flightfeather.monitor.service.RiskAnalysisService;
+import com.flightfeather.monitor.service.RiskValueService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -21,13 +16,24 @@
 @CrossOrigin
 public class RiskValueController {
     @Autowired
-    private RiskAnalysisService riskAnalysisService;
+    private RiskValueService riskValueService;
 
 
-    /*鏍规嵁绔欑偣鍚嶅瓧锛堝彲閫夊�硷級锛屾湀浠斤紝绫诲瀷鏉ヨ繑鍥為闄╁��*/
+    /**
+     * 鏍规嵁绔欑偣鍚嶅瓧锛堝彲閫夊�硷級锛屾湀浠斤紝绫诲瀷鏉ヨ繑鍥為闄╁��
+     *
+     * @param mnCode
+     * @param month
+     * @param type
+     * @return
+     */
     @GetMapping("/month")
-    public Result queryRiskDataByMonth(String siteName,String month,String type){
-        List<RiskValue> list =riskAnalysisService.queryRiskDataByMonth(siteName,month,type);
+    public Result queryRiskDataByMonth(
+            @RequestParam String mnCode,
+            @RequestParam String month,
+            @RequestParam String type
+    ) {
+        List<RiskValue> list = riskValueService.queryRiskDataByMonth(mnCode, month, type);
         return Result.success(list);
     }
 }
diff --git a/src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt b/src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt
index dc3e5d6..338db81 100644
--- a/src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt
+++ b/src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt
@@ -26,16 +26,27 @@
         }
     }
 
+    /**
+     * 鎻掑叆鍒楄〃
+     * @param list
+     */
     fun insert(list: List<RiskValue>): Int {
         return riskValueMapper.insertList(list)
     }
 
-    fun select(mnCode: String, date: LocalDate): List<RiskValue?> {
+    /**
+     * 鏌ヨ
+     * @param mnCode
+     * @param date
+     * @param type
+     */
+    fun select(mnCode: String, date: LocalDate, type: String): List<RiskValue?> {
         val s = date.withDayOfMonth(1).atStartOfDay()
         val e = s.plusMonths(1).minusSeconds(1)
         return riskValueMapper.selectByExample(Example(RiskValue::class.java).apply {
             createCriteria().andEqualTo("mnCode", mnCode)
                 .andBetween("lst", s, e)
+                .andEqualTo("type", type)
         })
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/flightfeather/monitor/pojo/Result.java b/src/main/java/com/flightfeather/monitor/pojo/Result.java
index 6809e86..6a27345 100644
--- a/src/main/java/com/flightfeather/monitor/pojo/Result.java
+++ b/src/main/java/com/flightfeather/monitor/pojo/Result.java
@@ -14,15 +14,17 @@
     private Object data; //杩斿洖鐨勬暟鎹�
 
     //澧炲垹鏀� 鎴愬姛鍝嶅簲
-    public static Result success(){
-        return new Result(1,"success",null);
+    public static Result success() {
+        return new Result(1, "success", null);
     }
+
     //鏌ヨ 鎴愬姛鍝嶅簲
-    public static Result success(Object data){
-        return new Result(1,"success",data);
+    public static Result success(Object data) {
+        return new Result(1, "success", data);
     }
+
     //澶辫触鍝嶅簲
-    public static Result error(String msg){
-        return new Result(0,msg,null);
+    public static Result error(String msg) {
+        return new Result(0, msg, null);
     }
 }
diff --git a/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt
index 1f1e24f..11744a8 100644
--- a/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt
+++ b/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt
@@ -29,6 +29,7 @@
             taskDelay = isTaskDelay(localtime)
             if (!taskDelay) {
                 log.info("鏃ラ闄╁垎鏋愭墽琛�")
+                riskAnalysisController.init()
                 riskAnalysisController.autoRunDaily()
             }
         }
diff --git a/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt
index fa70d2e..62f485f 100644
--- a/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt
+++ b/src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt
@@ -23,6 +23,7 @@
             taskDelay = isTaskDelay(localtime)
             if (!taskDelay) {
                 log.info("鏈堥闄╁垎鏋愭墽琛�")
+                riskAnalysisController.init()
                 riskAnalysisController.autoRunMonthly()
             }
         }
diff --git a/src/main/java/com/flightfeather/monitor/service/RiskAnalysisService.java b/src/main/java/com/flightfeather/monitor/service/RiskAnalysisService.java
deleted file mode 100644
index 9374e3a..0000000
--- a/src/main/java/com/flightfeather/monitor/service/RiskAnalysisService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.flightfeather.monitor.service;
-
-import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
-
-import java.util.List;
-
-public interface RiskAnalysisService {
-    List<RiskValue> queryRiskDataByMonth(String siteName,String month,String type);
-}
diff --git a/src/main/java/com/flightfeather/monitor/service/RiskValueService.java b/src/main/java/com/flightfeather/monitor/service/RiskValueService.java
new file mode 100644
index 0000000..5d39c8a
--- /dev/null
+++ b/src/main/java/com/flightfeather/monitor/service/RiskValueService.java
@@ -0,0 +1,16 @@
+package com.flightfeather.monitor.service;
+
+import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
+
+import java.util.List;
+
+public interface RiskValueService {
+    /**
+     * 鏍规嵁绔欑偣鍚嶅瓧锛堝彲閫夊�硷級锛屾湀浠斤紝绫诲瀷鏉ヨ繑鍥為闄╁��
+     * @param mnCode
+     * @param month
+     * @param type
+     * @return
+     */
+    List<RiskValue> queryRiskDataByMonth(String mnCode, String month, String type);
+}
diff --git a/src/main/java/com/flightfeather/monitor/service/impl/RiskAnalysisServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/RiskAnalysisServiceImpl.java
deleted file mode 100644
index 6e8dd21..0000000
--- a/src/main/java/com/flightfeather/monitor/service/impl/RiskAnalysisServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.flightfeather.monitor.service.impl;
-
-import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
-import com.flightfeather.monitor.mapper.RiskAnalysisMapper;
-import com.flightfeather.monitor.service.RiskAnalysisService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class RiskAnalysisServiceImpl implements RiskAnalysisService {
-    @Autowired
-    private RiskAnalysisMapper riskAnalysisMapper;
-
-    @Override
-    public List<RiskValue> queryRiskDataByMonth(String siteName,String month,String type) {
-        List<RiskValue> list = riskAnalysisMapper.queryRiskDataByMonth(siteName,month,type);
-        return list;
-    }
-}
diff --git a/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java
new file mode 100644
index 0000000..07bb3cf
--- /dev/null
+++ b/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java
@@ -0,0 +1,31 @@
+package com.flightfeather.monitor.service.impl;
+
+import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
+import com.flightfeather.monitor.domain.ds1.mapper.RiskValueMapper;
+import com.flightfeather.monitor.domain.ds1.repository.RiskValueRep;
+import com.flightfeather.monitor.mapper.RiskAnalysisMapper;
+import com.flightfeather.monitor.service.RiskValueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class RiskValueServiceImpl implements RiskValueService {
+    @Autowired
+    private RiskValueMapper riskValueMapper;
+    @Autowired
+    private RiskValueRep riskValueRep;
+
+    @Override
+    public List<RiskValue> queryRiskDataByMonth(String mnCode, String month, String type) {
+        LocalDate date = LocalDate.parse(month);
+        if (date != null) {
+            return riskValueRep.select(mnCode, date, type);
+        } else {
+            return new ArrayList<>();
+        }
+    }
+}
diff --git a/src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt b/src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt
index dfa23f6..c24a3de 100644
--- a/src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt
+++ b/src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt
@@ -74,8 +74,8 @@
             return uid.toString()
         }
 
-        private fun toHex(value: Int, length: Int): String {
-            var value = value
+        private fun toHex(v: Int, length: Int): String {
+            var value = v
             val hexDigits = charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F')
             val buffer = StringBuffer(length)
             val shift = length - 1 shl 2
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ceaf07e..f4ff63b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,13 +2,14 @@
   datasource:
     ds1:
       driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://localhost:3306/fume
-#      username: fume
-#      password: fume_feiyu2023
+#      鐢熶骇鐜
+      url: jdbc:mysql://localhost:3306/fume
+      username: fume
+      password: fume_feiyu2023
 
-      url: jdbc:mysql://localhost:3306/qianduan_sql
-      username: root
-      password: 1234
+#      url: jdbc:mysql://localhost:3306/qianduan_sql
+#      username: root
+#      password: 1234
 
 #      url: jdbc:mysql://localhost:3306/fume
 #      username: root
diff --git a/src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt b/src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt
index 839524d..7ac1b93 100644
--- a/src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt
+++ b/src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt
@@ -1,6 +1,5 @@
 package com.flightfeather.monitor.analysis.dust
 
-import com.flightfeather.monitor.utils.DateUtil
 import org.junit.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.runner.RunWith
@@ -8,7 +7,6 @@
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.context.junit4.SpringRunner
-import java.time.LocalDate
 
 @RunWith(SpringRunner::class)
 @ExtendWith(SpringExtension::class)

--
Gitblit v1.9.3