2023-04.04 降雨量统计判断修改 新增报警状态统计

eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/MpDataController.java

@@ -172,5 +172,6 @@ public class MpDataController {
     public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
         mpDataService.download(response, dataQueryCriteria, request);
     }
+
 }
 

eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/RealDataController.java

@@ -133,7 +133,7 @@ public class RealDataController {
     @GetMapping("dimensional")
     public ResponseEntity<Object> dimensionalReal(HttpServletRequest request, String tailInfoNo) {
         if (ObjectUtils.isEmpty(tailInfoNo)) {
-            return null;
+            return new ResponseEntity<>(PageResult.failed(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
         //创建返回对象
         ArrayList<RealDataVo> realDataVos = new ArrayList<>();
@@ -150,39 +150,39 @@ public class RealDataController {
         for (SysType sysType : list) {
             switch (sysType.getCode()) {
                 case "1":
-                    List<RealDataVo> dbdatas = dbDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> dbdatas = dbDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(dbdatas);
                     break;
                 case "2":
-                    List<RealDataVo> wtdatas = wtDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> wtdatas = wtDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(wtdatas);
                     break;
                 case "3":
-                    List<RealDataVo> mpdatas = mpDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> mpdatas = mpDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(mpdatas);
                     break;
                 case "4":
-                    List<RealDataVo> dmdatas = dmDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> dmdatas = dmDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(dmdatas);
                     break;
                 case "5":
-                    List<RealDataVo> stdatas = stDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> stdatas = stDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(stdatas);
                     break;
                 case "6":
-                    List<RealDataVo> rgdatas = rgDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> rgdatas = rgDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(rgdatas);
                     break;
                 case "7":
-                    List<RealDataVo> psldatas = pslDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> psldatas = pslDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(psldatas);
                     break;
                 case "9":
-                    List<RealDataVo> sldatas = slDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> sldatas = slDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(sldatas);
                     break;
                 case "16":
-                    List<RealDataVo> wpbdatas = wpbDataService.real(sysType.getTypeno(), request,tailInfoNo);
+                    List<RealDataVo> wpbdatas = wpbDataService.real(sysType.getTypeno(), request, tailInfoNo);
                     realDataVos.addAll(wpbdatas);
                     break;
             }

eladmin-system/src/main/resources/mapper/data/RgDataMapper.xml

@@ -35,7 +35,6 @@
             time >= #{start}
           AND time <= #{end}
           and sensorid=#{sensorid}
-          and state = 0
         GROUP BY
             DATE_FORMAT( time, '%Y-%m-%d' )
     </select>

eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml

@@ -27,8 +27,7 @@
         SELECT COUNT(id) as unloin
         FROM tb_drybeachequipinfor
         where tailingid = #{tailingid}
-            and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 30 MINUTE), '%Y-%m-%d
-        %H:%m:%s')
+            and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 30 MINUTE), '%Y-%m-%d %H:%i:%s')
            or datarealtime is Null) and  equipname !='基准点'
     </select>
     <update id="enforceOnline">