From 74e70bd5cd5d3c5ca6c2966bfdf3b5d62a95d071 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 16:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CameraInfoController.java | 109 ++++++- .../tplink/camera/entity/CameraInfo.java | 29 +- .../camera/mapper/CameraInfoMapper.java | 12 + .../camera/mapper/xml/CameraInfoMapper.xml | 276 +++++++++++++++- .../camera/service/ICameraInfoService.java | 8 + .../service/impl/CameraInfoServiceImpl.java | 294 ++++++++++++++++++ .../tq/water/mapper/xml/WaterMeterMapper.xml | 4 +- .../service/impl/WaterMeterServiceImpl.java | 3 + 8 files changed, 727 insertions(+), 8 deletions(-) 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 562b31a..d7ad647 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 @@ -11,12 +11,10 @@ */ package com.nu.modules.tplink.camera.controller; -import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.modules.tplink.camera.entity.NuBaseInfo; import com.nu.modules.tplink.camera.model.CameraTreeModel; import org.apache.commons.lang.StringUtils; @@ -27,7 +25,6 @@ import lombok.extern.slf4j.Slf4j; import com.nu.modules.tplink.camera.service.ICameraInfoService; import org.jeecg.common.system.base.controller.JeecgController; import com.nu.modules.tplink.camera.entity.CameraInfo; -import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -563,4 +560,110 @@ public class CameraInfoController extends JeecgController> sourceList(CameraInfo cameraInfo, + @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, cameraInfo); + return Result.OK(pageList); + } + + /** + * 摄像头数据中机构列表查询 + * + * @param cameraInfo + * @return + */ + @GetMapping(value = "/departList") + public Result> departList(CameraInfo cameraInfo) { + List list = service.findDepartList(cameraInfo); + return Result.OK(list); + } + + /** + * 摄像头数据中区域列表查询 + * + * @param cameraInfo + * @return + */ + @GetMapping(value = "/departNuList") + public Result> departNuList(CameraInfo cameraInfo) { + List list = service.findNuList(cameraInfo); + return Result.OK(list); + } + + /** + * 摄像头数据中已同步列表查询 + * + * @param cameraInfo + * @return + */ + @GetMapping(value = "/businessList") + public Result> businessList(CameraInfo cameraInfo, + @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,cameraInfo); + 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 cameraInfo + * @return + */ + @GetMapping(value = "/syncLogList") + public Result> syncLogList(CameraInfo cameraInfo, + @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, cameraInfo); + return Result.OK(pageList); + } + + /** + * 绑定完摄像头的区域列表查询 + * + * @param cameraInfo + * @return + */ + @GetMapping(value = "/nuSyncList") + public Result> nuSyncList(CameraInfo cameraInfo, + @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, cameraInfo); + return Result.OK(pageList); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index a15bb73..bfa1e01 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -1,6 +1,7 @@ package com.nu.modules.tplink.camera.entity; import java.io.Serializable; +import java.util.List; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; @@ -137,7 +138,6 @@ public class CameraInfo implements Serializable { private String nuId; /**护理单元*/ @ApiModelProperty(value = "护理单元") - @TableField(exist = false) private String nuName; @ApiModelProperty(value = "码流类型 0 代表主码流,1 代码子码流") @TableField(exist = false) @@ -308,7 +308,6 @@ public class CameraInfo implements Serializable { private String ftpPassword; //回放视频转FTP上传密码 private String ftpUploadpath; //回放视频转FTP上传路径 - private String departId;//机构ID private String departName;//机构名称 private String departServerUrl;//机构服务地址 @@ -320,4 +319,30 @@ public class CameraInfo implements Serializable { @TableField(exist = false) private String checkType; + + @TableField(exist = false) + private String actionType;//操作类型 + @Dict(dicCode = "nu_type") + @TableField(exist = false) + private String areaFlag;//区域标签 + private Integer deviceNum;//已绑定设备数 + @TableField(exist = false) + private String orgCode;//机构编码 + @TableField(exist = false) + private String oldOrgCode;//原机构编码 + @TableField(exist = false) + private String viewType;//选择，未选择 用于设备同步功能 + @TableField(exist = false) + private String dataType;//数据类型 + @TableField(exist = false) + private String status;//状态 + @TableField(exist = false) + private String sn;//设备号 + @TableField(exist = false) + private String serverType;//服务类型 + @TableField(exist = false) + private String oldNuId;//原护理单元ID + @TableField(exist = false) + private String createTime;//时间 + private List seedList;//子列表 } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java index 344a4cf..c4483de 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java @@ -28,9 +28,21 @@ public interface CameraInfoMapper extends BaseMapper { CameraInfo getCapabilityByDeviceId(CameraInfo cameraInfo); void insertCapability(CameraInfo cameraInfo); void updateCapabilityById(CameraInfo cameraInfo); + void deleteCapabilityById(CameraInfo cameraInfo); void updatePlanByDevId(CameraInfo cameraInfo); IPage getNuBaseList(Page page, @Param("params") NuBaseInfo nuBaseInfo); void updateDepartById(@Param("params") CameraInfo cameraInfo); + + CameraInfo getCameraInfo(CameraInfo cameraInfo); + void deleteCameraInfo(CameraInfo cameraInfo); + void updateSync(CameraInfo cameraInfo); + IPage findSourcePage(Page page, @Param("params") CameraInfo cameraInfo); + List findDepartList(CameraInfo cameraInfo); + List findNuList(CameraInfo cameraInfo); + IPage findBusinessPage(Page page,@Param("params") CameraInfo cameraInfo); + IPage findSyncLogMainPage(Page page,@Param("params") CameraInfo cameraInfo); + List findSyncLogSeedList(CameraInfo cameraInfo); + IPage findNuSyncPage(Page page,@Param("params") CameraInfo cameraInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index 1c2a13c..b74c296 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -288,13 +288,16 @@ where id = #{id} + + DELETE FROM nu_iot_tplink_camera_capability WHERE device_index = #{deviceIndex} + + UPDATE nu_iot_tplink_camera SET record_plan_id = #{recordPlanId} where device_index = #{deviceIndex} - @@ -302,4 +305,275 @@ update nu_iot_tplink_camera set nu_id = null,nu_name = null,depart_id = null,depart_name = null,depart_server_url=null where id = #{params.id} + + + + + DELETE FROM nu_iot_tplink_camera WHERE device_index = #{deviceIndex} + + + + update nu_iot_tplink_camera + 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 device_index = #{deviceIndex} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java index c164bae..e05a24c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java @@ -66,4 +66,12 @@ public interface ICameraInfoService extends IService { IPage getNuBaseList(String dataSourceCode,Page page, NuBaseInfo nuBaseInfo); String syncCameraList(Map cameraList); + + IPage findSourcePage(Page page, CameraInfo cameraInfo); + List findDepartList(CameraInfo cameraInfo); + List findNuList(CameraInfo cameraInfo); + IPage findBusinessPage(Page page,CameraInfo cameraInfo); + String syncDevices(List list); + IPage findSyncLogPage(Page page,CameraInfo cameraInfo); + IPage findNuSyncPage(Page page,CameraInfo cameraInfo); } 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 d9ff17c..c53e8b6 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 @@ -19,6 +19,7 @@ import com.nu.modules.tplink.region.entity.RegionInfo; import com.nu.modules.tplink.region.mapper.RegionInfoMapper; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.service.impl.ElectricityMeterServiceImpl; +import com.nu.modules.tq.water.entity.WaterMeter; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -2758,6 +2759,299 @@ public class CameraInfoServiceImpl extends ServiceImpl findSourcePage(Page page, CameraInfo cameraInfo){ + return baseMapper.findSourcePage(page,cameraInfo); + } + @Override + public List findDepartList(CameraInfo cameraInfo){ + return baseMapper.findDepartList(cameraInfo); + } + + @Override + public List findNuList(CameraInfo cameraInfo){ + return baseMapper.findNuList(cameraInfo); + } + + @Override + public IPage findBusinessPage(Page page, CameraInfo cameraInfo){ + return baseMapper.findBusinessPage(page,cameraInfo); + } + + /** + * 以设备维度同步摄像头到业务 + * @param list + * @return + */ + @Override + public String syncDevices(List list){ + + for (CameraInfo cameraInfo : list) { + CameraInfo entityInfo = baseMapper.getCameraInfo(cameraInfo); + CameraInfo capabilityInfo = baseMapper.getCapabilityByDeviceId(cameraInfo); + String actionType = cameraInfo.getActionType();//操作类型 + if(actionType.equals("添加")){ + String orgCode = cameraInfo.getOrgCode(); + if(!StringUtils.isNotBlank(orgCode)){ + return "1"; + } + entityInfo.setSyncType("1"); + entityInfo.setNuId(cameraInfo.getNuId()); + entityInfo.setNuName(cameraInfo.getNuName()); + entityInfo.setDepartServerUrl(orgCode); + entityInfo.setDepartId(cameraInfo.getDepartId()); + entityInfo.setDepartName(cameraInfo.getDepartName()); + entityInfo.setOldServerUrl(null); + entityInfo.setOldDepartId(null); + entityInfo.setOldDepartName(null); + + boolean flag = syncImpl.syncDevice(orgCode,"更新",entityInfo,capabilityInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(cameraInfo.getDeviceIndex()); + syncLog.setMainName(cameraInfo.getDeviceName()); + syncLog.setSyncType("添加"); + syncLog.setNewOrgId(cameraInfo.getDepartId()); + syncLog.setNewOrgCode(orgCode); + syncLog.setNewOrgName(cameraInfo.getDepartName()); + if(flag){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("添加业务机构摄像头数据"); + syncLog.setServerType("摄像头"); + syncLog.setNewNuId(cameraInfo.getNuId()); + nuIotTqElectricitySyncLogService.save(syncLog); + if(flag){ + //更新同步 + baseMapper.updateSync(entityInfo); + } + } + if(actionType.equals("删除")){ + String oldOrgCode = cameraInfo.getOldOrgCode(); + if(!StringUtils.isNotBlank(oldOrgCode)){ + return "1"; + } + entityInfo.setSyncType("1"); + entityInfo.setNuId(null); + entityInfo.setNuName(null); + entityInfo.setDepartServerUrl(null); + entityInfo.setDepartId(null); + entityInfo.setDepartName(null); + entityInfo.setOldServerUrl(oldOrgCode); + entityInfo.setOldDepartId(cameraInfo.getOldDepartId()); + entityInfo.setOldDepartName(cameraInfo.getOldDepartName()); + + boolean flag = syncImpl.syncDevice(oldOrgCode,"删除",entityInfo,capabilityInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(cameraInfo.getDeviceIndex()); + syncLog.setMainName(cameraInfo.getDeviceName()); + syncLog.setSyncType("删除"); + syncLog.setOrgId(cameraInfo.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(cameraInfo.getOldDepartName()); + if(flag){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("删除原来业务机构摄像头数据"); + syncLog.setServerType("摄像头"); + syncLog.setNuId(cameraInfo.getNuId()); + nuIotTqElectricitySyncLogService.save(syncLog); + if(flag){ + //更新同步 + baseMapper.updateSync(entityInfo); + } + } + if(actionType.equals("调整")){ + String oldNuId = entityInfo.getNuId();//原护理单元ID + String nuId = cameraInfo.getNuId();//新护理单元ID + if(!oldNuId.equals(nuId)){ + String oldOrgCode = cameraInfo.getOldOrgCode(); + entityInfo.setNuId(cameraInfo.getNuId()); + entityInfo.setNuName(cameraInfo.getNuName()); + entityInfo.setDepartServerUrl(oldOrgCode); + entityInfo.setDepartId(cameraInfo.getOldDepartId()); + entityInfo.setDepartName(cameraInfo.getOldDepartName()); + entityInfo.setOldServerUrl(null); + entityInfo.setOldDepartId(null); + entityInfo.setOldDepartName(null); + boolean flag = syncImpl.syncDevice(oldOrgCode,"更新",entityInfo,capabilityInfo); + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(cameraInfo.getDeviceIndex()); + syncLog.setMainName(cameraInfo.getDeviceName()); + syncLog.setSyncType("调整"); + syncLog.setNewOrgId(cameraInfo.getOldDepartId()); + syncLog.setNewOrgCode(oldOrgCode); + syncLog.setNewOrgName(cameraInfo.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(entityInfo); + } + } + } + if(actionType.equals("变更")){ + String oldOrgCode = cameraInfo.getOldOrgCode(); + String orgCode = cameraInfo.getOrgCode(); + String oldNuId = entityInfo.getNuId();//原护理单元ID + if(!StringUtils.isNotBlank(oldOrgCode)){ + return "1"; + } + if(!StringUtils.isNotBlank(orgCode)){ + return "1"; + } + + boolean flag = syncImpl.syncDevice(oldOrgCode,"删除",entityInfo,capabilityInfo); + if(!flag){ + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(cameraInfo.getDeviceIndex()); + syncLog.setMainName(cameraInfo.getDeviceName()); + syncLog.setSyncType("删除"); + syncLog.setOrgId(cameraInfo.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(cameraInfo.getOldDepartName()); + syncLog.setStatus("失败"); + syncLog.setContent("删除业务机构摄像头数据"); + syncLog.setServerType("摄像头"); + syncLog.setNuId(oldNuId); + nuIotTqElectricitySyncLogService.save(syncLog); + } + boolean flag2 = false; + if(flag){ + entityInfo.setSyncType("1"); + entityInfo.setNuId(cameraInfo.getNuId()); + entityInfo.setNuName(cameraInfo.getNuName()); + entityInfo.setDepartServerUrl(orgCode); + entityInfo.setDepartId(cameraInfo.getDepartId()); + entityInfo.setDepartName(cameraInfo.getDepartName()); + entityInfo.setOldServerUrl(null); + entityInfo.setOldDepartId(null); + entityInfo.setOldDepartName(null); + flag2 = syncImpl.syncDevice(orgCode,"更新",entityInfo,capabilityInfo); + + SyncLog syncLog = new SyncLog(); + syncLog.setId(null); + syncLog.setMainId(cameraInfo.getDeviceIndex()); + syncLog.setMainName(cameraInfo.getDeviceName()); + syncLog.setSyncType("更新"); + syncLog.setOrgId(cameraInfo.getOldDepartId()); + syncLog.setOrgCode(oldOrgCode); + syncLog.setOrgName(cameraInfo.getOldDepartName()); + syncLog.setNewOrgId(cameraInfo.getDepartId()); + syncLog.setNewOrgCode(orgCode); + syncLog.setNewOrgName(cameraInfo.getDepartName()); + if(flag2){ + syncLog.setStatus("成功"); + }else{ + syncLog.setStatus("失败"); + } + syncLog.setContent("更新业务机构摄像头数据"); + syncLog.setServerType("摄像头"); + syncLog.setNewNuId(entityInfo.getNuId()); + syncLog.setNuId(oldNuId); + nuIotTqElectricitySyncLogService.save(syncLog); + } + if(flag2){ + //更新同步 + entityInfo.setSyncType("1"); + entityInfo.setNuId(cameraInfo.getNuId()); + entityInfo.setNuName(cameraInfo.getNuName()); + entityInfo.setDepartServerUrl(orgCode); + entityInfo.setDepartId(cameraInfo.getDepartId()); + entityInfo.setDepartName(cameraInfo.getDepartName()); + entityInfo.setOldServerUrl(oldOrgCode); + entityInfo.setOldDepartId(cameraInfo.getOldDepartId()); + entityInfo.setOldDepartName(cameraInfo.getOldDepartName()); + baseMapper.updateSync(entityInfo); + }else{ + if(flag){ + //更新同步 + entityInfo.setSyncType("1"); + entityInfo.setNuId(null); + entityInfo.setNuName(null); + entityInfo.setDepartServerUrl(null); + entityInfo.setDepartId(null); + entityInfo.setDepartName(null); + entityInfo.setOldServerUrl(oldOrgCode); + entityInfo.setOldDepartId(cameraInfo.getOldDepartId()); + entityInfo.setOldDepartName(cameraInfo.getOldDepartName()); + baseMapper.updateSync(entityInfo); + } + } + } + } + return "0"; + } + + //业务系统保存或者修改命令 + @DS("#dataSourceCode") + public boolean syncDevice(String dataSourceCode,String type,CameraInfo cameraInfo,CameraInfo capabilityInfo) { + try { + CameraInfo oldCamera = baseMapper.getCameraInfo(cameraInfo); + if(type.equals("更新")){ + if(oldCamera == null){ + baseMapper.insert(cameraInfo); + CameraInfo oldCapability = baseMapper.getCapabilityByDeviceId(capabilityInfo); + if(oldCapability == null){ + baseMapper.insertCapability(capabilityInfo); + }else{ + capabilityInfo.setId(oldCapability.getId()); + baseMapper.updateCapabilityById(cameraInfo); + } + }else{ + cameraInfo.setId(oldCamera.getId()); + baseMapper.updateById(cameraInfo); + CameraInfo oldCapability = baseMapper.getCapabilityByDeviceId(capabilityInfo); + if(oldCapability == null){ + baseMapper.insertCapability(capabilityInfo); + }else{ + capabilityInfo.setId(oldCapability.getId()); + baseMapper.updateCapabilityById(cameraInfo); + } + } + } + if(type.equals("删除")){ + baseMapper.deleteCameraInfo(cameraInfo); + baseMapper.deleteCapabilityById(cameraInfo); + } + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public IPage findSyncLogPage(Page page, CameraInfo cameraInfo){ + IPage mainPage = baseMapper.findSyncLogMainPage(page,cameraInfo); + List records = mainPage.getRecords(); + for(int i=0;i seedList = baseMapper.findSyncLogSeedList(record); + record.setSeedList(seedList); + } + return mainPage; + } + + @Override + public IPage findNuSyncPage(Page page, CameraInfo cameraInfo){ + return baseMapper.findNuSyncPage(page,cameraInfo); + } } 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 6c4f23f..5b7c81c 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 @@ -212,7 +212,7 @@