From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 132 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index 9623c9c..f287939 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -2,14 +2,19 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Device;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.DeviceAdjustValueMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+import com.moral.api.pojo.form.adjust.AdjustForm;
import com.moral.api.service.DeviceAdjustValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -17,6 +22,7 @@
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.jdbc.object.UpdatableSqlQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
@@ -25,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import java.sql.Time;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,10 +54,10 @@
private DeviceMapper deviceMapper;
@Autowired(required = false)
- private SensorMapper sensorMapper;
+ private SpecialDeviceMapper specialDeviceMapper;
- @Autowired
- LogUtils logUtils;
+ @Autowired(required = false)
+ private SensorMapper sensorMapper;
@Autowired
RedisTemplate redisTemplate;
@@ -72,7 +79,10 @@
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
wrapper_device.eq("is_delete",Constants.NOT_DELETE);
wrapper_device.eq("mac",deviceAdjustValue.getMac());
- if (deviceMapper.selectCount(wrapper_device)==0){
+ QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+ wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDevice.eq("mac",deviceAdjustValue.getMac());
+ if (deviceMapper.selectCount(wrapper_device)==0 && specialDeviceMapper.selectCount(wrapper_specialDevice)==0){
resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
return resultMap;
@@ -89,7 +99,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
- logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache(deviceAdjustValue.getMac());
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
@@ -167,7 +177,7 @@
content = content+"������������:"+deviceAdjustValueOld.getValue()+"->"+map.get(key)+";";
}
}
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
//������������
refreshCache(deviceAdjustValueOld.getMac());
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
@@ -199,7 +209,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
//������������
refreshCache(deviceAdjustValue.getMac());
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
@@ -241,6 +251,114 @@
return resultMap;
}
+ @Override
+ public Map<String, Object> refreshRedis() {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<DeviceAdjustValue> wrapper_mac = new QueryWrapper<>();
+ wrapper_mac.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_mac.select("DISTINCT mac");
+ List<DeviceAdjustValue> deviceAdjustValues = deviceAdjustValueMapper.selectList(wrapper_mac);
+ for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
+ //������������
+ refreshCache(deviceAdjustValue.getMac());
+ }
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+
+
+ /**
+ * ���������������������
+ *
+ * @param parameters
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getAllAdjust(Map<String, Object> parameters) {
+ ArrayList<Map<String, Object>> rsList = new ArrayList<>();
+ String code = parameters.get("code").toString();
+ List<AdjustDTO> adjustDTOS = deviceAdjustValueMapper.selectAllAdjust(parameters);
+ for (AdjustDTO adjustDTO : adjustDTOS) {
+ HashMap<String, Object> map = new HashMap<>();
+ String value = adjustDTO.getValue();
+ if (ObjectUtils.isEmpty(value)){
+ if (code.equals("a99054")){
+ value ="cel*1";
+ map.put("cel",1);
+ }else {
+ value ="aqi*0+cel*1";
+ map.put("aqi",0);
+ map.put("cel",1);
+ }
+ }else {
+ if (code.equals("a99054")){
+ String[] split = value.split("\\*");
+ map.put("cel",Double.parseDouble(split[1]));
+ }else {
+ String[] split = value.split("\\+");
+ String[] split1 = split[0].toString().split("\\*");
+ map.put("aqi",Double.parseDouble(split1[1]));
+ String[] split2 = split[1].toString().split("\\*");
+ map.put("cel",Double.parseDouble(split2[1]));
+ }
+ }
+ map.put("value",value);
+ map.put("name",adjustDTO.getName());
+ map.put("id",adjustDTO.getId());
+ map.put("mac",adjustDTO.getMac());
+ map.put("code",code);
+ rsList.add(map);
+ }
+ return rsList;
+ }
+
+ /**
+ * ���������������������
+ *
+ * @param paras
+ * @return
+ */
+ @Override
+ @Transactional
+ public Map<String, Object> updateAllAdjust(List<AdjustForm> paras) {
+ Map<String,Object> resultMap = new HashMap<>();
+ for (AdjustForm adjustForm : paras) {
+ DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
+ QueryWrapper<DeviceAdjustValue> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("mac",adjustForm.getMac());
+ wrapper1.eq ("sensor_code",adjustForm.getCode());
+ Integer integer = deviceAdjustValueMapper.selectCount(wrapper1);
+ if (integer==0){
+ deviceAdjustValue.setValue(adjustForm.getAgehou());
+ deviceAdjustValue.setCreateTime(new Date());
+ deviceAdjustValue.setIsDelete("0");
+ deviceAdjustValue.setUpdateTime(new Date());
+ deviceAdjustValue.setSensorCode(adjustForm.getCode());
+ deviceAdjustValue.setMac(adjustForm.getMac());
+ deviceAdjustValue.setEndTime(Time.valueOf("23:59:00"));
+ deviceAdjustValue.setStartTime(Time.valueOf("00:00:00"));
+ deviceAdjustValueMapper.insert(deviceAdjustValue);
+ }else {
+ deviceAdjustValue.setValue(adjustForm.getAgehou());
+ deviceAdjustValue.setUpdateTime(new Date());
+ deviceAdjustValue.setId(adjustForm.getId());
+ deviceAdjustValueMapper.updateById(deviceAdjustValue);
+ }
+ //������������
+ refreshCache(adjustForm.getMac());
+ }
+
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+ public void refreshRedisAll(){
+ refreshRedis();
+ }
+
private Map<String,Object> getDeviceAdjustValueFromDB(String mac){
QueryWrapper<DeviceAdjustValue> wapper_redis = new QueryWrapper<>();
wapper_redis.eq("mac",mac);
--
Gitblit v1.8.0