温湿度预警

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinewarrayDao.java

@@ -12,10 +12,10 @@ import java.util.List;
public interface MediicinewarrayDao extends PagingAndSortingRepository<Mediicinewarray, String> {
    //温度报警
    @Query("select a from Mediicinewarray a where a.type='temperature' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    @Query("select a from Mediicinewarray a where a.type like '%温度%' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> gettemperature(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //湿度报警
    @Query("select a from Mediicinewarray a where a.type='humidity' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    @Query("select a from Mediicinewarray a where a.type like '%湿度%' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> gethumidity(String idDevice,String equClass,float networkStatus,float humiditybeg,float humidityend,String codename,Date beg , Date end);
    //离线报警
    @Query("select a from Mediicinewarray a where a.type='offline' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineWarrayEndpoint.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineWarrayService;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -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));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -91,7 +91,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        String conditionSql = "";
        conditionSql += " and t.type='temperature'";
        conditionSql += " and t.type like '%温度%'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = '" + idDevice + "'";
@@ -184,7 +184,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type='humidity'";
        conditionSql += " and t.type like '%湿度%'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = '" + idDevice + "'";