From f183af46a77eb7049a15e379eece4adbb59a9738 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 08 Sep 2021 11:16:33 +0800
Subject: [PATCH] screen-api 增加获取无人机飞行日期接口
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 30 ++++++++++
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java | 47 +++++++++++++++
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java | 12 ++++
screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java | 8 ++
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 24 ++++++++
5 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index 408ba94..412ef42 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.mapper.HistorySecondUavMapper;
+import com.moral.api.pojo.vo.uav.UAVQueryDateVO;
+import com.moral.api.service.HistorySecondUavService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
import java.util.List;
/**
@@ -30,6 +33,8 @@
@Autowired
HistorySecondUavMapper historySecondUavMapper;
+ @Autowired
+ HistorySecondUavService historySecondUavService;
/**
* @Description: ������������id���mac���������������������������������
* @Param: []
@@ -42,4 +47,23 @@
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(new QueryWrapper<>());
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
}
+
+
+ /**
+ * @Description: ������������������������������������������������������������
+ * @Param: [organizationId]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/9/8
+ */
+ @RequestMapping("queryDate")
+ public ResultMessage queryDate(Integer organizationId){
+ //������������������
+ List<Date> dates = historySecondUavService.queryDate(organizationId);
+ //������vo���
+ UAVQueryDateVO vo = UAVQueryDateVO.convert(dates);
+ //������������
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
index 74a3c76..37443ae 100644
--- a/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
+++ b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
@@ -1,5 +1,7 @@
package com.moral.api.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.time.LocalDateTime;
import java.io.Serializable;
@@ -23,6 +25,12 @@
private static final long serialVersionUID = 1L;
/**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
* ������mac
*/
private String mac;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java
new file mode 100644
index 0000000..96263ef
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java
@@ -0,0 +1,47 @@
+package com.moral.api.pojo.vo.uav;
+
+import com.moral.util.DateUtils;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * @ClassName UAVQueryDateVO
+ * @Description ������������������������������������vo
+ * @Author ���������
+ * @Date 2021/9/8 11:03
+ * @Version TODO
+ **/
+@Data
+public class UAVQueryDateVO {
+
+ /**
+ * @Description: ������hashset���������������
+ * @Param:
+ * @return:
+ * @Author: ���������
+ * @Date: 2021/9/8
+ */
+ public HashSet<String> datesStr;
+
+ /**
+ * @Description: ���������������������������������vo���������
+ * @Param: [dates]
+ * @return: com.moral.api.pojo.vo.uav.UAVQueryDateVO
+ * @Author: ���������
+ * @Date: 2021/9/8
+ */
+ public static UAVQueryDateVO convert(List<Date> dates){
+ //������������������������������������
+ UAVQueryDateVO uavQueryDateVO = new UAVQueryDateVO();
+ HashSet<String> datesStr = new HashSet<>();
+ for (Date date : dates) {
+ datesStr.add(DateUtils.dateToDateString(date,"yyyy-MM-dd"));
+ }
+ uavQueryDateVO.setDatesStr(datesStr);
+ return uavQueryDateVO;
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
index 7814476..fcfef5e 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
@@ -3,6 +3,9 @@
import com.moral.api.entity.HistorySecondUav;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Date;
+import java.util.List;
+
/**
* <p>
* ��������������������� ���������
@@ -13,4 +16,13 @@
*/
public interface HistorySecondUavService extends IService<HistorySecondUav> {
+ /**
+ * @Description: ������������id������������������������������������������
+ * @Param: [organizationId]
+ * @return: java.util.List<java.util.Date>
+ * @Author: ���������
+ * @Date: 2021/9/8
+ */
+ List<Date> queryDate(Integer organizationId);
+
}
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 c0da684..81620b9 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
@@ -1,10 +1,17 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.service.HistorySecondUavService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -17,4 +24,27 @@
@Service
public class HistorySecondUavServiceImpl extends ServiceImpl<HistorySecondUavMapper, HistorySecondUav> implements HistorySecondUavService {
+ @Autowired
+ HistorySecondUavMapper historySecondUavMapper;
+
+ @Override
+ public List<Date> queryDate(Integer organizationId) {
+ //������������������
+ QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("organization_id",organizationId);
+ //���������������������������180���
+ Date endDate = new Date();
+ Date startDate = DateUtils.addDays(endDate, -180);
+ queryWrapper.between("batch",startDate,endDate);
+ //������������������
+ queryWrapper.select("DISTINCT batch");
+ //������������
+ List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
+ //������������Date������
+ List<Date> result = new ArrayList<>();
+ for (HistorySecondUav historySecondUav : historySecondUavs) {
+ result.add(historySecondUav.getBatch());
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0