luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改心跳包回应

Browse Source
This commit is contained in:
蒾酒 2024-12-30 23:35:00 +08:00
parent 672eff2c55
commit d40c7c956e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
View File

@ -114,11 +114,11 @@ public class DeviceOtherMsgConsumer {
else if(jsonObject.getStr("type").equals("heartBeat")){ else if(jsonObject.getStr("type").equals("heartBeat")){
//需要回应 //需要回应
//构建回复消息----------------------------------------------------------------------------- //构建回复消息-----------------------------------------------------------------------------
// Map<String,Object> reportMsg=new HashMap<>(); Map<String,Object> reportMsg=new HashMap<>();
// reportMsg.put("code",100); reportMsg.put("code",100);
// reportMsg.put("pakSn","ok"); reportMsg.put("pakSn",jsonObject.getStr("pakSn"));
// reportMsg.put("data","heartBeat"); // reportMsg.put("data","heartBeat");
jsonObject.set("code",100); // jsonObject.set("code",100);
issueInstructionsProducer.receiveDataReportResponse(productId.toString(),serialNumber,JSONUtil.toJsonStr(jsonObject)); issueInstructionsProducer.receiveDataReportResponse(productId.toString(),serialNumber,JSONUtil.toJsonStr(jsonObject));
} }

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceReportInfoController.java
View File

@ -183,7 +183,7 @@ public class DeviceReportInfoController extends BaseController
@PostMapping("/update/run/status") @PostMapping("/update/run/status")
public AjaxResult updateStatus(String deviceNumber,Integer status){ public AjaxResult updateStatus(String deviceNumber,Integer status){
boolean update = new LambdaUpdateChainWrapper<>(deviceReportInfoMapper) boolean update = new LambdaUpdateChainWrapper<>(deviceReportInfoMapper)
.set(DeviceReportInfo::getStatus, status) .set(DeviceReportInfo::getRunStatus, status)
.eq(DeviceReportInfo::getSerialNumber, deviceNumber) .eq(DeviceReportInfo::getSerialNumber, deviceNumber)
.update(); .update();
if(!update){ if(!update){
@ -197,7 +197,7 @@ public class DeviceReportInfoController extends BaseController
@GetMapping("/get/run/status") @GetMapping("/get/run/status")
public AjaxResult getStatus(String deviceNumber){ public AjaxResult getStatus(String deviceNumber){
List<DeviceReportInfo> list = new LambdaQueryChainWrapper<>(deviceReportInfoMapper) List<DeviceReportInfo> list = new LambdaQueryChainWrapper<>(deviceReportInfoMapper)
.select(DeviceReportInfo::getStatus) .select(DeviceReportInfo::getRunStatus)
.eq(DeviceReportInfo::getSerialNumber, deviceNumber) .eq(DeviceReportInfo::getSerialNumber, deviceNumber)
.list(); .list();
if(!list.isEmpty()){ if(!list.isEmpty()){