From 2d6c5b3f4f72ae3ca6ba155ee3b85892c81f2fe0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 14:29:02 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 9 ++++++++-
screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java | 4 ++++
screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java | 2 ++
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 22 ++++++++++++++++++++++
4 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
index 5e9619b..4b91bf2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
@@ -29,6 +29,10 @@
*ZHC_RANGE
*/
SYS_SECOND_CRUISER_RANGE("ZHCRANGE","���������������������"),
+ /**
+ *UAV_RANGE
+ */
+ SYS_SECOND_UAV_RANGE("UAVRANGE","���������������������"),
/**
*WIND
diff --git a/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java b/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
index 932f5df..ed75e70 100644
--- a/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
@@ -22,4 +22,6 @@
SysDictData listOne(String code, String dataKey);
List<SysDictData> listWindAll(String code, List<String> dataKey);
+
+ List<Integer> dateValueList(String code);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 627b26a..671af4f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -3,14 +3,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.*;
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
import com.moral.api.pojo.form.uav.UAVQueryTimeSlotForm;
import com.moral.api.service.HistorySecondUavService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceService;
+import com.moral.api.service.SysDictTypeService;
import com.moral.api.utils.UnitConvertUtils;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -49,6 +51,8 @@
@Autowired
SpecialDeviceService specialDeviceService;
@Autowired
+ private SysDictTypeService sysDictTypeService;
+ @Autowired
RedisTemplate redisTemplate;
@Override
@@ -84,6 +88,8 @@
public List<UAVQueryTimeSlotDTO> queryTimeSlot(UAVQueryTimeSlotForm form) {
//������
Integer organizationId = form.getOrganizationId();
+
+ List<Integer> integerList = sysDictTypeService.dateValueList(SysDictTypeEnum.SYS_SECOND_UAV_RANGE.getValue());
Date startDate = form.getStartDate();
Date endDate = form.getEndDate();
QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
@@ -94,6 +100,7 @@
childrenId.add(child.getId());
}
childrenId.add(organizationId);
+ childrenId.addAll(integerList);
wrapper.in("organization_id", childrenId);
//������������batch������������������������������������������������
wrapper.between("batch", startDate, endDate);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index 088bc46..f2e928a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -1,14 +1,21 @@
package com.moral.api.service.impl;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.SysDictTypeMapper;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.SysDictTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -43,4 +50,19 @@
List<SysDictData> listAll = this.baseMapper.selectIdList(code,dataKey);
return listAll;
}
+
+ @Override
+ public List<Integer> dateValueList(String code) {
+ QxUser user = UserHelper.getCurrentUser();
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = this.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),user.getUserId().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);
+ }
+ return integerList;
+ }
}
--
Gitblit v1.8.0