From bcd63b915e69917990dcde932492e6d253d62962 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 23 七月 2024 11:11:29 +0800
Subject: [PATCH] 运维阈值key 反引号

---
 ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml                    |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java         |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java |    2 
 ycl-server/src/main/java/com/ycl/task/HKTask.java                                  |    5 +-
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java         |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java           |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java   |    2 
 ycl-server/src/main/java/com/ycl/web/UYClient.java                                 |    7 +--
 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java           |    2 
 ycl-server/src/main/java/com/ycl/task/UYTask.java                                  |   59 +++++++++++++++++++++++++++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java     |    2 
 11 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
similarity index 89%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
index 176eec5..0a74a9d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
similarity index 91%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
index 5ab8659..110dc3c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
index b842cba..83ea4e5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
similarity index 98%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
index 059dd62..93e5fda 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
 
 import lombok.Data;
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
index 1868a9b..8e6f1b1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
 
 import lombok.Data;
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
similarity index 97%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
index 078b9d4..8ac3736 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
 
 import lombok.Data;
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 6422958..94819a5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
 
 import lombok.Data;
 
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index d4bf4be..5220041 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -58,6 +58,7 @@
             mongoTemplate.insert(list);
             //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
             ywThresholdService.carCheck(list);
+
         } else {
             log.error("鍚屾杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
         }
@@ -80,10 +81,10 @@
             if (CollectionUtils.isEmpty(list)) {
                 throw new RuntimeException("浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
             }
-            //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
-
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insert(list);
+            //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
+
         } else {
             log.error("鍚屾浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
         }
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
new file mode 100644
index 0000000..e0c9c37
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -0,0 +1,59 @@
+package com.ycl.task;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ycl.platform.domain.param.HK.FaceDeviceInspectionParam;
+import com.ycl.platform.domain.param.HK.VehicleDeviceInspectionParam;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.web.HKClient;
+import com.ycl.web.UYClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@Component("UYTask")
+public class UYTask {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Autowired
+    private UYClient uyClient;
+    @Autowired
+    private IYwThresholdService ywThresholdService;
+
+    private final static Integer pageNo = 1;
+    private final static Integer pageSize = 5000;
+    //鎴愬姛鐘舵�佺爜
+    private final static String successCode = "0";
+
+    //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
+    public void VehicleDeviceInspectionTask() {
+        log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+
+        log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+    }
+
+
+    public void FaceDeviceInspectionTask() {
+        log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+
+        log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+    }
+
+
+    private String getToday() {
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String today = sdf.format(date);
+        return today;
+    }
+}
diff --git a/ycl-server/src/main/java/com/ycl/web/UYClient.java b/ycl-server/src/main/java/com/ycl/web/UYClient.java
index e66f4ef..8757669 100644
--- a/ycl-server/src/main/java/com/ycl/web/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/UYClient.java
@@ -1,11 +1,10 @@
 package com.ycl.web;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ycl.config.HKFeignConfig;
 import com.ycl.config.YYFeignConfig;
-import com.ycl.platform.domain.param.YY.CameraParam;
-import com.ycl.platform.domain.param.YY.OnlineParam;
-import com.ycl.platform.domain.param.YY.RecordMetaDSumParam;
+import com.ycl.platform.domain.param.UY.CameraParam;
+import com.ycl.platform.domain.param.UY.OnlineParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
index dc3787c..da7ee24 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="selectYwThresholdVo">
-        select id, monitor_type, count_type , key, name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
+        select id, monitor_type, count_type,  `key` , name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
     </sql>
 
     <select id="selectYwThresholdList" parameterType="YwThreshold" resultMap="YwThresholdResult">

--
Gitblit v1.8.0