mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

develop
zhaoxianglong 10 months ago
parent
65d95ba62c 058c64257f
commit
41a0e06999
4 changed files with 194 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      zc-business/src/main/java/com/zc/business/domain/ExternalInterfaceMonitoring.java
  2. 100
      zc-business/src/main/java/com/zc/business/service/impl/DcTrafficStatisticsServiceImpl.java
  3. 29
      zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java
  4. 2
      zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

2
zc-business/src/main/java/com/zc/business/domain/ExternalInterfaceMonitoring.java
View File

@ -1,5 +1,6 @@
package com.zc.business.domain; package com.zc.business.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -41,6 +42,7 @@ public class ExternalInterfaceMonitoring {
@ApiModelProperty("操作结果") @ApiModelProperty("操作结果")
private String operationResult; private String operationResult;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@ApiModelProperty("操作时间") @ApiModelProperty("操作时间")
private Date operationTime; private Date operationTime;
} }

100
zc-business/src/main/java/com/zc/business/service/impl/DcTrafficStatisticsServiceImpl.java
View File

@ -5,17 +5,16 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.sun.xml.bind.v2.TODO;
import com.zc.business.constant.RedisKeyConstants; import com.zc.business.constant.RedisKeyConstants;
import com.zc.business.domain.*; import com.zc.business.domain.DcCongestionSection;
import com.zc.business.domain.DcFacility;
import com.zc.business.domain.DcRoadSection;
import com.zc.business.domain.DcRoadSectionCongestion;
import com.zc.business.enums.StakeMarkRange; import com.zc.business.enums.StakeMarkRange;
import com.zc.business.enums.UniversalEnum; import com.zc.business.enums.UniversalEnum;
import com.zc.business.service.IDcFacilityService; import com.zc.business.service.IDcFacilityService;
import com.zc.business.service.IDcRoadConditionInformationService;
import com.zc.business.service.IDcRoadSectionService; import com.zc.business.service.IDcRoadSectionService;
import com.zc.business.service.IDcTrafficStatisticsService; import com.zc.business.service.IDcTrafficStatisticsService;
import com.zc.business.utils.StakeMarkUtils; import com.zc.business.utils.StakeMarkUtils;
@ -28,7 +27,6 @@ import okhttp3.Response;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
@ -119,7 +117,6 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
} }
*/ */
public static CompletableFuture<String> refreshAccessToken() { public static CompletableFuture<String> refreshAccessToken() {
CompletableFuture<String> future = new CompletableFuture<>(); CompletableFuture<String> future = new CompletableFuture<>();
OkHttp okHttp = new OkHttp(); OkHttp okHttp = new OkHttp();
@ -208,7 +205,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
} else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
@ -241,7 +243,10 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
JSONArray jsonArray = null; JSONArray jsonArray = null;
if (body != null) { if (body != null) {
jsonArray = JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
jsonArray = JSON.parseArray(jsonString);
}
} }
Map<String, Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>();
@ -318,7 +323,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
} else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
} }
@ -563,7 +573,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
} else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
@ -604,7 +619,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
} else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
@ -642,7 +662,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
}else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
@ -682,7 +707,9 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
JSONArray jsonArray = JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
JSONArray jsonArray = JSON.parseArray(jsonString);
Map<String, Integer> sumByName = new LinkedHashMap<>(); Map<String, Integer> sumByName = new LinkedHashMap<>();
Integer totalFlow1 = 0; Integer totalFlow1 = 0;
List<Map<String, String>> list = new ArrayList(); List<Map<String, String>> list = new ArrayList();
@ -712,7 +739,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
} }
return list; return list;
} }
}
return new ArrayList(); return new ArrayList();
} }
@ -746,7 +773,12 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
return JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
}else {
return new JSONArray();
}
} }
return new JSONArray(); return new JSONArray();
@ -866,8 +898,15 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
.data(requestParams) // 请求参数 .data(requestParams) // 请求参数
.post(); // 请求方法 .post(); // 请求方法
ResponseBody body = response.body(); ResponseBody body = response.body();
JSONArray jsonArray = JSON.parseArray(body.string()); if (body != null) {
return jsonArray; String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
return JSON.parseArray(jsonString);
}else {
return new JSONArray();
}
}
return new JSONArray();
} }
//格式化桩号 //格式化桩号
@ -933,8 +972,9 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
JSONArray jsonArray = JSON.parseArray(body.string()); String jsonString = body.string();
System.out.println(jsonArray); if (JSON.isValidArray(jsonString)) {
JSONArray jsonArray = JSON.parseArray(jsonString);
for (Object item : jsonArray) { for (Object item : jsonArray) {
JSONObject jsonObject = (JSONObject) item; JSONObject jsonObject = (JSONObject) item;
if (jsonObject.getString("gantry_id").equals(nearestFacility.getFacilityCode())) { if (jsonObject.getString("gantry_id").equals(nearestFacility.getFacilityCode())) {
@ -946,7 +986,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
mapList.add(map); mapList.add(map);
} }
} }
}
// 输出结果 // 输出结果
return mapList; return mapList;
@ -982,7 +1022,9 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
ResponseBody body = response.body(); ResponseBody body = response.body();
if (body != null) { if (body != null) {
JSONArray jsonArray = JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
JSONArray jsonArray = JSON.parseArray(jsonString);
for (Object object : jsonArray) { for (Object object : jsonArray) {
JSONObject jsonObject = (JSONObject) object; JSONObject jsonObject = (JSONObject) object;
Integer asOneRoad = jsonObject.getInteger("as_one_road"); Integer asOneRoad = jsonObject.getInteger("as_one_road");
@ -1036,14 +1078,16 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
} }
return jsonArray; return jsonArray;
}
} }
return new JSONArray(); return new JSONArray();
} }
/** /**
* 各收费站日累计车流辆 * 各收费站日累计车流辆
*
* @return * @return
*/ */
@Override @Override
@ -1059,19 +1103,25 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
Integer totalFlow1 = UniversalEnum.ZERO.getNumber(); Integer totalFlow1 = UniversalEnum.ZERO.getNumber();
Integer totalFlow2 = UniversalEnum.ZERO.getNumber(); Integer totalFlow2 = UniversalEnum.ZERO.getNumber();
if (body != null) { if (body != null) {
JSONArray jsonArray = JSON.parseArray(body.string()); String jsonString = body.string();
if (JSON.isValidArray(jsonString)) {
JSONArray jsonArray = JSON.parseArray(jsonString);
for (Object item : jsonArray) { for (Object item : jsonArray) {
JSONObject jsonObject = (JSONObject) item; JSONObject jsonObject = (JSONObject) item;
totalFlow1 = totalFlow1 + jsonObject.getInteger("total_flow"); totalFlow1 = totalFlow1 + jsonObject.getInteger("total_flow");
} }
} }
}
if (bodyTwo != null) { if (bodyTwo != null) {
JSONArray jsonArray = JSON.parseArray(bodyTwo.string()); String jsonString = bodyTwo.string();
if (JSON.isValidArray(jsonString)) {
JSONArray jsonArray = JSON.parseArray(jsonString);
for (Object item : jsonArray) { for (Object item : jsonArray) {
JSONObject jsonObject = (JSONObject) item; JSONObject jsonObject = (JSONObject) item;
totalFlow2 = totalFlow2 + jsonObject.getInteger("total_flow"); totalFlow2 = totalFlow2 + jsonObject.getInteger("total_flow");
} }
} }
}
return totalFlow1 + totalFlow2; return totalFlow1 + totalFlow2;
} }

