From 9245e75ed2529d667f0284ec3698b9c531d7c3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 5 Aug 2025 17:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectricityMeterController.java | 110 ++++++- .../electricity/entity/ElectricityMeter.java | 33 +- .../mapper/ElectricityMeterMapper.java | 14 +- .../mapper/xml/ElectricityMeterMapper.xml | 244 ++++++++++++++- .../service/IElectricityMeterService.java | 8 + .../impl/ElectricityMeterServiceImpl.java | 283 +++++++++++++++++- .../tq/water/mapper/xml/WaterMeterMapper.xml | 36 ++- 7 files changed, 708 insertions(+), 20 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index 9bb4047..f6c3a0e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.service.IElectricityMeterService; -import com.nu.modules.tq.water.entity.WaterMeter; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -15,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; @Slf4j @@ -98,8 +98,6 @@ public class ElectricityMeterController extends JeecgController> sourceList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findSourcePage(page, electricityMeter); + return Result.OK(pageList); + } + + /** + * 电表数据中机构列表查询 + * + * @param electricityMeter + * @return + */ + @GetMapping(value = "/departList") + public Result> departList(ElectricityMeter electricityMeter) { + List list = service.findDepartList(electricityMeter); + return Result.OK(list); + } + + /** + * 电表数据中区域列表查询 + * + * @param electricityMeter + * @return + */ + @GetMapping(value = "/nuList") + public Result> nuList(ElectricityMeter electricityMeter) { + List list = service.findNuList(electricityMeter); + return Result.OK(list); + } + + /** + * 电表数据中已同步列表查询 + * + * @param electricityMeter + * @return + */ + @GetMapping(value = "/businessList") + public Result> businessList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findBusinessPage(page,electricityMeter); + return Result.OK(pageList); + } + + /** + * 以设备维度同步电表到业务 + * + * @param list + * @return + */ + @PostMapping(value = "/syncDevices") + public Result syncDevices(@RequestBody List list) { + String result = service.syncDevices(list); + if(StringUtils.equals(result,"0")){ + return Result.OK("操作成功!"); + }else if (StringUtils.equals(result,"1")){ + return Result.error("参数为空!"); + }else if (StringUtils.equals(result,"2")){ + return Result.error("设备ID为空！"); + }else{ + return Result.error("其他错误，请联系管理员！"); + } + } + + /** + * 电表同步日志列表查询 + * + * @param electricityMeter + * @return + */ + @GetMapping(value = "/syncLogList") + public Result> syncLogList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findSyncLogPage(page, electricityMeter); + return Result.OK(pageList); + } + + /** + * 绑定完摄像头的区域列表查询 + * + * @param electricityMeter + * @return + */ + @GetMapping(value = "/nuSyncList") + public Result> nuSyncList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findNuSyncPage(page, electricityMeter); + return Result.OK(pageList); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index bff6527..c837284 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -9,9 +9,11 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; +import java.util.List; /** *

Class :物联电表管理Entity @@ -69,14 +71,43 @@ public class ElectricityMeter implements Serializable { private String nuId;//护理单元ID private String nuName;//护理单元 + @Dict(dicCode = "nu_type") + @TableField(exist = false) + private String areaFlag;//区域标签 + @TableField(exist = false) + private Integer deviceNum;//已绑定设备数 private String departId;//机构ID private String departName;//机构名称 private String departServerUrl;//机构服务地址 + @TableField(exist = false) + private String orgCode;//机构编码 private String oldServerUrl;//原机构服务地址 private String syncType;//是否同步 0 未同步 1已同步 private String oldDepartId;//原机构id private String oldDepartName;//原机构名称 - + @TableField(exist = false) + private String oldOrgCode;//原机构编码 @TableField(exist = false) private String checkType; + @TableField(exist = false) + private String viewType;//选择，未选择 用于设备同步功能 + @TableField(exist = false) + private String dataType;//数据类型 + @TableField(exist = false) + private String actionType;//操作类型 + + @TableField(exist = false) + private String sn;//设备号 + @TableField(exist = false) + private String deviceName;//设备名称 + @TableField(exist = false) + private String status;//状态 + @TableField(exist = false) + private String serverType;//服务类型 + @TableField(exist = false) + private String oldNuId;//原护理单元ID + @TableField(exist = false) + private String createTime;//时间 + @TableField(exist = false) + private List seedList;//子列表 } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java index e96321d..e0afa2b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java @@ -18,5 +18,17 @@ public interface ElectricityMeterMapper extends BaseMapper { int updateElectricty(ElectricityMeter electricityMeter); - void updateDepartById(ElectricityMeter cameraInfo); + void updateDepartById(ElectricityMeter electricityMeter); + + void updateSync(ElectricityMeter electricityMeter); + + IPage findSourcePage(Page page, @Param("params") ElectricityMeter electricityMeter); + List findDepartList(ElectricityMeter electricityMeter); + List findNuList(ElectricityMeter electricityMeter); + IPage findBusinessPage(Page page, @Param("params") ElectricityMeter electricityMeter); + + IPage findSyncLogMainPage(Page page, @Param("params") ElectricityMeter electricityMeter); + List findSyncLogSeedList(ElectricityMeter electricityMeter); + + IPage findNuSyncPage(Page page, @Param("params") ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 2c94465..38e9fd4 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -89,10 +89,24 @@ ele_value as eleValue, relay_state as relayState, read_time as readTime, - remark + remark, + nu_id as nuId, + nu_name as nuName, + depart_id as departId, + depart_name as departName, + depart_server_url as departServerUrl, + old_server_url as oldServerUrl, + old_depart_id as oldDepartId, + old_depart_name as oldDepartName from nu_iot_tq_electricity_meter - where cid = #{cid} - and address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -118,8 +132,14 @@ relay_state = #{relayState}, remark = #{remark}, update_time = now() - where cid = #{cid} - and address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -128,8 +148,14 @@ ele_value = #{eleValue}, read_time = #{readTime}, update_time = now() - where cid = #{cid} - and address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -137,12 +163,212 @@ set relay_state = #{relayState}, update_time = now() - where cid = #{cid} - and address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + update nu_iot_tq_electricity_meter set nu_id = null,nu_name = null,depart_id = null,depart_name = null,depart_server_url=null where id = #{id} + + update nu_iot_tq_electricity_meter + set + sync_type = #{syncType}, + nu_id = #{nuId}, + nu_name = #{nuName}, + depart_server_url = #{departServerUrl}, + depart_id = #{departId}, + depart_name = #{departName}, + old_server_url = #{oldServerUrl}, + old_depart_id = #{oldDepartId}, + old_depart_name = #{oldDepartName} + where address = #{address} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index f28fc25..6fd242b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -25,4 +25,12 @@ public interface IElectricityMeterService extends IService { void editHldy(ElectricityMeter electricityMeter); String syncElectricityList(Map electricityList); + + IPage findSourcePage(Page page, ElectricityMeter electricityMeter); + List findDepartList(ElectricityMeter electricityMeter); + List findNuList(ElectricityMeter electricityMeter); + IPage findBusinessPage(Page page,ElectricityMeter electricityMeter); + String syncDevices(List list); + IPage findSyncLogPage(Page page,ElectricityMeter electricityMeter); + IPage findNuSyncPage(Page page,ElectricityMeter electricityMeter); } 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 3565688..3f90777 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 @@ -10,13 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.syncLog.entity.SyncLog; import com.nu.modules.syncLog.service.ISyncLogService; -import com.nu.modules.tplink.camera.entity.CameraInfo; 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; @@ -673,5 +671,286 @@ public class ElectricityMeterServiceImpl extends ServiceImpl findSourcePage(Page page, ElectricityMeter electricityMeter){ + return baseMapper.findSourcePage(page,electricityMeter); + } + + @Override + public List findDepartList(ElectricityMeter electricityMeter){ + return baseMapper.findDepartList(electricityMeter); + } + + @Override + public List findNuList(ElectricityMeter electricityMeter){ + return baseMapper.findNuList(electricityMeter); + } + + @Override + public IPage findBusinessPage(Page page, ElectricityMeter electricityMeter){ + return baseMapper.findBusinessPage(page,electricityMeter); + } + + /** + * 以设备维度同步电表到业务 + * @param list + * @return + */ + @Override + public String syncDevices(List list){ + + for (ElectricityMeter electricityMeter : list) { + ElectricityMeter waterInfo = baseMapper.getElectricityMeter(electricityMeter); + String actionType = electricityMeter.getActionType();//操作类型 + if(actionType.equals("添加")){ + String orgCode = electricityMeter.getOrgCode(); + if(!StringUtils.isNotBlank(orgCode)){ + return "1"; + } + waterInfo.setSyncType("1"); + waterInfo.setNuId(electricityMeter.getNuId()); + waterInfo.setNuName(electricityMeter.getNuName()); + waterInfo.setDepartServerUrl(orgCode); + waterInfo.setDepartId(electricityMeter.getDepartId()); + waterInfo.setDepartName(electricityMeter.getDepartName()); + waterInfo.setOldServerUrl(null); + waterInfo.setOldDepartId(null); + waterInfo.setOldDepartName(null); + + boolean flag = syncImpl.syncDevice(orgCode,"更新",waterInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(electricityMeter.getAddress()); + syncLog.setMainName(electricityMeter.getAddress()); + syncLog.setSyncType("添加"); + syncLog.setNewOrgId(electricityMeter.getDepartId()); + syncLog.setNewOrgCode(orgCode); + syncLog.setNewOrgName(electricityMeter.getDepartName()); + if(flag){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("添加业务机构电表数据"); + syncLog.setServerType("电表"); + syncLog.setNewNuId(electricityMeter.getNuId()); + nuIotTqElectricitySyncLogService.save(syncLog); + if(flag){ + //更新同步 + baseMapper.updateSync(waterInfo); + } + } + if(actionType.equals("删除")){ + String oldOrgCode = electricityMeter.getOldOrgCode(); + if(!StringUtils.isNotBlank(oldOrgCode)){ + return "1"; + } + waterInfo.setSyncType("1"); + waterInfo.setNuId(null); + waterInfo.setNuName(null); + waterInfo.setDepartServerUrl(null); + waterInfo.setDepartId(null); + waterInfo.setDepartName(null); + waterInfo.setOldServerUrl(oldOrgCode); + waterInfo.setOldDepartId(electricityMeter.getOldDepartId()); + waterInfo.setOldDepartName(electricityMeter.getOldDepartName()); + + boolean flag = syncImpl.syncDevice(oldOrgCode,"删除",waterInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(electricityMeter.getAddress()); + syncLog.setMainName(electricityMeter.getAddress()); + syncLog.setSyncType("删除"); + syncLog.setOrgId(electricityMeter.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(electricityMeter.getOldDepartName()); + if(flag){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("删除原来业务机构电表数据"); + syncLog.setServerType("电表"); + syncLog.setNuId(electricityMeter.getNuId()); + nuIotTqElectricitySyncLogService.save(syncLog); + if(flag){ + //更新同步 + baseMapper.updateSync(waterInfo); + } + } + if(actionType.equals("调整")){ + String oldNuId = waterInfo.getNuId();//原护理单元ID + String nuId = electricityMeter.getNuId();//新护理单元ID + if(!oldNuId.equals(nuId)){ + String oldOrgCode = electricityMeter.getOldOrgCode(); + waterInfo.setNuId(electricityMeter.getNuId()); + waterInfo.setNuName(electricityMeter.getNuName()); + waterInfo.setDepartServerUrl(oldOrgCode); + waterInfo.setDepartId(electricityMeter.getOldDepartId()); + waterInfo.setDepartName(electricityMeter.getOldDepartName()); + waterInfo.setOldServerUrl(null); + waterInfo.setOldDepartId(null); + waterInfo.setOldDepartName(null); + boolean flag = syncImpl.syncDevice(oldOrgCode,"更新",waterInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(electricityMeter.getAddress()); + syncLog.setMainName(electricityMeter.getAddress()); + syncLog.setSyncType("调整"); + syncLog.setNewOrgId(electricityMeter.getOldDepartId()); + syncLog.setNewOrgCode(oldOrgCode); + syncLog.setNewOrgName(electricityMeter.getOldDepartName()); + if(flag){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("调整业务机构电表数据"); + syncLog.setServerType("电表"); + syncLog.setNewNuId(nuId); + syncLog.setNuId(oldNuId); + nuIotTqElectricitySyncLogService.save(syncLog); + if(flag){ + //更新同步 + baseMapper.updateSync(waterInfo); + } + } + } + if(actionType.equals("变更")){ + String oldOrgCode = electricityMeter.getOldOrgCode(); + String orgCode = electricityMeter.getOrgCode(); + String oldNuId = waterInfo.getNuId();//原护理单元ID + if(!StringUtils.isNotBlank(oldOrgCode)){ + return "1"; + } + if(!StringUtils.isNotBlank(orgCode)){ + return "1"; + } + + boolean flag = syncImpl.syncDevice(oldOrgCode,"删除",waterInfo); + if(!flag){ + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(electricityMeter.getAddress()); + syncLog.setMainName(electricityMeter.getAddress()); + syncLog.setSyncType("删除"); + syncLog.setOrgId(electricityMeter.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(electricityMeter.getOldDepartName()); + syncLog.setStatus("失败"); + syncLog.setContent("删除业务机构电表数据"); + syncLog.setServerType("电表"); + syncLog.setNuId(oldNuId); + nuIotTqElectricitySyncLogService.save(syncLog); + } + boolean flag2 = false; + if(flag){ + waterInfo.setSyncType("1"); + waterInfo.setNuId(electricityMeter.getNuId()); + waterInfo.setNuName(electricityMeter.getNuName()); + waterInfo.setDepartServerUrl(orgCode); + waterInfo.setDepartId(electricityMeter.getDepartId()); + waterInfo.setDepartName(electricityMeter.getDepartName()); + waterInfo.setOldServerUrl(null); + waterInfo.setOldDepartId(null); + waterInfo.setOldDepartName(null); + flag2 = syncImpl.syncDevice(orgCode,"更新",waterInfo); + + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(electricityMeter.getAddress()); + syncLog.setMainName(electricityMeter.getAddress()); + syncLog.setSyncType("更新"); + syncLog.setOrgId(electricityMeter.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(electricityMeter.getOldDepartName()); + syncLog.setNewOrgId(electricityMeter.getDepartId()); + syncLog.setNewOrgCode(orgCode); + syncLog.setNewOrgName(electricityMeter.getDepartName()); + if(flag2){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("更新业务机构电表数据"); + syncLog.setServerType("电表"); + syncLog.setNewNuId(waterInfo.getNuId()); + syncLog.setNuId(oldNuId); + nuIotTqElectricitySyncLogService.save(syncLog); + } + if(flag2){ + //更新同步 + waterInfo.setSyncType("1"); + waterInfo.setNuId(electricityMeter.getNuId()); + waterInfo.setNuName(electricityMeter.getNuName()); + waterInfo.setDepartServerUrl(orgCode); + waterInfo.setDepartId(electricityMeter.getDepartId()); + waterInfo.setDepartName(electricityMeter.getDepartName()); + waterInfo.setOldServerUrl(oldOrgCode); + waterInfo.setOldDepartId(electricityMeter.getOldDepartId()); + waterInfo.setOldDepartName(electricityMeter.getOldDepartName()); + baseMapper.updateSync(waterInfo); + }else{ + if(flag){ + //更新同步 + waterInfo.setSyncType("1"); + waterInfo.setNuId(null); + waterInfo.setNuName(null); + waterInfo.setDepartServerUrl(null); + waterInfo.setDepartId(null); + waterInfo.setDepartName(null); + waterInfo.setOldServerUrl(oldOrgCode); + waterInfo.setOldDepartId(electricityMeter.getOldDepartId()); + waterInfo.setOldDepartName(electricityMeter.getOldDepartName()); + baseMapper.updateSync(waterInfo); + } + } + } + } + return "0"; + } + + //业务系统保存或者修改命令 + @DS("#dataSourceCode") + public boolean syncDevice(String dataSourceCode,String type,ElectricityMeter electricityMeter) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("address",electricityMeter.getAddress()); + ElectricityMeter oldParam = baseMapper.selectOne(queryWrapper);//查询数据库中该表号数据原始数据 + if(type.equals("更新")){ + if(oldParam == null){ + baseMapper.insert(electricityMeter); + }else{ + electricityMeter.setId(oldParam.getId()); + baseMapper.updateById(electricityMeter); + } + } + if(type.equals("删除")){ + baseMapper.deleteById(oldParam); + } + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public IPage findSyncLogPage(Page page, ElectricityMeter electricityMeter){ + IPage mainPage = baseMapper.findSyncLogMainPage(page,electricityMeter); + List records = mainPage.getRecords(); + for(int i=0;i seedList = baseMapper.findSyncLogSeedList(record); + record.setSeedList(seedList); + } + return mainPage; + } + + @Override + public IPage findNuSyncPage(Page page, ElectricityMeter electricityMeter){ + return baseMapper.findNuSyncPage(page,electricityMeter); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 5b7c81c..456c05b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -92,7 +92,14 @@ old_depart_id as oldDepartId, old_depart_name as oldDepartName from nu_iot_tq_water_meter - where address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -121,7 +128,14 @@ battery_state = #{batteryState}, remark = #{remark}, update_time = now() - where address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -130,7 +144,14 @@ water_value = #{waterValue}, read_time = #{readTime}, update_time = now() - where address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + + @@ -138,7 +159,14 @@ set relay_state = #{relayState}, update_time = now() - where address = #{address} + + + AND address = #{address} + + + AND cid = #{cid} + +