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

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

@@ -3,8 +3,10 @@ package com.zc.business.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.zc.business.domain.DcDevice;
 import com.zc.business.service.IDcDeviceService;
 import com.zc.common.core.httpclient.OkHttp;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 import static com.ruoyi.common.constant.Constants.HTTP;
 
@@ -36,6 +39,10 @@ import static com.ruoyi.common.constant.Constants.HTTP;
 @RequestMapping("/video")
 public class VideoController extends BaseController {
 
+    private static final String ID = "admin";
+    private static final String SECRET = "21232f297a57a5a743894a0e4a801fc3";
+    private static final String CALLBACKURL = "http://10.0.81.209/broadcast/logIn";
+    private final static String TOKENKEY = "tokenRoadTestBroadcastPlatform";
     private static final String USERNAME = "jhgskj";
     private static final String PASSWORD = "jhgskj@2023";
     private static String TOKEN;
@@ -47,6 +54,8 @@ public class VideoController extends BaseController {
 
     public static final Integer ERROR = 500;
 
+    @Resource
+    private RedisCache redisCache;
     @Resource
     private IDcDeviceService iDcDeviceService;
 
@@ -106,7 +115,7 @@ public class VideoController extends BaseController {
      */
     @Scheduled(cron = "0 0/5 * * * ?")
     public void updateDeviceState() throws HttpException, IOException {
-        logger.debug("开始执行：同步数据平台设备的设备状态！！");
+        logger.debug("开始执行：同步数据平台视频设备设备的设备状态！！");
         JSONObject cameraData = synchronizeCameraData();
         if (cameraData.get("code").equals(200)) {
             JSONObject data = JSONObject.parseObject(JSONArray.parseArray(cameraData.get("data").toString()).get(0).toString());
@@ -131,6 +140,7 @@ public class VideoController extends BaseController {
             logger.debug("执行：同步数据平台视频设备的设备状态成功！！");
 
         }
+        logger.debug("开始执行：同步物联平台设备的设备状态！！");
         AjaxResult ajaxResult = synchronizingDeviceStatus();
         if (ajaxResult.get("code").equals(200)) {
             JSONArray data = (JSONArray) ajaxResult.get("data");
@@ -143,13 +153,66 @@ public class VideoController extends BaseController {
                 dcDevices.add(dcDevice);
             }
             iDcDeviceService.batchUpdate(dcDevices);
-            logger.debug("执行：同步数据平台设备的设备状态成功！！");
+            logger.debug("执行：同步物联平台设备的设备状态成功！！");
 
         }
+        logger.debug("开始执行：同步广播设备的设备状态！！");
+        AjaxResult ajaxResultBroadcast = synchronizingBroadcastDeviceStatus();
+        if (Objects.equals(String.valueOf(ajaxResultBroadcast.get("retCode")), "0")) {
+            JSONArray data = (JSONArray) ajaxResultBroadcast.get("termList");
+            for (Object datum : data) {
+                DcDevice dcDevice = new DcDevice();
+                JSONObject datum1 = (JSONObject) datum;
+                dcDevice.setIotDeviceId(datum1.getString("termDN"));
+                dcDevice.setDeviceState(Objects.equals(datum1.getString("regState"), "online") ? "1" : "0");
+                LambdaQueryWrapper<DcDevice> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(DcDevice::getIotDeviceId, dcDevice.getIotDeviceId());
+                iDcDeviceService.update(dcDevice, queryWrapper);
+            }
+            logger.debug("执行：同步广播设备的设备状态成功！！");
 
+        }
 
+    }
 
+    private AjaxResult synchronizingBroadcastDeviceStatus() throws HttpException, IOException {
+        OkHttp okHttp = new OkHttp();
+        RequestParams requestParams = new RequestParams();
+        String tokenRoadTestBroadcastPlatform = redisCache.getCacheObject(TOKENKEY);
+        if (tokenRoadTestBroadcastPlatform == null) {
+            tokenRoadTestBroadcastPlatform = getBroadcastToken();
         }
+        requestParams.put("zoneId", "*6001");
+        requestParams.put("termDN", "");
+        Response response // 请求响应
+                = okHttp
+                .headers(new HashMap<>())
+                .data(requestParams) // 请求参数
+                .url("http://10.0.81.106/api/REST-API/queryTerm.do?accessToken=" + tokenRoadTestBroadcastPlatform) // 请求地址
+                .post(); // 请求方法
+        return JSON.parseObject(response.body().string(), AjaxResult.class);
+    }
+
+    public String getBroadcastToken() throws HttpException, IOException {
+        OkHttp okHttp = new OkHttp();
+        RequestParams requestParams = new RequestParams();
+        requestParams.put("id", ID);
+        requestParams.put("secret", SECRET);
+        requestParams.put("callbackUrl", CALLBACKURL);
+        Response response // 请求响应
+                = okHttp
+                .headers(new HashMap<>())
+                .url("http://10.0.81.106/api/REST-API/login.do") // 请求地址
+                .data(requestParams) // 请求参数
+                .post(); // 请求方法
+        if (response.body() != null) {
+            String accessToken = JSONObject.parseObject(response.body().string()).getString("accessToken");
+            redisCache.setCacheObject(TOKENKEY, accessToken, 100, TimeUnit.MINUTES);
+            return accessToken;
+        }
+        return null;
+    }
+
 
     private AjaxResult synchronizingDeviceStatus() throws HttpException, IOException {
 
@@ -159,8 +222,7 @@ public class VideoController extends BaseController {
                 = okHttp
                 .url(HTTP + "10.0.81.202:8081" + "/api/iot/device/query") // 请求地址
                 .get(); // 请求方法
-        AjaxResult ajaxResult = JSON.parseObject(response.body().string(), AjaxResult.class);
+        return JSON.parseObject(response.body().string(), AjaxResult.class);
-        return ajaxResult;
     }
 
 

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

@@ -22,40 +22,34 @@ public class DcEventProcess
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    @ApiModelProperty(value = "流水ID",required = true)
+    @ApiModelProperty(value = "流水ID")
-    @NotBlank(message = "流水ID不能为空")
     private Long id;
 
     /** $column.columnComment */
-    @ApiModelProperty(value="事件ID",required = true)
+    @ApiModelProperty(value="事件ID")
-    @NotBlank(message = "事件ID不能为空")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String eventId;
 
     /** $column.columnComment */
-    @ApiModelProperty(value="操作时间",required = true)
+    @ApiModelProperty(value="操作时间")
-    @NotBlank(message = "操作时间不能为空")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date operationTime;
 
     /** $column.columnComment */
-    @ApiModelProperty(value="操作人",required = true)
+    @ApiModelProperty(value="操作人")
-    @NotBlank(message = "操作人不能为空")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String operator;
 
     /** 1-pc端
             2-手机端 */
-    @ApiModelProperty(value="来源",required = true)
+    @ApiModelProperty(value="来源")
-    @NotBlank(message = "来源不能为空")
     @Excel(name = "1-pc端 2-手机端")
     private Integer source;
 
     /** 1-节点
             2-信息发布
              */
-    @ApiModelProperty(value="流程类型",required = true)
+    @ApiModelProperty(value="流程类型")
-    @NotBlank(message = "流程类型不能为空")
     @Excel(name = "1-节点 2-信息发布 ")
     private Integer processType;
 

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

@@ -72,7 +72,7 @@ public class DcEventTrafficControl extends BaseEntity
     private Long roadId;
 */
 
-    @ApiModelProperty("原因类型")
+    @ApiModelProperty("原因类型   3-1 雨3-2 雪3-3 雾3-4 道路积水3-5 道路湿滑3-6 道路结冰3-7 沙尘暴4-1 专项工程施工 4-2 改扩建工程施工4-3 其他施工',")
     private String causeType;
 
     @ApiModelProperty("措施  1-临时关闭2-限行车辆3-限行车道4-限行车道且限行车辆5-间隔放行6-并道行驶 7-限速',")

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

@@ -13,8 +13,8 @@ public class DcStakeMark {
     public static final String UP = "1";
     public static final String CENTRE = "2";
     public static final String DOWN = "3";
-    @ApiModelProperty("ID")
+    @ApiModelProperty("桩号")
-    private String id;
+    private String stakeMark;
     @ApiModelProperty("经度")
     private String longitude;
     @ApiModelProperty("纬度")

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

@@ -281,7 +281,7 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
     public DcStakeMark exampleQueryTheAssociatedPileNumber(DcDevice dcDevice) {
         DcStakeMark dcStakeMark = new DcStakeMark();
         dcStakeMark.setDirection(dcDevice.getDirection());
-        dcStakeMark.setId(dcDevice.getStakeMark());
+        dcStakeMark.setStakeMark(dcDevice.getStakeMark());
         List<DcStakeMark> dcStakeMarks = dcStakeMarkService.listStakeMark(dcStakeMark);
         if (dcStakeMarks.size() == 1) {
             return dcStakeMarks.get(0);

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

@@ -29,8 +29,8 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
         LambdaQueryWrapper<DcStakeMark> queryWrapper = new LambdaQueryWrapper<>();
 
         // 设备ID
-        if (StringUtils.hasText(dcStakeMark.getId())) {
+        if (StringUtils.hasText(dcStakeMark.getStakeMark())) {
-            queryWrapper.eq(DcStakeMark::getId, dcStakeMark.getId());
+            queryWrapper.eq(DcStakeMark::getStakeMark, dcStakeMark.getStakeMark());
         }
 
         // 经度
@@ -69,7 +69,7 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
     @Override
     public boolean addStakeMark(DcStakeMark dcStakeMark) {
 
-        String id = dcStakeMark.getId();
+        String id = dcStakeMark.getStakeMark();
         if (Objects.nonNull(id)) {
             DcStakeMark device = getById(id);
             if (Objects.nonNull(device)) {
@@ -84,7 +84,7 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
     @Override
     public boolean editStakeMark(DcStakeMark dcStakeMark) {
 
-        String id = dcStakeMark.getId();
+        String id = dcStakeMark.getStakeMark();
 
         // 检查设备id是否重复
         DcStakeMark product = getById(id);

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

@@ -435,7 +435,7 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService
                     BigDecimal yearNumRatio = new BigDecimal(map.get("num").toString()).multiply(new BigDecimal("100")).divide(new BigDecimal(map.get("lastYearNum").toString()),2, RoundingMode.HALF_UP);
                     map.put("yearNumRatio",yearNumRatio);
                 } else {
-                    map.put("ratio",0);
+                    map.put("yearNumRatio",0);
                 }
 
                 //时长同比

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

@@ -257,7 +257,7 @@
         LEFT JOIN
             (select t2.section_id, count(*) num
             from dc_event t1
-            left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
+            left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
             where
                 t1.event_type = '1' and t1.direction = #{direction}
                 <if test="type != null and type == '1'.toString">
@@ -277,7 +277,7 @@
         LEFT JOIN
             (select t2.section_id, count(*) lastNum
             from dc_event t1
-            left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
+            left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
             where
                 t1.event_type = '1' and t1.direction = #{direction}
                 <if test="type != null and type == '1'.toString">
@@ -298,7 +298,7 @@
 
     <select id="selectEventTypeAnalysis" resultType="java.util.Map">
 
-        select t1.eventSubclass,t1.eventSubclassName,
+        select t1.eventSubclass,t1.eventSubclassName,IFNULL(t2.num,0) num,IFNULL(t3.num,0) lastNum,
             IFNULL(t2.minuteTime,0) minuteTime,ROUND(IFNULL(t2.minuteTime/t2.num,0)) avgTime,
             IFNULL(t3.minuteTime,0) lastMinuteTime,ROUND(IFNULL(t3.minuteTime/t3.num,0)) lastAvgTime
         from