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

1、修改灌溉记录和刷卡记录bug

Browse Source 
2、修改设备信息bug
This commit is contained in:
wyw 2024-08-15 23:50:40 +08:00
parent efafc02865
commit 52f9a1c382
4 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java
View File

@ -166,19 +166,19 @@ public class DeviceController extends BaseController {
public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId) {
Device device = deviceService.selectDeviceByDeviceId(deviceId);
// 判断当前用户是否有设备分享权限 （设备所属机构管理员和设备所属用户有权限）
LoginUser loginUser = getLoginUser();
List<SysRole> roles = loginUser.getUser().getRoles();
//判断当前用户是否为设备所属机构管理员
if (roles.stream().anyMatch(a -> "admin".equals(a.getRoleKey()))) {
device.setIsOwner(1);
} else {
//判断当前用户是否是设备所属用户
if (Objects.equals(device.getTenantId(), loginUser.getUserId())) {
device.setIsOwner(1);
} else {
device.setIsOwner(0);
}
}
// LoginUser loginUser = getLoginUser();
// List<SysRole> roles = loginUser.getUser().getRoles();
// //判断当前用户是否为设备所属机构管理员
// if (roles.stream().anyMatch(a -> "admin".equals(a.getRoleKey()))) {
// device.setIsOwner(1);
// } else {
// //判断当前用户是否是设备所属用户
// if (Objects.equals(device.getTenantId(), loginUser.getUserId())) {
// device.setIsOwner(1);
// } else {
// device.setIsOwner(0);
// }
// }
return AjaxResult.success(device);
}

9
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaGuangaiRecordServiceImpl.java
View File

@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONArray;
@ -96,17 +97,23 @@ public class MaGuangaiRecordServiceImpl implements IMaGuangaiRecordService
MaGuangaiRecord record = new MaGuangaiRecord();
record.setDevSn(item.get("dev_sn").toString());
if(StringUtils.isNotEmpty(item.get("start_time").toString())){
if(NumberUtil.isNumber(item.get("start_time").toString())) {
Date date = new Date(Long.parseLong(item.get("start_time").toString()) * 1000);
record.setStartTime(date);
}
}
if(StringUtils.isNotEmpty(item.get("end_time").toString())){
if(NumberUtil.isNumber(item.get("end_time").toString())){
Date date = new Date(Long.parseLong(item.get("end_time").toString())*1000);
record.setEndTime(date);
}
}
if(StringUtils.isNotEmpty(item.get("last_time").toString())){
if(NumberUtil.isNumber(item.get("last_time").toString())) {
Date date = new Date(Long.parseLong(item.get("last_time").toString()) * 1000);
record.setLastTime(date);
}
}
record.setCurEle(item.get("cur_ele").toString());
record.setCardId(item.get("card_id").toString());
record.setAreaCode(item.get("area_code").toString());
@ -115,9 +122,11 @@ public class MaGuangaiRecordServiceImpl implements IMaGuangaiRecordService
record.setCurEle(item.get("cur_ele").toString());
record.setStatus(Integer.parseInt(item.get("status").toString()));
if(StringUtils.isNotEmpty(item.get("create_time").toString())){
if(NumberUtil.isNumber(item.get("create_time").toString())) {
Date date = new Date(Long.parseLong(item.get("create_time").toString()) * 1000);
record.setCreateTime(date);
}
}
list.add(record);
}
}

13
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaRechargerecordServiceImpl.java
View File

@ -3,6 +3,8 @@ package com.fastbee.waterele.service.impl;
import java.util.Date;
import java.util.List;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import com.fastbee.common.utils.DateUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.waterele.domain.vo.UnchargeAmountVo;
@ -54,8 +56,19 @@ public class MaRechargerecordServiceImpl implements IMaRechargerecordService {
@Override
public int insertMaRechargerecord(MaRechargerecord maRechargerecord) {
maRechargerecord.setCreateTime(DateUtils.getNowDate());
// https://zhwly.sdhzwl.cn/api/java/xinjiangup/recharge?cardNum=1&areaCode=123&jine=20
String url = "https://zhwly.sdhzwl.cn/api/java/xinjiangup/recharge?cardNum="
+ maRechargerecord.getCardNum()+"&areaCode="+maRechargerecord.getAreaCode()+"&jine="+maRechargerecord.getInvestval();
String result = HttpUtil.get(url);
JSONObject jsonObject = new JSONObject(result);
if(jsonObject != null){
if(jsonObject.containsKey("code") && Integer.parseInt(jsonObject.get("code").toString()) == 200){
return maRechargerecordMapper.insertMaRechargerecord(maRechargerecord);
}
}
return 0;
}
/**
* 修改充值记录

5
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.fastbee.waterele.service.impl;
import java.util.*;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@ -107,13 +108,17 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
record.setAreacode(item.get("areaCode").toString());
record.setAction(item.get("action").toString());
if(StringUtils.isNotEmpty(item.get("create_time").toString())){
if(NumberUtil.isNumber(item.get("create_time").toString())) {
Date date = new Date(Long.parseLong(item.get("create_time").toString()) * 1000);
record.setCreateTime(date);
}
}
if(StringUtils.isNotEmpty(item.get("update_time").toString())){
if(NumberUtil.isNumber(item.get("update_time").toString())) {
Date date = new Date(Long.parseLong(item.get("update_time").toString()) * 1000);
record.setUpdateTime(date);
}
}
list.add(record);
}
}