From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 73e3552..2930b9a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -4,23 +4,25 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.HistorySecondCruiser;
-import com.moral.api.entity.Organization;
-import com.moral.api.entity.SpecialDevice;
-import com.moral.api.entity.SpecialDeviceHistory;
-import com.moral.api.entity.TbDaily;
+import com.moral.api.config.Interceptor.UserHelper;
+import com.moral.api.entity.*;
import com.moral.api.mapper.DailyMapper;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultCountDTO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
+import com.moral.api.pojo.vo.device.AppDeviceVo;
import com.moral.api.pojo.vo.excel.DailyVo;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysDictTypeService;
import com.moral.constant.Constants;
import com.moral.util.AmendUtils;
@@ -61,6 +63,9 @@
private HistorySecondCruiserMapper HistorySecondCruiserMapper;
@Autowired
+ private SysDictTypeService sysDictTypeService;
+
+ @Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@Autowired
@@ -91,16 +96,28 @@
//������������������������
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer userId = (Integer) userInfo.get("userId");
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
Integer orgId = (Integer) orgInfo.get("id");
//���������������������
List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
orgIds.add(orgId);
+ integerList.addAll(orgIds);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("mac", "name")
+ queryWrapper.select("DISTINCT mac, name").lambda();
+
//.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
- .eq("is_delete", Constants.NOT_DELETE)
- .in("organization_id", orgIds);
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", integerList);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
@@ -148,12 +165,24 @@
@Override
public List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params) {
double range = Double.valueOf(params.get("range").toString());
+ String type = params.get("type").toString();
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Integer userId = (Integer) userInfo.get("userId");
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
- params.put("orgId", orgId);
- params.put("type","$."+params.get("type"));
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
+ integerList.add(orgId);
+ params.put("orgIds", integerList);
+ params.put("type","$."+type);
//������������������������������������
List<HistorySecondCruiserListDTO> data = HistorySecondCruiserMapper.getCruiserDataNewAvg(params);
data.removeIf(o->{
@@ -170,8 +199,39 @@
if(CollectionUtils.isEmpty(data)){
return null;
}
- return filterDataNew(data,range);
+ List<HistorySecondCruiserResultDTO> result = filterDataNew(data,range);
+ if(CollectionUtils.isNotEmpty(result)){
+ SysDictData list = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER.getValue(),type);
+ if(list.getDataValue().contains(",")){
+ List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
+ if(resultStr.size() % 2 ==0){
+ result.forEach(it->{
+ it.setAvgNum(numAvg(resultStr,it.getAvgNum()));
+ });
+ }
+ }else {
+ BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO;
+ result.forEach(it->{
+ it.setAvgNum(it.getAvgNum().add(dataValue));
+ });
+ }
+
+
+ }
+ return result;
}
+
+ private BigDecimal numAvg(List<String> list , BigDecimal num){
+ int nums = 1;
+ for (int i=0;i<list.size();i=i+2){
+ if(num.compareTo(BigDecimal.valueOf(Double.parseDouble(list.get(i))))>= 0 ){
+ return num.add(BigDecimal.valueOf(Double.parseDouble(list.get(i+1))));
+ }
+ nums+=2;
+ }
+ return num;
+ }
+
@Override
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
@@ -450,6 +510,20 @@
return excelBOS;
}
+ @Override
+ public List<AppDeviceVo> selectSpecialDevice() {
+ QxUser user = UserHelper.getCurrentUser();
+ Integer organizationId = user.getOrganizationId();
+// Integer organizationId=71;
+ List<AppDeviceVo> appDeviceVos;
+ if (organizationId!=24){
+ appDeviceVos = specialDeviceMapper.selectSpecialDevice(organizationId);
+ }else {
+ appDeviceVos = specialDeviceMapper.selectSpecialDevice(null);
+ }
+ return appDeviceVos;
+ }
+
//���������������������������
private HashMap<String, Object> getStringObjectHashMap(List<Map<String, Object>> maps) {
HashMap<String, Object> rsMap = new HashMap<>();
--
Gitblit v1.8.0