From 259294a3a1f922188075ad6ddad502eca5886b07 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:06:31 +0800
Subject: [PATCH] 旧版登录功能 加密修复
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index a8267e6..79cf204 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -9,27 +9,49 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
-import com.moral.common.util.ExampleUtil;
-import com.moral.common.util.MyBatisBaseMapUtil;
+import com.moral.common.util.*;
import org.springframework.stereotype.Service;
-import com.moral.common.util.ValidateUtil;
import com.moral.entity.MonitorPoint;
import com.moral.mapper.MonitorPointMapper;
import com.moral.service.MonitorPointService;
import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
@Service
public class MonitorPointServiceImpl implements MonitorPointService {
@Resource
private MonitorPointMapper monitorPointMapper;
+ @Resource
+ RedisUtils redisUtils;
private static Class ENTITY_CLASS = MonitorPoint.class;
@Override
public List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");
return monitorPointMapper.getMonitorPointsByAreaName(parameters);
}
-
+ @Override
+ public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){
+ List<MonitorPoint> monitorPointList = monitorPointMapper.selectByMap(params);
+ for(MonitorPoint monitorPoint:monitorPointList){
+ loadStateFromRedis(monitorPoint);
+ }
+ return monitorPointList;
+ }
+ private void loadStateFromRedis(MonitorPoint monitorPoint){
+ StringBuilder key = new StringBuilder();
+ key.append("*_").append(monitorPoint.getId()).append("_*");
+ List<Map> stateList = redisUtils.getList(key.toString(),Map.class);
+ int state = -1;
+ if(stateList!=null){
+ for (Map deviceState:stateList){
+ int s = Integer.parseInt(deviceState.get("state").toString());
+ state = s>state&&s<4?s:state;
+ }
+ }
+ state = state==-1?4:state;
+ monitorPoint.setState(state);
+ }
@Override
public PageBean queryByPageBean(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
@@ -45,11 +67,18 @@
List<MonitorPoint> monitorPointList = monitorPointMapper.selectWithAreaNameByExample(example);
return new PageBean(monitorPointList);
}
-
+ @Override
+ public MonitorPoint queryWithRelationById(Integer id){
+ Example example = new Example(ENTITY_CLASS);
+ example.or().andEqualTo("id",id);
+ List<MonitorPoint> monitorPointList = monitorPointMapper.selectWithAreaNameByExample(example);
+ return monitorPointList!=null&&monitorPointList.size()>0?monitorPointList.get(0):null;
+ }
@Override
public void addOrModify(MonitorPoint monitorPoint) {
try{
if(monitorPoint.getId()==null){
+ monitorPoint.setIsDelete(Constants.IS_DELETE_FALSE);
monitorPointMapper.insertSelective(monitorPoint);
}else{
monitorPointMapper.updateByPrimaryKeySelective(monitorPoint);
@@ -77,4 +106,15 @@
}
}
+ @Override
+ public List<MonitorPoint> getMonitorPointsByName(String name) {
+ Example example = new Example(MonitorPoint.class);
+ Criteria criteria = example.createCriteria();
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
+ example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");
+
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
+ return monitorPoints;
+ }
}
--
Gitblit v1.8.0