bug 修复

xufenglei

2018-11-07 c62507c7e0ce18e9a62f29221fd3799cb58bf431

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

@@ -4,6 +4,7 @@
import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.validation.constraints.NotNull;



import com.alibaba.fastjson.TypeReference;

import com.github.pagehelper.Page;

@@ -13,8 +14,8 @@
import com.moral.common.exception.BusinessException;

import com.moral.common.util.ExampleUtil;

import com.moral.common.util.RedisUtils;

import com.moral.mapper.MonitorPointMapper;

import com.moral.mapper.OrganizationMapper;

import com.moral.entity.DeviceVersion;

import com.moral.mapper.*;

import org.apache.commons.collections.MapUtils;

import org.apache.commons.lang3.BooleanUtils;

import org.apache.commons.lang3.StringUtils;

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

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Device;

import com.moral.mapper.DeviceMapper;

import com.moral.service.AccountService;

import com.moral.service.DeviceService;

import tk.mybatis.mapper.entity.Example;

@@ -58,8 +58,14 @@
    private Class ENTITY_CLASS = Device.class;

    @Resource

   OrganizationMapper orgMapper;

    @Resource

   DeviceVersionMapper deviceVersionMapper;

   @Resource

   RedisUtils redisUtils;

   @Resource

   OrganizationMapper organizationMapper;

   @Resource

   DictionaryDataMapper dictionaryDataMapper;

   @Override

   public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {

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

@@ -133,9 +139,6 @@
            Device device = getDeviceFromRedis(mac);

            if(device==null) {

                device = deviceMapper.selectWithOrgIdsByMac(mac);

                if(device!=null){

                    setDeviceToRedis(mac,device);

                }

            }

            return  device;

        }else {

@@ -160,21 +163,22 @@
   private String getDeviceKey(String mac) {

      return keysConnect(DEVICE,mac);

   }

   /*

    * 将校正值存入redis方法组 开始

    */

   private void setDeviceToRedis(String mac,Device device){

      String key = getDeviceKey(mac);

      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());// 组织数组

      redisUtils.set(key,simpleDevice);

   }

//   /*

//    * 将校正值存入redis方法组 开始

//    */

//   private void setDeviceToRedis(String mac,Device device){

//      String key = getDeviceKey(mac);

//      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());// 组织数组

//      simpleDevice.setDeviceVersion(device.getDeviceVersion());

//      redisUtils.set(key,simpleDevice);

//   }

   private Device getDeviceFromRedis(String mac) {

      String key = getDeviceKey(mac);

      return redisUtils.get(key,Device.class);

@@ -305,20 +309,13 @@


   /**

    * 要在数据库更改后刷新

    * 刷新 redis 设备的信息

    * 刷新 redis 设备的信息,注意此处指删除不做更新。更新由task完成

    * @param mac

    */

   private void refreshDeviceInRedis(String mac){

        if(!StringUtils.isBlank(mac)){

            Device devQuery = new Device();

            devQuery.setMac(mac);

            Device device = deviceMapper.selectOne(devQuery);

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

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

               device.setOrganizationIds(orgIds);

          }

             String key = "device_"+mac;

             redisUtils.set(key,device);

            String key = getDeviceKey(mac);

            redisUtils.remove(key);

         }else

       {

          log.warn("param mac is null in method [refreshDeviceInRedis]");

@@ -346,14 +343,14 @@
      }

   }

   @Override

   public PageBean queryByPageBean(PageBean pageBean) {

   public PageBean    queryByPageBean(PageBean pageBean) {

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

      addDeletesToExample(example);

//      addDeletesToExample(example);

      if(pageBean.getPageSize()>0){

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

      }

      List<Device> organizationList = deviceMapper.selectWithRelationData(example);

      return new PageBean(organizationList);

      List<Device> deviceList = deviceMapper.selectWithRelationData(example);

      return new PageBean(deviceList);

   }



   @Override

@@ -476,4 +473,39 @@
      return deviceMapper.getDevicesByProfession(parameters);

   }



   @Override

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

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

      return deviceMapper.getDevicesByOrganizationId(parameters);

   }

   @Override

    public Map<String,Long> queryDeviceStateSummary(@NotNull Integer orgId){

       Map<String,Object> params = new HashMap<>();

       if(!dictionaryDataMapper.isSupperOrgId(orgId)){

         List<Integer> orgIds = organizationMapper.selectLowerOrgIds(orgId);

         params.put("orgIds",orgIds);

      }

      List<Map<String, Object>> list = deviceMapper.getDeviceStatesByAccount(params);

      Long all = 0L, normal = 0L, abnormal = 0L, stop = 0L;

      for (Map<String, Object> map : list) {

         Long count = (Long) map.get("count");

         all += count;

         switch (Integer.valueOf((String) map.get("state"))) {

            case 0:

               normal = count;

               break;

            case 4:

               stop = count;

               break;

            default:

               abnormal += count;

         }

      }

      Map<String,Long> result = new HashMap<>();

      result.put("all", all);

      result.put("normal", normal);

      result.put("abnormal", abnormal);

      result.put("stop", stop);

      return result;

   }

}