修改气象站工具

bigdata_django/zhijian/qxz_zhijian_new.py

@@ -193,7 +193,7 @@ class QxzCand:
             "经度": "合格条件(绿色)：\n113°46′13″±30″范围内",
             "纬度": "合格条件(绿色)：\n35°1′45″±30″范围内",
             "固件版本号": "合格条件(绿色)：\n用检验时的输入作为导入的标准.\n/ 无法显示,替换为 -",
-            "电压": "合格条件(绿色)：\n11.5~12.5",
+            "电压": "合格条件(绿色)：\n11~13",
             "信号强度": "合格条件(绿色)：\n>14",
             "上传数据条数": "合格条件(绿色)：\n1、大于7条\n2、两条数据时间间隔小于20分钟的出现频次2次以内、两条数据间隔大于40分钟出现频率2次以内",
             "风速": "合格条件(绿色)：\n1、0<示值<10\n2、有1条合格 即可",
@@ -221,7 +221,7 @@ class QxzCand:
             "水质pH": "合格条件(绿色)：\n1、6≤示值≤8\n2、有1条合格即可",
             "水位": "合格条件(绿色)：\n1、0<示值\n2、有1条合格即可",
             "水质电导率": "合格条件(绿色)：\n1、0<示值\n2、有1条合格即可",
-            "气压": "合格条件(绿色)：\n1、1000<示值<1100\n2、有1条合格即可",
+            "气压": "合格条件(绿色)：\n1、900<示值<1150\n2、有1条合格即可",
             "光照度": "合格条件(绿色)：\n1、0<示值<200000\n2、有1条合格即可",
             "硫化氢": "合格条件(绿色)：\n1、示值=0\n2、有1条合格即可",
             "水温": "合格条件(绿色)：\n1.0~30°C，但不允许为0°C\n2、 有1条合格即可",
@@ -356,7 +356,7 @@ function(values_list){{
 
     def get_cond_127(self, ek):
         """获取气压条件"""
-        cond = self.template_func(ek, "1000 < v && v < 1100")
+        cond = self.template_func(ek, "900 < v && v < 1150")
         return cond
 
     def get_cond_154(self, ek):
@@ -1075,8 +1075,8 @@ function(uptime_list){
                             "$cond": {
                                 "if": {
                                     "$and": [
-                                        {"$lte": ["$max_volt", 12.5]},
-                                        {"$gte": ["$min_volt", 11.5]}
+                                        {"$lte": ["$max_volt", 13]},
+                                        {"$gte": ["$min_volt", 11]}
                                     ]
                                 },
                                 "then": 1,

bigdata_django/zhijian/scd_zhijian.py

@@ -189,7 +189,7 @@ class Ui_MainWindow(object):
         self.startTimeEdit = QtWidgets.QDateTimeEdit(self.centralwidget)
         self.startTimeEdit.setGeometry(QtCore.QRect(310, 210, 151, 21))
         self.startTimeEdit.setMaximumDateTime(QtCore.QDateTime(QtCore.QDate(2025, 12, 31), QtCore.QTime(23, 59, 59)))
-        self.startTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2022, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.startTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2022, 1, 1), QtCore.QTime(1, 0, 0)))
         self.startTimeEdit.setObjectName("startTimeEdit")
         self.endTimeLabel = QtWidgets.QLabel(self.centralwidget)
         self.endTimeLabel.setGeometry(QtCore.QRect(180, 250, 121, 21))
@@ -197,7 +197,7 @@ class Ui_MainWindow(object):
         self.endTimeEdit = QtWidgets.QDateTimeEdit(self.centralwidget)
         self.endTimeEdit.setGeometry(QtCore.QRect(310, 250, 151, 21))
         self.endTimeEdit.setMaximumDateTime(QtCore.QDateTime(QtCore.QDate(2025, 12, 31), QtCore.QTime(23, 59, 59)))
-        self.endTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2022, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.endTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2022, 1, 1), QtCore.QTime(1, 0, 0)))
         self.endTimeEdit.setObjectName("endTimeEdit")
         self.platLabel = QtWidgets.QLabel(self.centralwidget)
         self.platLabel.setGeometry(QtCore.QRect(180, 290, 121, 21))
