From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 26 Aug 2021 11:33:56 +0800
Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 324 ++++++++++++++++++++++++++++-------------------------
1 files changed, 171 insertions(+), 153 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 c618490..dc7f819 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
@@ -33,7 +33,7 @@
/**
* <p>
- * ���������������
+ * ���������������
* </p>
*
* @author moral
@@ -64,35 +64,35 @@
@Override
@Transactional
public Map<String, Object> insertOne(Sensor sensor) {
- Map<String,Object> resultMap = new HashMap<>();
- if (sensor.getName()==null || sensor.getCode()==null){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ Map<String, Object> resultMap = new HashMap<>();
+ if (sensor.getName() == null || sensor.getCode() == null) {
+ resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_name = new QueryWrapper<>();
- wrapper_name.eq("name",sensor.getName());
- wrapper_name.eq("is_delete","0");
- if (sensorMapper.selectCount(wrapper_name)!=0){
- resultMap.put("code",ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
+ wrapper_name.eq("name", sensor.getName());
+ wrapper_name.eq("is_delete", "0");
+ if (sensorMapper.selectCount(wrapper_name) != 0) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
- wrapper_code.eq("code",sensor.getCode());
- wrapper_code.eq("is_delete","0");
- if (sensorMapper.selectCount(wrapper_code)!=0){
- resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
+ wrapper_code.eq("code", sensor.getCode());
+ wrapper_code.eq("is_delete", "0");
+ if (sensorMapper.selectCount(wrapper_code) != 0) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
return resultMap;
}
sensorMapper.insertOne(sensor);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+sensor.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
- resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ String content = "������������:" + sensor.getName() + ";";
+ logUtils.saveOperationForManage(request, content, Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
return resultMap;
@@ -100,201 +100,201 @@
@Override
@Transactional
- public Map<String, Object> updateSensor(Map<String,Object> updateSensorMap) {
- Map<String,Object> resultMap = new HashMap<>();
- if(ObjectUtils.isEmpty(updateSensorMap.get("id"))){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public Map<String, Object> updateSensor(Map<String, Object> updateSensorMap) {
+ Map<String, Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(updateSensorMap.get("id"))) {
+ 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());
+ if (updateSensorMap.get("name") == "") {
+ 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());
+ 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)){
- resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ if (ObjectUtils.isEmpty(oldSensor)) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
- wrapper_code.eq("code",updateSensorMap.get("code"));
- wrapper_code.eq("is_delete","0");
+ wrapper_code.eq("code", updateSensorMap.get("code"));
+ wrapper_code.eq("is_delete", "0");
List<Sensor> sensorList = sensorMapper.selectList(wrapper_code);
- 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());
+ 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());
return resultMap;
}
sensorMapper.updateSensor(updateSensorMap);
- if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){
+ if (!ObjectUtils.isEmpty(updateSensorMap.get("code")) && !oldSensor.getCode().equals(updateSensorMap.get("code"))) {
QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
- wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
- wrapper_OUA.eq("sensor_code",oldSensor.getCode());
+ wrapper_OUA.eq("is_delete", Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code", oldSensor.getCode());
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
- organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
}
//������deviceInfo������
CacheUtils.refreshDeviceAlarmInfo();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+oldSensor.getName()+";";
- for (Object key:updateSensorMap.keySet()) {
- if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
- content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
+ String content = "������������:" + oldSensor.getName() + ";";
+ for (Object key : updateSensorMap.keySet()) {
+ if (key.toString().equals("name") && updateSensorMap.get(key) != null) {
+ content = content + "���������:" + oldSensor.getName() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
+ 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)+";";
+ content = content + "������:" + oldSensor.getCode() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
- content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ 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("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("lower") && updateSensorMap.get(key) != null) {
+ content = content + "������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
- content = content+"������������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("default_unit_key") && updateSensorMap.get(key) != null) {
+ content = content + "������������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
}
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
- resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ 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<>();
+ 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);
+ Page<Sensor> page = new Page(current, size);
QueryWrapper<Sensor> wrapper = new QueryWrapper();
- wrapper.eq("is_delete",0);
+ wrapper.eq("is_delete", 0);
int totleNum = sensorMapper.selectCount(wrapper);
- if (!ObjectUtils.isEmpty(map.get("orderType"))){
+ if (!ObjectUtils.isEmpty(map.get("orderType"))) {
String orderType = map.get("orderType").toString();
- if (orderType.equals(Constants.ORDER_DESC)){
+ if (orderType.equals(Constants.ORDER_DESC)) {
wrapper.orderByDesc("update_time");
- }else {
+ } else {
wrapper.orderByAsc("update_time");
}
}
- Page resultPage = sensorMapper.selectPage(page,wrapper);
+ 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);
+ 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());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
- resultMap.put("totalNumber",totleNum);
- resultMap.put("current",current);
- int totalPageNumber = totleNum/size;
- if(totleNum%size != 0){
+ resultMap.put("sensors", sensorList);
+ resultMap.put("totalNumber", totleNum);
+ resultMap.put("current", current);
+ int totalPageNumber = totleNum / size;
+ if (totleNum % size != 0) {
totalPageNumber += 1;
}
- resultMap.put("totalPageNumber",totalPageNumber);
+ resultMap.put("totalPageNumber", totalPageNumber);
return resultMap;
}
@Override
public Map<String, Object> getAllSensorWithoutPage() {
- Map<String,Object> resultMap = new HashMap<>();
+ Map<String, Object> resultMap = new HashMap<>();
QueryWrapper<Sensor> wrapper = new QueryWrapper();
- wrapper.eq("is_delete",0);
+ wrapper.eq("is_delete", 0);
List<Sensor> sensors = sensorMapper.selectList(wrapper);
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);
+ 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());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
+ resultMap.put("sensors", sensorList);
return resultMap;
}
@Override
@Transactional
public Map<String, Object> deleteSensor(Map map) {
- Map<String,Object> resultMap = new HashMap<>();
+ Map<String, Object> resultMap = new HashMap<>();
QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
- wrapper.eq("id",map.get("id"));
- wrapper.eq("is_delete","0");
+ 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());
+ 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);
+ sensorMapper.update(deleteSensor, wrapper);
QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
- wrapper_Version.eq("sensor_code",sensor.getCode());
- wrapper_Version.eq("is_delete","0");
+ 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);
- if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){
+ versionSensorUnitMapper.update(versionSensorUnit, wrapper_Version);
+ if (!ObjectUtils.isEmpty(sensor.getCode()) && !sensor.getCode().equals("")) {
QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
- wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
- wrapper_OUA.eq("sensor_code",sensor.getCode());
+ wrapper_OUA.eq("is_delete", Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code", sensor.getCode());
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setIsDelete(Constants.DELETE);
- organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
}
//������������������
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());
+ 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();
//������token
@@ -304,82 +304,100 @@
@Override
public Map<String, Object> getSensorByFuzzy(Map map) {
- Map<String,Object> resultMap = new HashMap<>();
+ 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);
+ 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"));
+ 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)){
+ if (orderType.equals(Constants.ORDER_ASC)) {
wrapper.orderByAsc("update_time");
- }else {
+ } else {
wrapper.orderByDesc("update_time");
}
- Page resultPage = sensorMapper.selectPage(page,wrapper);
+ 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);
+ 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());
- if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && !sensor.getDefaultUnitKey().equals("")) {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
- resultMap.put("totalNumber",totleNum);
- resultMap.put("current",current);
- int totalPageNumber = totleNum/size;
- if(totleNum%size != 0){
+ resultMap.put("sensors", sensorList);
+ resultMap.put("totalNumber", totleNum);
+ resultMap.put("current", current);
+ int totalPageNumber = totleNum / size;
+ if (totleNum % size != 0) {
totalPageNumber += 1;
}
- resultMap.put("totalPageNumber",totalPageNumber);
+ resultMap.put("totalPageNumber", totalPageNumber);
return resultMap;
}
@Override
- public Map<String,Sensor> getAllSensorFromCache(){
- Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
- if(ObjectUtils.isEmpty(sensors))
- sensors = getAllSensorFromDB();
+ 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;
}
@Override
- public void refreshCache(){
+ public Sensor getSensorByCode(String code) {
+ if (code == null)
+ return null;
+ //������������������
+ Sensor sensor = (Sensor) redisTemplate.opsForHash().get(RedisConstants.SENSOR_KEY, code);
+ //���������������������������������������
+ if (sensor == null) {
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ sensor = new Sensor();
+ sensor.setCode(code);
+ sensor.setIsDelete(Constants.NOT_DELETE);
+ wrapper.setEntity(sensor);
+ sensor = sensorMapper.selectOne(wrapper);
+ }
+ return sensor;
+ }
+
+ @Override
+ public void refreshCache() {
Map<String, Sensor> sensors = getAllSensorFromDB();
refreshCache(sensors);
}
- private Map<String,Sensor> getAllSensorFromDB(){
+ private Map<String, Sensor> getAllSensorFromDB() {
QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
- wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
List<Sensor> sensors = sensorMapper.selectList(wrapper);
- Map<String,Sensor> result = new HashMap<>();
+ Map<String, Sensor> result = new HashMap<>();
for (Sensor sensor : sensors) {
- result.put(sensor.getCode(),sensor);
+ result.put(sensor.getCode(), sensor);
}
return result;
}
- private void refreshCache(Map<String,Sensor> sensors){
+ private void refreshCache(Map<String, Sensor> sensors) {
//������������
redisTemplate.delete(RedisConstants.SENSOR_KEY);
//������������
- redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY,sensors);
+ redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY, sensors);
}
}
--
Gitblit v1.8.0