Merge remote-tracking branch 'origin/master'

cjy-project/src/main/java/com/cjy/emergencycommand/service/impl/AcceptAlarmServiceImpl.java

@@ -51,42 +51,83 @@ public class AcceptAlarmServiceImpl implements AcceptAlarmService {
      */
     @Override
     public int createAlarmOrder(AlarmInfo alarmInfo) {
-        alarmInfo.setAlarmSource(MOBILE.getValue());
-        // alarmInfo.setStatus(RECEIVING_ALARM.getValue());
-        alarmInfo.setType(ORDER_ALARM.getValue());
-        alarmInfo.setOrderType(MANUAL_ORDER.getValue());
-        //接警
-        if(RECEIVING_ALARM.getValue().equals(alarmInfo.getStatus())){
-            alarmInfo.setCreateTime(DateUtils.getNowDate());
-            alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
-            alarmInfo.setAcceptTime(DateUtils.getNowDate());
-        }
-        //
-        if(CLOSING_ALARM.getValue().equals(alarmInfo.getStatus())){
-            alarmInfo.setCreateTime(DateUtils.getNowDate());
-            alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
-            alarmInfo.setAcceptTime(DateUtils.getNowDate());
-
-            alarmInfo.setEndTime(DateUtils.getNowDate());
-            alarmInfo.setEndUserId(alarmInfo.getCreateBy());
-        }
-        //无效告警
-        if(INVALID_ALARM.getValue().equals(alarmInfo.getStatus())){
-            alarmInfo.setCreateTime(DateUtils.getNowDate());
-            alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
-            alarmInfo.setAcceptTime(DateUtils.getNowDate());
+        if(alarmInfo.getId()==0 || null ==alarmInfo.getId() || "".equals(alarmInfo.getId())){
+            alarmInfo.setAlarmSource(MOBILE.getValue());
+            // alarmInfo.setStatus(RECEIVING_ALARM.getValue());
+            alarmInfo.setType(ORDER_ALARM.getValue());
+            alarmInfo.setOrderType(MANUAL_ORDER.getValue());
+            //接警
+            if(RECEIVING_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
+            }
+            //
+            if(CLOSING_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
 
-            alarmInfo.setUpdateTime(DateUtils.getNowDate());
-        }
+                alarmInfo.setEndTime(DateUtils.getNowDate());
+                alarmInfo.setEndUserId(alarmInfo.getCreateBy());
+            }
+            //无效告警
+            if(INVALID_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
+
+                alarmInfo.setUpdateTime(DateUtils.getNowDate());
+            }
+
+            alarmInfo.setOrderId(UUID.randomUUID().toString().replaceAll("-",""));
+            try {
+                //通知指挥调度平台
+                WebSocketServer.sendInfo("", alarmInfo.getCid());
+            } catch (Exception e) {
+                return 0;
+            }
+            return alarmInfoService.insertAlarmInfo(alarmInfo);
+        }else {
+            alarmInfo.setAlarmSource(MOBILE.getValue());
+            // alarmInfo.setStatus(RECEIVING_ALARM.getValue());
+            alarmInfo.setType(ORDER_ALARM.getValue());
+            alarmInfo.setOrderType(MANUAL_ORDER.getValue());
+            //接警
+            if(RECEIVING_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
+            }
+            //
+            if(CLOSING_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
+
+                alarmInfo.setEndTime(DateUtils.getNowDate());
+                alarmInfo.setEndUserId(alarmInfo.getCreateBy());
+            }
+            //无效告警
+            if(INVALID_ALARM.getValue().equals(alarmInfo.getStatus())){
+                alarmInfo.setCreateTime(DateUtils.getNowDate());
+                alarmInfo.setAcceptUserId(alarmInfo.getCreateBy());
+                alarmInfo.setAcceptTime(DateUtils.getNowDate());
+
+                alarmInfo.setUpdateTime(DateUtils.getNowDate());
+            }
+
+            alarmInfo.setOrderId(UUID.randomUUID().toString().replaceAll("-",""));
+            try {
+                //通知指挥调度平台
+                WebSocketServer.sendInfo("", alarmInfo.getCid());
+            } catch (Exception e) {
+                return 0;
+            }
+            return alarmInfoService.updateAlarmInfo(alarmInfo);
 
-        alarmInfo.setOrderId(UUID.randomUUID().toString().replaceAll("-",""));
-        try {
-            //通知指挥调度平台
-            WebSocketServer.sendInfo("", alarmInfo.getCid());
-        } catch (Exception e) {
-            return 0;
         }
-        return alarmInfoService.insertAlarmInfo(alarmInfo);
+
     }
 
     @Override

cjy-project/src/main/java/com/cjy/emergencycommand/service/impl/AlarmInfoServiceImpl.java

@@ -97,7 +97,8 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
 
     @Override
     public List<AlarmInfoVO> selectAlarmInfoListByAlarmInfo(AlarmInfoDTO alarmInfoDTO) {
-        return alarmInfoMapper.selectAlarmInfoListByAlarmInfo(alarmInfoDTO);
+        List<AlarmInfoVO>  list= alarmInfoMapper.selectAlarmInfoListByAlarmInfo(alarmInfoDTO);
+        return list;
     }
 
     @Override

cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml

@@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ec_classification_config t4 ON t1.classification_event_code = t4.code AND t2.type = 2
         LEFT JOIN sys_dict_data t5 ON t1.event_grade_id = t5.dict_value AND t5.dict_type = 'event_grade_id'
         <where>
-        t1.del_flag !=2 and t1.status &lt; 2
+        t1.del_flag !=2 and t1.status =1
         <if test="classificationDataCode != null  and classificationDataCode != ''">and t1.classification_data_code =
             #{classificationDataCode}
         </if>
@@ -402,7 +402,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id, t1.create_time as createTime ,t2.name as alarmSourceName,
                t1.alarm_code as alarmCode,t4.dict_label as gradeName,t3.name as classificationDataName,t1.classification_data_code as classificationDataCode,
                t1.contact_user as contactUser,t1.phone as phone,
-               t1.title,t1.longitude,t1.latitude,t1.status
+               t1.title,t1.longitude,t1.latitude,t1.status,t1.description
         from ec_alarm_info t1
                  LEFT JOIN ec_classification_config t2 ON t1.alarm_source = t2.code AND t2.type = 3
                  LEFT JOIN ec_classification_data_config t3 ON t1.classification_data_code = t3.code