@@ -710,46 +710,49 @@ class SCDThread(QtCore.QThread):
         formal_counts = 0
         verify_list = []
         for index,shortId in enumerate(self.device_list):
-            if isinstance(shortId,int):
+            if isinstance(shortId,int) or isinstance(shortId, float):
                 shortId = str(int(shortId))
             else:
                 shortId = shortId.strip()
             d_id,deviceId,platform = self.device_their_platform(shortId)
             worksheet.write(index+4,0,shortId,formal_style)
             if platform == "大数据平台":
-                worksheet.write(index+4,1,deviceId,formal_style)
-                if platform==self.set_plat:
-                    worksheet.write(index+4,14,platform,formal_style)
-                else:
-                    worksheet.write(index+4,14,platform,error_style)
-                self.mongo_ping()
-                data_cursor = self.scd_collection.find({"device_id":d_id,'addtime': {"$gte":self.start_time ,"$lte":self.end_time}})
-                data_counts = data_cursor.count()
-                if data_counts == 0:
-                    for i in range(2,14):
-                        worksheet.write(index+4,i,"搜索时间内无数据",error_style)
-                    worksheet.write(index+4,15,"不合格",error_style)
-                    danji_verify = []
-                    for i in range(12):
-                        danji_verify.append(0)
-                    verify_list.append(danji_verify)
-                else:
-                    verify_data = self.__bigdata_verify(data_cursor,proess)
-                    danji_verify = []
-                    for clo_index, verify_ in enumerate(verify_data):
-                        danji_verify.append(verify_[0])
-                        if verify_[0] == 0:
-                            worksheet.write(index+4,clo_index+2,verify_[1],error_style)
-                        elif verify_[0] == 1:
-                            worksheet.write(index+4,clo_index+2,verify_[1],formal_style)
-                        else:
-                            worksheet.write(index+4,clo_index+2,verify_[1],common_style)
-                    if 0 in danji_verify:
+                try:
+                    worksheet.write(index+4,1,deviceId,formal_style)
+                    if platform==self.set_plat:
+                        worksheet.write(index+4,14,platform,formal_style)
+                    else:
+                        worksheet.write(index+4,14,platform,error_style)
+                    self.mongo_ping()
+                    data_cursor = self.scd_collection.find({"device_id":d_id,'addtime': {"$gte":self.start_time ,"$lte":self.end_time}})
+                    data_counts = data_cursor.count()
+                    if data_counts == 0:
+                        for i in range(2,14):
+                            worksheet.write(index+4,i,"搜索时间内无数据",error_style)
                         worksheet.write(index+4,15,"不合格",error_style)
+                        danji_verify = []
+                        for i in range(12):
+                            danji_verify.append(0)
+                        verify_list.append(danji_verify)
                     else:
-                        formal_counts += 1
-                        worksheet.write(index+4,15,"合格",formal_style)
-                    verify_list.append(danji_verify)
+                        verify_data = self.__bigdata_verify(data_cursor,proess)
+                        danji_verify = []
+                        for clo_index, verify_ in enumerate(verify_data):
+                            danji_verify.append(verify_[0])
+                            if verify_[0] == 0:
+                                worksheet.write(index+4,clo_index+2,verify_[1],error_style)
+                            elif verify_[0] == 1:
+                                worksheet.write(index+4,clo_index+2,verify_[1],formal_style)
+                            else:
+                                worksheet.write(index+4,clo_index+2,verify_[1],common_style)
+                        if 0 in danji_verify:
+                            worksheet.write(index+4,15,"不合格",error_style)
+                        else:
+                            formal_counts += 1
+                            worksheet.write(index+4,15,"合格",formal_style)
+                        verify_list.append(danji_verify)
+                except Exception as e:
+                    print(e)
             elif platform == "四情平台":
                 worksheet.write(index+4,1,deviceId,formal_style)
                 if platform==self.set_plat: