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:
蒾酒
2025-01-01 13:12:47 +08:00
parent ec614c02b1
commit 010101ffb4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class DeviceOtherMsgConsumer {
try { try {
//处理emq订阅的非 property/post 属性上报的消息 ，因为其他消息量小，放在一起处理 //处理emq订阅的非 property/post 属性上报的消息 ，因为其他消息量小，放在一起处理
Long productId;//产品id,设备所属产品 Long productId;//产品id,设备所属产品
Long packetId;//包号 Long pacSn;//包号
byte[] data = bo.getData();//数据 byte[] data = bo.getData();//数据
String topic=bo.getTopicName();//主题 String topic=bo.getTopicName();//主题
//从主题中解析出产品id //从主题中解析出产品id
@ -128,6 +128,9 @@ public class DeviceOtherMsgConsumer {
if(runStatus!=null){ if(runStatus!=null){
new LambdaUpdateChainWrapper<>(deviceReportInfoMapper).set(DeviceReportInfo::getRunStatus,runStatus).eq(DeviceReportInfo::getSerialNumber,serialNumber).update(); new LambdaUpdateChainWrapper<>(deviceReportInfoMapper).set(DeviceReportInfo::getRunStatus,runStatus).eq(DeviceReportInfo::getSerialNumber,serialNumber).update();
} }
//获取流量计累计用水量/瞬时流量
Float meterSum = data1.getFloat("meterSum");
Float meterIns = data1.getFloat("meterIns");
} }
//收到关阀时定时报文 //收到关阀时定时报文
else if(JSONUtil.parseObj(data1).get("action").equals("safeMsg")){ else if(JSONUtil.parseObj(data1).get("action").equals("safeMsg")){

8
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgMerchantsController.java
View File

@ -42,7 +42,7 @@ public class NgMerchantsController extends BaseController
/** /**
* 查询商户信息列表 * 查询商户信息列表
*/ */
@PreAuthorize("@ss.hasPermi('iot:merchants:list')") // @PreAuthorize("@ss.hasPermi('iot:merchants:list')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询商户信息列表") @ApiOperation("查询商户信息列表")
public TableDataInfo list(NgMerchants ngMerchants) public TableDataInfo list(NgMerchants ngMerchants)
@ -56,7 +56,7 @@ public class NgMerchantsController extends BaseController
* 导出商户信息列表 * 导出商户信息列表
*/ */
@ApiOperation("导出商户信息列表") @ApiOperation("导出商户信息列表")
@PreAuthorize("@ss.hasPermi('iot:merchants:export')") // @PreAuthorize("@ss.hasPermi('iot:merchants:export')")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, NgMerchants ngMerchants) public void export(HttpServletResponse response, NgMerchants ngMerchants)
{ {
@ -69,7 +69,7 @@ public class NgMerchantsController extends BaseController
/** /**
* 获取商户信息详细信息 * 获取商户信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:merchants:query')") // @PreAuthorize("@ss.hasPermi('iot:merchants:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@ApiOperation("获取商户信息详细信息") @ApiOperation("获取商户信息详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
@ -80,7 +80,7 @@ public class NgMerchantsController extends BaseController
/** /**
* 新增商户信息 * 新增商户信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:merchants:add')") // @PreAuthorize("@ss.hasPermi('iot:merchants:add')")
@PostMapping @PostMapping
@ApiOperation("新增商户信息") @ApiOperation("新增商户信息")
public AjaxResult add(@RequestBody NgMerchants ngMerchants) public AjaxResult add(@RequestBody NgMerchants ngMerchants)