yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化物联设备sn为模糊查询

This commit is contained in:
1378012178@qq.com 2025-10-27 10:28:10 +08:00
parent bd409ea196
commit 4a8f345968
3 changed files with 117 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
View File

@ -40,8 +40,7 @@ public class WaterMeterController extends JeecgController<WaterMeter, IWaterMete
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Page<WaterMeter> page = new Page<WaterMeter>(pageNo, pageSize); Page<WaterMeter> page = new Page<>(pageNo, pageSize);
QueryWrapper<WaterMeter> queryWrapper = QueryGenerator.initQueryWrapper(waterMeter, req.getParameterMap());
IPage<WaterMeter> pageList = service.findPage(page, waterMeter); IPage<WaterMeter> pageList = service.findPage(page, waterMeter);
return Result.OK(pageList); return Result.OK(pageList);
} }

226
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java
View File

@ -9,12 +9,14 @@ import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@Slf4j @Slf4j
@ -22,126 +24,126 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping("/iot/yiweilian/humidDevice") @RequestMapping("/iot/yiweilian/humidDevice")
public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDeviceService> { public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDeviceService> {
@Autowired @Autowired
private IHumidDeviceService service; private IHumidDeviceService service;
/** /**
* 分页列表查询 * 分页列表查询
* *
* @param humidDevice * @param humidDevice
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param req * @param req
* @return * @return
*/ */
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<HumidDevice>> queryPageList(HumidDevice humidDevice, public Result<IPage<HumidDevice>> queryPageList(HumidDevice humidDevice,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Page<HumidDevice> page = new Page<HumidDevice>(pageNo, pageSize); Page<HumidDevice> page = new Page<>(pageNo, pageSize);
QueryWrapper<HumidDevice> queryWrapper = QueryGenerator.initQueryWrapper(humidDevice, req.getParameterMap()); IPage<HumidDevice> pageList = service.findPage(page, humidDevice);
IPage<HumidDevice> pageList = service.findPage(page, humidDevice); return Result.OK(pageList);
return Result.OK(pageList); }
}
/** /**
* 添加设备 * 添加设备
* *
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@GetMapping(value = "/insertDevice") @GetMapping(value = "/insertDevice")
public Result<String> insertDevice(HumidDevice humidDevice) { public Result<String> insertDevice(HumidDevice humidDevice) {
return service.insertDevice(humidDevice); return service.insertDevice(humidDevice);
} }
/** /**
* 修改设备 * 修改设备
* *
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@GetMapping(value = "/updateDevice") @GetMapping(value = "/updateDevice")
public Result<String> updateDevice(HumidDevice humidDevice) { public Result<String> updateDevice(HumidDevice humidDevice) {
return service.updateDevice(humidDevice); return service.updateDevice(humidDevice);
} }
/** /**
* 删除设备 * 删除设备
* *
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@GetMapping(value = "/deleteDevice") @GetMapping(value = "/deleteDevice")
public Result<String> deleteDevice(HumidDevice humidDevice) { public Result<String> deleteDevice(HumidDevice humidDevice) {
return service.deleteDevice(humidDevice); return service.deleteDevice(humidDevice);
} }
/** /**
* 获取设备配置参数 * 获取设备配置参数
* *
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@GetMapping(value = "/getDeviceParameters") @GetMapping(value = "/getDeviceParameters")
public Result<String> getDeviceParameters(HumidDevice humidDevice) { public Result<String> getDeviceParameters(HumidDevice humidDevice) {
return service.getDeviceParameters(humidDevice); return service.getDeviceParameters(humidDevice);
} }
/** /**
* 抄表 * 抄表
* *
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@GetMapping(value = "/updateDeviceRealTime") @GetMapping(value = "/updateDeviceRealTime")
public Result<String> updateDeviceRealTime(HumidDevice humidDevice) { public Result<String> updateDeviceRealTime(HumidDevice humidDevice) {
String result = service.updateDeviceRealTime(humidDevice); String result = service.updateDeviceRealTime(humidDevice);
if(!result.equals("")){ if (!result.equals("")) {
return Result.error("抄表失败："+result); return Result.error("抄表失败：" + result);
} }
return Result.OK("抄表成功"); return Result.OK("抄表成功");
} }
/** /**
* 操作日志分页列表查询 * 操作日志分页列表查询
* *
* @param humidDevice * @param humidDevice
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param req * @param req
* @return * @return
*/ */
@GetMapping(value = "/logList") @GetMapping(value = "/logList")
public Result<IPage<HumidDevice>> queryLogPageList(HumidDevice humidDevice, public Result<IPage<HumidDevice>> queryLogPageList(HumidDevice humidDevice,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Page<HumidDevice> page = new Page<HumidDevice>(pageNo, pageSize); Page<HumidDevice> page = new Page<HumidDevice>(pageNo, pageSize);
IPage<HumidDevice> pageList = service.findLogPage(page, humidDevice); IPage<HumidDevice> pageList = service.findLogPage(page, humidDevice);
return Result.OK(pageList); return Result.OK(pageList);
} }
@AutoLog(value = "修改温湿度表信息")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @AutoLog(value = "修改温湿度表信息")
public Result<String> edit(@RequestBody HumidDevice humidDevice) { @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
service.updateById(humidDevice); public Result<String> edit(@RequestBody HumidDevice humidDevice) {
return Result.OK("编辑成功!"); service.updateById(humidDevice);
} return Result.OK("编辑成功!");
}
@AutoLog(value = "修改温湿度表的机构及护理单元信息") @AutoLog(value = "修改温湿度表的机构及护理单元信息")
@RequestMapping(value = "/editHldy", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/editHldy", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> editHldy(@RequestBody HumidDevice humidDevice) { public Result<String> editHldy(@RequestBody HumidDevice humidDevice) {
service.editHldy(humidDevice); service.editHldy(humidDevice);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@AutoLog(value = "设备报修") @AutoLog(value = "设备报修")
@ApiOperation(value="设备报修", notes="设备报修") @ApiOperation(value = "设备报修", notes = "设备报修")
@RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> baoxiu(@RequestBody HumidDevice humidDevice) { public Result<String> baoxiu(@RequestBody HumidDevice humidDevice) {
service.baoxiu(humidDevice); service.baoxiu(humidDevice);
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
} }

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
View File

@ -40,7 +40,7 @@
left join nu_base_info b on a.nu_id = b.nu_id left join nu_base_info b on a.nu_id = b.nu_id
<where> <where>
<if test="params.sn != null and params.sn != ''"> <if test="params.sn != null and params.sn != ''">
AND a.sn = #{params.sn} AND a.sn LIKE CONCAT('%', #{params.sn}, '%')
</if> </if>
<if test="params.nuId != null and params.nuId != ''"> <if test="params.nuId != null and params.nuId != ''">
AND a.nu_id = #{params.nuId} AND a.nu_id = #{params.nuId}