moral.git - Gitblit

			@@ -195,11 +195,15 @@

			// 修改设备状态
			private void judgeDeviceState(String mac,Map<String, Object> dataMap){
			List<String> sensorList = Arrays.asList("a34004","a34002","a21026","a21004","a21005","a05024","a99054");
			Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
			List<Sensor> sensors = device.getVersion().getSensors();
			Expression expression;
			int state = 1;
			for (Sensor sensor : sensors) {
			if(!sensorList.contains(sensor.getCode())){
			continue;
			}
			//因子报警等级
			String alarmLevel = sensor.getAlarmLevel();
			if (StringUtils.isEmpty(alarmLevel)) {

			@@ -293,7 +293,7 @@
			map.put("cel",1);
			}
			}else {
			if (code.equals("a99054")){
			if (code.equals("a99054")&& !value.contains("+")){
			String[] split = value.split("\\*");
			map.put("cel",Double.parseDouble(split[1]));
			}else {

	screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java	4 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history