From e7bc156f901b06e5af54cfe86fe53e7491af7b7f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 209 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 191 insertions(+), 18 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index 04f093d..d1da7a9 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -1,14 +1,21 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.ManageRole;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -16,6 +23,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,8 +44,14 @@
@Autowired(required = false)
private SensorMapper sensorMapper;
+ @Autowired(required = false)
+ private VersionSensorUnitMapper versionSensorUnitMapper;
+
@Autowired
LogUtils logUtils;
+
+ @Autowired
+ RedisTemplate redisTemplate;
@Override
@Transactional
@@ -70,10 +85,13 @@
logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
return resultMap;
}
@Override
+ @Transactional
public Map<String, Object> updateSensor(Map<String,Object> updateSensorMap) {
Map<String,Object> resultMap = new HashMap<>();
if(ObjectUtils.isEmpty(updateSensorMap.get("id"))){
@@ -81,19 +99,15 @@
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
- if (updateSensorMap.containsKey("name")){
- if (updateSensorMap.get("name")==null||updateSensorMap.get("name")==""){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return resultMap;
- }
+ if (updateSensorMap.get("name")==""){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
}
- if (updateSensorMap.containsKey("code")){
- if(ObjectUtils.isEmpty(updateSensorMap.get("code"))){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return resultMap;
- }
+ if(updateSensorMap.get("code")==""){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
}
Sensor oldSensor = sensorMapper.getSensorById(Integer.parseInt(updateSensorMap.get("id").toString()));
if (ObjectUtils.isEmpty(oldSensor)){
@@ -105,7 +119,6 @@
wrapper_code.eq("code",updateSensorMap.get("code"));
wrapper_code.eq("is_delete","0");
List<Sensor> sensorList = sensorMapper.selectList(wrapper_code);
- System.out.println(sensorList.get(0));
if (sensorList.size()!=0&&!sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())){
resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
@@ -115,20 +128,180 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+oldSensor.getName()+";";
for (Object key:updateSensorMap.keySet()) {
- if (key.toString().equals("name")){
- content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
+ content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
}
- if (key.toString().equals("code")){
+ if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
+ QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
+ wrapper_Version.eq("sensor_code",oldSensor.getCode());
+ wrapper_Version.eq("is_delete","0");
+ VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
+ versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
+ versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
content = content+"������:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
}
+ if (key.toString().equals("upper")&&updateSensorMap.get(key)!=null){
+ content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
+ if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
+ content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
+ if (key.toString().equals("default_util")&&updateSensorMap.get(key)!=null){
+ content = content+"������������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
}
- System.out.println(content);
logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
return resultMap;
}
+
+ @Override
+ public Map<String,Object> getAllSensor(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<Sensor> page = new Page(current,size);
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ int totleNum = sensorMapper.selectCount(wrapper);
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper.orderByAsc("create_time");
+ }else {
+ wrapper.orderByDesc("create_time");
+ }
+ Page resultPage = sensorMapper.selectPage(page,wrapper);
+ List<Sensor> sensors = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ sensorList.add(sensorMap);
+ }
+ resultMap.put("manageRoles",sensorList);
+ resultMap.put("totalNumber",totleNum);
+ resultMap.put("current",current);
+ int totalPageNumber = totleNum/size;
+ if(totleNum%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ @Override
+ @Transactional
+ public Map<String, Object> deleteSensor(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ wrapper.eq("id",map.get("id"));
+ wrapper.eq("is_delete","0");
+ Sensor sensor = sensorMapper.selectOne(wrapper);
+ if(ObjectUtils.isEmpty(sensor)){
+ resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ return resultMap;
+ }
+ Sensor deleteSensor = new Sensor();
+ deleteSensor.setIsDelete(Constants.DELETE);
+ sensorMapper.update(deleteSensor,wrapper);
+ QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
+ wrapper_Version.eq("sensor_code",sensor.getCode());
+ wrapper_Version.eq("is_delete","0");
+ VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
+ versionSensorUnit.setIsDelete(Constants.DELETE);
+ versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "������������:"+sensor.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getSensorByFuzzy(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<Sensor> page = new Page(current,size);
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.like("name",map.get("key")).or().like("code",map.get("key"));
+ int totleNum = sensorMapper.selectCount(wrapper);
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper.orderByAsc("create_time");
+ }else {
+ wrapper.orderByDesc("create_time");
+ }
+ Page resultPage = sensorMapper.selectPage(page,wrapper);
+ List<Sensor> sensors = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ sensorList.add(sensorMap);
+ }
+ resultMap.put("manageRoles",sensorList);
+ resultMap.put("totalNumber",totleNum);
+ resultMap.put("current",current);
+ int totalPageNumber = totleNum/size;
+ if(totleNum%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ public Map<String,Sensor> getAllSensorFromCache(){
+ Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
+ if(ObjectUtils.isEmpty(sensors))
+ sensors = getAllSensorFromDB();
+ //������������
+ refreshCache(sensors);
+ return sensors;
+ }
+
+ private Map<String,Sensor> getAllSensorFromDB(){
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorMapper.selectList(wrapper);
+ Map<String,Sensor> result = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ result.put(sensor.getCode(),sensor);
+ }
+ return result;
+ }
+
+ private void refreshCache(){
+ Map<String, Sensor> sensors = getAllSensorFromDB();
+ refreshCache(sensors);
+ }
+
+ private void refreshCache(Map<String,Sensor> sensors){
+ //������������
+ redisTemplate.delete(RedisConstants.SENSOR_KEY);
+ //������������
+ redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY,sensors);
+ }
}
--
Gitblit v1.8.0