|
@ -20,6 +20,7 @@ import io.swagger.annotations.Api;
|
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
@ -182,14 +183,17 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
|
|
|
@RequestParam(value = "humidity", required = false) Float humidity,
|
|
|
@ApiParam(name = "type",value = "故障类型",required = false)
|
|
|
@RequestParam(value = "type",required = false)String type) throws Exception {
|
|
|
Map<String,Object> mediicinewarray = warrayService.warning(equNum,temperature,humidity,type);
|
|
|
if (mediicinewarray==null){
|
|
|
return failed("请确认设备编码是否正确");
|
|
|
if (StringUtils.isEmpty(type)){
|
|
|
Map<String,Object> mediicinewarray = warrayService.warning(equNum,temperature,humidity,type);
|
|
|
if (mediicinewarray==null){
|
|
|
return failed("请确认设备编码是否正确");
|
|
|
}
|
|
|
if (mediicinewarray.get("msg")==null){
|
|
|
return success("设备正常");
|
|
|
}
|
|
|
return success(mediicinewarray.get("msg"));
|
|
|
}
|
|
|
if (mediicinewarray.get("msg")==null){
|
|
|
return success("设备正常");
|
|
|
}
|
|
|
return success(mediicinewarray.get("msg"));
|
|
|
return success(deviceService.uploadDeviceInfo(equNum, temperature, humidity, type));
|
|
|
}
|
|
|
|
|
|
}
|