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-31 18:26:05 +08:00
parent aba6f51ea7
commit b5f1ec63d0
8 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.fastbee.common.constant.FastBeeConstant;
import com.fastbee.common.core.mq.DeviceReportBo;
import com.fastbee.common.utils.DateUtils;
import com.fastbee.iot.domain.DeviceReportInfo;
import com.fastbee.iot.mapper.DeviceReportInfoMapper;
import com.fastbee.mq.redischannel.producer.IssueInstructionsProducer;
@ -14,6 +15,7 @@ import com.fastbee.mqttclient.PubMqttClient;
import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
import com.fastbee.rechargecard.domain.NgWaterPumpUsageRecords;
import com.fastbee.rechargecard.domain.UserIrrigationRecord;
import com.fastbee.rechargecard.domain.UserRechargeCards;
import com.fastbee.rechargecard.mapper.NgUserRechargeRecordsMapper;
import com.fastbee.rechargecard.mapper.NgWaterPumpUsageRecordsMapper;
import com.fastbee.rechargecard.mapper.UserIrrigationRecordMapper;
@ -141,6 +143,8 @@ public class DeviceOtherMsgConsumer {
userIrrigationRecord.setCardNumber(cardNumber);//卡号
System.err.println("cardNumber"+cardNumber);
/*Long userId=null;
System.err.println("userId");
if(userRechargeCardsMapper.selectUserRechargeCardsByCardNumber(cardNumber)==null)
@ -166,7 +170,26 @@ public class DeviceOtherMsgConsumer {
userIrrigationRecord.setStatus(1);//状态改为灌溉中
userIrrigationRecordMapper.insertUserIrrigationRecord(userIrrigationRecord);//开阀时添加一条灌溉记录
System.out.println(userIrrigationRecord);
userIrrigationRecord.setCreateTime(DateUtils.getNowDate());
//对充值卡余额的操作
UserRechargeCards userRechargeCards = userRechargeCardsMapper.selectUserRechargeCardsByCardNumber(cardNumber);//获取充值卡信息
BigDecimal balance=dataJson.getBigDecimal("userBalance");//获取当前用户金额
userRechargeCards.setBalance(balance);//同步用户余额
int flag=userIrrigationRecordMapper.insertUserIrrigationRecord(userIrrigationRecord);//开阀时添加一条灌溉记录
if(flag<1)
{
System.err.println("灌溉记录添加失败");
}else{
flag=userRechargeCardsMapper.updateUserRechargeCards(userRechargeCards);//同步充值卡余额
if(flag<1)
{
System.err.println("充值卡金额同步失败");
}
}
}else{
System.err.println("关阀");
//关阀-修改灌溉记录，修改结束时间、灌溉用水量（做差 关阀-开阀用户总累计流量。）查卡号最新一条记录
@ -192,7 +215,22 @@ public class DeviceOtherMsgConsumer {
userIrrigationRecord.setStatus(2);//灌溉状态更改为结束灌溉
userIrrigationRecordMapper.updateUserIrrigationRecord(userIrrigationRecord);
//对充值卡余额的操作
UserRechargeCards userRechargeCards = userRechargeCardsMapper.selectUserRechargeCardsByCardNumber(cardNumber);//获取充值卡信息
BigDecimal balance=dataJson.getBigDecimal("userBalance");//获取当前用户金额
userRechargeCards.setBalance(balance);//同步用户余额
int flag=userIrrigationRecordMapper.updateUserIrrigationRecord(userIrrigationRecord);//关阀时修改一条灌溉记录
if(flag<1)
{
System.err.println("灌溉记录修改失败");
}else{
flag=userRechargeCardsMapper.updateUserRechargeCards(userRechargeCards);//同步充值卡余额
if(flag<1)
{
System.err.println("充值卡金额同步失败");
}
}
}
}
@ -385,7 +423,7 @@ public class DeviceOtherMsgConsumer {
+ " \"meterStatus\": 1,"
+ " \"userSumFlow\": 640000,"
+ " \"cardId\": 402,"
+ " \"action\": \"stopPump\","
+ " \"action\": \"startPump\","
+ " \"meterSum\": 6400,"
+ " \"pumpState\": 0,"
+ " \"mcuSn\": 2147483647,"