From a7a3868364ede2922f424035a85dfc555db542c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Mar 2026 18:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mapper/xml/DeviceConfigMapper.xml | 5 - .../config/service/IDeviceInfoService.java | 13 - .../service/impl/DeviceConfigServiceImpl.java | 20 -- .../controller/DeviceConfigController.java | 23 +- .../config/entity/DeviceConfig.java | 2 +- .../config/mapper/DeviceConfigMapper.java | 8 +- .../config/mapper/xml/DeviceConfigMapper.xml | 21 ++ .../config/service/IDeviceConfigService.java | 16 + .../service/impl/DeviceConfigServiceImpl.java | 25 ++ .../controller/DeviceManagerController.java | 310 ++++++++++++++++++ .../manager/entity/DeviceIntegration.java | 23 ++ .../device/manager/entity/DeviceManager.java | 23 ++ .../device/manager/entity/DevicePreview.java | 30 ++ .../manager/mapper/DeviceManagerMapper.java | 33 ++ .../mapper/xml/DeviceManagerMapper.xml | 218 ++++++++++++ .../service/IDeviceManagerService.java | 33 ++ .../impl/DeviceManagerServiceImpl.java | 95 ++++++ 17 files changed, 844 insertions(+), 54 deletions(-) delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/xml/DeviceConfigMapper.xml delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/IDeviceInfoService.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/impl/DeviceConfigServiceImpl.java rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{ => device}/config/controller/DeviceConfigController.java (89%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{ => device}/config/entity/DeviceConfig.java (94%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{ => device}/config/mapper/DeviceConfigMapper.java (55%) create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/xml/DeviceConfigMapper.xml create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/IDeviceConfigService.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/impl/DeviceConfigServiceImpl.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceManager.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DevicePreview.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/xml/DeviceConfigMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/xml/DeviceConfigMapper.xml deleted file mode 100644 index de30d4c..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/xml/DeviceConfigMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/IDeviceInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/IDeviceInfoService.java deleted file mode 100644 index 1d7370a..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/IDeviceInfoService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.nu.modules.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.entity.DeviceConfig; - -/** - * @Description: 设备配置 - * @Author: jeecg-boot - * @Date: 2026-03-27 - * @Version: V1.0 - */ -public interface IDeviceInfoService extends IService { -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/impl/DeviceConfigServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/impl/DeviceConfigServiceImpl.java deleted file mode 100644 index 897f93a..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/service/impl/DeviceConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nu.modules.config.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.entity.DeviceConfig; -import com.nu.modules.config.mapper.DeviceConfigMapper; -import com.nu.modules.config.service.IDeviceInfoService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @Description: 设备配置 - * @Author: jeecg-boot - * @Date: 2026-03-27 - * @Version: V1.0 - */ -@Service -@Slf4j -public class DeviceConfigServiceImpl extends ServiceImpl implements IDeviceInfoService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/controller/DeviceConfigController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/controller/DeviceConfigController.java similarity index 89% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/controller/DeviceConfigController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/controller/DeviceConfigController.java index be6b707..bf36909 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/controller/DeviceConfigController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/controller/DeviceConfigController.java @@ -1,19 +1,14 @@ -package com.nu.modules.config.controller; +package com.nu.modules.device.config.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.config.entity.DeviceConfig; -import com.nu.modules.config.service.IDeviceInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.nu.modules.device.config.entity.DeviceConfig; +import com.nu.modules.device.config.service.IDeviceConfigService; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; 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.jeecg.common.system.query.QueryRuleEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -21,8 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; +import java.util.List; /** * @Description: 设备配置 @@ -33,9 +27,9 @@ import java.util.Map; @RestController @RequestMapping("/iot/device/config") @Slf4j -public class DeviceConfigController extends JeecgController { +public class DeviceConfigController extends JeecgController { @Autowired - private IDeviceInfoService service; + private IDeviceConfigService service; /** * 分页列表查询 @@ -56,6 +50,11 @@ public class DeviceConfigController extends JeecgController pageList = service.page(page, queryWrapper); return Result.OK(pageList); } + + @GetMapping(value = "/queryList") + public Result> queryList(DeviceConfig deviceConfig) { + return Result.OK(service.queryList(deviceConfig)); + } /** * 添加 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/entity/DeviceConfig.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/entity/DeviceConfig.java similarity index 94% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/entity/DeviceConfig.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/entity/DeviceConfig.java index cbc4db3..91684ad 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/entity/DeviceConfig.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/entity/DeviceConfig.java @@ -1,4 +1,4 @@ -package com.nu.modules.config.entity; +package com.nu.modules.device.config.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/DeviceConfigMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/DeviceConfigMapper.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/DeviceConfigMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/DeviceConfigMapper.java index 8f27d9d..90246a8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/config/mapper/DeviceConfigMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/DeviceConfigMapper.java @@ -1,7 +1,9 @@ -package com.nu.modules.config.mapper; +package com.nu.modules.device.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.entity.DeviceConfig; +import com.nu.modules.device.config.entity.DeviceConfig; + +import java.util.List; /** * @Description: 设备配置 @@ -10,5 +12,5 @@ import com.nu.modules.config.entity.DeviceConfig; * @Version: V1.0 */ public interface DeviceConfigMapper extends BaseMapper { - + List queryList(DeviceConfig deviceConfig); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/xml/DeviceConfigMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/xml/DeviceConfigMapper.xml new file mode 100644 index 0000000..5ed8317 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/mapper/xml/DeviceConfigMapper.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/IDeviceConfigService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/IDeviceConfigService.java new file mode 100644 index 0000000..a1586ae --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/IDeviceConfigService.java @@ -0,0 +1,16 @@ +package com.nu.modules.device.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.device.config.entity.DeviceConfig; + +import java.util.List; + +/** + * @Description: 设备配置 + * @Author: jeecg-boot + * @Date: 2026-03-27 + * @Version: V1.0 + */ +public interface IDeviceConfigService extends IService { + List queryList(DeviceConfig deviceConfig); +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/impl/DeviceConfigServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/impl/DeviceConfigServiceImpl.java new file mode 100644 index 0000000..fc89d35 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/config/service/impl/DeviceConfigServiceImpl.java @@ -0,0 +1,25 @@ +package com.nu.modules.device.config.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.device.config.entity.DeviceConfig; +import com.nu.modules.device.config.mapper.DeviceConfigMapper; +import com.nu.modules.device.config.service.IDeviceConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 设备配置 + * @Author: jeecg-boot + * @Date: 2026-03-27 + * @Version: V1.0 + */ +@Service +@Slf4j +public class DeviceConfigServiceImpl extends ServiceImpl implements IDeviceConfigService { + @Override + public List queryList(DeviceConfig deviceConfig){ + return baseMapper.queryList(deviceConfig); + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java new file mode 100644 index 0000000..df62bd3 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java @@ -0,0 +1,310 @@ +package com.nu.modules.device.manager.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.device.config.entity.DeviceConfig; +import com.nu.modules.device.manager.entity.DeviceIntegration; +import com.nu.modules.device.manager.entity.DeviceManager; +import com.nu.modules.device.manager.entity.DevicePreview; +import com.nu.modules.device.manager.service.IDeviceManagerService; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * @Description: 设备管理 + * @Author: jeecg-boot + * @Date: 2026-03-30 + * @Version: V1.0 + */ +@RestController +@RequestMapping("/iot/device/manager") +@Slf4j +public class DeviceManagerController extends JeecgController { + @Autowired + private IDeviceManagerService service; + + /** + * 分页列表查询 + * + * @param DeviceManager + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/list") + public Result> queryPageList(DeviceManager DeviceManager, + @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, DeviceManager); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param DeviceManager + * @return + */ + @PostMapping(value = "/add") + public Result add(@RequestBody DeviceManager DeviceManager) { + service.save(DeviceManager); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param DeviceManager + * @return + */ + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DeviceManager DeviceManager) { + service.updateById(DeviceManager); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + service.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.service.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DeviceManager DeviceManager = service.getById(id); + if(DeviceManager==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(DeviceManager); + } + + /** + * 导出excel + * + * @param request + * @param DeviceManager + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DeviceManager DeviceManager) { + return super.exportXls(request, DeviceManager, DeviceManager.class, "物联设备配置"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DeviceManager.class); + } + + /** + * 设备集成-机构设备清单分页列表查询 + * + * @param devicePreview + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/departPreview") + public Result> departPreview(DevicePreview devicePreview, + @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.findDepartPreviewPage(page, devicePreview); + return Result.OK(pageList); + } + + /** + * 设备集成-区域列表查询 + * + * @param devicePreview + * @return + */ + @GetMapping(value = "/nuList") + public Result> nuList(DevicePreview devicePreview) { + return Result.OK(service.queryNuList(devicePreview)); + } + + /** + * 设备集成-区域设备清单分页列表查询 + * + * @param devicePreview + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/nuPreview") + public Result> nuPreview(DevicePreview devicePreview, + @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.findNuPreviewPage(page, devicePreview); + return Result.OK(pageList); + } + + /** + * 增加设备清单 + * + * @param devicePreview + * @return + */ + @RequestMapping(value = "/savePreview", method = RequestMethod.POST) + public Result savePreview(@RequestBody DevicePreview devicePreview) { + service.addPreview(devicePreview); + return Result.OK("添加成功!"); + } + + /** + * 通过id删除 + * + * @param devicePreview + * @return + */ + @RequestMapping(value = "/deletePreview", method = RequestMethod.POST) + public Result deletePreview(@RequestBody DevicePreview devicePreview) { + service.deletePreview(devicePreview); + return Result.OK("删除成功!"); + } + + /** + * 设备集成-监控设备分页列表查询 + * + * @param deviceIntegration + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/cameraList") + public Result> cameraList(DeviceIntegration deviceIntegration, + @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.findCameraPage(page, deviceIntegration); + return Result.OK(pageList); + } + + /** + * 设备集成-网络设备分页列表查询 + * + * @param deviceIntegration + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/networkList") + public Result> networkList(DeviceIntegration deviceIntegration, + @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.findNetworkPage(page, deviceIntegration); + return Result.OK(pageList); + } + + /** + * 设备集成-电表分页列表查询 + * + * @param deviceIntegration + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/electricityList") + public Result> electricityList(DeviceIntegration deviceIntegration, + @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.findElectricityPage(page, deviceIntegration); + return Result.OK(pageList); + } + + /** + * 设备集成-水表分页列表查询 + * + * @param deviceIntegration + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/waterList") + public Result> waterList(DeviceIntegration deviceIntegration, + @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.findWaterPage(page, deviceIntegration); + return Result.OK(pageList); + } + + + /** + * 设备集成-温湿度计分页列表查询 + * + * @param deviceIntegration + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/humidList") + public Result> humidList(DeviceIntegration deviceIntegration, + @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.findHumidPage(page, deviceIntegration); + return Result.OK(pageList); + } + + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java new file mode 100644 index 0000000..c658459 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceIntegration.java @@ -0,0 +1,23 @@ +package com.nu.modules.device.manager.entity; + +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import java.io.Serializable; + +@Data +public class DeviceIntegration implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String departId; + private String dimension; + @Dict(dicCode = "tplink_device_type") + private String deviceType; + private String deviceModel; + private String factory; + //在线状态 + private String deviceStatus; + //设备状态 + private String maintainStatus; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceManager.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceManager.java new file mode 100644 index 0000000..40cacda --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DeviceManager.java @@ -0,0 +1,23 @@ +package com.nu.modules.device.manager.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class DeviceManager implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String orgCode; + private String departName; + private String orgLeader; + private String auditStatus; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date auditTime; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DevicePreview.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DevicePreview.java new file mode 100644 index 0000000..5baec13 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/entity/DevicePreview.java @@ -0,0 +1,30 @@ +package com.nu.modules.device.manager.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; + +import java.io.Serializable; + +@Data +public class DevicePreview implements Serializable { + + private static final long serialVersionUID = 1L; + /**ID*/ + @TableId(type = IdType.AUTO) + @ApiModelProperty(value = "ID") + private Integer id; + private String orgCode; + private String departName; + private String nuId; + private String nuName; + @Dict(dicCode = "tplink_device_type") + private String deviceType; + private String deviceModel; + private String factory; + private String dimension; + private Integer purchaseQuantity; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java new file mode 100644 index 0000000..270a345 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java @@ -0,0 +1,33 @@ +package com.nu.modules.device.manager.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.device.manager.entity.DeviceIntegration; +import com.nu.modules.device.manager.entity.DeviceManager; +import com.nu.modules.device.manager.entity.DevicePreview; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 设备管理-机构信息 + * @Author: jeecg-boot + * @Date: 2026-03-30 + * @Version: V1.0 + */ +public interface DeviceManagerMapper extends BaseMapper { + IPage findPage(Page page, @Param("params") DeviceManager deviceManager); + List queryNuList(DevicePreview devicePreview); + IPage findDepartPreviewPage(Page page, @Param("params") DevicePreview devicePreview); + IPage findNuPreviewPage(Page page, @Param("params") DevicePreview devicePreview); + DevicePreview getPreview(DevicePreview devicePreview); + void addPreview(DevicePreview devicePreview); + void updatePreview(DevicePreview devicePreview); + void deletePreview(DevicePreview devicePreview); + IPage findCameraPage(Page page, @Param("params") DeviceIntegration deviceIntegration); + IPage findNetworkPage(Page page, @Param("params") DeviceIntegration deviceIntegration); + IPage findElectricityPage(Page page, @Param("params") DeviceIntegration deviceIntegration); + IPage findWaterPage(Page page, @Param("params") DeviceIntegration deviceIntegration); + IPage findHumidPage(Page page, @Param("params") DeviceIntegration deviceIntegration); +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml new file mode 100644 index 0000000..2ff5bfe --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + insert into nu_iot_device_preview( + org_code, + nu_id, + device_type, + device_model, + factory, + dimension, + purchase_quantity + ) + values( + #{orgCode}, + #{nuId}, + #{deviceType}, + #{deviceModel}, + #{factory}, + #{dimension}, + #{purchaseQuantity} + ) + + + + update nu_iot_device_preview + set purchase_quantity = #{purchaseQuantity} + where id = #{id} + + + + delete from nu_iot_device_preview where id = #{id} + + + + + + + + + + + + + diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java new file mode 100644 index 0000000..56305b6 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java @@ -0,0 +1,33 @@ +package com.nu.modules.device.manager.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.device.manager.entity.DeviceIntegration; +import com.nu.modules.device.manager.entity.DeviceManager; +import com.nu.modules.device.manager.entity.DevicePreview; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 设备管理-机构信息 + * @Author: jeecg-boot + * @Date: 2026-03-30 + * @Version: V1.0 + */ +public interface IDeviceManagerService extends IService { + IPage findPage(Page page, DeviceManager deviceManager); + List queryNuList(DevicePreview devicePreview); + IPage findDepartPreviewPage(Page page, DevicePreview devicePreview); + IPage findNuPreviewPage(Page page, DevicePreview devicePreview); + void addPreview(DevicePreview devicePreview); + void updatePreview(DevicePreview devicePreview); + void deletePreview(DevicePreview devicePreview); + IPage findCameraPage(Page page, DeviceIntegration deviceIntegration); + IPage findNetworkPage(Page page, DeviceIntegration deviceIntegration); + IPage findElectricityPage(Page page, DeviceIntegration deviceIntegration); + IPage findWaterPage(Page page, DeviceIntegration deviceIntegration); + IPage findHumidPage(Page page, DeviceIntegration deviceIntegration); + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java new file mode 100644 index 0000000..2b92dc5 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java @@ -0,0 +1,95 @@ +package com.nu.modules.device.manager.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.device.manager.entity.DeviceIntegration; +import com.nu.modules.device.manager.entity.DeviceManager; +import com.nu.modules.device.manager.entity.DevicePreview; +import com.nu.modules.device.manager.mapper.DeviceManagerMapper; +import com.nu.modules.device.manager.service.IDeviceManagerService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 设备管理-机构信息 + * @Author: jeecg-boot + * @Date: 2026-03-30 + * @Version: V1.0 + */ +@Service +@Slf4j +public class DeviceManagerServiceImpl extends ServiceImpl implements IDeviceManagerService { + + @Override + public IPage findPage(Page page, DeviceManager deviceManager){ + return baseMapper.findPage(page,deviceManager); + } + + @Override + public List queryNuList(DevicePreview devicePreview){ + return baseMapper.queryNuList(devicePreview); + } + + @Override + public IPage findDepartPreviewPage(Page page, DevicePreview devicePreview){ + return baseMapper.findDepartPreviewPage(page,devicePreview); + } + + @Override + public IPage findNuPreviewPage(Page page, DevicePreview devicePreview){ + return baseMapper.findNuPreviewPage(page,devicePreview); + } + + @Override + public void addPreview(DevicePreview devicePreview){ + DevicePreview entity = baseMapper.getPreview(devicePreview); + if(entity!=null){ + int purchaseQuantity = devicePreview.getPurchaseQuantity()+entity.getPurchaseQuantity(); + DevicePreview vo = new DevicePreview(); + vo.setId(entity.getId()); + vo.setPurchaseQuantity(purchaseQuantity); + baseMapper.updatePreview(vo); + }else{ + baseMapper.addPreview(devicePreview); + } + } + + @Override + public void updatePreview(DevicePreview devicePreview){ + baseMapper.updatePreview(devicePreview); + } + + @Override + public void deletePreview(DevicePreview devicePreview){ + baseMapper.deletePreview(devicePreview); + } + + @Override + public IPage findCameraPage(Page page, DeviceIntegration deviceIntegration){ + return baseMapper.findCameraPage(page,deviceIntegration); + } + + @Override + public IPage findNetworkPage(Page page, DeviceIntegration deviceIntegration){ + return baseMapper.findNetworkPage(page,deviceIntegration); + } + + @Override + public IPage findElectricityPage(Page page, DeviceIntegration deviceIntegration){ + return baseMapper.findElectricityPage(page,deviceIntegration); + } + + @Override + public IPage findWaterPage(Page page, DeviceIntegration deviceIntegration){ + return baseMapper.findWaterPage(page,deviceIntegration); + } + + @Override + public IPage findHumidPage(Page page, DeviceIntegration deviceIntegration){ + return baseMapper.findHumidPage(page,deviceIntegration); + } + +}