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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

This commit is contained in:
1378012178@qq.com 2025-06-30 10:04:29 +08:00
parent ae46ea7cba 6798015fdb
commit 483b92b238
10 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/alarm/controller/AlarmLogController.java
View File

@ -47,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
*/
@Api(tags="护理单元-物联管理-TPLINK告警日志信息")
@RestController
@RequestMapping("/iot/alarmLog")
@RequestMapping("/iot/tplink/alarmLog")
@Slf4j
public class AlarmLogController extends JeecgController<AlarmLog, IAlarmLogService> {
@Autowired

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

@ -41,7 +41,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
*/
@Api(tags="护理单元-物联管理-摄像头信息")
@RestController
@RequestMapping("/iot/cameraInfo")
@RequestMapping("/iot/tplink/cameraInfo")
@Slf4j
public class CameraInfoController extends JeecgController<CameraInfo, ICameraInfoService> {
@Autowired

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java
View File

@ -33,7 +33,7 @@ import java.util.List;
*/
@Api(tags="护理单元-物联管理-TPLINK项目信息")
@RestController
@RequestMapping("/iot/projectInfo")
@RequestMapping("/iot/tplink/projectInfo")
@Slf4j
public class ProjectInfoController extends JeecgController<ProjectInfo, IProjectInfoService> {
@Autowired

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java
View File

@ -29,7 +29,7 @@ import java.util.List;
*/
@Api(tags="护理单元-物联管理-TPLINK分组信息")
@RestController
@RequestMapping("/iot/regionInfo")
@RequestMapping("/iot/tplink/regionInfo")
@Slf4j
public class RegionInfoController extends JeecgController<RegionInfo, IRegionInfoService> {
@Autowired

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

@ -62,15 +62,26 @@ public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDe
return service.updateDevice(humidDevice);
}
// /**
// * 删除设备
// *
// * @param humidDevice
// * @return
// */
// @GetMapping(value = "/deleteDevice")
// public Result<String> deleteDevice(HumidDevice humidDevice) {
// return service.deleteDevice(humidDevice);
// }
/**
* 删除设备
* 启用/停用设备
*
* @param humidDevice
* @return
*/
@GetMapping(value = "/deleteDevice")
public Result<String> deleteDevice(HumidDevice humidDevice) {
return service.deleteDevice(humidDevice);
@GetMapping(value = "/delFlagDevice")
public Result<String> delFlagDevice(HumidDevice humidDevice) {
return service.delFlagDevice(humidDevice);
}
/**

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

@ -115,4 +115,6 @@ public class HumidDevice implements Serializable {
private String oldDepartId;//原机构id
private String oldDepartName;//原机构名称
private String delFlag;//停用标识 0正常 1停用
}

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

@ -11,7 +11,7 @@ public interface HumidDeviceMapper extends BaseMapper<HumidDevice> {
HumidDevice getHumidDevice(HumidDevice humidDevice);
int insertDevice(HumidDevice humidDevice);
int updateDevice(HumidDevice humidDevice);
int deleteDevice(HumidDevice humidDevice);
int delFlagDevice(HumidDevice humidDevice);
int updateValue(HumidDevice humidDevice);
int insertLog(HumidDevice humidDevice);
IPage<HumidDevice> findLogPage(Page<HumidDevice> page, @Param("params") HumidDevice humidDevice);

11
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
View File

@ -34,6 +34,7 @@
depart_server_url as departServerUrl,
old_server_url ,
sync_type,
del_flag as delFlag,
(select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn
from nu_iot_yiweilian_humid_device a
<where>
@ -84,6 +85,7 @@
depart_server_url as departServerUrl,
old_server_url ,
sync_type,
del_flag as delFlag,
(select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn
from nu_iot_yiweilian_humid_device
<where>
@ -101,12 +103,14 @@
sn,
time_code,
device_name,
del_flag,
create_time
)
values(
#{sn},
#{timeCode},
#{deviceName},
'0',
now()
)
</insert>
@ -134,9 +138,9 @@
where sn = #{sn}
</update>
<delete id="deleteDevice" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
delete from nu_iot_yiweilian_humid_device where sn = #{sn}
</delete>
<update id="delFlagDevice" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
update nu_iot_yiweilian_humid_device set del_flag = #{delFlag} where sn = #{sn}
</update>
<update id="updateValue" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
update nu_iot_yiweilian_humid_device
@ -147,6 +151,7 @@
reporting_time = #{reportingTime},
electricity = #{electricity}
where sn = #{sn}
and del_flag = '0'
</update>
<insert id="insertLog" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice">

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

@ -12,7 +12,7 @@ public interface IHumidDeviceService extends IService<HumidDevice> {
String updateDeviceParameters(HumidDevice humidDevice,String type);
String updateDeviceRealTime(HumidDevice humidDevice);
Result<String> updateDevice(HumidDevice humidDevice);
Result<String> deleteDevice(HumidDevice humidDevice);
Result<String> delFlagDevice(HumidDevice humidDevice);
Result getDeviceParameters(HumidDevice humidDevice);
IPage<HumidDevice> findLogPage(Page<HumidDevice> page, HumidDevice humidDevice);

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

@ -332,26 +332,33 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
}
/**
* 删除
* 启用/停用设备
*/
@Override
public Result<String> deleteDevice(HumidDevice humidDevice){
Map<String, Object> params = new HashMap<>();
params.put("sn", humidDevice.getSn());
String responseStr = yiweilianApi.deleteDevice(params);
JSONObject jsonObject = new JSONObject(responseStr);
Integer responseCode = jsonObject.getInt("code");
if(responseCode.equals(0)){
baseMapper.deleteDevice(humidDevice);
humidDevice.setOptType("delete");
public Result<String> delFlagDevice(HumidDevice humidDevice){
// Map<String, Object> params = new HashMap<>();
// params.put("sn", humidDevice.getSn());
// String responseStr = yiweilianApi.deleteDevice(params);
// JSONObject jsonObject = new JSONObject(responseStr);
// Integer responseCode = jsonObject.getInt("code");
// if(responseCode.equals(0)){
String option = "";
baseMapper.delFlagDevice(humidDevice);
if(humidDevice.getDelFlag().equals("0")){
humidDevice.setOptType("activate");
option = "启用成功";
}else{
humidDevice.setOptType("deactivated");
option = "停用成功";
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
humidDevice.setOptBy(sysUser.getUsername());
baseMapper.insertLog(humidDevice);
return Result.OK("删除成功");
}else{
String error = "删除失败："+jsonObject.getStr("msg");
return Result.error(error);
}
return Result.OK(option);
// }else{
// String error = "删除失败："+jsonObject.getStr("msg");
// return Result.error(error);
// }
}
/**