From 53b685a0ab67a4e6eaf960ef621dba08dbac5077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Thu, 22 Feb 2024 18:00:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zc/business/domain/DcEvent.java | 3 ++- .../zc/business/service/impl/DcEventServiceImpl.java | 9 ++++++--- .../main/resources/mapper/business/DcEventMapper.xml | 10 ++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java index 13361a65..08faa2b1 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java @@ -61,10 +61,11 @@ public class DcEvent extends BaseEntity { * 2-中 * 3-下 */ - @Excel(name = "方向", readConverterExp = "1=上行,3=下行") + @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向") //@Excel(name = "方向") @ApiModelProperty("方向") private String direction; + /** * 处理人员 */ diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index b922c48d..818869e1 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -5,6 +5,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.github.pagehelper.PageHelper; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; @@ -96,9 +99,9 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; String replace1 = dcEvent.getEndStakeMark().replace(" ", "+"); dcEvent.setEndStakeMark(replace1); } - List dcEventList = dcEventMapper.selectDcEventList(dcEvent); - for (DcEvent dcEvents : dcEventList) { + List dcEventList = dcEventMapper.selectDcEventList(dcEvent); + for (DcEvent dcEvents : dcEventList) { // 根据 deptId 获取部门名称 Long deptId = dcEvents.getDeptId(); String deptName = deptService.selectDeptById(deptId).getDeptName(); @@ -107,7 +110,7 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; dcEvents.setDeptName(deptName); } - return dcEventMapper.selectDcEventList(dcEvent); + return dcEventList; } /** diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index 0cfd9128..52b19c96 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -143,7 +143,10 @@ id, dc_event.dept_id as dept_id, stake_mark, - direction, + CASE direction + WHEN '1' THEN '菏泽方向' + WHEN '3' THEN '济南方向' + END AS direction, dc_event.user_id as user_id, sys_user.nick_name as nickName, start_time, @@ -353,7 +356,10 @@ /*详情可以调用事件处理流程*/ SELECT dc_event.id AS id, dc_event.stake_mark, - dc_event.direction, + CASE dc_event.direction + WHEN '1' THEN '菏泽方向' + WHEN '3' THEN '济南方向' + END AS direction, dc_event.user_id, dc_event.user_id as user_id, sys_user.nick_name as nickName, From 56a371f7ad1907de5520738311d454cbc1f29bfa Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 23 Feb 2024 11:25:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=9E=E6=9C=BA?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BA=8B=E4=BB=B6=E8=AE=A2=E9=98=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B7=9F=E9=9A=8F=E9=A1=B9=E7=9B=AE=E8=87=AA=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=20=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2=E7=BB=84=E4=BB=B6=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/system/NonAutomaticWarning.js | 10 +++ ruoyi-ui/src/views/system/device/index.vue | 18 +++- .../system/non-automatic-warning/index.vue | 83 +++++++++++++++++++ .../NonAutomaticWarningController.java | 37 +++++++-- .../business/domain/NonAutomaticWarning.java | 24 ++++++ 5 files changed, 162 insertions(+), 10 deletions(-) create mode 100644 ruoyi-ui/src/api/system/NonAutomaticWarning.js create mode 100644 ruoyi-ui/src/views/system/non-automatic-warning/index.vue create mode 100644 zc-business/src/main/java/com/zc/business/domain/NonAutomaticWarning.java diff --git a/ruoyi-ui/src/api/system/NonAutomaticWarning.js b/ruoyi-ui/src/api/system/NonAutomaticWarning.js new file mode 100644 index 00000000..2b19feb0 --- /dev/null +++ b/ruoyi-ui/src/api/system/NonAutomaticWarning.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 调用非机预警设备订阅事件 +export function eventSubscription(data) { + return request({ + url: '/nonAutomaticWarning/eventSubscription', + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/views/system/device/index.vue b/ruoyi-ui/src/views/system/device/index.vue index 906c0f2e..9c538fe1 100644 --- a/ruoyi-ui/src/views/system/device/index.vue +++ b/ruoyi-ui/src/views/system/device/index.vue @@ -140,7 +140,7 @@ - + - + +
@@ -187,11 +192,20 @@ diff --git a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java index 660deb56..1a45e07b 100644 --- a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java @@ -8,15 +8,15 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.zc.business.domain.DcWarning; +import com.zc.business.domain.NonAutomaticWarning; import com.zc.business.service.IDcWarningService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; @@ -51,13 +51,24 @@ public class NonAutomaticWarningController extends BaseController { * */ @ApiOperation("事件订阅") @PostMapping(value = "/eventSubscription") - public AjaxResult eventSubscription() throws Exception { + public AjaxResult eventSubscription(@RequestBody NonAutomaticWarning parameter) throws Exception { + if (parameter.getAPPKEY() == null || parameter.getAPPSECRET() == null || parameter.getURI() == null || parameter.getIP() == null) { + return AjaxResult.error(); + } + return getAjaxResult(parameter); + } + + private AjaxResult getAjaxResult(NonAutomaticWarning parameter) throws Exception { + String appKey = parameter.getAPPKEY(); + String appSecret = parameter.getAPPSECRET(); + String uri = parameter.getURI(); + String ip = parameter.getIP(); ArtemisConfig config = new ArtemisConfig(); - config.setHost(IP); // 代理API网关nginx服务器ip端口 - config.setAppKey(APPKEY); // 秘钥appkey - config.setAppSecret(APPSECRET);// 秘钥appSecret - final String getCamsApi = URI; + config.setHost(ip); // 代理API网关nginx服务器ip端口 + config.setAppKey(appKey); // 秘钥appkey + config.setAppSecret(appSecret);// 秘钥appSecret + final String getCamsApi = uri; Map paramMap = new HashMap();// post请求Form表单参数 ArrayList longs = new ArrayList<>(); longs.add(6274879489L); @@ -244,4 +255,14 @@ public class NonAutomaticWarningController extends BaseController { } return AjaxResult.error(); } + + @PostConstruct + public AjaxResult eventSubscriptionPostConstruct() throws Exception { + NonAutomaticWarning stringStringHashMap = new NonAutomaticWarning(); + stringStringHashMap.setAPPKEY(APPKEY); + stringStringHashMap.setAPPSECRET(APPSECRET); + stringStringHashMap.setURI(URI); + stringStringHashMap.setIP(IP); + return getAjaxResult(stringStringHashMap); + } } diff --git a/zc-business/src/main/java/com/zc/business/domain/NonAutomaticWarning.java b/zc-business/src/main/java/com/zc/business/domain/NonAutomaticWarning.java new file mode 100644 index 00000000..5a9bf0b5 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/domain/NonAutomaticWarning.java @@ -0,0 +1,24 @@ +package com.zc.business.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "NonAutomaticWarning", description = "非机预警事件订阅实体类") +public class NonAutomaticWarning { + + @ApiModelProperty("用户名称") + @JsonProperty + private String APPKEY; + @ApiModelProperty("用户密码") + @JsonProperty + private String APPSECRET; + @ApiModelProperty("请求路径") + @JsonProperty + private String URI; + @ApiModelProperty("请求IP") + @JsonProperty + private String IP; +} From 6a6d00d1a73139c0e4034f81a367dc08245da78c Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 23 Feb 2024 11:28:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B8=85=E7=90=86log=E8=AF=AD=E5=8F=A5=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/non-automatic-warning/index.vue | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/ruoyi-ui/src/views/system/non-automatic-warning/index.vue b/ruoyi-ui/src/views/system/non-automatic-warning/index.vue index 9e29a1aa..83b70f2c 100644 --- a/ruoyi-ui/src/views/system/non-automatic-warning/index.vue +++ b/ruoyi-ui/src/views/system/non-automatic-warning/index.vue @@ -1,20 +1,20 @@ From 47b8828730945c63bfc2c68857fd1b1d50d48ad6 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Fri, 23 Feb 2024 11:39:22 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E4=B8=AD=E9=97=B4=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/domain/DcDevice.java | 5 + .../java/com/zc/business/domain/MdDevice.java | 311 ++++++++++++++++++ .../business/mapper/MiddleDatabaseMapper.java | 30 +- .../service/IMiddleDatabaseService.java | 32 +- .../service/impl/DcDeviceServiceImpl.java | 30 ++ .../impl/MiddleDatabaseServiceImpl.java | 45 ++- .../mapper/business/MiddleDatabaseMapper.xml | 81 ++++- 7 files changed, 518 insertions(+), 16 deletions(-) create mode 100644 zc-business/src/main/java/com/zc/business/domain/MdDevice.java diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java index 54e75d83..1b1faa72 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java @@ -53,6 +53,8 @@ public class DcDevice { private String otherConfig; @ApiModelProperty("备注") private String remark; + @ApiModelProperty("设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等") + private String facilitiesType; @ApiModelProperty("创建时间") private Date createTime; @ApiModelProperty("修改时间") @@ -61,4 +63,7 @@ public class DcDevice { private String longitude; @TableField(exist = false) private String latitude; + //设备厂商 + @TableField(exist = false) + private String manufacturer; } diff --git a/zc-business/src/main/java/com/zc/business/domain/MdDevice.java b/zc-business/src/main/java/com/zc/business/domain/MdDevice.java new file mode 100644 index 00000000..f10d8964 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/domain/MdDevice.java @@ -0,0 +1,311 @@ +package com.zc.business.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.utils.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 中间库 设备对象 device + * + * @author ruoyi + * @date 2024-02-21 + */ +public class MdDevice +{ + + /** 主键 */ + private Long id; + + /** 设备id */ + @Excel(name = "设备id") + private String devNo; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String devName; + + /** 所在桩号 */ + @Excel(name = "所在桩号") + private String stakeNum; + + /** 方向1-上行,2-中,3-下行 */ + @Excel(name = "方向1-上行,2-中,3-下行") + private String direction; + + /** 设备类型 + 1 摄像机 + 2 可变信息标志 + 3 气象监测器 + 4 出口诱导灯 + 5 路段语音广播 + 6 护栏碰撞 + 7 毫米波雷达 + 8 合流区预警 + 9 智慧锥桶 + 10 激光疲劳唤醒 + 11 一类交通量调查站 + 12 行车诱导 + 13 智能设备箱 + 14 光线在线监测 + */ + @Excel(name = "设备类型") + private String typeCode; + + /** 设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等 */ + @Excel(name = "设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等 ") + private String facilitiesType; + + /** 设备状态：0-异常,1-正常 */ + @Excel(name = "设备状态：0-异常,1-正常") + private String devStatus; + + /** 所属机构id */ + @Excel(name = "所属机构id") + private String opmaManagerId; + + /** 所属机构名称 */ + @Excel(name = "所属机构名称") + private String opmaManagerName; + + /** 所属厂商 */ + @Excel(name = "所属厂商") + private String supplierName; + + /** 所属路段 */ + @Excel(name = "所属路段") + private String sectionId; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + /** 创建人 */ + @Excel(name = "创建人") + private Long creatorUserId; + + /** 最后修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date lastModificationTime; + + /** 最后修改人 */ + @Excel(name = "最后修改人") + private Long lastModifierUserId; + + /** 是否删除 */ + @Excel(name = "是否删除") + private Integer isDeleted; + + /** 删除人 */ + @Excel(name = "删除人") + private Long deleterUserId; + + /** 删除时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date deletionTime; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public String getDevNo() { + return devNo; + } + + public void setDevNo(String devNo) { + this.devNo = devNo; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public String getStakeNum() { + return stakeNum; + } + + public void setStakeNum(String stakeNum) { + this.stakeNum = stakeNum; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getFacilitiesType() { + return facilitiesType; + } + + public void setFacilitiesType(String facilitiesType) { + this.facilitiesType = facilitiesType; + } + + public String getDevStatus() { + return devStatus; + } + + public void setDevStatus(String devStatus) { + this.devStatus = devStatus; + } + + public String getOpmaManagerId() { + return opmaManagerId; + } + + public void setOpmaManagerId(String opmaManagerId) { + this.opmaManagerId = opmaManagerId; + } + + public String getOpmaManagerName() { + return opmaManagerName; + } + + public void setOpmaManagerName(String opmaManagerName) { + this.opmaManagerName = opmaManagerName; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getSectionId() { + return sectionId; + } + + public void setSectionId(String sectionId) { + this.sectionId = sectionId; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Long getCreatorUserId() { + return creatorUserId; + } + + public void setCreatorUserId(Long creatorUserId) { + this.creatorUserId = creatorUserId; + } + + public Date getLastModificationTime() { + return lastModificationTime; + } + + public void setLastModificationTime(Date lastModificationTime) { + this.lastModificationTime = lastModificationTime; + } + + public Long getLastModifierUserId() { + return lastModifierUserId; + } + + public void setLastModifierUserId(Long lastModifierUserId) { + this.lastModifierUserId = lastModifierUserId; + } + + public Integer getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Integer isDeleted) { + this.isDeleted = isDeleted; + } + + public Long getDeleterUserId() { + return deleterUserId; + } + + public void setDeleterUserId(Long deleterUserId) { + this.deleterUserId = deleterUserId; + } + + public Date getDeletionTime() { + return deletionTime; + } + + public void setDeletionTime(Date deletionTime) { + this.deletionTime = deletionTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("id", id) + .append("devNo", devNo) + .append("devName", devName) + .append("stakeNum", stakeNum) + .append("direction", direction) + .append("typeCode", typeCode) + .append("facilitiesType", facilitiesType) + .append("devStatus", devStatus) + .append("opmaManagerId", opmaManagerId) + .append("opmaManagerName", opmaManagerName) + .append("supplierName", supplierName) + .append("sectionId", sectionId) + .append("creationTime", creationTime) + .append("creatorUserId", creatorUserId) + .append("lastModificationTime", lastModificationTime) + .append("lastModifierUserId", lastModifierUserId) + .append("isDeleted", isDeleted) + .append("deleterUserId", deleterUserId) + .append("deletionTime", deletionTime) + .toString(); + } + + public MdDevice(){} + + public MdDevice(DcDevice dcDevice){ + this.id = dcDevice.getId(); + this.devNo = dcDevice.getIotDeviceId(); + this.devName = dcDevice.getDeviceName(); + this.stakeNum = dcDevice.getStakeMark(); + this.direction = dcDevice.getDirection(); + this.typeCode = dcDevice.getDeviceType().toString(); + if (StringUtils.isNotEmpty(dcDevice.getFacilitiesType())){ + this.facilitiesType = dcDevice.getFacilitiesType(); + } + this.devStatus = dcDevice.getDeviceState(); + if (dcDevice.getGroupId() > 0){ + this.opmaManagerId = dcDevice.getGroupId().toString(); + } + this.supplierName = dcDevice.getManufacturer(); + } +} diff --git a/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java b/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java index 864a86cd..028a80a3 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java @@ -3,10 +3,7 @@ package com.zc.business.mapper; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.zc.business.domain.DcBoardReleaseLog; -import com.zc.business.domain.DcDevice; -import com.zc.business.domain.MdDeviceData; -import com.zc.business.domain.MdEvent; +import com.zc.business.domain.*; import java.util.List; @@ -27,6 +24,31 @@ public interface MiddleDatabaseMapper */ Boolean insertMiddleDatabaseDeviceData(MdDeviceData mdDeviceData); + /** + * 新增中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + boolean insertMiddleDatabaseDeviceInfo(MdDevice mdDevice); + + /** + * 修改中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + boolean updateMiddleDatabaseDeviceInfo(MdDevice mdDevice); + + /** + * 删除中间库设备 + * 假删 + * + * @param ids 设备ids + * @return 结果 + */ + boolean deleteMiddleDatabaseDeviceInfoByIds(List ids); + /** * 更新中间库设备 * diff --git a/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java b/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java index 1d669667..c6a30df9 100644 --- a/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java +++ b/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java @@ -2,10 +2,7 @@ package com.zc.business.service; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; -import com.zc.business.domain.DcBoardPublish; -import com.zc.business.domain.DcDevice; -import com.zc.business.domain.MdDeviceData; -import com.zc.business.domain.MdEvent; +import com.zc.business.domain.*; import java.util.List; @@ -35,7 +32,32 @@ public interface IMiddleDatabaseService boolean updateMiddleDatabaseDeviceByList(List listDevice); /** - * 更新中间库设备 + * 添加中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + boolean insertMiddleDatabaseDeviceInfo(MdDevice mdDevice); + + /** + * 修改中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + boolean updateMiddleDatabaseDeviceInfo(MdDevice mdDevice); + + /** + * 批量删除中间库设备 + * 假删 + * + * @param ids ids + * @return 结果 + */ + boolean deleteMiddleDatabaseDeviceInfoByIds(List ids); + + /** + * 更新中间库设备状态 * * @param device 设备 * @return 结果 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java index 6d14e74b..1f4c0cce 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java @@ -10,10 +10,12 @@ import com.zc.business.constant.RedisKeyConstants; import com.zc.business.domain.DcDevice; import com.zc.business.domain.DcProduct; import com.zc.business.domain.DcStakeMark; +import com.zc.business.domain.MdDevice; import com.zc.business.mapper.DcDeviceMapper; import com.zc.business.service.IDcDeviceService; import com.zc.business.service.IDcProductService; import com.zc.business.service.IDcStakeMarkService; +import com.zc.business.service.IMiddleDatabaseService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -37,6 +39,8 @@ public class DcDeviceServiceImpl extends ServiceImpl i private IDcStakeMarkService dcStakeMarkService; @Resource private DcDeviceMapper dcDeviceMapper; + @Resource + private IMiddleDatabaseService middleDataBaseService; @Resource private RedisCache redisCache; @@ -211,6 +215,8 @@ public class DcDeviceServiceImpl extends ServiceImpl i if (Objects.isNull(dcProduct)) { throw new ServiceException("所属产品[" + productId + "]不存在", HttpStatus.BAD_REQUEST); } + //设备厂商 + dcDevice.setManufacturer(dcProduct.getManufacturer()); } dcDevice.setCreateTime(new Date()); @@ -219,6 +225,11 @@ public class DcDeviceServiceImpl extends ServiceImpl i if (save(dcDevice)) { // 更新缓存 updateRedisCache(); + + //中间库添加设备 + MdDevice mdDevice = new MdDevice(dcDevice); + middleDataBaseService.insertMiddleDatabaseDeviceInfo(mdDevice); + return true; } @@ -243,11 +254,27 @@ public class DcDeviceServiceImpl extends ServiceImpl i throw new ServiceException("设备ID[" + id + "]不存在", HttpStatus.BAD_REQUEST); } + Long productId = dcDevice.getProductId(); + if (Objects.nonNull(productId)) { + DcProduct dcProduct = dcProdurtService.getById(productId); + // 产品不存在 + if (Objects.isNull(dcProduct)) { + throw new ServiceException("所属产品[" + productId + "]不存在", HttpStatus.BAD_REQUEST); + } + //设备厂商 + dcDevice.setManufacturer(dcProduct.getManufacturer()); + } + dcDevice.setUpdateTime(new Date()); if (updateById(dcDevice)) { // 更新缓存 updateRedisCache(); + + //中间库修改设备 + MdDevice mdDevice = new MdDevice(dcDevice); + middleDataBaseService.updateMiddleDatabaseDeviceInfo(mdDevice); + return true; } @@ -275,6 +302,9 @@ public class DcDeviceServiceImpl extends ServiceImpl i if (removeByIds(ids)) { // 更新缓存 updateRedisCache(); + + //中间库 假删设备 + middleDataBaseService.deleteMiddleDatabaseDeviceInfoByIds(ids); return true; } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java index 0ea93378..88e733f8 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.SecurityUtils; import com.zc.business.domain.DcDevice; +import com.zc.business.domain.MdDevice; import com.zc.business.domain.MdDeviceData; import com.zc.business.domain.MdEvent; import com.zc.business.mapper.MiddleDatabaseMapper; @@ -39,7 +40,6 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { * @param mdDeviceData 气象检测器数据 * @return 结果 */ -// @DataSource(value = DataSourceType.SLAVE)//切换数据源 @Override public boolean insertMiddleDatabaseDeviceData(MdDeviceData mdDeviceData) { @@ -53,7 +53,6 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { * @param listDevice 设备列表 * @return 结果 */ -// @DataSource(value = DataSourceType.SLAVE)//切换数据源 @Override public boolean updateMiddleDatabaseDeviceByList(List listDevice) { @@ -63,6 +62,42 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { return true; } + /** + * 新增中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + @Override + public boolean insertMiddleDatabaseDeviceInfo(MdDevice mdDevice) + { + return middleDatabaseMapper.insertMiddleDatabaseDeviceInfo(mdDevice); + } + + /** + * 修改中间库设备 + * + * @param mdDevice 设备 + * @return 结果 + */ + @Override + public boolean updateMiddleDatabaseDeviceInfo(MdDevice mdDevice) + { + return middleDatabaseMapper.updateMiddleDatabaseDeviceInfo(mdDevice); + } + + /** + * 批量删除中间库设备 + * 假删 + * + * @param ids 设备ids + * @return 结果 + */ + @Override + public boolean deleteMiddleDatabaseDeviceInfoByIds(List ids) + { + return middleDatabaseMapper.deleteMiddleDatabaseDeviceInfoByIds(ids); + } /** * 更新中间库设备 @@ -70,7 +105,6 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { * @param device 设备 * @return 结果 */ -// @DataSource(value = DataSourceType.SLAVE)//切换数据源 @Override public boolean updateMiddleDatabaseDevice(DcDevice device) { @@ -85,10 +119,10 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { */ @Override public boolean insertMiddleDatabaseEvent(MdEvent mdEvent){ - /* LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null) { mdEvent.setCreatorUserId(loginUser.getUserId()); - }*/ + } return middleDatabaseMapper.insertMiddleDatabaseEvent(mdEvent); } @@ -98,7 +132,6 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { * @param mdEvent 事件 * @return 结果 */ -// @DataSource(value = DataSourceType.SLAVE)//切换数据源 @Override public boolean updateMiddleDatabaseEvent(MdEvent mdEvent){ LoginUser loginUser = SecurityUtils.getLoginUser(); diff --git a/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml b/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml index f26ca694..a6f3a0cd 100644 --- a/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml +++ b/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml @@ -117,7 +117,84 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into device + + id, + dev_no, + dev_name, + stake_num, + direction, + type_code, + facilities_type, + dev_status, + opma_manager_id, + opma_manager_name, + supplier_name, + section_id, + CreationTime, + CreatorUserId, + LastModificationTime, + LastModifierUserId, + IsDeleted, + DeleterUserId, + DeletionTime, + + + #{id}, + #{devNo}, + #{devName}, + #{stakeNum}, + #{direction}, + #{typeCode}, + #{facilitiesType}, + #{devStatus}, + #{opmaManagerId}, + #{opmaManagerName}, + #{supplierName}, + #{sectionId}, + now(), + #{creatorUserId}, + #{lastModificationTime}, + #{lastModifierUserId}, + #{isDeleted}, + #{deleterUserId}, + #{deletionTime}, + + + + + update device + + dev_no = #{devNo} + dev_name = #{devName} + stake_num = #{stakeNum} + direction = #{direction} + type_code = #{typeCode} + facilities_type = #{facilitiesType} + dev_status = #{devStatus} + opma_manager_id = #{opmaManagerId} + opma_manager_name = #{opmaManagerName} + supplier_name = #{supplierName} + section_id = #{sectionId} + LastModificationTime = now(), + LastModifierUserId = #{lastModifierUserId} + IsDeleted = #{isDeleted} + DeleterUserId = #{deleterUserId} + DeletionTime = #{deletionTime} + + where id = #{id} + + + + update device set IsDeleted = '1',DeletionTime = now() + where id in + + #{id} + + + + update device set dev_status = #{deviceState} where dev_no = #{iotDeviceId} @@ -164,4 +241,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + From d703999717bd90e45b6a93575b5feb6dcc2ccb48 Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Fri, 23 Feb 2024 14:56:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=80=E7=B1=BB=E4=BA=A4=E6=B5=81?= =?UTF-8?q?=E7=AB=99=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/DcYzsqbdcHmbldData.java | 79 +++++++ .../mapper/DcYzsqbdcHmbldDataMapper.java | 28 +++ .../DevicePropertyReportListener.java | 6 +- .../service/IDcYzsqbdcHmbldDataService.java | 18 ++ .../impl/DcYzsqbdcHmbldDataServiceImpl.java | 206 ++++++++++++++++++ .../business/DcYzsqbdcHmbldDataMapper.xml | 31 +++ 6 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 zc-business/src/main/java/com/zc/business/domain/DcYzsqbdcHmbldData.java create mode 100644 zc-business/src/main/java/com/zc/business/mapper/DcYzsqbdcHmbldDataMapper.java create mode 100644 zc-business/src/main/java/com/zc/business/service/IDcYzsqbdcHmbldDataService.java create mode 100644 zc-business/src/main/java/com/zc/business/service/impl/DcYzsqbdcHmbldDataServiceImpl.java create mode 100644 zc-business/src/main/resources/mapper/business/DcYzsqbdcHmbldDataMapper.xml diff --git a/zc-business/src/main/java/com/zc/business/domain/DcYzsqbdcHmbldData.java b/zc-business/src/main/java/com/zc/business/domain/DcYzsqbdcHmbldData.java new file mode 100644 index 00000000..8cc37205 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/domain/DcYzsqbdcHmbldData.java @@ -0,0 +1,79 @@ +package com.zc.business.domain; + +import lombok.Data; + +import java.util.Date; + +/** + * 一类交流站和毫米波雷达存储数据实体类 + */ +@Data +public class DcYzsqbdcHmbldData { + + private String id; + // 物联网设备id + private String iotDeviceId; + // 数据源 1一站式情报调查,2毫米波雷达 + private String sjy; + // 设备编号(设备身份识别码) + private String sbbh; + // 上报周期(交通数据处理周期) + private String sbzq; + // 时间序号(一站式情报调查) + private String sjxh; + // 上报时间 + private String sbsj; + // 平均车速 + private Integer pjcs; + // 车道数 + private Integer lane; + // 方向 + private String direction; + // 总的车流量 + private Integer zdcll; + // 跟车百分比 + private String gcbfb; + // 平均车头间距 + private String pjctjj; + // 时间占有率 + private String sjzyl; + // 中小客车交通量 + private Integer zxkcjtl; + // 中小客车平均地点车速 + private Integer zxkcpjcs; + // 小型货车交通量 + private Integer xxhcjtl; + // 小型货车平均地点车速 + private Integer xxhcpjcs; + // 大客车交通量 + private Integer dkcjtl; + // 大客车平均地点车速 + private Integer dkcpjcs; + // 中型货车交通量 + private Integer zxhcjtl; + // 中型货车平均地点车速 + private Integer zxhcpjcs; + // 大型货车交通量 + private Integer dxhcjtl; + // 大型货车平均地点车速 + private Integer dxhcpjcs; + // 特大型货车交通量 + private Integer tdxhcjtl; + // 特大型货车平均地点车速 + private Integer tdxhcpjcs; + // 集装箱车交通量 + private Integer jzxcjtl; + // 集装箱车平均地点车速 + private Integer jzxcpjcs; + // 拖拉机交通量 + private Integer tljjtl; + // 拖拉机平均地点车速 + private Integer tljpjcs; + // 摩托车交通量 + private Integer mtcjtl; + // 摩托车平均地点车速 + private Integer mtcpjcs; + private Date updateTime; + private Date createTime; + +} diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcYzsqbdcHmbldDataMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcYzsqbdcHmbldDataMapper.java new file mode 100644 index 00000000..1a1bf419 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/mapper/DcYzsqbdcHmbldDataMapper.java @@ -0,0 +1,28 @@ +package com.zc.business.mapper; + + +import com.zc.business.domain.DcYzsqbdcHmbldData; + +import java.util.List; + + +/** + * 一类调查站Mapper接口 + * + * @author ruoyi + * @date 2024-01-12 + */ +public interface DcYzsqbdcHmbldDataMapper +{ + + /** + * 批量新增一类调查站数据 + * + * @param list 一类调查站数据 + * @return 结果 + */ + int insertDcEvent(List list); + +} + + diff --git a/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java b/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java index 172dadf8..49fe359c 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java +++ b/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java @@ -9,6 +9,7 @@ import com.zc.business.domain.MdDeviceData; import com.zc.business.enums.IotProductEnum; import com.zc.business.service.IDcMeteorologicalDetectorDataService; import com.zc.business.service.IMiddleDatabaseService; +import com.zc.business.service.IDcYzsqbdcHmbldDataService; import com.zc.common.core.redis.stream.RedisStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +23,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -43,6 +43,9 @@ public class DevicePropertyReportListener implements StreamListener message) { String streamKay = message.getStream(); @@ -86,6 +89,7 @@ public class DevicePropertyReportListener implements StreamListener list = new ArrayList<>(); + JSONObject properties = JSONObject.parseObject(data.get("properties").toString()); + if (properties.get("01") == null) { + return false; + } + JSONObject oneStopIntelligenceInvestigation = JSONObject.parseObject(properties.get("01").toString()); + // 上行 + DcYzsqbdcHmbldData upstream = new DcYzsqbdcHmbldData(); + setCommonDcYzsqbdcHmbldData(upstream, "1", oneStopIntelligenceInvestigation); + upstream.setIotDeviceId(data.get("deviceId").toString()); + + // 下行 + DcYzsqbdcHmbldData down = new DcYzsqbdcHmbldData(); + setCommonDcYzsqbdcHmbldData(down, "2", oneStopIntelligenceInvestigation); + down.setIotDeviceId(data.get("deviceId").toString()); + + // 平均车道数 + int averageNumberOfLanes = Integer.parseInt(oneStopIntelligenceInvestigation.get("numberOfLanes").toString()) / 2; + + JSONArray array = JSONArray.parseArray(oneStopIntelligenceInvestigation.get("lanes").toString()); + for (Object object : array) { + JSONObject lanesData = JSONObject.parseObject(object.toString()); + + if (lanesData.get("laneNumber").toString().equals("11") || + lanesData.get("laneNumber").toString().equals("12") || + lanesData.get("laneNumber").toString().equals("13") || + lanesData.get("laneNumber").toString().equals("14") || + lanesData.get("laneNumber").toString().equals("01") + ) { + // 上行数据 + processingVehicleModelData(upstream, lanesData); + } else { + // 下行数据 + processingVehicleModelData(down, lanesData); + } + + } + + averageSpeedOfAllLanesBasedOnType(upstream, averageNumberOfLanes); + averageSpeedOfAllLanesBasedOnType(down, averageNumberOfLanes); + + list.add(upstream); + list.add(down); + int number = dcYzsqbdcHmbldDataMapper.insertDcEvent(list); + if (number > 0) { + return true; + } + return false; + } + + /** + * 初始化上行和下行数据 + * + * @param data + * @param direction + * @param oneStopIntelligenceInvestigation + */ + public void setCommonDcYzsqbdcHmbldData(DcYzsqbdcHmbldData data, String direction, JSONObject oneStopIntelligenceInvestigation) { + data.setId(UUID.randomUUID().toString()); + // 数据源 + data.setSjy("1"); + // 方向 + data.setDirection(direction); + // 设备编号 + data.setSbbh(oneStopIntelligenceInvestigation.get("deviceIdentificationCode").toString()); + // 上报周期 + data.setSbzq(oneStopIntelligenceInvestigation.get("trafficDataProcessingCycle").toString()); + // 时间序号 + data.setSjxh(oneStopIntelligenceInvestigation.get("timeSequenceNumber").toString()); + // 上报时间 年月日 + data.setSbsj(oneStopIntelligenceInvestigation.get("time").toString()); + // 车道数 + data.setLane(Integer.parseInt(oneStopIntelligenceInvestigation.get("numberOfLanes").toString())); + // 创建时间 + data.setCreateTime(DateUtils.getNowDate()); + data.setZdcll(0); + data.setZxkcjtl(0); + data.setMtcpjcs(0); + data.setXxhcjtl(0); + data.setXxhcpjcs(0); + data.setDkcjtl(0); + data.setDkcpjcs(0); + data.setZxhcjtl(0); + data.setZxhcpjcs(0); + data.setDxhcjtl(0); + data.setDxhcpjcs(0); + data.setTdxhcjtl(0); + data.setTdxhcpjcs(0); + data.setJzxcjtl(0); + data.setJzxcpjcs(0); + data.setTljjtl(0); + data.setTljpjcs(0); + data.setMtcjtl(0); + data.setMtcpjcs(0); + + + + } + + /** + * 计算每个车型所有车道车速的平均值 + * + * @param data + * @param averageNumberOfLanes + */ + public static void averageSpeedOfAllLanesBasedOnType(DcYzsqbdcHmbldData data, int averageNumberOfLanes) { + data.setMtcpjcs(data.getMtcpjcs() / averageNumberOfLanes); + data.setXxhcpjcs(data.getXxhcpjcs() / averageNumberOfLanes); + data.setDkcpjcs(data.getDkcpjcs() / averageNumberOfLanes); + data.setZxhcpjcs(data.getZxhcpjcs() / averageNumberOfLanes); + data.setDxhcpjcs(data.getDxhcpjcs() / averageNumberOfLanes); + data.setTdxhcpjcs(data.getTdxhcpjcs() / averageNumberOfLanes); + data.setJzxcpjcs(data.getJzxcpjcs() / averageNumberOfLanes); + data.setTljpjcs(data.getTljpjcs() / averageNumberOfLanes); + data.setMtcpjcs(data.getMtcpjcs() / averageNumberOfLanes); + + int pjcs = data.getMtcpjcs() + data.getXxhcpjcs() + data.getDkcpjcs() + + data.getZxhcpjcs() + data.getDxhcpjcs() + data.getTdxhcpjcs() + + data.getJzxcpjcs() + data.getTljpjcs() + data.getMtcpjcs(); + data.setPjcs(pjcs / 9); + } + + /** + * 处理车辆类型数据 + * + * @param data + * @param lanesData + */ + public static void processingVehicleModelData(DcYzsqbdcHmbldData data, JSONObject lanesData) { + // 总的车流量 + data.setZdcll(data.getZdcll() + Integer.parseInt(lanesData.get("totalTrafficFlow").toString())); + // 中小客车交通量 + data.setZxkcjtl(data.getZxkcjtl() + Integer.parseInt(lanesData.get("trafficNumberOfInAndSmall").toString())); + // 中小客车平均地点车速 + data.setZxkcpjcs(data.getZxkcpjcs() + Integer.parseInt(lanesData.get("inAndSmallAverageVehicleSpeed").toString())); + // 小型货车交通量 + data.setXxhcjtl(data.getXxhcjtl() + Integer.parseInt(lanesData.get("trafficVolumeOfSmallTrucks").toString())); + // 小型货车平均地点车速 + data.setXxhcpjcs(data.getXxhcpjcs() + Integer.parseInt(lanesData.get("smallTrucksAverageVehicleSpeed").toString())); + // 大客车交通量 + data.setDkcjtl(data.getDkcjtl() + Integer.parseInt(lanesData.get("busTrafficVolume").toString())); + // 大客车平均地点车速 + data.setDkcpjcs(data.getDkcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfBus").toString())); + // 中型货车交通量 + data.setZxhcjtl(data.getZxhcjtl() + Integer.parseInt(lanesData.get("mediumTruckTrafficVolume").toString())); + // 中型货车平均地点车速 + data.setZxhcpjcs(data.getZxhcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfMediumSizeTrucks").toString())); + // 大型货车交通量 + data.setDxhcjtl(data.getDxhcjtl() + Integer.parseInt(lanesData.get("largeTruckTrafficVolume").toString())); + // 大型货车平均地点车速 + data.setDxhcpjcs(data.getDxhcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfLargeTrucks").toString())); + // 特大型货车交通量 + data.setTdxhcjtl(data.getTdxhcjtl() + Integer.parseInt(lanesData.get("extraLargeTrucksTrafficVolume").toString())); + // 特大型货车平均地点车速 + data.setTdxhcpjcs(data.getTdxhcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfExtraLargeTrucks").toString())); + // 集装箱车交通量 + data.setJzxcjtl(data.getJzxcjtl() + Integer.parseInt(lanesData.get("containerTruckTrafficVolume").toString())); + // 集装箱车平均地点车速 + data.setJzxcpjcs(data.getJzxcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfContainerTruck").toString())); + // 拖拉机交通量 + data.setTljjtl(data.getTljjtl() + Integer.parseInt(lanesData.get("tractorTrafficVolume").toString())); + // 拖拉机平均地点车速 + data.setTljpjcs(data.getTljpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfTractor").toString())); + // 摩托车交通量 + data.setMtcjtl(data.getMtcjtl() + Integer.parseInt(lanesData.get("motorcycleTrafficVolume").toString())); + // 摩托车平均地点车速 + data.setMtcpjcs(data.getMtcpjcs() + Integer.parseInt(lanesData.get("averageSpeedOfMotorcycle").toString())); + } + + +} diff --git a/zc-business/src/main/resources/mapper/business/DcYzsqbdcHmbldDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcYzsqbdcHmbldDataMapper.xml new file mode 100644 index 00000000..2d289a22 --- /dev/null +++ b/zc-business/src/main/resources/mapper/business/DcYzsqbdcHmbldDataMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + insert into dc_yzsqbdc_hmbld_data + + (id,iot_device_id,sjy, sbbh, sbzq, sjxh, sbsj, lane, direction, zdcll, pjcs, zxkcjtl, zxkcpjcs, + xxhcjtl, xxhcpjcs, + dkcjtl, dkcpjcs, zxhcjtl, zxhcpjcs, dxhcjtl, dxhcpjcs, tdxhcjtl, tdxhcpjcs, jzxcjtl, jzxcpjcs, tljjtl, + tljpjcs, mtcjtl, mtcpjcs,create_time) values + + + ( + #{item.id}, + #{item.iotDeviceId}, + #{item.sjy},#{item.sbbh},#{item.sbzq},#{item.sjxh},#{item.sbsj},#{item.lane},#{item.direction},#{item.zdcll}, + #{item.pjcs},#{item.zxkcjtl},#{item.zxkcpjcs},#{item.xxhcjtl},#{item.xxhcpjcs}, + #{item.dkcjtl},#{item.dkcpjcs},#{item.zxhcjtl},#{item.zxhcpjcs},#{item.dxhcjtl},#{item.dxhcpjcs},#{item.tdxhcjtl}, + #{item.tdxhcpjcs},#{item.jzxcjtl},#{item.jzxcpjcs},#{item.tljjtl},#{item.tljpjcs},#{item.mtcjtl},#{item.mtcpjcs}, + #{item.createTime} + ) + + + + + From 54c476d702de710a39fa8559a633e4de4afa49c9 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Fri, 23 Feb 2024 16:03:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/domain/MdDevice.java | 2 +- .../business/mapper/MiddleDatabaseMapper.java | 9 ++ .../service/IMiddleDatabaseService.java | 9 ++ .../impl/MiddleDatabaseServiceImpl.java | 13 +++ .../zc/business/task/MiddleDatabaseTask.java | 78 +++++++++++++++ .../mapper/business/DcDeviceMapper.xml | 2 +- .../mapper/business/MiddleDatabaseMapper.xml | 98 ++++++++++++++++--- 7 files changed, 194 insertions(+), 17 deletions(-) create mode 100644 zc-business/src/main/java/com/zc/business/task/MiddleDatabaseTask.java diff --git a/zc-business/src/main/java/com/zc/business/domain/MdDevice.java b/zc-business/src/main/java/com/zc/business/domain/MdDevice.java index f10d8964..c728ef66 100644 --- a/zc-business/src/main/java/com/zc/business/domain/MdDevice.java +++ b/zc-business/src/main/java/com/zc/business/domain/MdDevice.java @@ -303,7 +303,7 @@ public class MdDevice this.facilitiesType = dcDevice.getFacilitiesType(); } this.devStatus = dcDevice.getDeviceState(); - if (dcDevice.getGroupId() > 0){ + if (dcDevice.getGroupId() != null && dcDevice.getGroupId() > 0){ this.opmaManagerId = dcDevice.getGroupId().toString(); } this.supplierName = dcDevice.getManufacturer(); diff --git a/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java b/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java index 028a80a3..180700fb 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/MiddleDatabaseMapper.java @@ -49,6 +49,15 @@ public interface MiddleDatabaseMapper */ boolean deleteMiddleDatabaseDeviceInfoByIds(List ids); + /** + * 批量更新中间库设备 + * 有则修改,无则新增 + * + * @param mdDeviceList 设备列表 + * @return 结果 + */ + boolean synchronizeMdDevice(List mdDeviceList); + /** * 更新中间库设备 * diff --git a/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java b/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java index c6a30df9..96560db1 100644 --- a/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java +++ b/zc-business/src/main/java/com/zc/business/service/IMiddleDatabaseService.java @@ -56,6 +56,15 @@ public interface IMiddleDatabaseService */ boolean deleteMiddleDatabaseDeviceInfoByIds(List ids); + /** + * 批量更新中间库设备 + * 有则修改,无则新增 + * + * @param mdDeviceList 设备列表 + * @return 结果 + */ + boolean synchronizeMdDevice(List mdDeviceList); + /** * 更新中间库设备状态 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java index 88e733f8..7f5021de 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/MiddleDatabaseServiceImpl.java @@ -99,6 +99,19 @@ public class MiddleDatabaseServiceImpl implements IMiddleDatabaseService { return middleDatabaseMapper.deleteMiddleDatabaseDeviceInfoByIds(ids); } + /** + * 批量更新中间库设备 + * 有则修改,无则新增 + * + * @param mdDeviceList 设备列表 + * @return 结果 + */ + @Override + public boolean synchronizeMdDevice(List mdDeviceList){ + + return middleDatabaseMapper.synchronizeMdDevice(mdDeviceList); + } + /** * 更新中间库设备 * diff --git a/zc-business/src/main/java/com/zc/business/task/MiddleDatabaseTask.java b/zc-business/src/main/java/com/zc/business/task/MiddleDatabaseTask.java new file mode 100644 index 00000000..ebb74b25 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/task/MiddleDatabaseTask.java @@ -0,0 +1,78 @@ +package com.zc.business.task; + +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.zc.business.domain.DcDevice; +import com.zc.business.domain.DcProduct; +import com.zc.business.domain.MdDevice; +import com.zc.business.service.IDcDeviceService; +import com.zc.business.service.IDcProductService; +import com.zc.business.service.IMiddleDatabaseService; +import com.zc.business.service.impl.StatusService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * 定时任务 + * + */ +@Component +public class MiddleDatabaseTask +{ + private IDcDeviceService dcDeviceService= SpringUtils.getBean(IDcDeviceService.class); + + private IMiddleDatabaseService middleDatabaseService= SpringUtils.getBean(IMiddleDatabaseService.class); + + private IDcProductService productService= SpringUtils.getBean(IDcProductService.class); + + + /** + * @Description 定时同步设备信息到中间库 + * + * @author liuwenge + * @date 2024/2/23 11:57 + * @param + * @return void + */ + public void synchronizeMdDevice(){ + Date startTime = new Date(); + + System.out.println("定时同步设备信息到中间库 开始-----------------------------"); + + List dcDeviceList = dcDeviceService.listDevice(null); + if (dcDeviceList != null){ + + List mdDeviceList = new ArrayList<>(); + + dcDeviceList.forEach(item -> { + + Long productId = item.getProductId(); + if (Objects.nonNull(productId)) { + //设备厂商 + DcProduct dcProduct = productService.getById(productId); + if (dcProduct != null) { + item.setManufacturer(dcProduct.getManufacturer()); + } + } + + MdDevice mdDevice = new MdDevice(item); + + mdDeviceList.add(mdDevice); + }); + + middleDatabaseService.synchronizeMdDevice(mdDeviceList); + } + Date endTime = new Date(); + + Long diff = (endTime.getTime() - startTime.getTime()) / 1000; + System.out.println("定时同步设备信息到中间库 结束-----------------------------用时" + diff + "秒"); + + } +} diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index 3b18ddad..938e1c93 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"