报表展示 增加行业筛选

xufenglei

2018-05-14 c0d88c1f82394c0374d2d592f4d2bca951d6334e

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

@@ -10,12 +10,14 @@
import com.moral.common.bean.Constants;

import com.moral.common.bean.PageBean;

import com.moral.common.bean.PageResult;

import com.moral.common.exception.BusinessException;

import com.moral.common.util.ExampleUtil;

import com.moral.common.util.RedisUtils;

import com.moral.mapper.MonitorPointMapper;

import org.apache.commons.collections.MapUtils;

import org.apache.commons.lang3.BooleanUtils;

import org.apache.commons.lang3.StringUtils;

import org.apache.log4j.Logger;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.ObjectUtils;

@@ -30,6 +32,7 @@


@Service

public class DeviceServiceImpl implements DeviceService {

   Logger log = Logger.getLogger(DeviceServiceImpl.class);

   //-----------------------redis key前缀-开始---------------------------------

   private static String AlARM = "alarm";//警报阀值储存key前缀

   private static String ADJUST="adjust";//校准值存储key前缀

@@ -101,6 +104,8 @@
         device.setId(queryDevice.getId());

         deviceMapper.updateByPrimaryKeySelective(device);

      }

      //刷新redis里的信息

      refreshDeviceInRedis(device);

   }



   @Override

@@ -108,21 +113,43 @@
      ValidateUtil.notNull(uid, "param.is.null");

      Device device = new Device();

      device.setOperateUserId(uid);

      PageHelper.startPage(pageIndex, pageSize);

      PageHelper.startPage(pageIndex, pageSize,false);

      List<Device> devices = deviceMapper.select(device);

      return devices;

   }



   /**

    *

    * @param mac

    * @param fromCache

    * @return 包含组织数组

    */

    @Override

    public  Device getDeviceByMac (String mac ,boolean fromCache){

       if(fromCache){

            Device device = getDeviceFromRedis(mac);

            if(device==null) {

                device = deviceMapper.selectWithOrgIdsByMac(mac);

                if(device!=null){

                    setDeviceToRedis(mac,device);

                }

            }

            return  device;

        }else {

            return  deviceMapper.selectWithOrgIdsByMac(mac);

        }



    }



    /**

     * 默认会从缓存取

     * @param mac

     * @return

     */

   @Override

   public Device getDeviceByMac(String mac) {

      Device device = getDeviceFromRedis(mac);

      if(device==null) {

         device = deviceMapper.selectWithOrgIdsByMac(mac);

         if(device!=null){

            setDeviceToRedis(mac,device);

         }

      }

      return device;



      return getDeviceByMac(mac,true);

   }

   /*

    * 获取报警阀值在redis里的key

@@ -251,25 +278,34 @@
    */

   private void refreshDeviceInRedis(Device device){

        if(!StringUtils.isBlank(device.getMac())){

             Device simpleDevice = new Device();

          simpleDevice.setId(device.getId());// id

          simpleDevice.setName(device.getName());// name

          simpleDevice.setAddress(device.getAddress());// address

          simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version

          simpleDevice.setMac(device.getMac()); // mac

          simpleDevice.setMonitorPointId(device.getMonitorPointId());// 监控地id

          simpleDevice.setOrganizationIds(device.getOrganizationIds());// 组织数组

//             Device simpleDevice = new Device();

//          simpleDevice.setId(device.getId());// id

//          simpleDevice.setName(device.getName());// name

//          simpleDevice.setAddress(device.getAddress());// address

//          simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version

//          simpleDevice.setMac(device.getMac()); // mac

//          simpleDevice.setMonitorPointId(device.getMonitorPointId());// 监控地id

//          simpleDevice.setOrganizationIds(device.getOrganizationIds());// 组织数组

             if(device.getMonitorPointId()!=null){

                 List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());

                 simpleDevice.setOrganizationIds(orgIds);

             device.setOrganizationIds(orgIds);

             }

             String key = "device_"+device.getMac();

             redisUtils.set(key,simpleDevice);

             redisUtils.set(key,device);

         }

   }

   @Override

   public PageBean queryByPageBean(PageBean pageBean) {

   public int countByExample(PageBean pageBean){

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

      addDeletesToExample(example);

        return deviceMapper.selectCountByExample(example);

   }



   /**

    * 增加删除条件过滤

    * @param example

    */

   private void addDeletesToExample(Example example){

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

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

         for(Example.Criteria cri : criteriaList){

@@ -278,6 +314,11 @@
      }else {

         example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

      }

   }

   @Override

   public PageBean queryByPageBean(PageBean pageBean) {

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

      addDeletesToExample(example);

      if(pageBean.getPageSize()>0){

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

      }

@@ -306,7 +347,7 @@
   public void addOrModify(Device device){

      try{

         //mac 转小写

         if(StringUtils.isBlank(device.getMac())){

         if(!StringUtils.isBlank(device.getMac())){

            device.setMac(device.getMac().toLowerCase());

         }

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

@@ -315,15 +356,22 @@
            deviceMapper.insertSelective(device);

         }else{

            deviceMapper.updateByPrimaryKeySelective(device);

            //刷新redis里设备信息

            refreshDeviceInRedis(device);

         }

         //刷新redis里设备信息

         refreshDeviceInRedis(device);

      }

      catch (Exception ex){

         throw  ex;

      }

   }



   @Override

   public List<Map> countByTimes(Date start,Date end,String format){

      if(start==null||end==null||StringUtils.isBlank(format)){

         log.error("some  params is null");

         throw new BusinessException("some  params is null");

      }

      return  deviceMapper.countByTimes(start, end, format);

   }

   @Override

   public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {

      Device device = new Device();

@@ -364,4 +412,16 @@
      }).collect(Collectors.toList());

      return list;

   }



   @Override

   public Device queryById(Integer id) {

      return deviceMapper.selectByPrimaryKey(id);

   }



   @Override

   public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {

		
      return deviceMapper.getDevicesByProfession(parameters);

   }



}