Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -246,4 +246,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String  isLockName;
     
     private String releasedUrl;
+
+    /**
+     * 1已报警2未报警
+     */
+    @TableField(exist = false)
+    private Integer failureToAlarm;
 }

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -147,4 +147,11 @@ public class MsgAlarmResp implements Serializable {
     private Integer alarmConfidence;
 
     private String alarmAttrName;
+    /**
+     * 1已报警2未报警
+     */
+    private Integer failureToAlarm;
+    
+
+
 }

business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml

@@ -290,10 +290,10 @@
                 and a.released_type =#{releasedType}
             </if>
             <if test="beginAlarmTime != null and beginAlarmTime != ''">
-                and date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d %H:%i:%S')
+                and date_format(a.alarm_time,'%Y-%m-%d') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d')
             </if>
             <if test="endAlarmTime != null and endAlarmTime != ''">
-                AND date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d %H:%i:%S')
+                AND date_format(a.alarm_time,'%Y-%m-%d') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d')
             </if>
         </where>
         order by  a.alarm_time desc

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -790,6 +790,7 @@ public class BaseCameraManagementController extends BaseController {
             }
             List<MsgAlarm> list = msgAlarmService.list(wrapper1);
             if (list.size() > 0) {
+                msgAlarmResp.setFailureToAlarm(1);
                 MsgAlarm msgAlarm = list.get(0);
                 if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
@@ -819,6 +820,8 @@ public class BaseCameraManagementController extends BaseController {
                     log.info("publish--------" + objects);
                     msgAlarmResp.setImageUrls(objects);
                 }
+            }else {
+                msgAlarmResp.setFailureToAlarm(2);
             }
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -456,7 +456,16 @@ public class MsgAlarmController extends BaseController {
         wrapper.eq("camera_code", cameraCode);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarm> list = msgAlarmService.list(wrapper);
-        return AjaxResult.success(list);
+        if (list.size()>0) {
+            for (MsgAlarm msgAlarm : list) {
+                msgAlarm.setFailureToAlarm(1);
+            }
+            return AjaxResult.success(list);
+        }else {
+            MsgAlarm msgAlarm = new MsgAlarm();
+            msgAlarm.setFailureToAlarm(2);
+            return AjaxResult.success(msgAlarm);
+        }
     }
 
     /**