From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 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 6712510..fc0db0d 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -6,7 +6,10 @@
import javax.annotation.Resource;
+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 org.springframework.stereotype.Service;
@@ -15,6 +18,7 @@
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 {
@@ -26,16 +30,37 @@
ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");
return monitorPointMapper.getMonitorPointsByAreaName(parameters);
}
-
+ @Override
+ public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){
+ return monitorPointMapper.selectWithStateByMap(params);
+ }
@Override
public PageBean queryByPageBean(PageBean pageBean) {
- return MyBatisBaseMapUtil.queryPage(monitorPointMapper,pageBean,ENTITY_CLASS);
+ Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+ List<Example.Criteria> criteriaList = example.getOredCriteria();
+ if(criteriaList!=null&&criteriaList.size()>0){
+ for(Example.Criteria cri : criteriaList){
+ cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
+ }
+ }else {
+ example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
+ }
+ PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ 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);
@@ -48,16 +73,30 @@
@Override
public void deleteByIds(Integer... ids) {
+ MonitorPoint monitorPoint = new MonitorPoint();
+ monitorPoint.setIsDelete(Constants.IS_DELETE_TRUE);
if(ids!=null&&ids.length>0){
if(ids.length==1){
- monitorPointMapper.deleteByPrimaryKey(ids[0]);
+ monitorPoint.setId(ids[0]);
+ monitorPointMapper.updateByPrimaryKeySelective(monitorPoint);
}else{
Example example = new Example(ENTITY_CLASS);
example.or().andIn("id", Arrays.asList(ids));
- monitorPointMapper.deleteByExample(example);
+ monitorPointMapper.updateByExampleSelective(monitorPoint,example);
}
}
}
+ @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