|  | @ -4,9 +4,11 @@ package com.yihu.jw.base.service.a3service;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | import com.alibaba.fastjson.JSONObject;
 |  | import com.alibaba.fastjson.JSONObject;
 | 
												
													
														
															|  | import com.fasterxml.jackson.databind.ObjectMapper;
 |  | import com.fasterxml.jackson.databind.ObjectMapper;
 | 
												
													
														
															|  | 
 |  | import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
 | 
												
													
														
															|  | import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
 |  | import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
 | 
												
													
														
															|  | import com.yihu.jw.base.dao.a2dao.MediicinewarrayDao;
 |  | import com.yihu.jw.base.dao.a2dao.MediicinewarrayDao;
 | 
												
													
														
															|  | import com.yihu.jw.base.util.JavaBeanUtils;
 |  | import com.yihu.jw.base.util.JavaBeanUtils;
 | 
												
													
														
															|  | 
 |  | import com.yihu.jw.entity.a1entity.Mediicinedevice;
 | 
												
													
														
															|  | import com.yihu.jw.entity.a1entity.Mediicinestore;
 |  | import com.yihu.jw.entity.a1entity.Mediicinestore;
 | 
												
													
														
															|  | import com.yihu.jw.entity.a1entity.Mediicinewarray;
 |  | import com.yihu.jw.entity.a1entity.Mediicinewarray;
 | 
												
													
														
															|  | import com.yihu.jw.util.date.DateUtil;
 |  | import com.yihu.jw.util.date.DateUtil;
 | 
												
											
												
													
														
															|  | @ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
 | 
												
													
														
															|  | import org.springframework.util.StringUtils;
 |  | import org.springframework.util.StringUtils;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | import java.util.Date;
 |  | import java.util.Date;
 | 
												
													
														
															|  | 
 |  | import java.util.HashMap;
 | 
												
													
														
															|  | import java.util.List;
 |  | import java.util.List;
 | 
												
													
														
															|  | import java.util.Map;
 |  | import java.util.Map;
 | 
												
													
														
															|  | import java.util.logging.Logger;
 |  | import java.util.logging.Logger;
 | 
												
											
												
													
														
															|  | @ -31,6 +34,11 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
 | 
												
													
														
															|  |     private MediicinewarrayDao warrayDao;
 |  |     private MediicinewarrayDao warrayDao;
 | 
												
													
														
															|  |     @Autowired
 |  |     @Autowired
 | 
												
													
														
															|  |     private ObjectMapper objectMapper;
 |  |     private ObjectMapper objectMapper;
 | 
												
													
														
															|  | 
 |  |     @Autowired
 | 
												
													
														
															|  | 
 |  |     private MediicineDeviceDao deviceDao;
 | 
												
													
														
															|  | 
 |  |     @Autowired
 | 
												
													
														
															|  | 
 |  |     private MedicinedeviceService medicinedeviceService;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @Autowired
 |  |     @Autowired
 | 
												
											
												
													
														
															|  | @ -721,4 +729,38 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
 | 
												
													
														
															|  |         Date endDate = DateUtil.strToDateShort(end);
 |  |         Date endDate = DateUtil.strToDateShort(end);
 | 
												
													
														
															|  |         return   warrayDao.getexceed( idDevice, equClass, networkStatus, durationebeg, durationend, codename,startDate,endDate);
 |  |         return   warrayDao.getexceed( idDevice, equClass, networkStatus, durationebeg, durationend, codename,startDate,endDate);
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |     public Map<String,Object> warning(String equNum, Float temperature, Float humidity ,String type) {
 | 
												
													
														
															|  | 
 |  |         Map<String,Object> result=new HashMap<>();
 | 
												
													
														
															|  | 
 |  |         Mediicinedevice mediicinedevice=deviceDao.findMediicinedeviceByEquNum(equNum);
 | 
												
													
														
															|  | 
 |  |         type = "";
 | 
												
													
														
															|  | 
 |  |         if (mediicinedevice==null){
 | 
												
													
														
															|  | 
 |  |             return null;
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |         if (!StringUtils.isEmpty(mediicinedevice.getWarningTemperatureHeight())&&!StringUtils.isEmpty(mediicinedevice.getWarningTemperatureLow())){
 | 
												
													
														
															|  | 
 |  |             Float temperatureHeight= Float.parseFloat(mediicinedevice.getWarningTemperatureHeight());
 | 
												
													
														
															|  | 
 |  |             Float temperatureLow = Float.parseFloat(mediicinedevice.getWarningTemperatureLow());
 | 
												
													
														
															|  | 
 |  |             if (mediicinedevice.getTemperaturecontrol().equalsIgnoreCase("1")){
 | 
												
													
														
															|  | 
 |  |                 if(temperature!=null&&(temperature>temperatureHeight||temperature<temperatureLow)){
 | 
												
													
														
															|  | 
 |  |                     type="温度异常";
 | 
												
													
														
															|  | 
 |  |                 }
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |         if (!StringUtils.isEmpty(mediicinedevice.getWaringHumidityHeight())&&!StringUtils.isEmpty(mediicinedevice.getWaringHumidityLow())){
 | 
												
													
														
															|  | 
 |  |             Float humidityHeight = Float.parseFloat(mediicinedevice.getWaringHumidityHeight());
 | 
												
													
														
															|  | 
 |  |             Float humidityLow = Float.parseFloat(mediicinedevice.getWaringHumidityLow());
 | 
												
													
														
															|  | 
 |  |             if (mediicinedevice.getHumiditycontrol().equalsIgnoreCase("1")){
 | 
												
													
														
															|  | 
 |  |                 if (humidity!=null&&(humidity>humidityHeight||humidity<humidityLow)){
 | 
												
													
														
															|  | 
 |  |                     type += "湿度异常";
 | 
												
													
														
															|  | 
 |  |                 }
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |         if (!StringUtils.isEmpty(type)) {
 | 
												
													
														
															|  | 
 |  |             Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
 | 
												
													
														
															|  | 
 |  |             result.put("msg",mediicinewarray);
 | 
												
													
														
															|  | 
 |  |             return result;
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |         result.put("msg",null);
 | 
												
													
														
															|  | 
 |  |         return result;
 | 
												
													
														
															|  | 
 |  |     }
 | 
												
													
														
															|  | }
 |  | }
 |