From 4841c936b24233cc03bb58fdf9ca022f6d52077c Mon Sep 17 00:00:00 2001 From: wangshilong Date: Fri, 21 Feb 2025 13:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E5=B0=94=E6=99=AE=E6=96=AF=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=95=B0=E6=8D=AEBUG=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/listener/DynamicRabbitListener.java | 2 + .../ModbusMessagePersistListener.java | 8 +- .../service/impl/DeviceServiceImpl.java | 48 ++++++----- .../service/impl/SummaryServiceImpl.java | 84 ++++++++++--------- .../isu/gaswellwatch/vo/DeviceHistoryVO.java | 52 +++++++++--- src/main/resources/application-dev.yaml | 4 +- src/main/resources/mapper/DeviceDao.xml | 29 +++++-- src/main/resources/sql/INSERT_WEPS_PLUG.sql | 70 ++++++++-------- 8 files changed, 175 insertions(+), 122 deletions(-) diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java index c487a87..51bbd8e 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java @@ -5,6 +5,7 @@ package com.isu.gaswellwatch.modbus.data.listener; * 2024/11/23 0:32 */ +import lombok.Getter; import org.springframework.amqp.core.AmqpAdmin; import org.springframework.amqp.core.Queue; import org.springframework.amqp.core.QueueBuilder; @@ -22,6 +23,7 @@ import java.util.stream.IntStream; public class DynamicRabbitListener implements ApplicationRunner { private final AmqpAdmin amqpAdmin; + @Getter private final ComposeModbusMessageListener composeListener; private final ComposeModbusMessageListener businessMessageListener; private final SimpleMessageListenerContainer modbusMessageListenerContainer; diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java index 18a3936..4c639b2 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java @@ -207,8 +207,12 @@ public class ModbusMessagePersistListener implements BatchMessageListener { } else if (stepSize <= 1) { messagePoint = modbusMessage.getMessagePointMap() .get(StringUtils.leftPad(String.valueOf(startAddress), 4, '0')); - decodeMessage(decodeName, point, messagePoint); - value = messagePoint.getValue(); + if (Objects.isNull(messagePoint)) { + value = StringUtils.EMPTY; + } else { + decodeMessage(decodeName, point, messagePoint); + value = messagePoint.getValue(); + } } else { value = decodeStepCommandPoint(modbusMessage.getMessagePointMap(), decodeName, point, startAddress, stepSize); } diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java index 348c39b..5eb2d6e 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java @@ -38,6 +38,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; @Service("deviceService") @@ -66,7 +67,7 @@ public class DeviceServiceImpl extends ServiceImpl implements @Override public Page page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, Long deviceTypeId, Long blockId, Integer product) { - Page page = this.deviceDao.page(new Page<>(currentPage, pageSize), gasWellName, gasStationName, deviceTypeId, blockId,product); + Page page = this.deviceDao.page(new Page<>(currentPage, pageSize), gasWellName, gasStationName, deviceTypeId, blockId, product); List deviceVOList = page.getRecords(); // 从Redis获取设备运行数据 if (CollectionUtil.isNotEmpty(deviceVOList)) { @@ -93,7 +94,7 @@ public class DeviceServiceImpl extends ServiceImpl implements Object online = this.redisTemplate.opsForHash().get(deviceKey, "online"); deviceVO.setOnline(online == null ? "" : online.toString()); - if(PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ + if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) { Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "solenoidValveStatus"); deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); @@ -104,7 +105,7 @@ public class DeviceServiceImpl extends ServiceImpl implements Dictionary runMode1 = controlModeMap.get(runMode.toString()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); } - }else if(PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ + } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) { Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus"); deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); @@ -115,7 +116,7 @@ public class DeviceServiceImpl extends ServiceImpl implements Dictionary runMode1 = ctlModeMap.get(runMode.toString()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); } - }else{ + } else { Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "wellStatus"); deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); @@ -185,7 +186,7 @@ public class DeviceServiceImpl extends ServiceImpl implements this.gasWellService.unbindDevice(gasWellId); //删除t_data_设备历史数据表 删除缓存和MQ - cacheService.cleanDeviceCache(id); + this.cacheService.cleanDeviceCache(id); } @@ -221,13 +222,13 @@ public class DeviceServiceImpl extends ServiceImpl implements @Override public List getPressureChartData(Long deviceId, String startTime, String endTime) { String tableName = Redis2DBPersistenceService.DEFAULT_DATA_TABLE + deviceId; - return deviceDao.getPressureChartData(deviceId,startTime,endTime,tableName); + return this.deviceDao.getPressureChartData(deviceId, startTime, endTime, tableName); } @Override - public List getSwitchStatusData(Long deviceId, String startTime, String endTime,String deviceProduct) { + public List getSwitchStatusData(Long deviceId, String startTime, String endTime, String deviceProduct) { String tableName = Redis2DBPersistenceService.DEFAULT_DATA_TABLE + deviceId; - return deviceDao.getSwitchStatusData(deviceId,startTime,endTime,tableName,deviceProduct); + return this.deviceDao.getSwitchStatusData(deviceId, startTime, endTime, tableName, deviceProduct); } @Override @@ -244,18 +245,21 @@ public class DeviceServiceImpl extends ServiceImpl implements } //判断设备品牌 DeviceVO device = this.getDevice(deviceId); - List list = this.deviceDao.getDeviceHistoryData(start, end,deviceId,tableName,device.getProduct().getCode()); + List list = this.deviceDao.getDeviceHistoryData(start, end, deviceId, tableName, device.getProduct().getCode()); if (CollectionUtil.isNotEmpty(list)) { Map runModeMap = this.dictionaryService.getValueMapByType("runMode"); - if(PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())){ + if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { runModeMap = this.dictionaryService.getValueMapByType("controlMode"); - }else if(PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())){ + } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { runModeMap = this.dictionaryService.getValueMapByType("ctlMode"); } Map plugStatusMap = this.dictionaryService.getValueMapByType("plugStatus"); for (DeviceHistoryVO deviceVO : list) { + if (Objects.equals(deviceVO.getType(), PersistenceHandler.WEPS_PLUG_MODBUS_TYPE)) { + continue; + } deviceVO.setRunMode(StringUtils.isEmpty(deviceVO.getRunMode()) ? "" : runModeMap.get(deviceVO.getRunMode()).getName()); deviceVO.setPlugStatus(StringUtils.isEmpty(deviceVO.getPlugStatus()) ? "" : plugStatusMap.get(deviceVO.getPlugStatus()).getName()); } @@ -268,8 +272,8 @@ public class DeviceServiceImpl extends ServiceImpl implements String fileName = null; try { ServletOutputStream outputStream = response.getOutputStream(); - fileName = URLEncoder.encode(device.getGasWell().getName()+"|"+simpleDateFormat.format(new Date()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"); - response.setHeader("Access-Control-Expose-Headers","Content-Disposition"); + fileName = URLEncoder.encode(device.getGasWell().getName() + "|" + simpleDateFormat.format(new Date()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); EasyExcel.write(outputStream) // 这里放入动态头 @@ -277,7 +281,7 @@ public class DeviceServiceImpl extends ServiceImpl implements // 当然这里数据也可以用 List> 去传入 .doWrite(export); } catch (Exception e) { - log.error(e.getMessage()); + this.log.error(e.getMessage()); } } @@ -287,9 +291,9 @@ public class DeviceServiceImpl extends ServiceImpl implements SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); UserLoginInfoVO userLoginInfoVO = (UserLoginInfoVO) StpUtil.getTokenSession().get(UserConstant.TOKEN_SESSION); - UserVO userVO = userService.selectUserInfo(userLoginInfoVO.getUserVO().getUsername()); + UserVO userVO = this.userService.selectUserInfo(userLoginInfoVO.getUserVO().getUsername()); - List list = switchStatusExportService.getSwitchStatusExport(startTime, endTime,userVO.getDepartment().getId()); + List list = this.switchStatusExportService.getSwitchStatusExport(startTime, endTime, userVO.getDepartment().getId()); List export = ConverterUtil.convert(list, SwitchStatusExportVO.class); @@ -298,8 +302,8 @@ public class DeviceServiceImpl extends ServiceImpl implements String fileName = null; try { ServletOutputStream outputStream = response.getOutputStream(); - fileName = URLEncoder.encode("全井数据-"+simpleDateFormat.format(new Date()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"); - response.setHeader("Access-Control-Expose-Headers","Content-Disposition"); + fileName = URLEncoder.encode("全井数据-" + simpleDateFormat.format(new Date()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); EasyExcel.write(outputStream) // 这里放入动态头 @@ -307,7 +311,7 @@ public class DeviceServiceImpl extends ServiceImpl implements // 当然这里数据也可以用 List> 去传入 .doWrite(export); } catch (Exception e) { - log.error(e.getMessage()); + this.log.error(e.getMessage()); } } @@ -328,13 +332,13 @@ public class DeviceServiceImpl extends ServiceImpl implements //判断设备品牌 DeviceVO device = this.getDevice(deviceId); - Page page = this.deviceDao.historyPage(new Page<>(currentPage, pageSize), start, end, deviceId, tableName,device.getProduct().getCode()); + Page page = this.deviceDao.historyPage(new Page<>(currentPage, pageSize), start, end, deviceId, tableName, device.getProduct().getCode()); List deviceHistoryVO = page.getRecords(); if (CollectionUtil.isNotEmpty(deviceHistoryVO)) { Map runModeMap = this.dictionaryService.getValueMapByType("runMode"); - if(PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())){ + if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { runModeMap = this.dictionaryService.getValueMapByType("controlMode"); - }else if(PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())){ + } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { runModeMap = this.dictionaryService.getValueMapByType("ctlMode"); } Map plugStatusMap = this.dictionaryService.getValueMapByType("plugStatus"); diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java index 5ea38ec..d6c3105 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java @@ -23,7 +23,7 @@ import static com.isu.gaswellwatch.modbus.data.PersistenceHandler.*; @Service("summaryService") @Transactional(rollbackFor = Exception.class) @Slf4j -public class SummaryServiceImpl implements SummaryService { +public class SummaryServiceImpl implements SummaryService { @Resource(name = "stringRedisTemplate") private RedisTemplate redisTemplate; @@ -34,27 +34,27 @@ public class SummaryServiceImpl implements SummaryService { @Override public List getIndexPieSummary() { - Map onlineMap = new HashMap<>(); - try{ - onlineMap = redisTemplate.opsForHash().entries(ONLINE_DEVICE_CACHE); - }catch (RedisConnectionFailureException e){ - log.error("获取在线设备缓存失败",e); - return getPieSummaryVOS(); + Map onlineMap = new HashMap<>(); + try { + onlineMap = this.redisTemplate.opsForHash().entries(ONLINE_DEVICE_CACHE); + } catch (RedisConnectionFailureException e) { + log.error("获取在线设备缓存失败", e); + return getPieSummaryVOS(); } - if(onlineMap.isEmpty()){ + if (onlineMap.isEmpty()) { return getPieSummaryVOS(); } // List deviceIdList = onlineMap.keySet().stream().map(Long::parseLong).toList(); - List deviceVOList = deviceService.getDeviceVOByIds(null); + List deviceVOList = this.deviceService.getDeviceVOByIds(null); //将所有设备按不同的设备品牌进行分组 - Map> deviceGroup = new HashMap<>(); + Map> deviceGroup = new HashMap<>(); for (DeviceVO deviceVO : deviceVOList) { - if(deviceGroup.containsKey(deviceVO.getProduct().getCode())){ + if (deviceGroup.containsKey(deviceVO.getProduct().getCode())) { deviceGroup.get(deviceVO.getProduct().getCode()).add(deviceVO); - }else { + } else { List deviceVOList1 = new ArrayList<>(); deviceVOList1.add(deviceVO); deviceGroup.put(deviceVO.getProduct().getCode(), deviceVOList1); @@ -63,9 +63,11 @@ public class SummaryServiceImpl implements SummaryService { List pieSummaryVOList = new ArrayList<>(); - addKNPCDeviceSummary(KNPCV1_MODBUS_TYPE,deviceGroup, onlineMap, pieSummaryVOList,"KNPCV1"); - addKNPCDeviceSummary(ETC_MODBUS_TYPE,deviceGroup, onlineMap, pieSummaryVOList,"ETC"); - addKNPCDeviceSummary(SCSS_MODBUS_TYPE,deviceGroup, onlineMap, pieSummaryVOList,"四川双晟"); + addKNPCDeviceSummary(KNPCV1_MODBUS_TYPE, deviceGroup, onlineMap, pieSummaryVOList, "KNPCV1"); + addKNPCDeviceSummary(ETC_MODBUS_TYPE, deviceGroup, onlineMap, pieSummaryVOList, "ETC"); + addKNPCDeviceSummary(SCSS_MODBUS_TYPE, deviceGroup, onlineMap, pieSummaryVOList, "四川双晟"); + addKNPCDeviceSummary(WEPS_PLUG_MODBUS_TYPE, deviceGroup, onlineMap, pieSummaryVOList, "维尔普斯"); + addKNPCDeviceSummary(MI_WEPS_PLUG_MODBUS_TYPE, deviceGroup, onlineMap, pieSummaryVOList, "维尔普斯"); //计算总数 PieSummaryVO pieSummaryVO = new PieSummaryVO(); @@ -76,16 +78,16 @@ public class SummaryServiceImpl implements SummaryService { Integer offLineCount = 0; - for(DeviceVO deviceVO : deviceVOList){ - if("true".equalsIgnoreCase(onlineMap.get(deviceVO.getId().toString()))){ + for (DeviceVO deviceVO : deviceVOList) { + if ("true".equalsIgnoreCase(onlineMap.get(deviceVO.getId().toString()))) { onLineCount++; - }else { + } else { offLineCount++; } } - PieDataVO onlinePieDataVO = new PieDataVO("在线",onLineCount); - PieDataVO offlinePieDataVO = new PieDataVO("离线",offLineCount); - pieSummaryVO.setData(List.of(onlinePieDataVO,offlinePieDataVO)); + PieDataVO onlinePieDataVO = new PieDataVO("在线", onLineCount); + PieDataVO offlinePieDataVO = new PieDataVO("离线", offLineCount); + pieSummaryVO.setData(List.of(onlinePieDataVO, offlinePieDataVO)); pieSummaryVOList.add(pieSummaryVO); @@ -95,13 +97,13 @@ public class SummaryServiceImpl implements SummaryService { @Override public LineSummaryVO getPressureChartData(String startTime, String endTime, Long deviceId) { //根据设备ID、时间范围查询设备历史数据表的油压 套压 - DeviceVO deviceVO = deviceService.getDevice(deviceId); - if(deviceVO == null){ + DeviceVO deviceVO = this.deviceService.getDevice(deviceId); + if (deviceVO == null) { throw new RuntimeException("设备不存在"); } List xAxisData = new ArrayList<>(); - List dataList = deviceService.getPressureChartData(deviceId,startTime,endTime); + List dataList = this.deviceService.getPressureChartData(deviceId, startTime, endTime); //将查询到的结果组装成LineSummaryVO返回给前端 LineSummaryVO lineSummaryVO = new LineSummaryVO(); lineSummaryVO.setTitle(deviceVO.getGasWell().getName()); @@ -117,11 +119,11 @@ public class SummaryServiceImpl implements SummaryService { List casPressureData = new ArrayList<>(); List prePressureData = new ArrayList<>(); - for(DeviceHistoryVO deviceHistoryVO : dataList){ + for (DeviceHistoryVO deviceHistoryVO : dataList) { xAxisData.add(deviceHistoryVO.getCollectionTime()); - oilPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getOilPressure())?"0":deviceHistoryVO.getOilPressure()); - casPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getCasPressure())?"0":deviceHistoryVO.getCasPressure()); - prePressureData.add(StringUtils.isEmpty(deviceHistoryVO.getPrePressure())?"0":deviceHistoryVO.getPrePressure()); + oilPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getOilPressure()) ? "0" : deviceHistoryVO.getOilPressure()); + casPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getCasPressure()) ? "0" : deviceHistoryVO.getCasPressure()); + prePressureData.add(StringUtils.isEmpty(deviceHistoryVO.getPrePressure()) ? "0" : deviceHistoryVO.getPrePressure()); } //设置x轴数据（日期） @@ -175,13 +177,13 @@ public class SummaryServiceImpl implements SummaryService { @Override public LineSummaryVO getSwitchChartData(String startTime, String endTime, Long deviceId) { - DeviceVO deviceVO = deviceService.getDevice(deviceId); - if(deviceVO == null){ + DeviceVO deviceVO = this.deviceService.getDevice(deviceId); + if (deviceVO == null) { throw new RuntimeException("设备不存在"); } List xAxisData = new ArrayList<>(); - List dataList = deviceService.getSwitchStatusData(deviceId,startTime,endTime,deviceVO.getProduct().getCode()); + List dataList = this.deviceService.getSwitchStatusData(deviceId, startTime, endTime, deviceVO.getProduct().getCode()); LineSummaryVO lineSummaryVO = new LineSummaryVO(); lineSummaryVO.setTitle(deviceVO.getGasWell().getName()); @@ -192,9 +194,9 @@ public class SummaryServiceImpl implements SummaryService { List switchStatusData = new ArrayList<>(); - for(DeviceHistoryVO deviceHistoryVO : dataList){ + for (DeviceHistoryVO deviceHistoryVO : dataList) { xAxisData.add(deviceHistoryVO.getCollectionTime()); - switchStatusData.add(StringUtils.isEmpty(deviceHistoryVO.getWellStatus())?"0":deviceHistoryVO.getWellStatus()); + switchStatusData.add(StringUtils.isEmpty(deviceHistoryVO.getWellStatus()) ? "0" : deviceHistoryVO.getWellStatus()); } //设置x轴数据（日期） @@ -245,21 +247,21 @@ public class SummaryServiceImpl implements SummaryService { PieSummaryVO pieSummaryVO = new PieSummaryVO(); pieSummaryVO.setChartName(productName); pieSummaryVO.setTitle(title); - if(knpcDeviceList != null){ + if (knpcDeviceList != null) { //根据设备列表查找在线map中的状态进行统计在线数量 Integer onLineCount = 0; Integer offLineCount = 0; - for(DeviceVO deviceVO : knpcDeviceList){ - if("true".equalsIgnoreCase(onlineMap.get(deviceVO.getId().toString()))){ + for (DeviceVO deviceVO : knpcDeviceList) { + if ("true".equalsIgnoreCase(onlineMap.get(deviceVO.getId().toString()))) { onLineCount++; - }else { + } else { offLineCount++; } } - PieDataVO onlinePieDataVO = new PieDataVO("在线",onLineCount); - PieDataVO offlinePieDataVO = new PieDataVO("离线",offLineCount); - pieSummaryVO.setData(List.of(onlinePieDataVO,offlinePieDataVO)); - }else{ + PieDataVO onlinePieDataVO = new PieDataVO("在线", onLineCount); + PieDataVO offlinePieDataVO = new PieDataVO("离线", offLineCount); + pieSummaryVO.setData(List.of(onlinePieDataVO, offlinePieDataVO)); + } else { //无值时需要构建空值结构 pieSummaryVO.setData(new ArrayList<>()); } diff --git a/src/main/java/com/isu/gaswellwatch/vo/DeviceHistoryVO.java b/src/main/java/com/isu/gaswellwatch/vo/DeviceHistoryVO.java index a53d9f3..794137b 100644 --- a/src/main/java/com/isu/gaswellwatch/vo/DeviceHistoryVO.java +++ b/src/main/java/com/isu/gaswellwatch/vo/DeviceHistoryVO.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; /** * 设备对象 Device - * + * * @author scwsl * @date 2024-11-17 */ @@ -21,37 +21,65 @@ public class DeviceHistoryVO extends Model { private static final long serialVersionUID = 1L; - /** 采集时间 */ + + /** + * 设备类型 + */ + private String type; + + /** + * 采集时间 + */ private String collectionTime; - /** 油压 */ + /** + * 油压 + */ private String oilPressure; - /** 套压 */ + /** + * 套压 + */ private String casPressure; - /** 输压 */ + /** + * 输压 + */ private String prePressure; - /** 运行模式 */ + /** + * 运行模式 + */ private String runMode; - /** 柱塞状态 */ + /** + * 柱塞状态 + */ private String plugStatus; - /** 气井状态 */ + /** + * 气井状态 + */ private String wellStatus; - /** 倒计时 */ + /** + * 倒计时 + */ private String statusEndTime; - /** 温度 */ + /** + * 温度 + */ private String temperature; - /** 湿度 */ + /** + * 湿度 + */ private String humidity; - /** 太阳能电压 */ + /** + * 太阳能电压 + */ private String solarVoltage; diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index ed1feb9..b076024 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -2,6 +2,6 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource url: jdbc:mysql://localhost:3306/gas_well_watch?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: cq - password: cq + username: dev + password: 1qaz@WSX driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml index 7e4fc2a..bc7c042 100644 --- a/src/main/resources/mapper/DeviceDao.xml +++ b/src/main/resources/mapper/DeviceDao.xml @@ -171,15 +171,26 @@