From 534515eeac9a28c5ab9dbcd666ec2d652146354e Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 15:02:44 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
index 3c7bc5d..14a1a24 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
@@ -1,9 +1,7 @@
package com.moral.api.service.impl;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date;
@@ -11,6 +9,7 @@
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +18,7 @@
import com.moral.api.entity.HandDevice;
import com.moral.api.entity.HistoryFiveMinutely;
import com.moral.api.entity.HistoryHourly;
+import com.moral.api.entity.HistoryMinutely;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HandDeviceMapper;
import com.moral.api.pojo.query.handdevice.HandDevicePageCond;
@@ -65,6 +65,7 @@
*/
@Override
public Page<HandDevice> page(HandDevicePageCond handDevicePageCond) {
+
Page<HandDevice> page = handDeviceMapper.Page(handDevicePageCond.getPage().convertPage(),
handDevicePageCond.getMac(),
handDevicePageCond.getName(),
@@ -79,51 +80,37 @@
*/
@Override
public List<Device> check() {
- List<Device> organizationDevice = deviceService.getOrganizationDevice(123);
- return organizationDevice;
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Device::getMac,Device::getName,Device::getId);
+ wrapper.eq(Device::getMonitorPointId,123);
+ wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
+ wrapper.orderByAsc(Device::getCreateTime);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ return devices;
}
/**
* ������������������
*
- * @param device
+ * @param handDevice
* @return
*/
@Override
- @Transactional
- public void update(Device device) {
+ public HandDevice update(HandDevice handDevice) {
QxUser currentUser = UserHelper.getCurrentUser();
- deviceMapper.updateById(device);
- QueryWrapper<HandDevice> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac",device.getMac());
- queryWrapper.orderByDesc("create_time");
- List<HandDevice> handDevices = handDeviceMapper.selectList(queryWrapper);
- HandDevice handDevice = new HandDevice();
- handDevice.setAddress(device.getAddress());
- handDevice.setName(device.getName());
- handDevice.setMac(device.getMac());
- handDevice.setLongitude(device.getLongitude());
- handDevice.setLatitude(device.getLatitude());
- handDevice.setIsDelete(Constants.NOT_DELETE);
- handDevice.setUpdateName(currentUser.getUserName());
- handDevice.setStartTime(new Date());
- handDevice.setUpdateTime(new Date());
- handDevice.setCreateTime(new Date());
- handDevice.setState("1");
- if (!ObjectUtils.isEmpty(handDevices)){
- HandDevice handDevice1 = handDevices.get(0);
- String state = handDevice1.getState();
- if (state.equals("1")){
- handDevice1.setState("0");
- handDevice1.setEndTime(new Date());
- handDeviceMapper.updateById(handDevice1);
- }else {
- handDeviceMapper.insert(handDevice);
- }
+ String state = handDevice.getState();
+ if (state.equals("0")){
+ HandDevice handDevice1 = getHand(handDevice);
+ handDevice1.setCreateName(currentUser.getUserName());
+ handDeviceMapper.insert(handDevice1);
+ return handDevice1;
}else {
- handDeviceMapper.insert(handDevice);
+ handDevice.setEndTime(new Date());
+ handDevice.setState("0");
+ handDevice.setUpdateName(currentUser.getUserName());
+ handDeviceMapper.updateById(handDevice);
+ return handDevice;
}
-
}
@Override
@@ -136,7 +123,8 @@
if (ObjectUtils.isEmpty(handDevices)){
handDevice = new HandDevice();
Device deviceByMac = deviceService.getDeviceByMac(mac);
- BeanUtils.copyProperties(deviceByMac,handDevice);
+ handDevice.setName(deviceByMac.getName());
+ handDevice.setMac(deviceByMac.getMac());
handDevice.setState("0");
}else {
handDevice = handDevices.get(0);
@@ -156,10 +144,11 @@
public List<Map<String, Object>> details(String mac, String startTime, String endTime,String type) {
Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
-// Date startDate = DateUtils.getDate("2024-01-02 00:00:00",DateUtils.yyyy_MM_dd_HH_mm_EN);
-// Date endDate = DateUtils.getDate("2024-01-03 05:00:00",DateUtils.yyyy_MM_dd_HH_mm_EN);
List<Map<String, Object>> rsMap = new ArrayList<>();
+ if (ObjectUtils.isEmpty(endTime)){
+ endDate = new Date();
+ }
if (type.equals("hour")){
List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
for (HistoryHourly historyHourly : valueByMacAndTime) {
@@ -170,7 +159,17 @@
map.put("a21028",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
rsMap.add(map);
}
- }else {
+ }else if (type.equals("minute")){
+ List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, startDate, endDate);
+ for (HistoryMinutely historyMinutely : historyMinutelys) {
+ String value = historyMinutely.getValue();
+ Map map = JSON.parseObject(value, Map.class);
+ map.put("time",DateUtils.dateToDateString(historyMinutely.getTime()));
+ map.put("a21001",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
+ map.put("a21028",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
+ rsMap.add(map);
+ }
+ }else if (type.equals("minutely")){
List<HistoryFiveMinutely> historyFiveMinutelies = historyFiveMinutelyService.queryFiveMinutely(mac, startDate, endDate);
for (HistoryFiveMinutely historyFiveMinutely : historyFiveMinutelies) {
String value = historyFiveMinutely.getValue();
@@ -194,11 +193,15 @@
public List<Map<String, Object>> detailsExecl(Map<String, Object> params) {
String type = params.get("type").toString();
String mac = params.get("mac").toString();
+ Object endTime = params.get("endTime");
Date startDate = DateUtils.getDate(params.get("startTime").toString(),DateUtils.yyyy_MM_dd_HH_mm_EN);
- Date endDate = DateUtils.getDate(params.get("endTime").toString(),DateUtils.yyyy_MM_dd_HH_mm_EN);
-// Date startDate = DateUtils.getDate("2024-01-02 00:00:00",DateUtils.yyyy_MM_dd_HH_mm_EN);
-// Date endDate = DateUtils.getDate("2024-01-03 05:00:00",DateUtils.yyyy_MM_dd_HH_mm_EN);
+ Date endDate;
List<Map<String, Object>> rsMap = new ArrayList<>();
+ if (ObjectUtils.isEmpty(endTime)){
+ endDate = new Date();
+ }else {
+ endDate = DateUtils.getDate(endTime.toString(),DateUtils.yyyy_MM_dd_HH_mm_EN);
+ }
if (type.equals("hour")){
List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
for (HistoryHourly historyHourly : valueByMacAndTime) {
@@ -246,4 +249,20 @@
}
+ private HandDevice getHand(HandDevice handDevice){
+ HandDevice rsHandDevice = new HandDevice();
+ rsHandDevice.setName(handDevice.getName());
+ rsHandDevice.setMac(handDevice.getMac());
+ rsHandDevice.setAddress(handDevice.getAddress());
+ rsHandDevice.setLatitude(handDevice.getLatitude());
+ rsHandDevice.setLongitude(handDevice.getLongitude());
+ rsHandDevice.setIsDelete(Constants.NOT_DELETE);
+ rsHandDevice.setStartTime(new Date());
+ rsHandDevice.setUpdateTime(new Date());
+ rsHandDevice.setCreateTime(new Date());
+ rsHandDevice.setState("1");
+ return rsHandDevice;
+ }
+
+
}
--
Gitblit v1.8.0