From 3e3ded66eef55dfc53673b8360cc9540138f7123 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 20 Dec 2025 10:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FIotVirtualDeviceGroupController.java | 54 +++---- .../FIotVirtualDeviceModuleController.java | 54 +++---- .../FIotVirtualDeviceNetController.java | 54 +++---- .../SurvDeviceOprationController.java | 52 +++--- .../controller/SurvIotProtocolController.java | 54 +++---- .../SurvIotVirtualDeviceController.java | 54 +++---- ...per.java => SurvDeviceOprationMapper.java} | 4 +- ...Mapper.java => SurvIotProtocolMapper.java} | 4 +- ...a => SurvIotVirtualDeviceGroupMapper.java} | 4 +- ...r.java => SurvIotVirtualDeviceMapper.java} | 6 +- ... => SurvIotVirtualDeviceModuleMapper.java} | 4 +- ...ava => SurvIotVirtualDeviceNetMapper.java} | 4 +- ...apper.xml => SurvDeviceOprationMapper.xml} | 2 +- ...olMapper.xml => SurvIotProtocolMapper.xml} | 2 +- ...ml => SurvIotVirtualDeviceGroupMapper.xml} | 3 +- ...per.xml => SurvIotVirtualDeviceMapper.xml} | 6 +- ...l => SurvIotVirtualDeviceModuleMapper.xml} | 4 +- ....xml => SurvIotVirtualDeviceNetMapper.xml} | 3 +- ...e.java => ISurvDeviceOprationService.java} | 4 +- ...vice.java => ISurvIotProtocolService.java} | 4 +- ...=> ISurvIotVirtualDeviceGroupService.java} | 4 +- ...> ISurvIotVirtualDeviceModuleService.java} | 4 +- ...a => ISurvIotVirtualDeviceNetService.java} | 4 +- ...java => ISurvIotVirtualDeviceService.java} | 16 +- .../impl/FDeviceOprationServiceImpl.java | 73 --------- .../service/impl/FIotProtocolServiceImpl.java | 18 --- .../FIotVirtualDeviceGroupServiceImpl.java | 18 --- .../FIotVirtualDeviceModuleServiceImpl.java | 61 ------- .../impl/FIotVirtualDeviceNetServiceImpl.java | 28 ---- .../impl/SurvDeviceOprationServiceImpl.java | 73 +++++++++ .../impl/SurvIotProtocolServiceImpl.java | 18 +++ .../SurvIotVirtualDeviceGroupServiceImpl.java | 18 +++ ...SurvIotVirtualDeviceModuleServiceImpl.java | 61 +++++++ .../SurvIotVirtualDeviceNetServiceImpl.java | 28 ++++ ...a => SurvIotVirtualDeviceServiceImpl.java} | 149 +++++++++--------- .../jeecg/modules/mqtt/MyMqttCallback.java | 4 +- ...eOpration.java => SurvDeviceOpration.java} | 2 +- ...FIotProtocol.java => SurvIotProtocol.java} | 2 +- ...lDevice.java => SurvIotVirtualDevice.java} | 4 +- ...up.java => SurvIotVirtualDeviceGroup.java} | 2 +- ...e.java => SurvIotVirtualDeviceModule.java} | 2 +- ...eNet.java => SurvIotVirtualDeviceNet.java} | 2 +- 42 files changed, 483 insertions(+), 484 deletions(-) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FDeviceOprationMapper.java => SurvDeviceOprationMapper.java} (60%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FIotProtocolMapper.java => SurvIotProtocolMapper.java} (63%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FIotVirtualDeviceGroupMapper.java => SurvIotVirtualDeviceGroupMapper.java} (58%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FIotVirtualDeviceMapper.java => SurvIotVirtualDeviceMapper.java} (53%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FIotVirtualDeviceModuleMapper.java => SurvIotVirtualDeviceModuleMapper.java} (57%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/{FIotVirtualDeviceNetMapper.java => SurvIotVirtualDeviceNetMapper.java} (59%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FDeviceOprationMapper.xml => SurvDeviceOprationMapper.xml} (62%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FIotProtocolMapper.xml => SurvIotProtocolMapper.xml} (63%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FIotVirtualDeviceNetMapper.xml => SurvIotVirtualDeviceGroupMapper.xml} (60%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FIotVirtualDeviceMapper.xml => SurvIotVirtualDeviceMapper.xml} (91%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FIotVirtualDeviceModuleMapper.xml => SurvIotVirtualDeviceModuleMapper.xml} (94%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/{FIotVirtualDeviceGroupMapper.xml => SurvIotVirtualDeviceNetMapper.xml} (61%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFDeviceOprationService.java => ISurvDeviceOprationService.java} (70%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFIotProtocolService.java => ISurvIotProtocolService.java} (63%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFIotVirtualDeviceGroupService.java => ISurvIotVirtualDeviceGroupService.java} (58%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFIotVirtualDeviceModuleService.java => ISurvIotVirtualDeviceModuleService.java} (58%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFIotVirtualDeviceNetService.java => ISurvIotVirtualDeviceNetService.java} (59%) rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/{IFIotVirtualDeviceService.java => ISurvIotVirtualDeviceService.java} (72%) delete mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FDeviceOprationServiceImpl.java delete mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotProtocolServiceImpl.java delete mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceGroupServiceImpl.java delete mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceModuleServiceImpl.java delete mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceNetServiceImpl.java create mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceOprationServiceImpl.java create mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotProtocolServiceImpl.java create mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceGroupServiceImpl.java create mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceModuleServiceImpl.java create mode 100644 zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceNetServiceImpl.java rename zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/{FIotVirtualDeviceServiceImpl.java => SurvIotVirtualDeviceServiceImpl.java} (83%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FDeviceOpration.java => SurvDeviceOpration.java} (98%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FIotProtocol.java => SurvIotProtocol.java} (98%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FIotVirtualDevice.java => SurvIotVirtualDevice.java} (97%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FIotVirtualDeviceGroup.java => SurvIotVirtualDeviceGroup.java} (97%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FIotVirtualDeviceModule.java => SurvIotVirtualDeviceModule.java} (98%) rename zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/{FIotVirtualDeviceNet.java => SurvIotVirtualDeviceNet.java} (98%) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceGroupController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceGroupController.java index 340610d..9072cd6 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceGroupController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceGroupController.java @@ -13,8 +13,8 @@ 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.util.JwtUtil; -import org.jeecg.common.entity.FIotVirtualDeviceGroup; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceGroupService; +import org.jeecg.common.entity.SurvIotVirtualDeviceGroup; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,22 +35,22 @@ import java.util.Date; @RestController @RequestMapping("/api/iot/fIotVirtualDeviceGroup") @Slf4j -public class FIotVirtualDeviceGroupController extends JeecgController { +public class FIotVirtualDeviceGroupController extends JeecgController { @Autowired - private IFIotVirtualDeviceGroupService fIotVirtualDeviceGroupService; + private ISurvIotVirtualDeviceGroupService fIotVirtualDeviceGroupService; //@AutoLog(value = "虚拟设备模块分组-分页列表查询") @ApiOperation(value="01. 分页查询", notes="") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FIotVirtualDeviceGroup fIotVirtualDeviceGroup, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceGroup, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = fIotVirtualDeviceGroupService.page(page, queryWrapper); + public Result> queryPageList(SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceGroup, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = fIotVirtualDeviceGroupService.page(page, queryWrapper); return Result.OK(pageList); } @@ -60,11 +60,11 @@ public class FIotVirtualDeviceGroupController extends JeecgController add(@RequestBody FIotVirtualDeviceGroup fIotVirtualDeviceGroup, HttpServletRequest request) { + public Result add(@RequestBody SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceGroup.setCreateBy(username); - fIotVirtualDeviceGroup.setCreateTime(new Date()); - fIotVirtualDeviceGroupService.save(fIotVirtualDeviceGroup); + survIotVirtualDeviceGroup.setCreateBy(username); + survIotVirtualDeviceGroup.setCreateTime(new Date()); + fIotVirtualDeviceGroupService.save(survIotVirtualDeviceGroup); return Result.OK("添加成功！"); } @@ -73,13 +73,13 @@ public class FIotVirtualDeviceGroupController extends JeecgController edit(@RequestBody FIotVirtualDeviceGroup fIotVirtualDeviceGroup, HttpServletRequest request) { + public Result edit(@RequestBody SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup, HttpServletRequest request) { //创建、更新时间不能编辑 - fIotVirtualDeviceGroup.setCreateTime(null); - fIotVirtualDeviceGroup.setUpdateTime(null); + survIotVirtualDeviceGroup.setCreateTime(null); + survIotVirtualDeviceGroup.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceGroup.setUpdateBy(username); - fIotVirtualDeviceGroupService.updateById(fIotVirtualDeviceGroup); + survIotVirtualDeviceGroup.setUpdateBy(username); + fIotVirtualDeviceGroupService.updateById(survIotVirtualDeviceGroup); return Result.OK("编辑成功!"); } @@ -114,12 +114,12 @@ public class FIotVirtualDeviceGroupController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - FIotVirtualDeviceGroup fIotVirtualDeviceGroup = fIotVirtualDeviceGroupService.getById(id); - if(fIotVirtualDeviceGroup==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup = fIotVirtualDeviceGroupService.getById(id); + if(survIotVirtualDeviceGroup ==null) { return Result.error("未找到对应数据"); } - return Result.OK(fIotVirtualDeviceGroup); + return Result.OK(survIotVirtualDeviceGroup); } @@ -127,8 +127,8 @@ public class FIotVirtualDeviceGroupController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FIotVirtualDeviceGroup.class); + return super.importExcel(request, response, SurvIotVirtualDeviceGroup.class); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceModuleController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceModuleController.java index a96d59f..19a512a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceModuleController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceModuleController.java @@ -13,8 +13,8 @@ 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.util.JwtUtil; -import org.jeecg.common.entity.FIotVirtualDeviceModule; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceModuleService; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceModuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,22 +35,22 @@ import java.util.Date; @RestController @RequestMapping("/api/iot/fIotVirtualDeviceModule") @Slf4j -public class FIotVirtualDeviceModuleController extends JeecgController { +public class FIotVirtualDeviceModuleController extends JeecgController { @Autowired - private IFIotVirtualDeviceModuleService fIotVirtualDeviceModuleService; + private ISurvIotVirtualDeviceModuleService fIotVirtualDeviceModuleService; //@AutoLog(value = "虚拟设备模组表-分页列表查询") @ApiOperation(value="01. 分页查询", notes="") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FIotVirtualDeviceModule fIotVirtualDeviceModule, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceModule, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = fIotVirtualDeviceModuleService.page(page, queryWrapper); + public Result> queryPageList(SurvIotVirtualDeviceModule survIotVirtualDeviceModule, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceModule, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = fIotVirtualDeviceModuleService.page(page, queryWrapper); return Result.OK(pageList); } @@ -60,11 +60,11 @@ public class FIotVirtualDeviceModuleController extends JeecgController add(@RequestBody FIotVirtualDeviceModule fIotVirtualDeviceModule, HttpServletRequest request) { + public Result add(@RequestBody SurvIotVirtualDeviceModule survIotVirtualDeviceModule, HttpServletRequest request) { String username =JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceModule.setCreateBy(username); - fIotVirtualDeviceModule.setCreateTime(new Date()); - fIotVirtualDeviceModuleService.save(fIotVirtualDeviceModule); + survIotVirtualDeviceModule.setCreateBy(username); + survIotVirtualDeviceModule.setCreateTime(new Date()); + fIotVirtualDeviceModuleService.save(survIotVirtualDeviceModule); return Result.OK("添加成功！"); } @@ -73,13 +73,13 @@ public class FIotVirtualDeviceModuleController extends JeecgController edit(@RequestBody FIotVirtualDeviceModule fIotVirtualDeviceModule, HttpServletRequest request) { + public Result edit(@RequestBody SurvIotVirtualDeviceModule survIotVirtualDeviceModule, HttpServletRequest request) { //创建、更新时间不能编辑 - fIotVirtualDeviceModule.setCreateTime(null); - fIotVirtualDeviceModule.setUpdateTime(null); + survIotVirtualDeviceModule.setCreateTime(null); + survIotVirtualDeviceModule.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceModule.setUpdateBy(username); - fIotVirtualDeviceModuleService.updateById(fIotVirtualDeviceModule); + survIotVirtualDeviceModule.setUpdateBy(username); + fIotVirtualDeviceModuleService.updateById(survIotVirtualDeviceModule); return Result.OK("编辑成功!"); } @@ -114,12 +114,12 @@ public class FIotVirtualDeviceModuleController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - FIotVirtualDeviceModule fIotVirtualDeviceModule = fIotVirtualDeviceModuleService.getById(id); - if(fIotVirtualDeviceModule==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + SurvIotVirtualDeviceModule survIotVirtualDeviceModule = fIotVirtualDeviceModuleService.getById(id); + if(survIotVirtualDeviceModule ==null) { return Result.error("未找到对应数据"); } - return Result.OK(fIotVirtualDeviceModule); + return Result.OK(survIotVirtualDeviceModule); } @@ -127,8 +127,8 @@ public class FIotVirtualDeviceModuleController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FIotVirtualDeviceModule.class); + return super.importExcel(request, response, SurvIotVirtualDeviceModule.class); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceNetController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceNetController.java index e8b889f..df9801a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceNetController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceNetController.java @@ -13,8 +13,8 @@ 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.util.JwtUtil; -import org.jeecg.common.entity.FIotVirtualDeviceNet; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceNetService; +import org.jeecg.common.entity.SurvIotVirtualDeviceNet; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceNetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,22 +35,22 @@ import java.util.Date; @RestController @RequestMapping("/api/iot/fIotVirtualDeviceNet") @Slf4j -public class FIotVirtualDeviceNetController extends JeecgController { +public class FIotVirtualDeviceNetController extends JeecgController { @Autowired - private IFIotVirtualDeviceNetService fIotVirtualDeviceNetService; + private ISurvIotVirtualDeviceNetService fIotVirtualDeviceNetService; //@AutoLog(value = "虚拟设备网络模块-分页列表查询") @ApiOperation(value="01. 分页查询", notes="") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FIotVirtualDeviceNet fIotVirtualDeviceNet, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceNet, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = fIotVirtualDeviceNetService.page(page, queryWrapper); + public Result> queryPageList(SurvIotVirtualDeviceNet survIotVirtualDeviceNet, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceNet, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = fIotVirtualDeviceNetService.page(page, queryWrapper); return Result.OK(pageList); } @@ -60,11 +60,11 @@ public class FIotVirtualDeviceNetController extends JeecgController add(@RequestBody FIotVirtualDeviceNet fIotVirtualDeviceNet, HttpServletRequest request) { + public Result add(@RequestBody SurvIotVirtualDeviceNet survIotVirtualDeviceNet, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceNet.setCreateBy(username); - fIotVirtualDeviceNet.setCreateTime(new Date()); - fIotVirtualDeviceNetService.save(fIotVirtualDeviceNet); + survIotVirtualDeviceNet.setCreateBy(username); + survIotVirtualDeviceNet.setCreateTime(new Date()); + fIotVirtualDeviceNetService.save(survIotVirtualDeviceNet); return Result.OK("添加成功！"); } @@ -73,13 +73,13 @@ public class FIotVirtualDeviceNetController extends JeecgController edit(@RequestBody FIotVirtualDeviceNet fIotVirtualDeviceNet, HttpServletRequest request) { + public Result edit(@RequestBody SurvIotVirtualDeviceNet survIotVirtualDeviceNet, HttpServletRequest request) { //创建、更新时间不能编辑 - fIotVirtualDeviceNet.setCreateTime(null); - fIotVirtualDeviceNet.setUpdateTime(null); + survIotVirtualDeviceNet.setCreateTime(null); + survIotVirtualDeviceNet.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDeviceNet.setUpdateBy(username); - fIotVirtualDeviceNetService.updateById(fIotVirtualDeviceNet); + survIotVirtualDeviceNet.setUpdateBy(username); + fIotVirtualDeviceNetService.updateById(survIotVirtualDeviceNet); return Result.OK("编辑成功!"); } @@ -114,12 +114,12 @@ public class FIotVirtualDeviceNetController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - FIotVirtualDeviceNet fIotVirtualDeviceNet = fIotVirtualDeviceNetService.getById(id); - if(fIotVirtualDeviceNet==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + SurvIotVirtualDeviceNet survIotVirtualDeviceNet = fIotVirtualDeviceNetService.getById(id); + if(survIotVirtualDeviceNet ==null) { return Result.error("未找到对应数据"); } - return Result.OK(fIotVirtualDeviceNet); + return Result.OK(survIotVirtualDeviceNet); } @@ -127,8 +127,8 @@ public class FIotVirtualDeviceNetController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FIotVirtualDeviceNet.class); + return super.importExcel(request, response, SurvIotVirtualDeviceNet.class); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceOprationController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceOprationController.java index 4c94c4e..8289a94 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceOprationController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceOprationController.java @@ -11,11 +11,11 @@ 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.entity.FDeviceOpration; +import org.jeecg.common.entity.SurvDeviceOpration; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.modules.appmana.service.IFDeviceOprationService; +import org.jeecg.modules.appmana.service.ISurvDeviceOprationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,24 +38,24 @@ import java.util.Date; @RestController @RequestMapping("/api/farm/fDeviceOpration") @Slf4j -public class SurvDeviceOprationController extends JeecgController { +public class SurvDeviceOprationController extends JeecgController { @Autowired - private IFDeviceOprationService fDeviceOprationService; + private ISurvDeviceOprationService fDeviceOprationService; //@AutoLog(value = "设备操作记录-分页列表查询") @ApiOperation(value = "01. 分页查询", notes = "") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FDeviceOpration fDeviceOpration, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(SurvDeviceOpration survDeviceOpration, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fDeviceOpration, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survDeviceOpration, req.getParameterMap()); DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - if (StringUtils.isNotBlank(fDeviceOpration.getAlertTimes())) { - String[] tims = fDeviceOpration.getAlertTimes().split(","); + if (StringUtils.isNotBlank(survDeviceOpration.getAlertTimes())) { + String[] tims = survDeviceOpration.getAlertTimes().split(","); LocalDateTime bTime = LocalDateTime.of(LocalDate.parse(tims[0], sdf), LocalTime.MIN); LocalDateTime eTime = LocalDateTime.of(LocalDate.parse(tims[1], sdf), LocalTime.MAX).withNano(999999000); queryWrapper.gt("OPERATOR_TIME", bTime); @@ -66,8 +66,8 @@ public class SurvDeviceOprationController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = fDeviceOprationService.page(page, queryWrapper); + Page page = new Page(pageNo, pageSize); + IPage pageList = fDeviceOprationService.page(page, queryWrapper); return Result.OK(pageList); } @@ -77,11 +77,11 @@ public class SurvDeviceOprationController extends JeecgController add(@RequestBody FDeviceOpration fDeviceOpration, HttpServletRequest request) { + public Result add(@RequestBody SurvDeviceOpration survDeviceOpration, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); - fDeviceOpration.setCreateBy(username); - fDeviceOpration.setCreateTime(new Date()); - fDeviceOprationService.save(fDeviceOpration); + survDeviceOpration.setCreateBy(username); + survDeviceOpration.setCreateTime(new Date()); + fDeviceOprationService.save(survDeviceOpration); return Result.OK("添加成功！"); } @@ -90,13 +90,13 @@ public class SurvDeviceOprationController extends JeecgController edit(@RequestBody FDeviceOpration fDeviceOpration, HttpServletRequest request) { + public Result edit(@RequestBody SurvDeviceOpration survDeviceOpration, HttpServletRequest request) { //创建、更新时间不能编辑 - fDeviceOpration.setCreateTime(null); - fDeviceOpration.setUpdateTime(null); + survDeviceOpration.setCreateTime(null); + survDeviceOpration.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fDeviceOpration.setUpdateBy(username); - fDeviceOprationService.updateById(fDeviceOpration); + survDeviceOpration.setUpdateBy(username); + fDeviceOprationService.updateById(survDeviceOpration); return Result.OK("编辑成功!"); } @@ -131,12 +131,12 @@ public class SurvDeviceOprationController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { - FDeviceOpration fDeviceOpration = fDeviceOprationService.getById(id); - if (fDeviceOpration == null) { + public Result queryById(@RequestParam(name = "id", required = true) String id) { + SurvDeviceOpration survDeviceOpration = fDeviceOprationService.getById(id); + if (survDeviceOpration == null) { return Result.error("未找到对应数据"); } - return Result.OK(fDeviceOpration); + return Result.OK(survDeviceOpration); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotProtocolController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotProtocolController.java index 467c32d..2da900d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotProtocolController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotProtocolController.java @@ -13,8 +13,8 @@ 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.util.JwtUtil; -import org.jeecg.common.entity.FIotProtocol; -import org.jeecg.modules.appmana.service.IFIotProtocolService; +import org.jeecg.common.entity.SurvIotProtocol; +import org.jeecg.modules.appmana.service.ISurvIotProtocolService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,22 +35,22 @@ import java.util.Date; @RestController @RequestMapping("/api/iot/fIotProtocol") @Slf4j -public class SurvIotProtocolController extends JeecgController { +public class SurvIotProtocolController extends JeecgController { @Autowired - private IFIotProtocolService fIotProtocolService; + private ISurvIotProtocolService fIotProtocolService; //@AutoLog(value = "物联网设备协议表-分页列表查询") @ApiOperation(value="01. 分页查询", notes="") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FIotProtocol fIotProtocol, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fIotProtocol, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = fIotProtocolService.page(page, queryWrapper); + public Result> queryPageList(SurvIotProtocol survIotProtocol, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survIotProtocol, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = fIotProtocolService.page(page, queryWrapper); return Result.OK(pageList); } @@ -60,11 +60,11 @@ public class SurvIotProtocolController extends JeecgController add(@RequestBody FIotProtocol fIotProtocol, HttpServletRequest request) { + public Result add(@RequestBody SurvIotProtocol survIotProtocol, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); - fIotProtocol.setCreateBy(username); - fIotProtocol.setCreateTime(new Date()); - fIotProtocolService.save(fIotProtocol); + survIotProtocol.setCreateBy(username); + survIotProtocol.setCreateTime(new Date()); + fIotProtocolService.save(survIotProtocol); return Result.OK("添加成功！"); } @@ -73,13 +73,13 @@ public class SurvIotProtocolController extends JeecgController edit(@RequestBody FIotProtocol fIotProtocol, HttpServletRequest request) { + public Result edit(@RequestBody SurvIotProtocol survIotProtocol, HttpServletRequest request) { //创建、更新时间不能编辑 - fIotProtocol.setCreateTime(null); - fIotProtocol.setUpdateTime(null); + survIotProtocol.setCreateTime(null); + survIotProtocol.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fIotProtocol.setUpdateBy(username); - fIotProtocolService.updateById(fIotProtocol); + survIotProtocol.setUpdateBy(username); + fIotProtocolService.updateById(survIotProtocol); return Result.OK("编辑成功!"); } @@ -114,12 +114,12 @@ public class SurvIotProtocolController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - FIotProtocol fIotProtocol = fIotProtocolService.getById(id); - if(fIotProtocol==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + SurvIotProtocol survIotProtocol = fIotProtocolService.getById(id); + if(survIotProtocol ==null) { return Result.error("未找到对应数据"); } - return Result.OK(fIotProtocol); + return Result.OK(survIotProtocol); } @@ -127,8 +127,8 @@ public class SurvIotProtocolController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FIotProtocol.class); + return super.importExcel(request, response, SurvIotProtocol.class); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotVirtualDeviceController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotVirtualDeviceController.java index d4316f9..95d316d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotVirtualDeviceController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotVirtualDeviceController.java @@ -13,8 +13,8 @@ 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.util.JwtUtil; -import org.jeecg.common.entity.FIotVirtualDevice; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceService; +import org.jeecg.common.entity.SurvIotVirtualDevice; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,22 +35,22 @@ import java.util.Date; @RestController @RequestMapping("/api/iot/fIotVirtualDevice") @Slf4j -public class SurvIotVirtualDeviceController extends JeecgController { +public class SurvIotVirtualDeviceController extends JeecgController { @Autowired - private IFIotVirtualDeviceService fIotVirtualDeviceService; + private ISurvIotVirtualDeviceService fIotVirtualDeviceService; //@AutoLog(value = "虚拟设备表-分页列表查询") @ApiOperation(value="01. 分页查询", notes="") @ApiOperationSupport(order = 1) @GetMapping(value = "/list") - public Result> queryPageList(FIotVirtualDevice fIotVirtualDevice, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDevice, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = fIotVirtualDeviceService.page(page, queryWrapper); + public Result> queryPageList(SurvIotVirtualDevice survIotVirtualDevice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDevice, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = fIotVirtualDeviceService.page(page, queryWrapper); return Result.OK(pageList); } @@ -60,11 +60,11 @@ public class SurvIotVirtualDeviceController extends JeecgController add(@RequestBody FIotVirtualDevice fIotVirtualDevice, HttpServletRequest request) { + public Result add(@RequestBody SurvIotVirtualDevice survIotVirtualDevice, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDevice.setCreateBy(username); - fIotVirtualDevice.setCreateTime(new Date()); - fIotVirtualDeviceService.save(fIotVirtualDevice); + survIotVirtualDevice.setCreateBy(username); + survIotVirtualDevice.setCreateTime(new Date()); + fIotVirtualDeviceService.save(survIotVirtualDevice); return Result.OK("添加成功！"); } @@ -73,13 +73,13 @@ public class SurvIotVirtualDeviceController extends JeecgController edit(@RequestBody FIotVirtualDevice fIotVirtualDevice, HttpServletRequest request) { + public Result edit(@RequestBody SurvIotVirtualDevice survIotVirtualDevice, HttpServletRequest request) { //创建、更新时间不能编辑 - fIotVirtualDevice.setCreateTime(null); - fIotVirtualDevice.setUpdateTime(null); + survIotVirtualDevice.setCreateTime(null); + survIotVirtualDevice.setUpdateTime(null); String username = JwtUtil.getUserNameByToken(request); - fIotVirtualDevice.setUpdateBy(username); - fIotVirtualDeviceService.updateById(fIotVirtualDevice); + survIotVirtualDevice.setUpdateBy(username); + fIotVirtualDeviceService.updateById(survIotVirtualDevice); return Result.OK("编辑成功!"); } @@ -114,12 +114,12 @@ public class SurvIotVirtualDeviceController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - FIotVirtualDevice fIotVirtualDevice = fIotVirtualDeviceService.getById(id); - if(fIotVirtualDevice==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + SurvIotVirtualDevice survIotVirtualDevice = fIotVirtualDeviceService.getById(id); + if(survIotVirtualDevice ==null) { return Result.error("未找到对应数据"); } - return Result.OK(fIotVirtualDevice); + return Result.OK(survIotVirtualDevice); } @@ -127,8 +127,8 @@ public class SurvIotVirtualDeviceController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FIotVirtualDevice.class); + return super.importExcel(request, response, SurvIotVirtualDevice.class); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FDeviceOprationMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDeviceOprationMapper.java similarity index 60% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FDeviceOprationMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDeviceOprationMapper.java index f823e97..801d8d0 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FDeviceOprationMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDeviceOprationMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.common.entity.FDeviceOpration; +import org.jeecg.common.entity.SurvDeviceOpration; /** * @Description: 设备操作记录 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FDeviceOpration; * @Date: 2023-11-04 * @Version: V1.0 */ -public interface FDeviceOprationMapper extends BaseMapper { +public interface SurvDeviceOprationMapper extends BaseMapper { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotProtocolMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotProtocolMapper.java similarity index 63% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotProtocolMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotProtocolMapper.java index 188ab56..6f5f09a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotProtocolMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotProtocolMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.common.entity.FIotProtocol; +import org.jeecg.common.entity.SurvIotProtocol; /** * @Description: 物联网设备协议表 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotProtocol; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface FIotProtocolMapper extends BaseMapper { +public interface SurvIotProtocolMapper extends BaseMapper { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceGroupMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceGroupMapper.java similarity index 58% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceGroupMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceGroupMapper.java index 4c12c13..b9e0c5b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceGroupMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceGroupMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.common.entity.FIotVirtualDeviceGroup; +import org.jeecg.common.entity.SurvIotVirtualDeviceGroup; /** * @Description: 虚拟设备模块分组 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceGroup; * @Date: 2025-09-06 * @Version: V1.0 */ -public interface FIotVirtualDeviceGroupMapper extends BaseMapper { +public interface SurvIotVirtualDeviceGroupMapper extends BaseMapper { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceMapper.java similarity index 53% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceMapper.java index 4e0bf6a..cb329a2 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceMapper.java @@ -2,7 +2,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.jeecg.common.entity.FIotVirtualDevice; +import org.jeecg.common.entity.SurvIotVirtualDevice; /** * @Description: 虚拟设备表 @@ -10,7 +10,7 @@ import org.jeecg.common.entity.FIotVirtualDevice; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface FIotVirtualDeviceMapper extends BaseMapper { +public interface SurvIotVirtualDeviceMapper extends BaseMapper { - FIotVirtualDevice getDeviceByCode(@Param("deployCode")String deployCode); + SurvIotVirtualDevice getDeviceByCode(@Param("deployCode")String deployCode); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceModuleMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceModuleMapper.java similarity index 57% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceModuleMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceModuleMapper.java index faae256..fbb5472 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceModuleMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceModuleMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.common.entity.FIotVirtualDeviceModule; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; /** * @Description: 虚拟设备模组表 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceModule; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface FIotVirtualDeviceModuleMapper extends BaseMapper { +public interface SurvIotVirtualDeviceModuleMapper extends BaseMapper { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceNetMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceNetMapper.java similarity index 59% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceNetMapper.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceNetMapper.java index ccc2655..d8e70d7 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceNetMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceNetMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.common.entity.FIotVirtualDeviceNet; +import org.jeecg.common.entity.SurvIotVirtualDeviceNet; /** * @Description: 虚拟设备网络模块 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceNet; * @Date: 2025-09-06 * @Version: V1.0 */ -public interface FIotVirtualDeviceNetMapper extends BaseMapper { +public interface SurvIotVirtualDeviceNetMapper extends BaseMapper { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FDeviceOprationMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceOprationMapper.xml similarity index 62% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FDeviceOprationMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceOprationMapper.xml index cce58c3..8bbb20d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FDeviceOprationMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceOprationMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotProtocolMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotProtocolMapper.xml similarity index 63% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotProtocolMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotProtocolMapper.xml index dc6b640..9ac1b1d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotProtocolMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotProtocolMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceNetMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceGroupMapper.xml similarity index 60% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceNetMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceGroupMapper.xml index 5f072db..b334f9a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceNetMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceGroupMapper.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceMapper.xml similarity index 91% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceMapper.xml index b8a3093..61555d4 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -35,7 +35,7 @@ - + diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceModuleMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceModuleMapper.xml similarity index 94% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceModuleMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceModuleMapper.xml index 03e8830..e3b0c5b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceModuleMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceModuleMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceGroupMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceNetMapper.xml similarity index 61% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceGroupMapper.xml rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceNetMapper.xml index 2f0174e..9892ae5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceGroupMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceNetMapper.xml @@ -1,6 +1,5 @@ - - + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFDeviceOprationService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvDeviceOprationService.java similarity index 70% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFDeviceOprationService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvDeviceOprationService.java index 527bd30..cc0654f 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFDeviceOprationService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvDeviceOprationService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FDeviceOpration; +import org.jeecg.common.entity.SurvDeviceOpration; import org.jeecg.common.iot.common.DeviceLogVo; /** @@ -10,7 +10,7 @@ import org.jeecg.common.iot.common.DeviceLogVo; * @Date: 2023-11-04 * @Version: V1.0 */ -public interface IFDeviceOprationService extends IService { +public interface ISurvDeviceOprationService extends IService { boolean saveDeviceOpration(DeviceLogVo deviceLogVo); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotProtocolService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotProtocolService.java similarity index 63% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotProtocolService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotProtocolService.java index 802ab1b..9315658 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotProtocolService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotProtocolService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FIotProtocol; +import org.jeecg.common.entity.SurvIotProtocol; /** * @Description: 物联网设备协议表 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotProtocol; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface IFIotProtocolService extends IService { +public interface ISurvIotProtocolService extends IService { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceGroupService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceGroupService.java similarity index 58% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceGroupService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceGroupService.java index eb86197..9dcd5a6 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceGroupService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceGroupService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FIotVirtualDeviceGroup; +import org.jeecg.common.entity.SurvIotVirtualDeviceGroup; /** * @Description: 虚拟设备模块分组 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceGroup; * @Date: 2025-09-06 * @Version: V1.0 */ -public interface IFIotVirtualDeviceGroupService extends IService { +public interface ISurvIotVirtualDeviceGroupService extends IService { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceModuleService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceModuleService.java similarity index 58% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceModuleService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceModuleService.java index f7585c9..b728f10 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceModuleService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceModuleService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FIotVirtualDeviceModule; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; /** * @Description: 虚拟设备模组表 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceModule; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface IFIotVirtualDeviceModuleService extends IService { +public interface ISurvIotVirtualDeviceModuleService extends IService { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceNetService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceNetService.java similarity index 59% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceNetService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceNetService.java index d059d20..cb9a485 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceNetService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceNetService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FIotVirtualDeviceNet; +import org.jeecg.common.entity.SurvIotVirtualDeviceNet; /** * @Description: 虚拟设备网络模块 @@ -9,6 +9,6 @@ import org.jeecg.common.entity.FIotVirtualDeviceNet; * @Date: 2025-09-06 * @Version: V1.0 */ -public interface IFIotVirtualDeviceNetService extends IService { +public interface ISurvIotVirtualDeviceNetService extends IService { } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceService.java similarity index 72% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceService.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceService.java index 650bd58..3357d2b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceService.java @@ -2,8 +2,8 @@ package org.jeecg.modules.appmana.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.entity.FIotVirtualDevice; -import org.jeecg.common.entity.FIotVirtualDeviceModule; +import org.jeecg.common.entity.SurvIotVirtualDevice; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; import org.jeecg.common.entity.SurvDeviceDeploy; import org.jeecg.common.iot.Fertilizer.VOFertilizerStats; import org.jeecg.common.iot.up.DeviceActionVo; @@ -19,9 +19,9 @@ import java.util.List; * @Date: 2025-05-15 * @Version: V1.0 */ -public interface IFIotVirtualDeviceService extends IService { +public interface ISurvIotVirtualDeviceService extends IService { - FIotVirtualDevice getDeviceByCode(String deployCode); + SurvIotVirtualDevice getDeviceByCode(String deployCode); VOFertilizerStats getDeviceStats(SurvDeviceDeploy deploy); @@ -36,14 +36,14 @@ public interface IFIotVirtualDeviceService extends IService { /** * 单查寄存器 */ - boolean sendSingleQuery(SurvDeviceDeploy deploy, FIotVirtualDeviceModule module); + boolean sendSingleQuery(SurvDeviceDeploy deploy, SurvIotVirtualDeviceModule module); /** * 多查寄存器 */ - boolean sendMutiQuery(SurvDeviceDeploy deploy, List modules); + boolean sendMutiQuery(SurvDeviceDeploy deploy, List modules); - FIotVirtualDevice getDeviceByIotCode(String deployCode); + SurvIotVirtualDevice getDeviceByIotCode(String deployCode); /** * 处理内部mqtt服务中，设备行为 @@ -54,7 +54,7 @@ public interface IFIotVirtualDeviceService extends IService { ModuleStatusResultVo getDeviceCache(String deployCode); - void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List devices); + void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List devices); /** * 厂家对接mqtt处理 * @param topic diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FDeviceOprationServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FDeviceOprationServiceImpl.java deleted file mode 100644 index c9b196d..0000000 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FDeviceOprationServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.jeecg.modules.appmana.service.impl; - -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.entity.FDeviceOpration; -import org.jeecg.common.entity.SurvDeviceDeploy; -import org.jeecg.common.iot.common.DeviceLogVo; -import org.jeecg.common.iot.common.LoginUser2; -import org.jeecg.common.iot.vo.VOCmdPack; -import org.jeecg.common.util.IpUtils; -import org.jeecg.modules.appmana.mapper.FDeviceOprationMapper; -import org.jeecg.modules.appmana.service.IFDeviceOprationService; -import org.jeecg.modules.appmana.utils.HttpServletRequestUtil; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; - -/** - * @Description: 设备操作记录 - * @Author: jeecg-boot - * @Date: 2023-11-04 - * @Version: V1.0 - */ -@Service -public class FDeviceOprationServiceImpl extends ServiceImpl implements IFDeviceOprationService { - - - @Override - public boolean saveDeviceOpration(DeviceLogVo deviceLogVo) { - if (deviceLogVo != null) { - - - LocalDateTime now = LocalDateTime.now(); - SurvDeviceDeploy deploy = deviceLogVo.getDeploy(); - LoginUser2 loginUser = deviceLogVo.getLoginUser(); - if (deploy != null && loginUser != null) { - FDeviceOpration fDeviceOpration = new FDeviceOpration(); - fDeviceOpration.setTenantId(deploy.getTenantId()); - fDeviceOpration.setOperatorUserId(loginUser.getId()); - fDeviceOpration.setOperatorUserName(loginUser.getRealname()); - fDeviceOpration.setOperatorUserAvatar(loginUser.getAvatar()); - fDeviceOpration.setCreateBy(loginUser.getId()); - - VOCmdPack voCmdPack = new VOCmdPack(); - voCmdPack.setVariableName(deviceLogVo.getVariableName()); - voCmdPack.setVariableValue(deviceLogVo.getVariableValue()); - fDeviceOpration.setDeployId(deploy.getId()); - fDeviceOpration.setOperatorTime(now); - fDeviceOpration.setOperatorContent(JSONUtil.parseObj(voCmdPack)); - - if(deviceLogVo.isProcessRequest()) { - HttpServletRequest request = HttpServletRequestUtil.getRequest(); - String ipAddr = IpUtils.getIpAddr(request); - String header = request.getHeader("user-agent"); - fDeviceOpration.setIp(ipAddr); - fDeviceOpration.setAgent(header); - } - fDeviceOpration.setOperatorDes(deviceLogVo.getOperationDetail()); - fDeviceOpration.setVariableId(deviceLogVo.getVariableName()); - fDeviceOpration.setVariableDes(deviceLogVo.getVariableDes()); - fDeviceOpration.setOprationName(deviceLogVo.getActions()); - fDeviceOpration.setVariableValue(deviceLogVo.getVariableValue()); - fDeviceOpration.setOperationResult(deviceLogVo.isOperationResult() ? 1 : 0); - fDeviceOpration.setCalStatus(deviceLogVo.getCalStatus()); - save(fDeviceOpration); - } - } - return false; - } - - -} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotProtocolServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotProtocolServiceImpl.java deleted file mode 100644 index 3b918c3..0000000 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotProtocolServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.appmana.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.entity.FIotProtocol; -import org.jeecg.modules.appmana.mapper.FIotProtocolMapper; -import org.jeecg.modules.appmana.service.IFIotProtocolService; -import org.springframework.stereotype.Service; - -/** - * @Description: 物联网设备协议表 - * @Author: jeecg-boot - * @Date: 2025-05-15 - * @Version: V1.0 - */ -@Service -public class FIotProtocolServiceImpl extends ServiceImpl implements IFIotProtocolService { - -} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceGroupServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceGroupServiceImpl.java deleted file mode 100644 index 58adc14..0000000 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceGroupServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.appmana.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.entity.FIotVirtualDeviceGroup; -import org.jeecg.modules.appmana.mapper.FIotVirtualDeviceGroupMapper; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceGroupService; -import org.springframework.stereotype.Service; - -/** - * @Description: 虚拟设备模块分组 - * @Author: jeecg-boot - * @Date: 2025-09-06 - * @Version: V1.0 - */ -@Service -public class FIotVirtualDeviceGroupServiceImpl extends ServiceImpl implements IFIotVirtualDeviceGroupService { - -} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceModuleServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceModuleServiceImpl.java deleted file mode 100644 index 71140f9..0000000 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceModuleServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.jeecg.modules.appmana.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.entity.FIotVirtualDevice; -import org.jeecg.common.entity.FIotVirtualDeviceModule; -import org.jeecg.modules.appmana.mapper.FIotVirtualDeviceModuleMapper; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceModuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Description: 虚拟设备模组表 - * @Author: jeecg-boot - * @Date: 2025-05-15 - * @Version: V1.0 - */ -@Service -@Slf4j -public class FIotVirtualDeviceModuleServiceImpl extends ServiceImpl implements IFIotVirtualDeviceModuleService { - @Autowired - @Lazy - private FIotVirtualDeviceServiceImpl deviceService; - - public List getModulesByCode(String deployCode) { - - FIotVirtualDevice device = deviceService.lambdaQuery() - .eq(FIotVirtualDevice::getIotCode,deployCode) - .eq(FIotVirtualDevice::getIsEnable,1) - .orderByDesc(FIotVirtualDevice::getCreateTime) - .last("limit 1") - .one(); - if(device==null){ - log.error("=======无效虚拟设备:{}======",deployCode); - return new ArrayList<>(); - } - List modules = lambdaQuery() - .eq(FIotVirtualDeviceModule::getDeviceId,device.getId()) - .eq(FIotVirtualDeviceModule::getIsEnable,1) - .orderByAsc(FIotVirtualDeviceModule::getSortNo) - .orderByDesc(FIotVirtualDeviceModule::getCreateTime) - .list() - ; - return modules; - } - - public List getModulesByNet(String id) { - List modules = lambdaQuery() - .eq(FIotVirtualDeviceModule::getModuleNetId,id) - .eq(FIotVirtualDeviceModule::getIsEnable,1) - .orderByAsc(FIotVirtualDeviceModule::getSortNo) - .orderByDesc(FIotVirtualDeviceModule::getCreateTime) - .list() - ; - return modules; - } -} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceNetServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceNetServiceImpl.java deleted file mode 100644 index f0311f8..0000000 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceNetServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.jeecg.modules.appmana.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.entity.FIotVirtualDeviceNet; -import org.jeecg.modules.appmana.mapper.FIotVirtualDeviceNetMapper; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceNetService; -import org.springframework.stereotype.Service; - -/** - * @Description: 虚拟设备网络模块 - * @Author: jeecg-boot - * @Date: 2025-09-06 - * @Version: V1.0 - */ -@Service -public class FIotVirtualDeviceNetServiceImpl extends ServiceImpl implements IFIotVirtualDeviceNetService { - - public FIotVirtualDeviceNet matchNetSet(String ident) { - FIotVirtualDeviceNet net = lambdaQuery() - .eq(FIotVirtualDeviceNet::getNetIdentCode, ident) - .eq(FIotVirtualDeviceNet::getIsEnable,1) - .orderByDesc(FIotVirtualDeviceNet::getCreateTime) - .last("limit 1") - .one() - ; - return net; - } -} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceOprationServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceOprationServiceImpl.java new file mode 100644 index 0000000..e0cb9fe --- /dev/null +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceOprationServiceImpl.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.appmana.service.impl; + +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.entity.SurvDeviceOpration; +import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.iot.common.DeviceLogVo; +import org.jeecg.common.iot.common.LoginUser2; +import org.jeecg.common.iot.vo.VOCmdPack; +import org.jeecg.common.util.IpUtils; +import org.jeecg.modules.appmana.mapper.SurvDeviceOprationMapper; +import org.jeecg.modules.appmana.service.ISurvDeviceOprationService; +import org.jeecg.modules.appmana.utils.HttpServletRequestUtil; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; + +/** + * @Description: 设备操作记录 + * @Author: jeecg-boot + * @Date: 2023-11-04 + * @Version: V1.0 + */ +@Service +public class SurvDeviceOprationServiceImpl extends ServiceImpl implements ISurvDeviceOprationService { + + + @Override + public boolean saveDeviceOpration(DeviceLogVo deviceLogVo) { + if (deviceLogVo != null) { + + + LocalDateTime now = LocalDateTime.now(); + SurvDeviceDeploy deploy = deviceLogVo.getDeploy(); + LoginUser2 loginUser = deviceLogVo.getLoginUser(); + if (deploy != null && loginUser != null) { + SurvDeviceOpration survDeviceOpration = new SurvDeviceOpration(); + survDeviceOpration.setTenantId(deploy.getTenantId()); + survDeviceOpration.setOperatorUserId(loginUser.getId()); + survDeviceOpration.setOperatorUserName(loginUser.getRealname()); + survDeviceOpration.setOperatorUserAvatar(loginUser.getAvatar()); + survDeviceOpration.setCreateBy(loginUser.getId()); + + VOCmdPack voCmdPack = new VOCmdPack(); + voCmdPack.setVariableName(deviceLogVo.getVariableName()); + voCmdPack.setVariableValue(deviceLogVo.getVariableValue()); + survDeviceOpration.setDeployId(deploy.getId()); + survDeviceOpration.setOperatorTime(now); + survDeviceOpration.setOperatorContent(JSONUtil.parseObj(voCmdPack)); + + if(deviceLogVo.isProcessRequest()) { + HttpServletRequest request = HttpServletRequestUtil.getRequest(); + String ipAddr = IpUtils.getIpAddr(request); + String header = request.getHeader("user-agent"); + survDeviceOpration.setIp(ipAddr); + survDeviceOpration.setAgent(header); + } + survDeviceOpration.setOperatorDes(deviceLogVo.getOperationDetail()); + survDeviceOpration.setVariableId(deviceLogVo.getVariableName()); + survDeviceOpration.setVariableDes(deviceLogVo.getVariableDes()); + survDeviceOpration.setOprationName(deviceLogVo.getActions()); + survDeviceOpration.setVariableValue(deviceLogVo.getVariableValue()); + survDeviceOpration.setOperationResult(deviceLogVo.isOperationResult() ? 1 : 0); + survDeviceOpration.setCalStatus(deviceLogVo.getCalStatus()); + save(survDeviceOpration); + } + } + return false; + } + + +} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotProtocolServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotProtocolServiceImpl.java new file mode 100644 index 0000000..34d7a7b --- /dev/null +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotProtocolServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.appmana.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.entity.SurvIotProtocol; +import org.jeecg.modules.appmana.mapper.SurvIotProtocolMapper; +import org.jeecg.modules.appmana.service.ISurvIotProtocolService; +import org.springframework.stereotype.Service; + +/** + * @Description: 物联网设备协议表 + * @Author: jeecg-boot + * @Date: 2025-05-15 + * @Version: V1.0 + */ +@Service +public class SurvIotProtocolServiceImpl extends ServiceImpl implements ISurvIotProtocolService { + +} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceGroupServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceGroupServiceImpl.java new file mode 100644 index 0000000..c4b6a65 --- /dev/null +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceGroupServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.appmana.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.entity.SurvIotVirtualDeviceGroup; +import org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceGroupMapper; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceGroupService; +import org.springframework.stereotype.Service; + +/** + * @Description: 虚拟设备模块分组 + * @Author: jeecg-boot + * @Date: 2025-09-06 + * @Version: V1.0 + */ +@Service +public class SurvIotVirtualDeviceGroupServiceImpl extends ServiceImpl implements ISurvIotVirtualDeviceGroupService { + +} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceModuleServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceModuleServiceImpl.java new file mode 100644 index 0000000..5ac75e0 --- /dev/null +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceModuleServiceImpl.java @@ -0,0 +1,61 @@ +package org.jeecg.modules.appmana.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.entity.SurvIotVirtualDevice; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; +import org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceModuleMapper; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceModuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: 虚拟设备模组表 + * @Author: jeecg-boot + * @Date: 2025-05-15 + * @Version: V1.0 + */ +@Service +@Slf4j +public class SurvIotVirtualDeviceModuleServiceImpl extends ServiceImpl implements ISurvIotVirtualDeviceModuleService { + @Autowired + @Lazy + private SurvIotVirtualDeviceServiceImpl deviceService; + + public List getModulesByCode(String deployCode) { + + SurvIotVirtualDevice device = deviceService.lambdaQuery() + .eq(SurvIotVirtualDevice::getIotCode,deployCode) + .eq(SurvIotVirtualDevice::getIsEnable,1) + .orderByDesc(SurvIotVirtualDevice::getCreateTime) + .last("limit 1") + .one(); + if(device==null){ + log.error("=======无效虚拟设备:{}======",deployCode); + return new ArrayList<>(); + } + List modules = lambdaQuery() + .eq(SurvIotVirtualDeviceModule::getDeviceId,device.getId()) + .eq(SurvIotVirtualDeviceModule::getIsEnable,1) + .orderByAsc(SurvIotVirtualDeviceModule::getSortNo) + .orderByDesc(SurvIotVirtualDeviceModule::getCreateTime) + .list() + ; + return modules; + } + + public List getModulesByNet(String id) { + List modules = lambdaQuery() + .eq(SurvIotVirtualDeviceModule::getModuleNetId,id) + .eq(SurvIotVirtualDeviceModule::getIsEnable,1) + .orderByAsc(SurvIotVirtualDeviceModule::getSortNo) + .orderByDesc(SurvIotVirtualDeviceModule::getCreateTime) + .list() + ; + return modules; + } +} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceNetServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceNetServiceImpl.java new file mode 100644 index 0000000..e18f9bb --- /dev/null +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceNetServiceImpl.java @@ -0,0 +1,28 @@ +package org.jeecg.modules.appmana.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.entity.SurvIotVirtualDeviceNet; +import org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceNetMapper; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceNetService; +import org.springframework.stereotype.Service; + +/** + * @Description: 虚拟设备网络模块 + * @Author: jeecg-boot + * @Date: 2025-09-06 + * @Version: V1.0 + */ +@Service +public class SurvIotVirtualDeviceNetServiceImpl extends ServiceImpl implements ISurvIotVirtualDeviceNetService { + + public SurvIotVirtualDeviceNet matchNetSet(String ident) { + SurvIotVirtualDeviceNet net = lambdaQuery() + .eq(SurvIotVirtualDeviceNet::getNetIdentCode, ident) + .eq(SurvIotVirtualDeviceNet::getIsEnable,1) + .orderByDesc(SurvIotVirtualDeviceNet::getCreateTime) + .last("limit 1") + .one() + ; + return net; + } +} diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java similarity index 83% rename from zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceServiceImpl.java rename to zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java index 4d7bd49..dd4a197 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java @@ -15,17 +15,16 @@ import org.jeecg.common.iot.enums.*; import org.jeecg.common.iot.vo.VODeviceCmd; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.TokenUtils; import org.jeecg.common.constant.IotConstants; import org.jeecg.common.entity.SurvDeviceDeploy; import org.jeecg.common.iot.common.DeviceLogVo; import org.jeecg.modules.appmana.mapper.IOTStatisticMapper; -import org.jeecg.modules.appmana.service.IFIotVirtualDeviceService; +import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceService; import org.jeecg.modules.appmana.utils.CommonUtils; -import org.jeecg.common.entity.FIotVirtualDevice; -import org.jeecg.common.entity.FIotVirtualDeviceModule; -import org.jeecg.common.entity.FIotVirtualDeviceNet; -import org.jeecg.modules.appmana.mapper.FIotVirtualDeviceMapper; +import org.jeecg.common.entity.SurvIotVirtualDevice; +import org.jeecg.common.entity.SurvIotVirtualDeviceModule; +import org.jeecg.common.entity.SurvIotVirtualDeviceNet; +import org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceMapper; import org.jeecg.common.iot.up.DeviceActionVo; import org.jeecg.common.iot.up.ModuleStatusDetailVo; import org.jeecg.common.iot.up.ModuleStatusResultVo; @@ -55,12 +54,12 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class FIotVirtualDeviceServiceImpl extends ServiceImpl implements IFIotVirtualDeviceService { +public class SurvIotVirtualDeviceServiceImpl extends ServiceImpl implements ISurvIotVirtualDeviceService { @Autowired - private FIotVirtualDeviceModuleServiceImpl moduleService; + private SurvIotVirtualDeviceModuleServiceImpl moduleService; @Autowired - private FIotVirtualDeviceNetServiceImpl netService; + private SurvIotVirtualDeviceNetServiceImpl netService; @Autowired(required = false) private MqttService mqttCustomerClient; @Autowired @@ -68,7 +67,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl arrList = new ArrayList(); - if(fIotVirtualDevice.getModules()!= null && !fIotVirtualDevice.getModules().isEmpty()){ - for (FIotVirtualDeviceModule module : fIotVirtualDevice.getModules()) { + if(survIotVirtualDevice.getModules()!= null && !survIotVirtualDevice.getModules().isEmpty()){ + for (SurvIotVirtualDeviceModule module : survIotVirtualDevice.getModules()) { VOFertilizerStatsArr voFertilizerStatsArr = new VOFertilizerStatsArr(); voFertilizerStatsArr.setDeployId(deploy.getId()); voFertilizerStatsArr.setEleType(IotConstants.FERTILIZER_DATA); @@ -115,11 +114,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules) { + public boolean sendMutiQuery(SurvDeviceDeploy deploy, List modules) { boolean result = false; Assert.notNull(deploy,"设备未传入"); Assert.isTrue((modules!=null && !modules.isEmpty()),"模组列表未传入"); - Map> moduleMap = modules.stream().collect(Collectors.groupingBy(FIotVirtualDeviceModule::getModuleNetId)); - Comparator nameComparator = Comparator.comparing(FIotVirtualDeviceModule::getRegisterNum); + Map> moduleMap = modules.stream().collect(Collectors.groupingBy(SurvIotVirtualDeviceModule::getModuleNetId)); + Comparator nameComparator = Comparator.comparing(SurvIotVirtualDeviceModule::getRegisterNum); for (String netId : moduleMap.keySet()) { - List list = moduleMap.get(netId); - FIotVirtualDeviceNet net = netService.getById(netId); + List list = moduleMap.get(netId); + SurvIotVirtualDeviceNet net = netService.getById(netId); if(net==null){ log.error("无效的物联网id：{},设备：{}",netId,deploy.getDeployDes()); continue; } //按寄存器类型分组 - Map> regTypeList = list.stream().collect(Collectors.groupingBy(FIotVirtualDeviceModule::getRegisterType)); + Map> regTypeList = list.stream().collect(Collectors.groupingBy(SurvIotVirtualDeviceModule::getRegisterType)); for (Integer keys : regTypeList.keySet()) { - List regs = regTypeList.get(keys); + List regs = regTypeList.get(keys); regs.sort(nameComparator.reversed());//倒叙获取最大的寄存器 Integer maxRegister = regs.get(0).getRegisterNum() +1;//起始寄存器位置 // Integer minRegister = regs.get(regs.size()-1).getRegisterNum();//查询寄存器数量 @@ -191,10 +190,10 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices = lambdaQuery() - .eq(FIotVirtualDevice::getIotCode, deployCode) - .eq(FIotVirtualDevice::getIsEnable,1) + public SurvIotVirtualDevice getDeviceByIotCode(String deployCode){ + List devices = lambdaQuery() + .eq(SurvIotVirtualDevice::getIotCode, deployCode) + .eq(SurvIotVirtualDevice::getIsEnable,1) .list(); if(!devices.isEmpty()){ return devices.get(0); @@ -216,15 +215,15 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices = new ArrayList<>(); + SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode()); + List devices = new ArrayList<>(); if(device!=null){ devices.add(device); } log.warn("============={}====缓存推入蓝海主题：{}=============",deviceAllChache,devices.size()); pubDeviceTopic(deviceAllChache, devices); }else{//无缓存查询 - List modules = moduleService.getModulesByCode(deploy.getDeployCode()); + List modules = moduleService.getModulesByCode(deploy.getDeployCode()); if(!modules.isEmpty()){ sendMutiQuery(deploy,modules); } @@ -234,14 +233,14 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices = new ArrayList<>(); + SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode()); + List devices = new ArrayList<>(); if(device!=null){ devices.add(device); } pubDeviceTopic(deviceSCache, devices); }else {//无缓存查询 - FIotVirtualDeviceModule module = moduleService.getById(deviceActionVo.getModuleId()); + SurvIotVirtualDeviceModule module = moduleService.getById(deviceActionVo.getModuleId()); if (module != null) { sendSingleQuery(deploy, module); } @@ -318,14 +317,14 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules = getModulesByIdent(ident); + List modules = getModulesByIdent(ident); if (!modules.isEmpty()) { ModuleStatusResultVo moduleStatusResultVo = processHexToJson(res, modules); //转发至设备的上下行主题 //模组关联的设备 - List deviceId = modules.stream().map(FIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList()); + List deviceId = modules.stream().map(SurvIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList()); log.warn("转换modbus=========" + JSONUtil.toJsonStr(moduleStatusResultVo)); - List devices = lambdaQuery().in(FIotVirtualDevice::getId, deviceId).list(); + List devices = lambdaQuery().in(SurvIotVirtualDevice::getId, deviceId).list(); //推送蓝海设备主题 pubDeviceTopic(moduleStatusResultVo, devices); //保存缓存 @@ -339,11 +338,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules = getModulesByIdent(ident); + List modules = getModulesByIdent(ident); if (!modules.isEmpty()) { - List deviceId = modules.stream().map(FIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList()); - List devices = lambdaQuery().in(FIotVirtualDevice::getId, deviceId).list(); - List deploys = devices.stream().map(FIotVirtualDevice::getIotId).collect(Collectors.toList()); + List deviceId = modules.stream().map(SurvIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList()); + List devices = lambdaQuery().in(SurvIotVirtualDevice::getId, deviceId).list(); + List deploys = devices.stream().map(SurvIotVirtualDevice::getIotId).collect(Collectors.toList()); deviceDeployService.refreshLastSyncTimeByDeployCode(deploys); } } @@ -358,9 +357,9 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices) { + private void saveDeviceCache(ModuleStatusResultVo inComeStaus, List devices) { if(!devices.isEmpty()){ - for (FIotVirtualDevice device : devices) { + for (SurvIotVirtualDevice device : devices) { String redisKey = IotConstants.mqtt_device_status+device.getIotCode(); //首先检查缓存 @@ -402,11 +401,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl getModulesByIdent(String identCode){ + private List getModulesByIdent(String identCode){ //查询网络模块 - FIotVirtualDeviceNet net = netService.matchNetSet(identCode); + SurvIotVirtualDeviceNet net = netService.matchNetSet(identCode); if (net != null) { - List modules = moduleService.getModulesByNet(net.getId()); + List modules = moduleService.getModulesByNet(net.getId()); if (!modules.isEmpty()) { //模组关联的设备 return modules; @@ -423,10 +422,10 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices) { + public void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List devices) { if(moduleStatusResultVo.getStatus()!=null && !moduleStatusResultVo.getStatus().isEmpty()){ if(!devices.isEmpty()){ - for (FIotVirtualDevice device : devices) { + for (SurvIotVirtualDevice device : devices) { //推送至设别的上行主题 sendModbus(device.getUpperUrl(),null,JSONObject.toJSONString(moduleStatusResultVo)); } @@ -459,13 +458,13 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices = lambdaQuery().nested(wrapper-> - wrapper.isNotNull(FIotVirtualDevice::getUpperUrl) + List devices = lambdaQuery().nested(wrapper-> + wrapper.isNotNull(SurvIotVirtualDevice::getUpperUrl) .or() - .isNotNull(FIotVirtualDevice::getLowerUrl) + .isNotNull(SurvIotVirtualDevice::getLowerUrl) ).list(); if(!devices.isEmpty()){ - for (FIotVirtualDevice device : devices) { + for (SurvIotVirtualDevice device : devices) { if(StringUtils.isNotBlank(device.getUpperUrl())){ topics.add(device.getUpperUrl()); } @@ -475,15 +474,15 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl nets = netService.lambdaQuery() + List nets = netService.lambdaQuery() .nested(wrapper-> - wrapper.isNotNull(FIotVirtualDeviceNet::getNetUpTopic) + wrapper.isNotNull(SurvIotVirtualDeviceNet::getNetUpTopic) .or() - .isNotNull(FIotVirtualDeviceNet::getNetDownTopic) + .isNotNull(SurvIotVirtualDeviceNet::getNetDownTopic) ).list(); ; if(!nets.isEmpty()){ - for (FIotVirtualDeviceNet net : nets) { + for (SurvIotVirtualDeviceNet net : nets) { if(StringUtils.isNotBlank(net.getNetUpTopic())){ topics.add(net.getNetUpTopic()); } @@ -509,8 +508,8 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl devices = new ArrayList<>(); + SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode()); + List devices = new ArrayList<>(); if(device!=null){ devices.add(device); } @@ -526,7 +525,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules){ + public ModuleStatusResultVo processHexToJson(ModbusResponseParser.ModbusResult modbusResult, List modules){ FunctionCode functionCode = FunctionCode.valueOfCode(modbusResult.getFunctionCode()); ModuleStatusResultVo moduleStatusResultVo = null; switch (functionCode){ @@ -545,7 +544,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules){ + public ModuleStatusResultVo BitsToHex(boolean[] bits,List modules){ ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo(); if(bits!=null && bits.length>0){ List detailVos = new ArrayList<>(); @@ -553,7 +552,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl moduleMap = new HashMap<>(); - for (FIotVirtualDeviceModule module : modules) { + for (SurvIotVirtualDeviceModule module : modules) { moduleMap.put(module.getRegisterNum(),module.getId()); } for (int i = 0; i < bits.length; i++) { @@ -577,7 +576,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules){ + public ModuleStatusResultVo ByteToHex(Integer address,Integer bytes,List modules){ ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo(); if(bytes!=null){ List detailVos = new ArrayList<>(); @@ -585,7 +584,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl moduleMap = new HashMap<>(); - for (FIotVirtualDeviceModule module : modules) { + for (SurvIotVirtualDeviceModule module : modules) { moduleMap.put(module.getRegisterNum(),module.getId()); } String modbusId = moduleMap.get(address); @@ -607,7 +606,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules){ + public ModuleStatusResultVo ByteArrToHex(int[] modbusBytes,List modules){ ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo(); if(modbusBytes!=null && modbusBytes.length>0){ List detailVos = new ArrayList<>(); @@ -615,7 +614,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl moduleMap = new HashMap<>(); - for (FIotVirtualDeviceModule module : modules) { + for (SurvIotVirtualDeviceModule module : modules) { moduleMap.put(module.getRegisterNum(),module.getId()); } for (int i = 0; i < modbusBytes.length; i++) { @@ -661,7 +660,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl modules; + private List modules; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceGroup.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceGroup.java similarity index 97% rename from zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceGroup.java rename to zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceGroup.java index 93efbca..d03e896 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceGroup.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceGroup.java @@ -25,7 +25,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="虚拟设备模块分组", description="虚拟设备模块分组") -public class FIotVirtualDeviceGroup implements Serializable { +public class SurvIotVirtualDeviceGroup implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceModule.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java similarity index 98% rename from zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceModule.java rename to zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java index dc7859e..f913a4c 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceModule.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java @@ -26,7 +26,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="虚拟设备模组表", description="虚拟设备模组表") -public class FIotVirtualDeviceModule implements Serializable { +public class SurvIotVirtualDeviceModule implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceNet.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceNet.java similarity index 98% rename from zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceNet.java rename to zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceNet.java index 221b8de..cdf612c 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceNet.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceNet.java @@ -26,7 +26,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="虚拟设备网络模块", description="虚拟设备网络模块") -public class FIotVirtualDeviceNet implements Serializable { +public class SurvIotVirtualDeviceNet implements Serializable { private static final long serialVersionUID = 1L;