From d3749116aa4142304d82d1687389adac92a03c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 26 Jun 2025 14:20:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B8=A9=E6=B9=BF?= =?UTF-8?q?=E5=BA=A6=E8=A1=A8=E6=8A=84=E8=A1=A8=E6=97=A5=E5=BF=97=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yiweilian/humid/controller/HumidDeviceController.java | 2 +- .../humid/service/impl/HumidDeviceServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java index 3bbd004..8874f64 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java @@ -133,7 +133,7 @@ public class HumidDeviceController extends JeecgController syncHumidDevice(@RequestBody HumidDevice humidDevice) { String dataSourceCode = humidDevice.getDepartServerUrl(); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 00d5a00..99eae71 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -248,12 +248,12 @@ public class HumidDeviceServiceImpl extends ServiceImpl params = getParmas(page+1,limit,humidDevice); From 5439480a3980aabcce4d44d2ae4ea85b5ee94ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 26 Jun 2025 17:06:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E6=B0=B4=E8=A1=A8?= =?UTF-8?q?=E6=8A=84=E8=A1=A8=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuIotTqApiRequestLogController.java | 34 +++- .../controller/CameraInfoController.java | 22 +++ .../tplink/camera/entity/CameraInfo.java | 25 ++- .../camera/service/ICameraInfoService.java | 3 +- .../service/impl/CameraInfoServiceImpl.java | 150 +++++++++++++++++- .../com/nu/modules/tplink/enums/ApiEnum.java | 3 +- .../com/nu/modules/tplink/utils/TumsApi.java | 24 ++- .../impl/ElectricityMeterServiceImpl.java | 57 +++++-- .../service/impl/WaterMeterServiceImpl.java | 56 +++++-- 9 files changed, 330 insertions(+), 44 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java index e728b1d..1d05302 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -1,15 +1,16 @@ package com.nu.modules.nuIotTqApiRequestLog.controller; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -78,6 +79,31 @@ public class NuIotTqApiRequestLogController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); Page page = new Page(pageNo, pageSize); IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); + // 获取当前时间 + Calendar calendar = Calendar.getInstance(); + // 减去5分钟 + calendar.add(Calendar.MINUTE, -5); + // 转换为Date对象 + Date fiveMinutesAgo = calendar.getTime(); + for(NuIotTqApiRequestLog par:pageList.getRecords()){ + String dateStr = par.getRequestTime(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = null; + try { + date = sdf.parse(dateStr); + System.out.println("Date: " + date); // 输出：Date: Tue Aug 15 14:30:00 CST 2023 + } catch (ParseException e) { + e.printStackTrace(); + } + //如果返回状态为空并且超过了5分钟则返回抄表失败 + if(StringUtils.isBlank(par.getResolveStatus()) && fiveMinutesAgo.getTime() > date.getTime()){ + par.setResolveStatus("抄表失败"); + //判断返回状态为空并且没有超过了5分钟则返回抄表中 + }else if(StringUtils.isBlank(par.getResolveStatus())){ + par.setResolveStatus(par.getRequestStatus()); + } + //返回状态有值，则保持原样，输出返回状态值 + } return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index 7842c76..1a82a72 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -120,6 +120,17 @@ public class CameraInfoController extends JeecgController syncProjectIpcDevice(CameraInfo cameraInfo) { + return service.syncProjectIpcDevice(cameraInfo); + } + /** * 获取IPC设备能力集 * @@ -507,4 +518,15 @@ public class CameraInfoController extends JeecgController { void rebootDevice(CameraInfo cameraInfo); void sync(String jsonResponse); void syncCapability(String deviceIndex,String jsonResponse); + Result syncProjectIpcDevice(CameraInfo cameraInfo); Result getIpcCapability(CameraInfo cameraInfo); Result getImageCommon(Map map); Result setImageCommon(Map map); @@ -60,6 +61,6 @@ public interface ICameraInfoService extends IService { Result uploadToServer(CameraInfo cameraInfo); Result stopUploadToServer(CameraInfo cameraInfo); Result getUploadToServerProcess(CameraInfo cameraInfo); - + Result motionCtrl(CameraInfo cameraInfo); IPage getNuBaseList(String dataSourceCode,Page page, NuBaseInfo nuBaseInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index 515afe7..9a6746b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -225,6 +225,111 @@ public class CameraInfoServiceImpl extends ServiceImpl syncProjectIpcDevice(CameraInfo cameraInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"start\"").append(":0").append(","); + sb.append("\"limit\"").append(":1000").append(","); + sb.append("\"filterAnd\"").append(":").append("{"); + sb.append("\"deviceTypeList\"").append(":[").append("\"SURVEILLANCECAMERA\"").append("],"); + sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\""); + sb.append("},"); + sb.append("\"sort\"").append(":").append("[{"); + sb.append("\"key\"").append(":").append("\"deviceIndex\"").append(","); + sb.append("\"value\"").append(":").append("\"asc\""); + sb.append("}]"); + sb.append("}"); + String jsonResponse = tumsApi.getDeviceList(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")){ + syncProjectIpc(jsonResponse); + return Result.OK("同步设备成功！"); + }else{ + ErrorCode errVo = errorCodeService.getByCode(errorCode); + String errMsg = errVo.getErrorMsg(); + log.info("getImageCommon:{}",errMsg); + return Result.error(errMsg); + } + } + + /** + * 同步IPC设备信息入库 + * @param jsonResponse + * @return + */ + private void syncProjectIpc(String jsonResponse){ + JSONObject jsonObject = new JSONObject(jsonResponse); + if(jsonObject.getInt("error_code").equals(0)){ + JSONObject result = (JSONObject)jsonObject.get("result"); + if(result.getInt("total")>0){ + JSONArray list = result.getJSONArray("list"); + for(int i=0;i getNuBaseList(String dataSourceCode,Page page, NuBaseInfo nuBaseInfo) { return baseMapper.getNuBaseList(page,nuBaseInfo); } + + /** + * 高速球机移动方向控制 + * @param cameraInfo + * @return + */ + @Override + public Result motionCtrl(CameraInfo cameraInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\","); + sb.append("\"direction\"").append(":").append(cameraInfo.getDirection()).append(","); + sb.append("\"startOrNot\"").append(":").append(cameraInfo.getStartOrNot()).append(","); + sb.append("\"speed\"").append(":").append("\"").append(cameraInfo.getSpeed()).append("\""); + sb.append("}"); + String res = tumsApi.motionCtrl(sb.toString()); + JSONObject jsonObject = new JSONObject(res); + int errorCode = jsonObject.getInt("error_code"); + if(errorCode == 0){ +// StringBuffer sb2 = new StringBuffer(); +// sb2.append("{"); +// sb2.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\","); +// sb2.append("\"direction\"").append(":").append(cameraInfo.getDirection()).append(","); +// sb2.append("\"startOrNot\"").append(":").append(0).append(","); +// sb2.append("\"speed\"").append(":").append("\"").append(cameraInfo.getSpeed()).append("\""); +// sb2.append("}"); +// String res2 = tumsApi.motionCtrl(sb2.toString()); + return Result.OK(); + }else{ + String errMsg = jsonObject.getStr("msg"); + if(errMsg == null || errMsg.equals("")) { + ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode)); + errMsg = errVo.getErrorMsg(); + } + log.info("motionCtrl:{}-{}",errorCode,errMsg); + return Result.error(errMsg); + } + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java index 528256b..e7b2712 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java @@ -60,8 +60,9 @@ public enum ApiEnum { IPC_GET_BATCH_PROGRESS("/tums/record/v1/getBatchProgress","获取批量操作录像计划进度"), IPC_GET_STORAGE_DEVICE("/tums/record/v1/getStorageDevice","获取存储设备列表"), IPC_GET_ALL_RECORD_PLANS("/tums/record/v1/getAllRecordPlans","获取所有录像计划列表"), - /** =================>暂时无用 **/ IPC_MOTION_CTRL("/tums/ptz/v1/motionCtrl","高速球机移动方向控制"), + + /** =================>暂时无用 **/ IPC_GET_ALL_PRESETS("/tums/ptz/v1/getAllPresets","获取高速球机的所有预置点"), IPC_OPERATE_PRESET("/tums/ptz/v1/operatePreset","操作高速球机的预置点"), IPC_GET_ALL_TOURS("/tums/ptz/v1/getAllTours","获取高速球机的所有巡航列表"), diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java index f638ca0..f0d60a2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java @@ -277,9 +277,11 @@ public class TumsApi { * @return */ public String getDeviceList(String jsonRequest){ + this.createTumsClient(); + log.info("getDeviceList:request:{}",jsonRequest); this.createTumsClient(); String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.GET_DEVICE_LIST.getValue()); -// log.info("getDeviceList:{}",jsonResponse); + log.info("getDeviceList:response:{}",jsonResponse); return jsonResponse; } @@ -326,8 +328,9 @@ public class TumsApi { */ public String getIpcCapability(String jsonRequest){ this.createTumsClient(); + log.info("getIpcCapability:request:{}",jsonRequest); String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.IPC_GET_IPC_CAPABILITY.getValue()); -// log.info("getIpcCapability:{}",jsonResponse); + log.info("getIpcCapability:response:{}",jsonResponse); return jsonResponse; } @@ -580,9 +583,24 @@ public class TumsApi { */ public String getUploadToServerProcess(String jsonRequest){ this.createTumsClient(); + log.info("getUploadToServerProcess:request:{}",jsonRequest); String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.IPC_GET_UPLOAD_TO_SERVER_PROCESS.getValue()); - log.info("getUploadToServerProcess:{}",jsonResponse); + log.info("getUploadToServerProcess:response:{}",jsonResponse); return jsonResponse; } + /** + * 高速球机移动方向控制 + * @param jsonRequest + * @return + */ + public String motionCtrl(String jsonRequest){ + this.createTumsClient(); + log.info("motionCtrl:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.IPC_MOTION_CTRL.getValue()); + log.info("motionCtrl:response:{}",jsonResponse); + return jsonResponse; + } + + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 1e00653..948ad9b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -105,7 +105,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl Date: Thu, 26 Jun 2025 17:39:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B8=A9=E6=B9=BF=E5=BA=A6=E6=8A=84?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HumidDeviceServiceImpl.java | 142 +++++++++++------- 1 file changed, 85 insertions(+), 57 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 99eae71..e7c8bf8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -1,5 +1,6 @@ package com.nu.modules.yiweilian.humid.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -25,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; +import java.util.*; @Slf4j @Service @@ -231,29 +230,53 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i params = getParmas(page+1,limit,humidDevice); @@ -344,7 +367,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i Date: Fri, 27 Jun 2025 09:20:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuIotTqApiRequestLogController.java | 19 +++------------ .../entity/NuIotTqApiRequestLog.java | 8 ++----- .../mapper/NuIotTqApiRequestLogMapper.java | 7 ++---- .../mapper/xml/NuIotTqApiRequestLogMapper.xml | 2 +- .../service/INuIotTqApiRequestLogService.java | 4 ++-- .../impl/NuIotTqApiRequestLogServiceImpl.java | 8 +++---- .../impl/ElectricityMeterServiceImpl.java | 5 ++-- .../NuIotTqElectricitySyncLogController.java | 23 +++---------------- .../entity/NuIotTqElectricitySyncLog.java | 9 ++------ .../NuIotTqElectricitySyncLogMapper.java | 7 ++---- .../xml/NuIotTqElectricitySyncLogMapper.xml | 2 +- .../INuIotTqElectricitySyncLogService.java | 4 ++-- .../NuIotTqElectricitySyncLogServiceImpl.java | 8 +++---- .../service/impl/WaterMeterServiceImpl.java | 6 ++--- .../service/impl/HumidDeviceServiceImpl.java | 8 ++----- 15 files changed, 34 insertions(+), 86 deletions(-) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/controller/NuIotTqApiRequestLogController.java (89%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/entity/NuIotTqApiRequestLog.java (92%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/mapper/NuIotTqApiRequestLogMapper.java (56%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/mapper/xml/NuIotTqApiRequestLogMapper.xml (63%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/service/INuIotTqApiRequestLogService.java (67%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/service/impl/NuIotTqApiRequestLogServiceImpl.java (57%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/controller/NuIotTqElectricitySyncLogController.java (85%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/entity/NuIotTqElectricitySyncLog.java (90%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/mapper/NuIotTqElectricitySyncLogMapper.java (55%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/mapper/xml/NuIotTqElectricitySyncLogMapper.xml (60%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/service/INuIotTqElectricitySyncLogService.java (65%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/service/impl/NuIotTqElectricitySyncLogServiceImpl.java (55%) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java similarity index 89% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index 1d05302..3042018 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -1,12 +1,8 @@ -package com.nu.modules.nuIotTqApiRequestLog.controller; +package com.nu.modules.tq.apiRequestLog.controller; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,27 +10,18 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java similarity index 92% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java index 228685a..2d94c75 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java @@ -1,15 +1,11 @@ -package com.nu.modules.nuIotTqApiRequestLog.entity; +package com.nu.modules.tq.apiRequestLog.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java similarity index 56% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java index 16181e3..1f12182 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.mapper; +package com.nu.modules.tq.apiRequestLog.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml similarity index 63% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml index 31f35b8..4706e40 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java similarity index 67% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java index 6b2ce12..506afcd 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.service; +package com.nu.modules.tq.apiRequestLog.service; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java similarity index 57% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java index ab4638b..1437058 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqApiRequestLog.service.impl; +package com.nu.modules.tq.apiRequestLog.service.impl; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 948ad9b..9e42706 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -8,14 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.SignTool; import com.nu.modules.tq.utils.TqApi; -import com.nu.modules.tq.water.entity.WaterMeter; import lombok.extern.slf4j.Slf4j; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java similarity index 85% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java index 70b68f4..5898ae0 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java @@ -1,39 +1,22 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.controller; +package com.nu.modules.tq.syncLog.controller; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java similarity index 90% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java index 82cb6e7..c2d93c8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java @@ -1,20 +1,15 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.entity; +package com.nu.modules.tq.syncLog.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java index fecebbe..459ca0b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.mapper; +package com.nu.modules.tq.syncLog.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml similarity index 60% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml index b4f9a34..b441196 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java similarity index 65% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java index bd60a30..c68c1e8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service; +package com.nu.modules.tq.syncLog.service; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java index 2954565..b62ed93 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service.impl; +package com.nu.modules.tq.syncLog.service.impl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.mapper.NuIotTqElectricitySyncLogMapper; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index c28c7c9..bcc9171 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -8,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; -import com.nu.modules.tq.electricity.entity.ElectricityMeter; -import com.nu.modules.tq.electricity.service.impl.ElectricityMeterServiceImpl; import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.SignTool; import com.nu.modules.tq.utils.TqApi; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 99eae71..f7883bc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -7,11 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; -import com.nu.modules.tq.utils.HttpTool; -import com.nu.modules.tq.water.entity.WaterMeter; -import com.nu.modules.tq.water.service.impl.WaterMeterServiceImpl; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -27,7 +24,6 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @Slf4j @Service From 229218cc0d144ff2d4fa456eb066da969bbd1f4f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 27 Jun 2025 09:27:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HumidDeviceServiceImpl.java | 144 +++++++++++------- 1 file changed, 86 insertions(+), 58 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index db2be6d..044ae88 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -1,5 +1,6 @@ package com.nu.modules.yiweilian.humid.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -9,9 +10,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; -import com.nu.modules.tq.utils.HttpTool; -import com.nu.modules.tq.water.entity.WaterMeter; -import com.nu.modules.tq.water.service.impl.WaterMeterServiceImpl; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -25,9 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @Slf4j @Service @@ -231,29 +230,53 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i params = getParmas(page+1,limit,humidDevice); @@ -344,7 +367,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i Date: Fri, 27 Jun 2025 10:28:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=8F=8A=E5=88=A4=E6=96=AD=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuIotTqApiRequestLogController.java | 22 +++++++++++++-- .../service/impl/WaterMeterServiceImpl.java | 28 +++++++++---------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index 3042018..c26a000 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -84,8 +84,26 @@ public class NuIotTqApiRequestLogController extends JeecgController date.getTime()){ - par.setResolveStatus("抄表失败"); - //判断返回状态为空并且没有超过了5分钟则返回抄表中 + //9清零 3抄表 10电表拉闸 11电表合闸 49水表清零 42水表抄表 43水表开闸 53水表关闸 + if(StringUtils.equals("9",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("3",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if(StringUtils.equals("10",par.getType())){ + par.setResolveStatus("拉闸失败"); + }else if (StringUtils.equals("11",par.getType())){ + par.setResolveStatus("合闸失败"); + }else if(StringUtils.equals("49",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("42",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if (StringUtils.equals("43",par.getType())){ + par.setResolveStatus("开阀失败"); + }else if (StringUtils.equals("53",par.getType())){ + par.setResolveStatus("关阀失败"); + } + + //判断返回状态为空并且没有超过了5分钟则返回抄表中 }else if(StringUtils.isBlank(par.getResolveStatus())){ par.setResolveStatus(par.getRequestStatus()); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index bcc9171..1ccb480 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -139,7 +139,7 @@ public class WaterMeterServiceImpl extends ServiceImpl waterControl(WaterMeter waterMeter){ @@ -147,9 +147,9 @@ public class WaterMeterServiceImpl extends ServiceImpl> req = new ArrayList<>(); @@ -181,9 +181,9 @@ public class WaterMeterServiceImpl extends ServiceImpl