diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java index b804fa06..93b94d34 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java @@ -40,8 +40,7 @@ public class WaterMeterController extends JeecgController page = new Page(pageNo, pageSize); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(waterMeter, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); IPage pageList = service.findPage(page, waterMeter); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java index 6bf11e14..3fe3e8c4 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java @@ -9,12 +9,14 @@ import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletRequest; @Slf4j @@ -22,126 +24,126 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("/iot/yiweilian/humidDevice") public class HumidDeviceController extends JeecgController { - @Autowired - private IHumidDeviceService service; + @Autowired + private IHumidDeviceService service; - /** - * 分页列表查询 - * - * @param humidDevice - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @GetMapping(value = "/list") - public Result> queryPageList(HumidDevice humidDevice, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - Page page = new Page(pageNo, pageSize); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(humidDevice, req.getParameterMap()); - IPage pageList = service.findPage(page, humidDevice); - return Result.OK(pageList); - } + /** + * 分页列表查询 + * + * @param humidDevice + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/list") + public Result> queryPageList(HumidDevice humidDevice, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page<>(pageNo, pageSize); + IPage pageList = service.findPage(page, humidDevice); + return Result.OK(pageList); + } - /** - * 添加设备 - * - * @param humidDevice - * @return - */ - @GetMapping(value = "/insertDevice") - public Result insertDevice(HumidDevice humidDevice) { - return service.insertDevice(humidDevice); - } + /** + * 添加设备 + * + * @param humidDevice + * @return + */ + @GetMapping(value = "/insertDevice") + public Result insertDevice(HumidDevice humidDevice) { + return service.insertDevice(humidDevice); + } - /** - * 修改设备 - * - * @param humidDevice - * @return - */ - @GetMapping(value = "/updateDevice") - public Result updateDevice(HumidDevice humidDevice) { - return service.updateDevice(humidDevice); - } + /** + * 修改设备 + * + * @param humidDevice + * @return + */ + @GetMapping(value = "/updateDevice") + public Result updateDevice(HumidDevice humidDevice) { + return service.updateDevice(humidDevice); + } - /** - * 删除设备 - * - * @param humidDevice - * @return - */ - @GetMapping(value = "/deleteDevice") - public Result deleteDevice(HumidDevice humidDevice) { - return service.deleteDevice(humidDevice); - } + /** + * 删除设备 + * + * @param humidDevice + * @return + */ + @GetMapping(value = "/deleteDevice") + public Result deleteDevice(HumidDevice humidDevice) { + return service.deleteDevice(humidDevice); + } - /** - * 获取设备配置参数 - * - * @param humidDevice - * @return - */ - @GetMapping(value = "/getDeviceParameters") - public Result getDeviceParameters(HumidDevice humidDevice) { - return service.getDeviceParameters(humidDevice); - } + /** + * 获取设备配置参数 + * + * @param humidDevice + * @return + */ + @GetMapping(value = "/getDeviceParameters") + public Result getDeviceParameters(HumidDevice humidDevice) { + return service.getDeviceParameters(humidDevice); + } - /** - * 抄表 - * - * @param humidDevice - * @return - */ - @GetMapping(value = "/updateDeviceRealTime") - public Result updateDeviceRealTime(HumidDevice humidDevice) { - String result = service.updateDeviceRealTime(humidDevice); - if(!result.equals("")){ - return Result.error("抄表失败:"+result); - } - return Result.OK("抄表成功"); - } + /** + * 抄表 + * + * @param humidDevice + * @return + */ + @GetMapping(value = "/updateDeviceRealTime") + public Result updateDeviceRealTime(HumidDevice humidDevice) { + String result = service.updateDeviceRealTime(humidDevice); + if (!result.equals("")) { + return Result.error("抄表失败:" + result); + } + return Result.OK("抄表成功"); + } - /** - * 操作日志分页列表查询 - * - * @param humidDevice - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @GetMapping(value = "/logList") - public Result> queryLogPageList(HumidDevice humidDevice, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - Page page = new Page(pageNo, pageSize); - IPage pageList = service.findLogPage(page, humidDevice); - return Result.OK(pageList); - } - @AutoLog(value = "修改温湿度表信息") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody HumidDevice humidDevice) { - service.updateById(humidDevice); - return Result.OK("编辑成功!"); - } + /** + * 操作日志分页列表查询 + * + * @param humidDevice + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/logList") + public Result> queryLogPageList(HumidDevice humidDevice, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findLogPage(page, humidDevice); + return Result.OK(pageList); + } + + @AutoLog(value = "修改温湿度表信息") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody HumidDevice humidDevice) { + service.updateById(humidDevice); + return Result.OK("编辑成功!"); + } - @AutoLog(value = "修改温湿度表的机构及护理单元信息") - @RequestMapping(value = "/editHldy", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result editHldy(@RequestBody HumidDevice humidDevice) { - service.editHldy(humidDevice); - return Result.OK("编辑成功!"); - } + @AutoLog(value = "修改温湿度表的机构及护理单元信息") + @RequestMapping(value = "/editHldy", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result editHldy(@RequestBody HumidDevice humidDevice) { + service.editHldy(humidDevice); + return Result.OK("编辑成功!"); + } - @AutoLog(value = "设备报修") - @ApiOperation(value="设备报修", notes="设备报修") - @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result baoxiu(@RequestBody HumidDevice humidDevice) { - service.baoxiu(humidDevice); - return Result.OK("操作成功!"); - } + @AutoLog(value = "设备报修") + @ApiOperation(value = "设备报修", notes = "设备报修") + @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result baoxiu(@RequestBody HumidDevice humidDevice) { + service.baoxiu(humidDevice); + return Result.OK("操作成功!"); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml index 79e561be..0a266a95 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml @@ -40,7 +40,7 @@ left join nu_base_info b on a.nu_id = b.nu_id - AND a.sn = #{params.sn} + AND a.sn LIKE CONCAT('%', #{params.sn}, '%') AND a.nu_id = #{params.nuId} @@ -378,4 +378,4 @@ where sn = #{sn} - \ No newline at end of file +