Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/java/com/moral/controller/DeviceVersionController.java

@@ -2,13 +2,13 @@


import com.moral.common.bean.PageBean;
import com.moral.common.bean.PageResult;
import com.moral.common.bean.ResultBean;
import com.moral.entity.DeviceVersion;
import com.moral.service.DeviceVersionService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.util.List;

@RestController
@RequestMapping("device-version")
@@ -21,4 +21,41 @@
    public PageBean<DeviceVersion> pageList(PageBean pageBean) throws NoSuchMethodException, UnsupportedEncodingException {
        return deviceVersionService.queryByPageBean(pageBean);
    }
    @PostMapping("delete-by-ids")
    public ResultBean deleteByIds(@RequestBody Integer [] ids){
        deviceVersionService.deleteByIds(ids);
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        return resultBean;
    }
    @PostMapping("add-or-modify")
    public ResultBean addOrModify(@RequestBody DeviceVersion deviceVersion){
        deviceVersionService.addOrModify(deviceVersion);
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        return resultBean;
    }
    @GetMapping("get-sensor-ids")
    public List<Integer> getSensorIds(Integer deviceVersionId){
        return deviceVersionService.getSensorIds(deviceVersionId);
    }
    @GetMapping("get-maxverno")
    public ResultBean<Integer> getMaxVersionNo(){
        return new ResultBean<Integer>(deviceVersionService.queryMaxVersionNo());
    }
    @GetMapping("get-byversion")
    public ResultBean<DeviceVersion> getByVersion(Integer version){
        return new ResultBean<DeviceVersion>(deviceVersionService.queryByVersionNo(version));
    }
    @PostMapping("version-sensor-config/{id}")
    public ResultBean versionSensorConfig(@PathVariable("id") Integer deviceVersionId,@RequestBody Integer [] sensorIds){
        ResultBean resultBean = new ResultBean();
        if(deviceVersionId==null){
             resultBean.setCode(ResultBean.NO_PERMISSION);
             resultBean.setMessage("设备型号ID不能为null");
             return resultBean;
        }else{
            deviceVersionService.versionSensorConfig(deviceVersionId,sensorIds);
            resultBean.setCode(ResultBean.SUCCESS);
        }
        return resultBean;
    }
}