xinzeng

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedevice.java

@@ -193,13 +193,22 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
     */
    private String heat;
    /**
     * 预警温度
     * 预警温度上限
     */
    private String warningTemperature;
    private String warningTemperatureHeight;
    /**
     * 预警湿度
     * 预警湿度上限
     */
    private String waringHumidity;
    private String waringHumidityHeight;
    /**
     * 预警温度下限
     */
    private String warningTemperatureHeight;
    /**
     * 预警湿度下限
     */
    private String waringHumidityHeight;
    public String getHumiditycontrol() {
@@ -226,20 +235,20 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
        this.heat = heat;
    }
    public String getWarningTemperature() {
        return warningTemperature;
    public String getWarningTemperatureHeight() {
        return warningTemperatureHeight;
    }
    public void setWarningTemperature(String warningTemperature) {
        this.warningTemperature = warningTemperature;
    public void setWarningTemperatureHeight(String warningTemperatureHeight) {
        this.warningTemperatureHeight = warningTemperatureHeight;
    }
    public String getWaringHumidity() {
        return waringHumidity;
    public String getWaringHumidityHeight() {
        return waringHumidityHeight;
    }
    public void setWaringHumidity(String waringHumidity) {
        this.waringHumidity = waringHumidity;
    public void setWaringHumidityHeight(String waringHumidityHeight) {
        this.waringHumidityHeight = waringHumidityHeight;
    }
    public Mediicinedevice() {

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

@@ -218,6 +218,22 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    }
//    @PostMapping(value = BaseRequestMapping.BaseDevice.updateTAndH)
//    @ApiOperation(value = "更新设备温度湿度and控制")
//    public Envelop updateSaleStatus(
//            @ApiParam(name = "deviceId", value = "设备Id", required = true)
//            @RequestParam(value = "deviceId", required = true) String deviceId,
//            @ApiParam(name = "saleStatus", value = "设备销售状态", required = true)
//            @RequestParam(value = "saleStatus", required = true) String saleStatus) throws Exception {
//        String str = deviceService.updateDeviceSaleStatus(deviceId, saleStatus);
//        JSONObject jsonObject = JSONObject.parseObject(str);
//        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
//            return failed(jsonObject.getString("msg"));
//        }
//        return success(jsonObject.getString("response"));
//    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.UNBINDDEVICE)
    @ApiOperation(value = "设备解绑")
    public Envelop unbindDevice(