Browse Source

更新设备网络状态

chenjiasheng 3 năm trước cách đây
mục cha
commit
2322b085e2

+ 1 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@ -218,6 +218,7 @@ public class BaseRequestMapping {
        public static final String  updateMediicinecabineInventory = "/updateMediicinecabineInventory";
        public static final String selectMediicinecabineInventoryById="/selectMediicinecabineInventoryById";
        public static final String updateMediicinecabineInventoryInfoById = "/updateMediicinecabineInventoryInfoById";
        public static final String uploadDeviceInfo = "/uploadDeviceInfo";
    }
    /**

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

@ -165,4 +165,18 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(jsonObject.getString("response"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.uploadDeviceInfo)
    @ApiOperation(value = "上传设备预警信息")
    public Envelop uploadDeviceInfo(
            @ApiParam(name = "equNum", value = "设备编码", required = true)
            @RequestParam(value = "equNum", required = true) String equNum,
            @ApiParam(name = "temperature", value = "温度", required = false)
            @RequestParam(value = "temperature", required = false) Float temperature,
            @ApiParam(name = "humidity", value = "湿度", required = false)
            @RequestParam(value = "humidity", required = false) Float humidity,
            @ApiParam(name = "type",value = "故障类型",required = false)
            @RequestParam(value = "type",required = false)String type) throws Exception {
        return success(deviceService.uploadDeviceInfo(equNum,temperature,humidity,type));
    }
}

+ 26 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@ -71,6 +71,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
    @Autowired
    private MediicinewarrayDao mediicinewarrayDao;
    @Transactional(rollbackFor = Exception.class)
@ -433,6 +435,30 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    /**
     * 更新设备网络状态
     * @param
     * @param
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Mediicinewarray  uploadDeviceInfo(String equNum, Float temperature,Float humidity,String type){
        Mediicinewarray mediicinewarray = new Mediicinewarray();
        Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(equNum);
        mediicinewarray.setEquNum(mediicinedevice.getEquNum());
        mediicinewarray.setEquName(mediicinedevice.getEquName());
        mediicinewarray.setEquArea(mediicinedevice.getEquArea());
        mediicinewarray.setEquClass(mediicinedevice.getEquClass());
        mediicinewarray.setCommunity(mediicinedevice.getCommunity());
        mediicinewarray.setBelongCommunity(mediicinedevice.getBelongCommunity());
        mediicinewarray.setTemperature(temperature);
        mediicinewarray.setHumidity(humidity);
        mediicinewarray.setEquType(mediicinedevice.getEquType());
        mediicinewarray.setEquInfo(mediicinedevice.getEquInfo());
        mediicinewarray.setLogTime(new Date());
        return mediicinewarrayDao.save(mediicinewarray);
    }
    /**
     * 更新设备销售状态
     * @param deviceId