29
zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java
View File

@ -7,6 +7,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
@ -71,8 +74,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
*/ */
@ApiOperation("外部接口监控信息列表") @ApiOperation("外部接口监控信息列表")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(ExternalInterfaceMonitoring externalInterfaceMonitoring) public TableDataInfo list(ExternalInterfaceMonitoring externalInterfaceMonitoring) {
{
startPage(); startPage();
LambdaQueryWrapper<ExternalInterfaceMonitoring> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ExternalInterfaceMonitoring> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if (externalInterfaceMonitoring.getInterfaceOwnership() != null) { if (externalInterfaceMonitoring.getInterfaceOwnership() != null) {
@ -594,15 +596,30 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
* 交通流结果处理 * 交通流结果处理
*/ */
public void trafficFlowResultProcessing(ExternalInterfaceMonitoring externalInterfaceMonitoring, Response response) throws Exception { public void trafficFlowResultProcessing(ExternalInterfaceMonitoring externalInterfaceMonitoring, Response response) throws Exception {
ResponseBody body = response.body(); ResponseBody body = response.body();
if (response.code() == UniversalEnum.TWO_HUNDRED.getNumber()) {
externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ONE.getNumber());
} else {
externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber()); externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
}
if (body != null) { if (body != null) {
JSONObject jsonResult = JSONObject.parseObject(body.string()); String bodyString = body.string();
if (jsonResult.containsKey("code") && jsonResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) { JsonObject jsonResult = null;
externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ONE.getNumber()); // 使用JsonElement解析数据
JsonElement jsonElement = JsonParser.parseString(bodyString);
// 检查数据类型并相应处理
if (jsonElement.isJsonObject()) {
// 如果是对象，进行对象处理
jsonResult = jsonElement.getAsJsonObject();
if (!jsonResult.get("code").toString().equals(UniversalEnum.TWO_HUNDRED.getValue())) {
externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
} }
externalInterfaceMonitoring.setOperationResult(body.string()); }
externalInterfaceMonitoring.setOperationResult(bodyString);
} else { } else {
externalInterfaceMonitoring.setOperationResult(response.toString()); externalInterfaceMonitoring.setOperationResult(response.toString());
} }

2
zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
View File

@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="deviceState != null and deviceState != ''">and device_state = #{deviceState}</if> <if test="deviceState != null and deviceState != ''">and device_state = #{deviceState}</if>
<if test="deviceName != null and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if> <if test="deviceName != null and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceType != null and deviceType != ''">and device_type = #{deviceType}</if> <if test="deviceType != null and deviceType != ''">and device_type = #{deviceType} and iot_device_id is not null</if>
<if test="deviceType == null || deviceType == ''"> <if test="deviceType == null || deviceType == ''">
and (device_type=3||device_type=13||device_type=15||device_type=16) and iot_device_id is not null and (device_type=3||device_type=13||device_type=15||device_type=16) and iot_device_id is not null
</if> </if>

Write Preview
Loading…
Cancel
Save