乱七八糟
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.gxwebsoft.apps.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.gxwebsoft.apps.mapper.EquipmentMapper;
|
||||
import com.gxwebsoft.apps.service.EquipmentService;
|
||||
@@ -9,10 +10,16 @@ import com.gxwebsoft.common.core.web.PageParam;
|
||||
import com.gxwebsoft.common.core.web.PageResult;
|
||||
import com.gxwebsoft.common.system.entity.User;
|
||||
import com.gxwebsoft.common.system.service.UserService;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 设备管理Service实现
|
||||
@@ -25,16 +32,51 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
|
||||
@Resource
|
||||
private UserService userService;
|
||||
|
||||
@Resource
|
||||
private RestTemplate restTemplate;
|
||||
|
||||
@Override
|
||||
public PageResult<Equipment> pageRel(EquipmentParam param) {
|
||||
PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
|
||||
page.setDefaultOrder("create_time desc");
|
||||
List<Equipment> list = baseMapper.selectPageRel(page, param);
|
||||
|
||||
Set<Integer> touziUserIds = list.stream().map(Equipment::getTouziUserId).collect(Collectors.toSet());
|
||||
List<User> touziUserList = userService.lambdaQuery().in(User::getUserId, touziUserIds).list();
|
||||
Map<Integer, List<User>> touziUserCollect = touziUserList.stream().collect(Collectors.groupingBy(User::getUserId));
|
||||
// 查询绑定电池的用户
|
||||
for(Equipment equipment : list){
|
||||
if(!equipment.getUserId().equals(0)){
|
||||
equipment.setUser(userService.getById(equipment.getUserId()));
|
||||
}
|
||||
for (Equipment equipment : list) {
|
||||
// 查询状态
|
||||
try {
|
||||
ResponseEntity<JSONObject> entity = restTemplate.getForEntity("https://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
|
||||
JSONObject body = entity.getBody();
|
||||
Integer code = body.getInteger("code");
|
||||
JSONObject data = body.getJSONObject("data");
|
||||
equipment.setBms(data.getString("bms_zt"));
|
||||
equipment.setBatteryPower(data.getString("sydl"));
|
||||
equipment.setTotalVoltage(data.getString("sbdy"));
|
||||
equipment.setGps(data.getString("gps_xh"));
|
||||
equipment.setGsm(data.getString("gsm_xh"));
|
||||
equipment.setWorkingStatus(data.getString("sbzt"));
|
||||
System.out.println(body);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (!equipment.getUserId().equals(0)) {
|
||||
equipment.setUser(userService.getById(equipment.getUserId()));
|
||||
}
|
||||
|
||||
|
||||
if ( equipment.getTouziUserId()!= null && !equipment.getTouziUserId().equals(0)) {
|
||||
List<User> users = touziUserCollect.get(equipment.getTouziUserId());
|
||||
if(!CollectionUtils.isEmpty(users)) {
|
||||
equipment.setTouziUser(users.get(0));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
return new PageResult<>(list, page.getTotal());
|
||||
}
|
||||
@@ -52,12 +94,30 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
|
||||
public Equipment getByIdRel(Integer equipmentId) {
|
||||
EquipmentParam param = new EquipmentParam();
|
||||
param.setEquipmentId(equipmentId);
|
||||
return param.getOne(baseMapper.selectListRel(param));
|
||||
Equipment equipment = baseMapper.selectListRel(param).get(0);
|
||||
try {
|
||||
ResponseEntity<JSONObject> entity = restTemplate.getForEntity("https://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
|
||||
JSONObject body = entity.getBody();
|
||||
Integer code = body.getInteger("code");
|
||||
JSONObject data = body.getJSONObject("data");
|
||||
equipment.setBms(data.getString("bms_zt"));
|
||||
equipment.setBatteryPower(data.getString("sydl"));
|
||||
equipment.setTotalVoltage(data.getString("sbdy"));
|
||||
equipment.setGps(data.getString("gps_xh"));
|
||||
equipment.setGsm(data.getString("gsm_xh"));
|
||||
equipment.setWorkingStatus(data.getString("sbzt"));
|
||||
System.out.println(body);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
return equipment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Equipment getByEquipmentCode(String equipmentCode) {
|
||||
return query().eq("equipment_code", equipmentCode).one();
|
||||
return query().eq("equipment_code", equipmentCode).one();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user