Merge remote-tracking branch 'origin/master'

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

@@ -51,6 +51,7 @@ public class AcceptAlarmServiceImpl implements AcceptAlarmService {
         if(CLOSING_ALARM.getValue().equals(alarmInfo.getStatus())){
             alarmInfo.setEndTime(DateUtils.getNowDate());
         }
+
         if(INVALID_ALARM.getValue().equals(alarmInfo.getStatus())){
             alarmInfo.setUpdateTime(DateUtils.getNowDate());
         }

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

@@ -311,8 +311,16 @@ public class ManageAlarmServiceImpl implements ManageAlarmService {
     public int alarmOrderCance(AlarmOrderHandleDTO alarmOrderHandleDTO) {
         AlarmInfo alarmInfo = new AlarmInfo();
         alarmInfo.setId(alarmOrderHandleDTO.getId());
+        AlarmInfo alarmInfo1 = alarmInfoService.selectAlarmInfoById(alarmInfo.getId());
+        alarmInfo.setStatus(WAITING_ALARM.getValue());
+        if(!StringUtils.isEmpty(alarmInfo1.getHandleUserId())){
+            alarmInfo.setStatus(HANDING_ALARM.getValue());
+        }
+
+        if(!StringUtils.isEmpty(alarmInfo1.getAcceptUserId())){
+            alarmInfo.setStatus(RECEIVING_ALARM.getValue());
+        }
         alarmInfo.setOrganCode(alarmOrderHandleDTO.getOrganCode());
-        alarmInfo.setStatus(HANDING_ALARM.getValue());
         alarmInfo.setUpdateTime(DateUtils.getNowDate());
         alarmInfo.setUpdateBy(alarmOrderHandleDTO.getUpdateBy());
         return alarmInfoService.updateAlarmInfo(alarmInfo);

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

@@ -356,12 +356,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="alarmOrderDetail" resultType="com.cjy.emergencycommand.domain.vo.AlarmOrderDetailVO">
-        select t1.id, t1.create_time as createTime ,t2.name as alarmSourceName,
+        select t1.id, t1.create_time as createTime , t1.update_time as updateTime ,t2.name as alarmSourceName,
                t1.alarm_code as alarmCode,t4.dict_label as gradeName,
                t1.contact_user as contactUser,t1.phone as phone,
                t1.title,CONCAT(t1.longitude,',',t1.latitude) as location,
                t1.accept_time as acceptTime,t1.accept_user_id AS acceptUser,
                t1.handle_time as handleTime ,t1.handle_user_id as handleUser,
+               t1.end_time as endTime ,t1.end_user_id as endUserId,
                t1.classification_event_code as classificationEventCode,t1.event_grade_id as eventGradeId,
                t1.principal_user_id AS principalUserId,t1.waring_feedback AS waringFeedback,
                t1.scheduling_id AS schedulingId,t1.multimedia_scheduling_type AS multimediaSchedulingType,

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/dto/PassengerFlowResult.java

@@ -0,0 +1,118 @@
+package com.ruoyi.quartz.domain.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author hehang
+ * @version 2021.3
+ * @date 2023/5/19 15:02
+ */
+public class PassengerFlowResult implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String projectId;
+    private String accuracy;
+    private Long startTime;
+    private Long endTime;
+    private String inFlow;
+    private String outflow;
+    private String deviceId;
+    private String deviceName;
+    private String relatedRegionId;
+    private String relatedRegionName;
+
+    @Override
+    public String toString() {
+        return "PassengerFlowResult{" +
+                "projectId='" + projectId + '\'' +
+                ", accuracy='" + accuracy + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", inFlow='" + inFlow + '\'' +
+                ", outflow='" + outflow + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", deviceName='" + deviceName + '\'' +
+                ", relatedRegionId='" + relatedRegionId + '\'' +
+                ", relatedRegionName='" + relatedRegionName + '\'' +
+                '}';
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getAccuracy() {
+        return accuracy;
+    }
+
+    public void setAccuracy(String accuracy) {
+        this.accuracy = accuracy;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getInFlow() {
+        return inFlow;
+    }
+
+    public void setInFlow(String inFlow) {
+        this.inFlow = inFlow;
+    }
+
+    public String getOutflow() {
+        return outflow;
+    }
+
+    public void setOutflow(String outflow) {
+        this.outflow = outflow;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getRelatedRegionId() {
+        return relatedRegionId;
+    }
+
+    public void setRelatedRegionId(String relatedRegionId) {
+        this.relatedRegionId = relatedRegionId;
+    }
+
+    public String getRelatedRegionName() {
+        return relatedRegionName;
+    }
+
+    public void setRelatedRegionName(String relatedRegionName) {
+        this.relatedRegionName = relatedRegionName;
+    }
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/EquipmentInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.quartz.domain.TpLinkConfig;
 import com.ruoyi.quartz.domain.dto.EquipmentResult;
 import com.ruoyi.quartz.domain.dto.GroupResult;
+import com.ruoyi.quartz.domain.dto.PassengerFlowResult;
 import com.ruoyi.quartz.domain.dto.TpLinkConfigExtend;
 import com.ruoyi.quartz.service.EquipmentInfoService;
 import com.ruoyi.quartz.service.ITpLinkConfigService;
@@ -229,8 +230,8 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
                                 map1.put("regionAccumulate",0);
                                 map1.put("accuracy","hour");
                                 List<Long> timeList = new ArrayList<>();
-                                timeList.add(20230518L);
-                                timeList.add(20230519L);
+                                timeList.add(2023051800L);
+                                timeList.add(2023051901L);
                                 map1.put("timeList",timeList);
                                 map1.put("projectId",t.getProjectId());
                                 map1.put("needExport",0);
@@ -243,7 +244,9 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
                                 if (passengerFlowjson.get("error_code").toString().equals("0")) {
                                     JSONObject resultJson = JSONObject.parseObject(passengerFlowjson.get("result").toString());
                                     JSONArray jsonArray = JSONArray.parseArray(resultJson.get("list").toString());
-                                    List<EquipmentResult> iotList = JSON.parseArray(jsonArray.toJSONString(), EquipmentResult.class);
+                                    List<PassengerFlowResult> passengerFlowList = JSON.parseArray(jsonArray.toJSONString(), PassengerFlowResult.class);
+
+
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();