From a7b49837e77eacf7a3ede4378ce98dee073da26d Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 22 Jan 2026 13:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../largeScreen/domain/IotLocationVo.java | 2 +- .../service/impl/LargeScreenServiceImpl.java | 6 ++--- .../sgzb/material/domain/StorageStatus.java | 16 ++++++++++++ .../service/impl/IotMachineServiceImpl.java | 26 ++++++++++++++++--- .../mapper/largeScreen/LargeScreenMapper.xml | 5 ++-- .../mapper/material/StorageStatusMapper.xml | 10 +++++++ 6 files changed, 56 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java index 9a5c5e5..3afb531 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java @@ -42,5 +42,5 @@ public class IotLocationVo { private String startAlarm; /** 电量百分比 */ @ApiModelProperty(value = "电量百分比") - private Double voltagepercent; + private String voltagepercent; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 25f307e..a21ede1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -402,10 +402,10 @@ public class LargeScreenServiceImpl implements ILargeScreenService { list.add(iotMaCodeMachine.getIotCode()); map.put("deviceids", list); String param = JSON.toJSONString(map); - String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL + redisCode, param); +// String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL + redisCode, param); String res1 = HttpHelper.doPost(HttpStatus.REPORT_OF_FLINE + redisCode, param); //对返回的结果进行解析 - IotLocationVo iotLocationVo = resultDataHandler(res); + IotLocationVo iotLocationVo = resultDataHandler(res1); String address = resultDataHandler1(res1); iotLocationVo.setAddress(address); iotMaCodeMachine.setIotLocationVo(iotLocationVo); @@ -427,7 +427,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = JSONObject.from(jsonArray.getJSONObject(i)); iotLocationVo.setIotId(jsonObject.getString("deviceid")); - iotLocationVo.setVoltagepercent(Double.valueOf(jsonObject.getString("voltagepercent"))); + iotLocationVo.setVoltagepercent(jsonObject.getString("strstatus")); iotLocationVo.setCallat(StringHelper.conversionBigDecimal(jsonObject.getString("callat"))); iotLocationVo.setCallon(StringHelper.conversionBigDecimal(jsonObject.getString("callon"))); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java index e45a7c1..a9f79b9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java @@ -31,6 +31,20 @@ public class StorageStatus { private String agreementCode; + /** + * 一级类目 + */ + @ApiModelProperty(value = "一级类目") + @Excel(name = "一级类目") + private String typeLevelOneName; + + /** + * 二级类目 + */ + @ApiModelProperty(value = "二级类目") + @Excel(name = "二级类目") + private String typeLevelTwoName; + /** * 类型名称 */ @@ -227,4 +241,6 @@ public class StorageStatus { @ApiModelProperty(value = "装备管理方式名称") private String manageTypeName; + + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java index 26fdc58..15bb0e7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java @@ -315,10 +315,30 @@ public class IotMachineServiceImpl implements IotMachineService { redisService.setCacheObject(TokenConstants.TOKEN_LOCATION,redisCode,23L, TimeUnit.HOURS); } map.clear(); - list.add(iotLocationVo.getIotId()); - map.put("deviceids",list); +// list.add(iotLocationVo.getIotId()); + + map.put("deviceid",iotLocationVo.getIotId()); + String endTime = iotLocationVo.getEndTime(); + if (endTime == null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date now = new Date(); + endTime = sdf.format(now); + + // Calculate one month before + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + calendar.add(Calendar.MONTH, -1); + String beginTime = sdf.format(calendar.getTime()); + + map.put("begintime", beginTime); + map.put("endtime", endTime); + } else { + map.put("begintime", iotLocationVo.getBeginTime()); + map.put("endtime", endTime); + } String param = JSON.toJSONString(map); - String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL+redisCode,param); +// String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL+redisCode,param); + String res = HttpHelper.doPost(HttpStatus.REPORT_PARK_DETAIL_BY_TIME_URL+redisCode,param); //对返回的结果进行解析 IotLocationVo iotLocationVoRes = resultDataHandler(res); log.info("返回结果resultDataHandler:{}", iotLocationVoRes); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index eb5d1b5..c037a91 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -42,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT + mt4.type_name AS typeLevelOneName, + mt3.type_name AS typeLevelTwoName, mt2.type_name AS typeName, mt.type_name AS typeModelName, mt.unit_name AS unit, @@ -187,6 +189,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lad.type_id ) AS subquery7 ON subquery7.type_id = mt.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id + LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id WHERE mt.`level` = 4 AND mt.del_flag = '0' @@ -196,5 +200,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.type_name like concat('%',#{typeModelName},'%') + + and mt3.type_name like concat('%',#{typeLevelTwoName},'%') + + + and mt4.type_name like concat('%',#{typeLevelOneName},'%') + \ No newline at end of file