组织模块

fengxiang

2018-01-04 aa6c487c0eccd86311489e8a0ed641618e5b9105

组织模块

 src/main/java/com/moral/common/util/ExampleUtil.java

@@ -47,7 +47,7 @@
            if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
                String[] criteria = params.trim().split(OR_SPLIT);
                for (String criterion : criteria) {
                    Example.Criteria criteriaOfExample = example.or();
                    Example.Criteria criteriaOfExample = null;
                    if (!StringUtils.isNullOrEmpty(criterion)) {
                        String[] conditions = criterion.trim().split(CRITERIA_SPLIT);
                        for (String condition : conditions) {
@@ -66,6 +66,10 @@
                                                values.add(conditionItems[index]);
                                            }
                                        }
                                        //经过所有验证后，才产生 or 条件组
                                        if(criteriaOfExample == null){
                                            criteriaOfExample = example.or();
                                        }
                                        invokeMethod(criteriaOfExample,method,propertyName,values);
                                    }


 src/main/java/com/moral/controller/MonitorPointController.java

New file
@@ -0,0 +1,34 @@
package com.moral.controller;

import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.MonitorPoint;
import com.moral.service.MonitorPointService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;


@RestController
@RequestMapping("monitor-point")
@CrossOrigin(origins = "*", maxAge = 3600)
public class MonitorPointController {
    @Resource
    MonitorPointService monitorPointService;
    @GetMapping("page-list")
    public PageBean pageList(PageBean pageBean) {
        return monitorPointService.queryByPageBean(pageBean);
    }
    @PostMapping("delete-by-ids")
    public ResultBean deleteByIds(@RequestBody Integer [] ids){
        monitorPointService.deleteByIds(ids);
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        return resultBean;
    }
    @PostMapping("add-or-modify")
    public ResultBean addOrModify(@RequestBody MonitorPoint monitorPoint){
        monitorPointService.addOrModify(monitorPoint);
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        return resultBean;
    }
}

 src/main/java/com/moral/service/MonitorPointService.java

@@ -3,10 +3,15 @@
import java.util.List;

import java.util.Map;



import com.moral.common.bean.PageBean;

import com.moral.entity.MonitorPoint;



public interface MonitorPointService {



    List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);

    public PageBean queryByPageBean(PageBean pageBean);



    public void addOrModify(MonitorPoint monitorPoint);



    public void deleteByIds(Integer... ids);

}


 src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java

@@ -41,7 +41,7 @@
                  if(ids.length==1){
                        deviceVersionMapper.deleteByPrimaryKey(ids[0]);
                  }else{
                        Example example = new Example(DeviceVersion.class);
                        Example example = new Example(ENTITY_CLASS);
                        example.or().andIn("id", Arrays.asList(ids));
                        deviceVersionMapper.deleteByExample(example);
                  }

 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java

@@ -1,26 +1,63 @@
package com.moral.service.impl;



import java.util.Arrays;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import com.moral.common.bean.PageBean;

import com.moral.common.util.MyBatisBaseMapUtil;

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;



@Service

public class MonitorPointServiceImpl implements MonitorPointService {

    @Resource

    private MonitorPointMapper monitorPointMapper;

    @Resource

    private MonitorPointMapper monitorPointMapper;

    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> getMonitorPointsByAreaName(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");

        return monitorPointMapper.getMonitorPointsByAreaName(parameters);

    }

    @Override

    public PageBean queryByPageBean(PageBean pageBean) {

        return MyBatisBaseMapUtil.queryPage(monitorPointMapper,pageBean,ENTITY_CLASS);

    }



    @Override

    public void addOrModify(MonitorPoint monitorPoint) {

        try{

            if(monitorPoint.getId()==null){

                monitorPointMapper.insertSelective(monitorPoint);

            }else{

                monitorPointMapper.updateByPrimaryKeySelective(monitorPoint);

            }

        }

        catch (Exception ex){

            throw  ex;

        }

    }



    @Override

    public void deleteByIds(Integer... ids) {

        if(ids!=null&&ids.length>0){

            if(ids.length==1){

                monitorPointMapper.deleteByPrimaryKey(ids[0]);

            }else{

                Example example = new Example(ENTITY_CLASS);

                example.or().andIn("id", Arrays.asList(ids));

                monitorPointMapper.deleteByExample(example);

            }



        }

    }



}


 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -3,6 +3,7 @@
import com.github.pagehelper.PageHelper;

import com.moral.common.bean.PageBean;

import com.moral.common.util.ExampleUtil;

import com.moral.common.util.MyBatisBaseMapUtil;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Organization;

import com.moral.entity.exp.OrganizationExp;

@@ -12,6 +13,7 @@
import com.moral.service.OrganizationService;

import org.springframework.stereotype.Service;

import tk.mybatis.mapper.entity.Example;

import tk.mybatis.mapper.mapperhelper.SqlHelper;



import javax.annotation.Resource;

import java.util.*;

@@ -56,6 +58,7 @@


    public PageBean queryByPageBean(PageBean pageBean){

        Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);

        //me

        List<Example.Criteria> criteriaList = example.getOredCriteria();

        if(criteriaList!=null&&criteriaList.size()>0){

            for(Example.Criteria cri : criteriaList){

@@ -65,8 +68,8 @@
            example.or().andNotEqualTo("isDelete","1");

        }

        PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

        List<OrganizationExp> organizationExpandList = organizationMapper.selectWithAreaNameByExample(example);

        return new PageBean(organizationExpandList);

        List page = organizationMapper.selectWithAreaNameByExample(example);

        return  new PageBean(page);

    }

    public void addOrModify(Organization organization){

        try{