From 0aed1c0e6a91207c15fa34f49a7dfa9b6e2b64c5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:24:06 +0800
Subject: [PATCH] screen-api 实时界面对数据进行保留小数位并且取整
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 7fe9dd9..357a576 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
@@ -2,10 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.HistorySecondSpecial;
-import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
+import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.HistorySecondSpecialMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.OrganizationService;
@@ -14,6 +13,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.util.DateUtils;
import com.moral.util.GeodesyUtils;
import com.moral.util.TokenUtils;
@@ -23,6 +23,8 @@
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -48,6 +50,10 @@
@Autowired
SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
+ private HistorySecondCruiserMapper historySecondCruiserMapper;
+
@Autowired
RedisTemplate redisTemplate;
@@ -97,22 +103,27 @@
return filterData(data);
}
- @Override
+
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
- //������������������
QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
- wrapper.eq("mac",mac);
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- return specialDeviceMapper.selectOne(wrapper);
+ wrapper.eq("mac", mac);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ return specialDeviceMapper.selectOne(wrapper);
}
+
@Override
- public SpecialDevice getSpecialDeviceByMac(String mac) {
- QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
- queryWrapper.eq("mac",mac);
- queryWrapper.eq("is_delete",Constants.NOT_DELETE);
- SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
- return specialDevice;
+ public List<String> getDatesByMac(String mac) {
+ Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("orgId", orgId);
+ params.put("mac", mac);
+ Date start = DateUtils.addMonths(new Date(), -6);
+ params.put("start", DateUtils.dateToDateString(start));
+ return historySecondCruiserMapper.getDates(params);
}
--
Gitblit v1.8.0