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 550df74..8c32439 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 @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import cn.hutool.json.JSONObject; import com.nu.modules.tplink.camera.entity.NuBaseInfo; import com.nu.modules.tplink.camera.model.CameraTreeModel; +import com.nu.modules.tq.electricity.entity.ElectricityMeter; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -675,4 +676,10 @@ public class CameraInfoController extends JeecgController pageList = service.findNuSyncPage(page, cameraInfo); return Result.OK(pageList); } + @AutoLog(value = "维修摄像头") + @RequestMapping(value = "/weixiu", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result weixiu(@RequestBody CameraInfo cameraInfo) { + service.weixiu(cameraInfo); + return Result.OK("操作成功!"); + } } 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 7c68b0f..5879437 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 @@ -76,4 +76,6 @@ public interface ICameraInfoService extends IService { IPage findNuSyncPage(Page page,CameraInfo cameraInfo); void updateDepartById(CameraInfo cameraInfo); + + void weixiu(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 3e8d251..b5cd685 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 @@ -3059,4 +3059,14 @@ public class CameraInfoServiceImpl extends ServiceImpl pageList = service.findNuSyncPage(page, electricityMeter); return Result.OK(pageList); } + @AutoLog(value = "维修电表") + @RequestMapping(value = "/weixiu", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result weixiu(@RequestBody ElectricityMeter electricityMeter) { + service.weixiu(electricityMeter); + return Result.OK("操作成功!"); + } } 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 05fcf42..237e003 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 @@ -35,4 +35,6 @@ public interface IElectricityMeterService extends IService { IPage findNuSyncPage(Page page,ElectricityMeter electricityMeter); void updateDepartById(ElectricityMeter electricityMeter); + + void weixiu(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 3f3b8a4..d8933f2 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 @@ -17,6 +17,7 @@ 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.yiweilian.humid.entity.HumidDevice; import lombok.extern.slf4j.Slf4j; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper; @@ -984,5 +985,15 @@ public class ElectricityMeterServiceImpl extends ServiceImpl weixiu(@RequestBody WaterMeter waterMeter) { + service.weixiu(waterMeter); + return Result.OK("操作成功!"); + } @AutoLog(value = "修改水表信息") @RequestMapping(value = "/updateDepartById", method = {RequestMethod.PUT,RequestMethod.POST}) public Result updateDepartById(@RequestBody WaterMeter waterMeter) { diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java index ecc97de..4808c99 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java @@ -35,4 +35,6 @@ public interface IWaterMeterService extends IService { IPage findNuSyncPage(Page page,WaterMeter waterMeter); void updateDepartById(WaterMeter waterMeter); + + void weixiu(WaterMeter waterMeter); } 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 8f03d94..b0d754c 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 @@ -998,4 +998,14 @@ public class WaterMeterServiceImpl extends ServiceImpl pageList = service.findNuSyncPage(page, humidDevice); return Result.OK(pageList); } - + + @AutoLog(value = "维修温湿度计") + @RequestMapping(value = "/weixiu", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result weixiu(@RequestBody HumidDevice humidDevice) { + service.weixiu(humidDevice); + return Result.OK("操作成功!"); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java index c49102b..c2bb678 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java @@ -34,4 +34,6 @@ public interface IHumidDeviceService extends IService { IPage findNuSyncPage(Page page,HumidDevice humidDevice); void updateDepartById(HumidDevice humidDevice); + + void weixiu(HumidDevice humidDevice); } 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 6e62be6..cb55e6e 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 @@ -10,6 +10,7 @@ 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.tq.water.entity.WaterMeter; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -928,5 +929,15 @@ public class HumidDeviceServiceImpl extends ServiceImpl