RIZO/shanghaiganxiang-zhusu-back01
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

一键关闭报警

Browse Source
This commit is contained in:
杨晓东 2025-11-27 15:39:14 +08:00
parent fc864d4b1c
commit 8139f92834
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentScreenController.java
View File

@ -18,8 +18,8 @@ import java.util.List;
@RequestMapping("/dry/screen")
public class DryEquipmentScreenController extends BaseController {
//
// @Autowired
// private IDryEquipmentScreenService dryEquipmentScreenService;
@Autowired
private IDryEquipmentScreenService dryEquipmentScreenService;
//
// /**
// * 干燥机列表
@ -43,14 +43,14 @@ public class DryEquipmentScreenController extends BaseController {
// return AjaxResult.success(list);
// }
//
// /**
// * 一键关闭报警
// * @return
// */
// @GetMapping("/closeAlarm")
// public AjaxResult closeAlarm(){
// // MqttConsole c = new MqttConsole();
// int result = dryEquipmentScreenService.closeAlarm();
// return AjaxResult.success(result);
// }
/**
* 一键关闭报警
* @return
*/
@GetMapping("/closeAlarm")
public AjaxResult closeAlarm(){
// MqttConsole c = new MqttConsole();
int result = dryEquipmentScreenService.closeAlarm();
return AjaxResult.success(result);
}
}

10
shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/IDryEquipmentScreenService.java
View File

@ -24,9 +24,9 @@ public interface IDryEquipmentScreenService {
// */
// public List<EquipmentScreenDTO.DrynessDTO> drynessList();
//
// /**
// * 一键关闭报警
// * @return
// */
// public int closeAlarm();
/**
* 一键关闭报警
* @return
*/
public int closeAlarm();
}

32
shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/impl/DryEquipmentScreenServiceImpl.java
View File

@ -35,8 +35,8 @@ import java.util.stream.Collectors;
@DS("postgres")
public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService {
// @Autowired
// private DryEquipmentInfoMapper infoMapper;
@Autowired
private DryEquipmentInfoMapper infoMapper;
//
// @Autowired
// private DryMonitoringDataMapper dataMapper;
@ -44,8 +44,8 @@ public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService
// @Autowired
// private DryParamThresholdMapper paramMapper;
//
// @Autowired
// private AlarmLightService alarmLightService;
@Autowired
private AlarmLightService alarmLightService;
//
// @Resource
// private RedisTemplate<String, Object> redisTemplate;
@ -331,16 +331,16 @@ public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService
// ));
// }
//
// /**
// * 一键关闭报警（无需修改）
// */
// @Override
// @Transactional
// public int closeAlarm() {
// LambdaUpdateWrapper<DryEquipmentInfo> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.set(DryEquipmentInfo::getStatus, "1");
// alarmLightService.stopAllAlarms();
// int result = infoMapper.update(null, updateWrapper);
// return result;
// }
/**
* 一键关闭报警（无需修改）
*/
@Override
@Transactional
public int closeAlarm() {
LambdaUpdateWrapper<DryEquipmentInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(DryEquipmentInfo::getStatus, "1");
alarmLightService.stopAllAlarms();
int result = infoMapper.update(null, updateWrapper);
return result;
}
}