From 040fe24077c6a57fd0b337fd41cec00d9125eb0e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 12 十二月 2024 00:58:52 +0800
Subject: [PATCH] 一机一档OSD优化

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java      |   40 ++++++++++++++++++----------------------
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |    8 ++++----
 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java    |    2 +-
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index f46261c..ea63c09 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -58,6 +58,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date setTime;
 
+
     /**
      * osd閫氶亾鍚�
      */
@@ -91,7 +92,7 @@
     /**
      * osdTimeCorrect鏃堕棿鏄惁姝g‘
      */
-    private String osdTimeCorrectText;
+    private Boolean osdTimeError;
 
     /**
      * osd閫氶亾鍚嶆槸鍚︽纭�   1姝g‘  0鏈煡  -1閿�
@@ -99,9 +100,9 @@
     private Integer osdNameCorrect;
 
     /**
-     * osd閫氶亾鍚嶆槸鍚︽纭�   1姝g‘  0鏈煡  -1閿�
+     * osd閫氶亾鍚嶆槸鍚︽纭�
      */
-    private String osdNameCorrectText;
+    private Boolean osdNameError;
 
     /**
      * osd鐪佹槸鍚︽纭�
@@ -111,7 +112,7 @@
     /**
      * osd鐪佹槸鍚︽纭�
      */
-    private String osdProvinceCorrectText;
+    private Boolean osdProvinceError;
 
     /**
      * osd甯傛槸鍚︽纭�
@@ -121,7 +122,7 @@
     /**
      * osd甯傛槸鍚︽纭�
      */
-    private String osdCityCorrectText;
+    private Boolean osdCityError;
 
     /**
      * osd鍖烘槸鍚︽纭�
@@ -131,7 +132,7 @@
     /**
      * osd鍖烘槸鍚︽纭�
      */
-    private String osdPartCorrectText;
+    private Boolean osdPartError;
     /**
      * osd宸︿笅瑙掓槸鍚︽纭�
      */
@@ -150,26 +151,21 @@
         return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
     }
 
-    public static void getText(OsdCheckResult result) {
-        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("姝g‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("閿欒");
-        else { result.setOsdTimeCorrectText("鏈煡"); }
+    public static void getError(OsdCheckResult result) {
+        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeError(Boolean.FALSE);
+        else {result.setOsdTimeError(Boolean.TRUE); }
 
-        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("姝g‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("閿欒");
-        else { result.setOsdNameCorrectText("鏈煡"); }
+        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameError(Boolean.FALSE);
+        else { result.setOsdNameError(Boolean.TRUE); }
 
-        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("姝g‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("閿欒");
-        else { result.setOsdProvinceCorrectText("鏈煡"); }
+        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceError(Boolean.FALSE);
+        else { result.setOsdProvinceError(Boolean.TRUE); }
 
-        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("姝g‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("閿欒");
-        else { result.setOsdCityCorrectText("鏈煡"); }
+        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityError(Boolean.FALSE);
+        else { result.setOsdCityError(Boolean.TRUE); }
 
-        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("姝g‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("閿欒");
-        else { result.setOsdPartCorrectText("鏈煡"); }
+        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartError(Boolean.FALSE);
+        else { result.setOsdPartError(Boolean.TRUE); }
 
         if(DeviceType.DH.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.DH.getDesc());
         else if(DeviceType.HK.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.HK.getDesc());
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index 55cb5e8..b151c5f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -162,7 +162,7 @@
     }
 
     /**
-     * 瑙嗛锛氭牎鏃舵纭巼
+     * 瑙嗛锛氭牎鏃舵纭巼 锛堟柊瑙勫垯宸茬粡寮冪敤锛�
      *
      * @param query
      * @return
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index ae7b2ce..84ae58a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1061,7 +1061,7 @@
         MongoUtil.setPage(query, params, "checkTime");
         List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
         for (OsdCheckResult osdCheckResult : resultList) {
-            OsdCheckResult.getText(osdCheckResult);
+            OsdCheckResult.getError(osdCheckResult);
         }
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
@@ -1183,7 +1183,7 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
+        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, null);
         //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
         if (params.getOption() != null) {
             if(params.getOption()==1) {
@@ -1200,14 +1200,14 @@
         List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
 
         for (OsdCheckResult osdCheckResult : resultList) {
-            OsdCheckResult.getText(osdCheckResult);
+            OsdCheckResult.getError(osdCheckResult);
         }
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("osd_check_result");
         //鎬绘暟
         List<Document> dList = new ArrayList<>(2);
-        dList.add(new Document("importantTag", Boolean.TRUE));
+//        dList.add(new Document("importantTag", Boolean.TRUE));
         setTag(params, dList);
         Document osdFilter = new Document("$and", dList);
         //姝e父鏁�

--
Gitblit v1.8.0