Merge remote-tracking branch 'origin/develop' into develop

ruoyi-common/src/main/java/com/zc/common/core/websocket/constant/WebSocketEvent.java

@@ -16,5 +16,7 @@ public class WebSocketEvent {
     //设备状态
     public static final String DEVICE_STATE = "deviceState";
 
+    //处置记录
+    public static final String EVENT_PROCESS = "eventProcess";
 
 }

zc-business/src/main/java/com/zc/business/controller/CodeScanningAlarmController.java

@@ -10,6 +10,8 @@ import com.zc.business.domain.DcWarning;
 import com.zc.business.enums.UniversalEnum;
 import com.zc.business.mapper.DcEventProcessMapper;
 import com.zc.business.service.IDcWarningService;
+import com.zc.common.core.websocket.WebSocketService;
+import com.zc.common.core.websocket.constant.WebSocketEvent;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -156,7 +158,8 @@ public class CodeScanningAlarmController extends BaseController {
         dcEventProcess.setOperationTime(new Date());
         dcEventProcessMapper.insertDcEventProcess(dcEventProcess);
 
-
+        //websocket推送
+        WebSocketService.broadcast(WebSocketEvent.EVENT_PROCESS, dcEventProcess);
 
         return AjaxResult.success("添加成功");
     }

zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java

@@ -165,7 +165,7 @@ public class DcSdhsEventController {
     }
     @PostMapping("/export")
     @ApiOperation("导出")
-    public void trafficSituationReport(HttpServletResponse response,@RequestBody DcSdhsEventQuery dcSdhsEventQuery) throws Exception {
+    public void trafficSituationReport(HttpServletResponse response,DcSdhsEventQuery dcSdhsEventQuery) throws Exception {
         try {
             SimpleDateFormat df = new SimpleDateFormat(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
             String date = df.format(new Date());
@@ -294,9 +294,9 @@ public class DcSdhsEventController {
      * @param dcSdhsEventQuery
      * @return
      */
-    @GetMapping("/accidentTimeAnalysis")
+    @PostMapping("/accidentTimeAnalysis")
     @ApiOperation("事故时间分析")
-    public AjaxResult accidentTimeAnalysis(DcSdhsEventQuery dcSdhsEventQuery){
+    public AjaxResult accidentTimeAnalysis(@RequestBody DcSdhsEventQuery dcSdhsEventQuery){
         return AjaxResult.success( dcSdhsEventService.accidentTimeAnalysis(dcSdhsEventQuery));
     }
     /**
@@ -304,18 +304,18 @@ public class DcSdhsEventController {
      * @param dcSdhsEventQuery
      * @return
      */
-    @GetMapping("/accidentModelAnalysis")
+    @PostMapping("/accidentModelAnalysis")
     @ApiOperation("事故车型分析")
-    public AjaxResult accidentModelAnalysis(DcSdhsEventQuery dcSdhsEventQuery){
+    public AjaxResult accidentModelAnalysis(@RequestBody DcSdhsEventQuery dcSdhsEventQuery){
         return AjaxResult.success( dcSdhsEventService.accidentModelAnalysis(dcSdhsEventQuery));
     }    /**
      * 收费站出入口分析
      * @param dcSdhsEventQuery
      * @return
      */
-    @GetMapping("/TollBoothStatisticsList")
+    @PostMapping("/TollBoothStatisticsList")
     @ApiOperation("收费站出入口分析")
-    public AjaxResult TollBoothStatisticsList(DcSdhsEventQuery dcSdhsEventQuery){
+    public AjaxResult TollBoothStatisticsList(@RequestBody DcSdhsEventQuery dcSdhsEventQuery){
         return AjaxResult.success( dcSdhsEventService.TollBoothStatisticsList(dcSdhsEventQuery));
     }
 
@@ -324,9 +324,9 @@ public class DcSdhsEventController {
      * @param dcSdhsEventQuery
      * @return
      */
-    @GetMapping("/gantryAnalysis")
+    @PostMapping("/gantryAnalysis")
     @ApiOperation("门架分析")
-    public AjaxResult gantryAnalysis(DcSdhsEventQuery dcSdhsEventQuery){
+    public AjaxResult gantryAnalysis(@RequestBody DcSdhsEventQuery dcSdhsEventQuery){
         return AjaxResult.success( dcSdhsEventService.trafficFlowStatistics(dcSdhsEventQuery));
     }
 

zc-business/src/main/java/com/zc/business/domain/DcSdhsEventQuery.java

@@ -27,15 +27,11 @@ public class DcSdhsEventQuery
     private String type;
 
     /** 开始时间 */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") //接收时间类型
-
     private Date startTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") //接收时间类型
-
     private Date endTime;
 
     /** 需要导出的键 */

zc-business/src/main/java/com/zc/business/domain/TrafficFlowStatisticsMap.java

@@ -18,7 +18,7 @@ public class TrafficFlowStatisticsMap {
         private String direction;
         private String statisticalDate;
         private String facilityName;
-        private Long trafficVolume;
+        private Long trafficVolume = 0L; // 默认值;
         private String periodType;
 
 }

zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java

@@ -167,7 +167,7 @@ public class OperationLogAspect {
                 operLog.setStatus(UniversalEnum.ONE.getNumber());
                 //sta = UniversalEnum.LOSE.getValue();
             }
-
+    
             ArrayList<String> deviceIds = new ArrayList<>();
             ArrayList<String> deviceNames = new ArrayList<>();
             String deviceType = UniversalEnum.EMPTY_STRING.getValue();

zc-business/src/main/java/com/zc/business/service/impl/DcEventProcessServiceImpl.java

@@ -10,6 +10,8 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.zc.business.domain.DcEvent;
+import com.zc.common.core.websocket.WebSocketService;
+import com.zc.common.core.websocket.constant.WebSocketEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zc.business.mapper.DcEventProcessMapper;
@@ -84,7 +86,12 @@ public class DcEventProcessServiceImpl implements IDcEventProcessService
         dcEventProcess.setOperationTime(new Date());
         dcEventProcess.setOperator(SecurityUtils.getUserId().toString());
         dcEventProcess.setOperatorName(SecurityUtils.getLoginUser().getUser().getNickName());
-        return dcEventProcessMapper.insertDcEventProcess(dcEventProcess);
+        int i = dcEventProcessMapper.insertDcEventProcess(dcEventProcess);
+
+        //websocket推送
+        WebSocketService.broadcast(WebSocketEvent.EVENT_PROCESS, dcEventProcess);
+
+        return i;
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java

@@ -295,6 +295,9 @@ public class DcWarningServiceImpl implements IDcWarningService {
             dcEventProcess.setOperationTime(new Date());
             dcEventProcessMapper.insertDcEventProcess(dcEventProcess);
 
+            //websocket推送
+            WebSocketService.broadcast(WebSocketEvent.EVENT_PROCESS, dcEventProcess);
+
         }
 
         extracted(dcWarning);

zc-business/src/main/resources/mapper/business/DcEventProcessMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertDcEventProcess" parameterType="DcEventProcess">
+    <insert id="insertDcEventProcess" parameterType="DcEventProcess"  useGeneratedKeys="true" keyProperty="id">
         insert into dc_event_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>