screencontroller rtm-layout utf-8 更新

fengxiang

2018-06-23 19cfd37456d6bf42fcb90207b481637f56aedb6d

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

@@ -32,7 +32,7 @@


@Service

public class DeviceServiceImpl implements DeviceService {

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

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

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

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

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

@@ -203,7 +203,25 @@
      if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){

         PageHelper.startPage(pageNo,pageSize);

      }

      List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);

      String state = null;

      switch (deviceName){

         case "正常":

            state = "0";

            deviceName = null;break;

            case "轻度":

            state = "1";

            deviceName = null;break;

         case "中度":

            state = "2";

            deviceName = null;break;

         case "重度":

            state = "3";

            deviceName = null;break;

         case "维保":

            state = "4";

            deviceName = null;break;

      }

      List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,state,deviceName);

      //从redis里取状态

      loadDeviceState(list);

      if(list instanceof Page){

@@ -358,18 +376,27 @@
   }



   @Override

   @Transactional

   public void addOrModify(Device device){

      try{

         //mac 转小写

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

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

         }

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

            device.setState(Constants.DEVICE_STATE_OFFLINE);

            device.setIsDelete(Constants.IS_DELETE_FALSE);

            deviceMapper.insertSelective(device);

         }else{

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

            deviceMapper.updateByPrimaryKeySelective(device);

         }else{

            Device deviceQuery = new Device();

            deviceQuery.setMac(device.getMac());

            Device deviceResult = deviceMapper.selectOne(deviceQuery);

            if(deviceResult !=null){

               device.setId(deviceResult.getId());

               deviceMapper.updateByPrimaryKeySelective(device);

            }else {

               device.setState(Constants.DEVICE_STATE_OFFLINE);

               device.setIsDelete(Constants.IS_DELETE_FALSE);

               deviceMapper.insertSelective(device);

            }

         }

         //刷新redis里设备信息

         refreshDeviceInRedis(device.getMac());