yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改维修功能

This commit is contained in:
yangjun 2025-08-14 13:54:31 +08:00
parent 4aadcd3435
commit 6ae4bd2093
13 changed files with 104 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java
View File

@ -106,6 +106,13 @@ public class CameraInfoController extends JeecgController<CameraInfo, ICameraInf
service.edit(cameraInfo);
return Result.OK("编辑成功!");
}
@AutoLog(value = "设备报修")
@ApiOperation(value="设备报修", notes="设备报修")
@RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> baoxiu(@RequestBody CameraInfo cameraInfo) {
service.baoxiu(cameraInfo);
return Result.OK("操作成功!");
}
/**
* 修改摄像头信息

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
View File

@ -29,7 +29,7 @@
a.nu_id as nuId,
b.nu_name as nuName,
ifnull(c.multitrans,0) as multitrans,
a.sn
a.sn,a.maintain_status
from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id
left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index
<where>

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java
View File

@ -61,4 +61,6 @@ public interface ICameraInfoService extends IService<CameraInfo> {
Result<String> stopUploadToServer(CameraInfo cameraInfo);
Result getUploadToServerProcess(CameraInfo cameraInfo);
Result motionCtrl(CameraInfo cameraInfo);
void baoxiu(CameraInfo cameraInfo);
}

18
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.nu.modules.tplink.camera.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -11,6 +12,7 @@ import com.nu.modules.camerainfo.entity.CameraInfoDto;
import com.nu.modules.tplink.camera.model.CameraTreeModel;
import com.nu.modules.tplink.common.entity.TumsConfig;
import com.nu.modules.tplink.common.mapper.TumsConfigMapper;
import com.nu.modules.yiweilian.humid.service.impl.HumidDeviceServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@ -24,6 +26,7 @@ import com.nu.modules.tplink.common.service.IErrorCodeService;
import com.nu.modules.tplink.utils.TumsApi;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@ -49,6 +52,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
@Autowired
private TumsConfigMapper tumsConfigMapper;
@Lazy
@Autowired
private CameraInfoServiceImpl syncImpl;
/**
* 获取摄像头信息-分页
* @param page
@ -2524,6 +2530,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}
}
@Override
public void baoxiu(CameraInfo cameraInfo) {
cameraInfo.setMaintainStatus("1");
baseMapper.updateById(cameraInfo);
syncImpl.devopsBaoxiu(cameraInfo);
}
@DS("devops")
public void devopsBaoxiu(CameraInfo cameraInfo){
baseMapper.updateById(cameraInfo);
}
@Override
public List<CameraInfoDto> getCameraInfoList() {
List<CameraInfo> list = baseMapper.findAllList();

7
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
View File

@ -84,4 +84,11 @@ public class ElectricityMeterController extends JeecgController<ElectricityMeter
return Result.OK("编辑成功!");
}
@AutoLog(value = "设备报修")
@ApiOperation(value="设备报修", notes="设备报修")
@RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> baoxiu(@RequestBody ElectricityMeter electricityMeter) {
service.baoxiu(electricityMeter);
return Result.OK("操作成功!");
}
}

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java
View File

@ -21,4 +21,6 @@ public interface IElectricityMeterService extends IService<ElectricityMeter> {
void editHldy(ElectricityMeter electricityMeter);
void baoxiu(ElectricityMeter electricityMeter);
}

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java
View File

@ -13,6 +13,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.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;
@ -480,6 +481,18 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
baseMapper.updateById(electricityMeter);
}
@Override
public void baoxiu(ElectricityMeter electricityMeter) {
electricityMeter.setMaintainStatus("1");
baseMapper.updateById(electricityMeter);
syncImpl.devopsBaoxiu(electricityMeter);
}
@DS("devops")
public void devopsBaoxiu(ElectricityMeter electricityMeter){
baseMapper.updateById(electricityMeter);
}
//业务系统删除命令
@DS("#dataSourceCode")
public boolean syncElectricityDel(String dataSourceCode,ElectricityMeter electricityMeter) {

18
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
View File

@ -3,18 +3,19 @@ package com.nu.modules.tq.water.controller;
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.nu.modules.tplink.camera.entity.CameraInfo;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.tq.water.service.IWaterMeterService;
import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@ -75,4 +76,13 @@ public class WaterMeterController extends JeecgController<WaterMeter, IWaterMete
return service.waterRead(waterMeter);
}
@AutoLog(value = "设备报修")
@ApiOperation(value="设备报修", notes="设备报修")
@RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> baoxiu(@RequestBody WaterMeter waterMeter) {
service.baoxiu(waterMeter);
return Result.OK("操作成功!");
}
}

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java
View File

@ -18,4 +18,6 @@ public interface IWaterMeterService extends IService<WaterMeter> {
String waterResetNotify(String response_content, String timestamp, String sign);
String waterControlNotify(String response_content, String timestamp, String sign);
String waterReadNotify(String response_content, String timestamp, String sign);
void baoxiu(WaterMeter waterMeter);
}

14
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
View File

@ -8,6 +8,7 @@ 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.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;
@ -479,6 +480,19 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
return "SUCCESS";
}
@Override
public void baoxiu(WaterMeter waterMeter) {
waterMeter.setMaintainStatus("1");
baseMapper.updateById(waterMeter);
syncImpl.devopsBaoxiu(waterMeter);
}
@DS("devops")
public void devopsBaoxiu(WaterMeter waterMeter){
baseMapper.updateById(waterMeter);
}
//业务系统删除命令
@DS("#dataSourceCode")

9
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java
View File

@ -3,9 +3,11 @@ package com.nu.modules.yiweilian.humid.controller;
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.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@ -135,4 +137,11 @@ public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDe
return Result.OK("编辑成功!");
}
@AutoLog(value = "设备报修")
@ApiOperation(value="设备报修", notes="设备报修")
@RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> baoxiu(@RequestBody HumidDevice humidDevice) {
service.baoxiu(humidDevice);
return Result.OK("操作成功!");
}
}

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java
View File

@ -17,4 +17,6 @@ public interface IHumidDeviceService extends IService<HumidDevice> {
IPage<HumidDevice> findLogPage(Page<HumidDevice> page, HumidDevice humidDevice);
void editHldy(HumidDevice humidDevice);
void baoxiu(HumidDevice humidDevice);
}

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
View File

@ -8,6 +8,7 @@ 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.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
@ -443,6 +444,18 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
baseMapper.updateById(humidDevice);
}
@Override
public void baoxiu(HumidDevice humidDevice) {
humidDevice.setMaintainStatus("1");
baseMapper.updateById(humidDevice);
syncImpl.devopsBaoxiu(humidDevice);
}
@DS("devops")
public void devopsBaoxiu(HumidDevice humidDevice){
baseMapper.updateById(humidDevice);
}
//业务系统删除命令
@DS("#dataSourceCode")
public boolean syncElectricityDel(String dataSourceCode, HumidDevice humidDevice) {