Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

统一类名

This commit is contained in:
zy 2025-12-20 10:08:46 +08:00
parent 0a8d1e6681
commit 3e3ded66ee
42 changed files with 483 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceGroupController.java
View File

@ -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<FIotVirtualDeviceGroup, IFIotVirtualDeviceGroupService> {
public class FIotVirtualDeviceGroupController extends JeecgController<SurvIotVirtualDeviceGroup, ISurvIotVirtualDeviceGroupService> {
@Autowired
private IFIotVirtualDeviceGroupService fIotVirtualDeviceGroupService;
private ISurvIotVirtualDeviceGroupService fIotVirtualDeviceGroupService;
//@AutoLog(value = "虚拟设备模块分组-分页列表查询")
@ApiOperation(value="01. 分页查询", notes="")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FIotVirtualDeviceGroup>> queryPageList(FIotVirtualDeviceGroup fIotVirtualDeviceGroup,
public Result<IPage<SurvIotVirtualDeviceGroup>> queryPageList(SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FIotVirtualDeviceGroup> queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceGroup, req.getParameterMap());
Page<FIotVirtualDeviceGroup> page = new Page<FIotVirtualDeviceGroup>(pageNo, pageSize);
IPage<FIotVirtualDeviceGroup> pageList = fIotVirtualDeviceGroupService.page(page, queryWrapper);
QueryWrapper<SurvIotVirtualDeviceGroup> queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceGroup, req.getParameterMap());
Page<SurvIotVirtualDeviceGroup> page = new Page<SurvIotVirtualDeviceGroup>(pageNo, pageSize);
IPage<SurvIotVirtualDeviceGroup> pageList = fIotVirtualDeviceGroupService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -60,11 +60,11 @@ public class FIotVirtualDeviceGroupController extends JeecgController<FIotVirtua
@ApiOperation(value="02. 添加", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_group:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FIotVirtualDeviceGroup fIotVirtualDeviceGroup, HttpServletRequest request) {
public Result<String> 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<FIotVirtua
@ApiOperation(value="03. 编辑", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_group:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FIotVirtualDeviceGroup fIotVirtualDeviceGroup, HttpServletRequest request) {
public Result<String> 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<FIotVirtua
@ApiOperationSupport(order = 5)
@ApiOperation(value="05. 通过id查询", notes="")
@GetMapping(value = "/queryById")
public Result<FIotVirtualDeviceGroup> queryById(@RequestParam(name="id",required=true) String id) {
FIotVirtualDeviceGroup fIotVirtualDeviceGroup = fIotVirtualDeviceGroupService.getById(id);
if(fIotVirtualDeviceGroup==null) {
public Result<SurvIotVirtualDeviceGroup> 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<FIotVirtua
@ApiOperation(value="06. 导出excel", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_group:exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, FIotVirtualDeviceGroup fIotVirtualDeviceGroup) {
return super.exportXls(request, fIotVirtualDeviceGroup, FIotVirtualDeviceGroup.class, "虚拟设备模块分组");
public ModelAndView exportXls(HttpServletRequest request, SurvIotVirtualDeviceGroup survIotVirtualDeviceGroup) {
return super.exportXls(request, survIotVirtualDeviceGroup, SurvIotVirtualDeviceGroup.class, "虚拟设备模块分组");
}
@ -137,7 +137,7 @@ public class FIotVirtualDeviceGroupController extends JeecgController<FIotVirtua
@RequiresPermissions("iot:f_iot_virtual_device_group:importExcel")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FIotVirtualDeviceGroup.class);
return super.importExcel(request, response, SurvIotVirtualDeviceGroup.class);
}
}

48
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceModuleController.java
View File

@ -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<FIotVirtualDeviceModule, IFIotVirtualDeviceModuleService> {
public class FIotVirtualDeviceModuleController extends JeecgController<SurvIotVirtualDeviceModule, ISurvIotVirtualDeviceModuleService> {
@Autowired
private IFIotVirtualDeviceModuleService fIotVirtualDeviceModuleService;
private ISurvIotVirtualDeviceModuleService fIotVirtualDeviceModuleService;
//@AutoLog(value = "虚拟设备模组表-分页列表查询")
@ApiOperation(value="01. 分页查询", notes="")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FIotVirtualDeviceModule>> queryPageList(FIotVirtualDeviceModule fIotVirtualDeviceModule,
public Result<IPage<SurvIotVirtualDeviceModule>> queryPageList(SurvIotVirtualDeviceModule survIotVirtualDeviceModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FIotVirtualDeviceModule> queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceModule, req.getParameterMap());
Page<FIotVirtualDeviceModule> page = new Page<FIotVirtualDeviceModule>(pageNo, pageSize);
IPage<FIotVirtualDeviceModule> pageList = fIotVirtualDeviceModuleService.page(page, queryWrapper);
QueryWrapper<SurvIotVirtualDeviceModule> queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceModule, req.getParameterMap());
Page<SurvIotVirtualDeviceModule> page = new Page<SurvIotVirtualDeviceModule>(pageNo, pageSize);
IPage<SurvIotVirtualDeviceModule> pageList = fIotVirtualDeviceModuleService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -60,11 +60,11 @@ public class FIotVirtualDeviceModuleController extends JeecgController<FIotVirtu
@ApiOperation(value="02. 添加", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_module:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FIotVirtualDeviceModule fIotVirtualDeviceModule, HttpServletRequest request) {
public Result<String> 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<FIotVirtu
@ApiOperation(value="03. 编辑", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_module:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FIotVirtualDeviceModule fIotVirtualDeviceModule, HttpServletRequest request) {
public Result<String> 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<FIotVirtu
@ApiOperationSupport(order = 5)
@ApiOperation(value="05. 通过id查询", notes="")
@GetMapping(value = "/queryById")
public Result<FIotVirtualDeviceModule> queryById(@RequestParam(name="id",required=true) String id) {
FIotVirtualDeviceModule fIotVirtualDeviceModule = fIotVirtualDeviceModuleService.getById(id);
if(fIotVirtualDeviceModule==null) {
public Result<SurvIotVirtualDeviceModule> 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<FIotVirtu
@ApiOperation(value="06. 导出excel", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_module:exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, FIotVirtualDeviceModule fIotVirtualDeviceModule) {
return super.exportXls(request, fIotVirtualDeviceModule, FIotVirtualDeviceModule.class, "虚拟设备模组表");
public ModelAndView exportXls(HttpServletRequest request, SurvIotVirtualDeviceModule survIotVirtualDeviceModule) {
return super.exportXls(request, survIotVirtualDeviceModule, SurvIotVirtualDeviceModule.class, "虚拟设备模组表");
}
@ -137,7 +137,7 @@ public class FIotVirtualDeviceModuleController extends JeecgController<FIotVirtu
@RequiresPermissions("iot:f_iot_virtual_device_module:importExcel")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FIotVirtualDeviceModule.class);
return super.importExcel(request, response, SurvIotVirtualDeviceModule.class);
}
}

48
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/FIotVirtualDeviceNetController.java
View File

@ -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<FIotVirtualDeviceNet, IFIotVirtualDeviceNetService> {
public class FIotVirtualDeviceNetController extends JeecgController<SurvIotVirtualDeviceNet, ISurvIotVirtualDeviceNetService> {
@Autowired
private IFIotVirtualDeviceNetService fIotVirtualDeviceNetService;
private ISurvIotVirtualDeviceNetService fIotVirtualDeviceNetService;
//@AutoLog(value = "虚拟设备网络模块-分页列表查询")
@ApiOperation(value="01. 分页查询", notes="")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FIotVirtualDeviceNet>> queryPageList(FIotVirtualDeviceNet fIotVirtualDeviceNet,
public Result<IPage<SurvIotVirtualDeviceNet>> queryPageList(SurvIotVirtualDeviceNet survIotVirtualDeviceNet,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FIotVirtualDeviceNet> queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDeviceNet, req.getParameterMap());
Page<FIotVirtualDeviceNet> page = new Page<FIotVirtualDeviceNet>(pageNo, pageSize);
IPage<FIotVirtualDeviceNet> pageList = fIotVirtualDeviceNetService.page(page, queryWrapper);
QueryWrapper<SurvIotVirtualDeviceNet> queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDeviceNet, req.getParameterMap());
Page<SurvIotVirtualDeviceNet> page = new Page<SurvIotVirtualDeviceNet>(pageNo, pageSize);
IPage<SurvIotVirtualDeviceNet> pageList = fIotVirtualDeviceNetService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -60,11 +60,11 @@ public class FIotVirtualDeviceNetController extends JeecgController<FIotVirtualD
@ApiOperation(value="02. 添加", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_net:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FIotVirtualDeviceNet fIotVirtualDeviceNet, HttpServletRequest request) {
public Result<String> 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<FIotVirtualD
@ApiOperation(value="03. 编辑", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_net:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FIotVirtualDeviceNet fIotVirtualDeviceNet, HttpServletRequest request) {
public Result<String> 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<FIotVirtualD
@ApiOperationSupport(order = 5)
@ApiOperation(value="05. 通过id查询", notes="")
@GetMapping(value = "/queryById")
public Result<FIotVirtualDeviceNet> queryById(@RequestParam(name="id",required=true) String id) {
FIotVirtualDeviceNet fIotVirtualDeviceNet = fIotVirtualDeviceNetService.getById(id);
if(fIotVirtualDeviceNet==null) {
public Result<SurvIotVirtualDeviceNet> 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<FIotVirtualD
@ApiOperation(value="06. 导出excel", notes="")
@RequiresPermissions("iot:f_iot_virtual_device_net:exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, FIotVirtualDeviceNet fIotVirtualDeviceNet) {
return super.exportXls(request, fIotVirtualDeviceNet, FIotVirtualDeviceNet.class, "虚拟设备网络模块");
public ModelAndView exportXls(HttpServletRequest request, SurvIotVirtualDeviceNet survIotVirtualDeviceNet) {
return super.exportXls(request, survIotVirtualDeviceNet, SurvIotVirtualDeviceNet.class, "虚拟设备网络模块");
}
@ -137,7 +137,7 @@ public class FIotVirtualDeviceNetController extends JeecgController<FIotVirtualD
@RequiresPermissions("iot:f_iot_virtual_device_net:importExcel")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FIotVirtualDeviceNet.class);
return super.importExcel(request, response, SurvIotVirtualDeviceNet.class);
}
}

46
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceOprationController.java
View File

@ -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<FDeviceOpration, IFDeviceOprationService> {
public class SurvDeviceOprationController extends JeecgController<SurvDeviceOpration, ISurvDeviceOprationService> {
@Autowired
private IFDeviceOprationService fDeviceOprationService;
private ISurvDeviceOprationService fDeviceOprationService;
//@AutoLog(value = "设备操作记录-分页列表查询")
@ApiOperation(value = "01. 分页查询", notes = "")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FDeviceOpration>> queryPageList(FDeviceOpration fDeviceOpration,
public Result<IPage<SurvDeviceOpration>> queryPageList(SurvDeviceOpration survDeviceOpration,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FDeviceOpration> queryWrapper = QueryGenerator.initQueryWrapper(fDeviceOpration, req.getParameterMap());
QueryWrapper<SurvDeviceOpration> 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<FDeviceOpratio
// queryWrapper.lt("OPERATOR_TIME", eTime);
// }
Page<FDeviceOpration> page = new Page<FDeviceOpration>(pageNo, pageSize);
IPage<FDeviceOpration> pageList = fDeviceOprationService.page(page, queryWrapper);
Page<SurvDeviceOpration> page = new Page<SurvDeviceOpration>(pageNo, pageSize);
IPage<SurvDeviceOpration> pageList = fDeviceOprationService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -77,11 +77,11 @@ public class SurvDeviceOprationController extends JeecgController<FDeviceOpratio
@ApiOperation(value = "02. 添加", notes = "")
@RequiresPermissions("farm:f_device_opration:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FDeviceOpration fDeviceOpration, HttpServletRequest request) {
public Result<String> 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<FDeviceOpratio
@ApiOperation(value = "03. 编辑", notes = "")
@RequiresPermissions("farm:f_device_opration:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FDeviceOpration fDeviceOpration, HttpServletRequest request) {
public Result<String> 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<FDeviceOpratio
@ApiOperationSupport(order = 5)
@ApiOperation(value = "05. 通过id查询", notes = "")
@GetMapping(value = "/queryById")
public Result<FDeviceOpration> queryById(@RequestParam(name = "id", required = true) String id) {
FDeviceOpration fDeviceOpration = fDeviceOprationService.getById(id);
if (fDeviceOpration == null) {
public Result<SurvDeviceOpration> 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);
}

48
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotProtocolController.java
View File

@ -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<FIotProtocol, IFIotProtocolService> {
public class SurvIotProtocolController extends JeecgController<SurvIotProtocol, ISurvIotProtocolService> {
@Autowired
private IFIotProtocolService fIotProtocolService;
private ISurvIotProtocolService fIotProtocolService;
//@AutoLog(value = "物联网设备协议表-分页列表查询")
@ApiOperation(value="01. 分页查询", notes="")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FIotProtocol>> queryPageList(FIotProtocol fIotProtocol,
public Result<IPage<SurvIotProtocol>> queryPageList(SurvIotProtocol survIotProtocol,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FIotProtocol> queryWrapper = QueryGenerator.initQueryWrapper(fIotProtocol, req.getParameterMap());
Page<FIotProtocol> page = new Page<FIotProtocol>(pageNo, pageSize);
IPage<FIotProtocol> pageList = fIotProtocolService.page(page, queryWrapper);
QueryWrapper<SurvIotProtocol> queryWrapper = QueryGenerator.initQueryWrapper(survIotProtocol, req.getParameterMap());
Page<SurvIotProtocol> page = new Page<SurvIotProtocol>(pageNo, pageSize);
IPage<SurvIotProtocol> pageList = fIotProtocolService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -60,11 +60,11 @@ public class SurvIotProtocolController extends JeecgController<FIotProtocol, IFI
@ApiOperation(value="02. 添加", notes="")
@RequiresPermissions("iot:f_iot_protocol:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FIotProtocol fIotProtocol, HttpServletRequest request) {
public Result<String> 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<FIotProtocol, IFI
@ApiOperation(value="03. 编辑", notes="")
@RequiresPermissions("iot:f_iot_protocol:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FIotProtocol fIotProtocol, HttpServletRequest request) {
public Result<String> 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<FIotProtocol, IFI
@ApiOperationSupport(order = 5)
@ApiOperation(value="05. 通过id查询", notes="")
@GetMapping(value = "/queryById")
public Result<FIotProtocol> queryById(@RequestParam(name="id",required=true) String id) {
FIotProtocol fIotProtocol = fIotProtocolService.getById(id);
if(fIotProtocol==null) {
public Result<SurvIotProtocol> 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<FIotProtocol, IFI
@ApiOperation(value="06. 导出excel", notes="")
@RequiresPermissions("iot:f_iot_protocol:exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, FIotProtocol fIotProtocol) {
return super.exportXls(request, fIotProtocol, FIotProtocol.class, "物联网设备协议表");
public ModelAndView exportXls(HttpServletRequest request, SurvIotProtocol survIotProtocol) {
return super.exportXls(request, survIotProtocol, SurvIotProtocol.class, "物联网设备协议表");
}
@ -137,7 +137,7 @@ public class SurvIotProtocolController extends JeecgController<FIotProtocol, IFI
@RequiresPermissions("iot:f_iot_protocol:importExcel")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FIotProtocol.class);
return super.importExcel(request, response, SurvIotProtocol.class);
}
}

48
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvIotVirtualDeviceController.java
View File

@ -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<FIotVirtualDevice, IFIotVirtualDeviceService> {
public class SurvIotVirtualDeviceController extends JeecgController<SurvIotVirtualDevice, ISurvIotVirtualDeviceService> {
@Autowired
private IFIotVirtualDeviceService fIotVirtualDeviceService;
private ISurvIotVirtualDeviceService fIotVirtualDeviceService;
//@AutoLog(value = "虚拟设备表-分页列表查询")
@ApiOperation(value="01. 分页查询", notes="")
@ApiOperationSupport(order = 1)
@GetMapping(value = "/list")
public Result<IPage<FIotVirtualDevice>> queryPageList(FIotVirtualDevice fIotVirtualDevice,
public Result<IPage<SurvIotVirtualDevice>> queryPageList(SurvIotVirtualDevice survIotVirtualDevice,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<FIotVirtualDevice> queryWrapper = QueryGenerator.initQueryWrapper(fIotVirtualDevice, req.getParameterMap());
Page<FIotVirtualDevice> page = new Page<FIotVirtualDevice>(pageNo, pageSize);
IPage<FIotVirtualDevice> pageList = fIotVirtualDeviceService.page(page, queryWrapper);
QueryWrapper<SurvIotVirtualDevice> queryWrapper = QueryGenerator.initQueryWrapper(survIotVirtualDevice, req.getParameterMap());
Page<SurvIotVirtualDevice> page = new Page<SurvIotVirtualDevice>(pageNo, pageSize);
IPage<SurvIotVirtualDevice> pageList = fIotVirtualDeviceService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -60,11 +60,11 @@ public class SurvIotVirtualDeviceController extends JeecgController<FIotVirtualD
@ApiOperation(value="02. 添加", notes="")
@RequiresPermissions("iot:f_iot_virtual_device:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FIotVirtualDevice fIotVirtualDevice, HttpServletRequest request) {
public Result<String> 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<FIotVirtualD
@ApiOperation(value="03. 编辑", notes="")
@RequiresPermissions("iot:f_iot_virtual_device:edit")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody FIotVirtualDevice fIotVirtualDevice, HttpServletRequest request) {
public Result<String> 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<FIotVirtualD
@ApiOperationSupport(order = 5)
@ApiOperation(value="05. 通过id查询", notes="")
@GetMapping(value = "/queryById")
public Result<FIotVirtualDevice> queryById(@RequestParam(name="id",required=true) String id) {
FIotVirtualDevice fIotVirtualDevice = fIotVirtualDeviceService.getById(id);
if(fIotVirtualDevice==null) {
public Result<SurvIotVirtualDevice> 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<FIotVirtualD
@ApiOperation(value="06. 导出excel", notes="")
@RequiresPermissions("iot:f_iot_virtual_device:exportXls")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, FIotVirtualDevice fIotVirtualDevice) {
return super.exportXls(request, fIotVirtualDevice, FIotVirtualDevice.class, "虚拟设备表");
public ModelAndView exportXls(HttpServletRequest request, SurvIotVirtualDevice survIotVirtualDevice) {
return super.exportXls(request, survIotVirtualDevice, SurvIotVirtualDevice.class, "虚拟设备表");
}
@ -137,7 +137,7 @@ public class SurvIotVirtualDeviceController extends JeecgController<FIotVirtualD
@RequiresPermissions("iot:f_iot_virtual_device:importExcel")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FIotVirtualDevice.class);
return super.importExcel(request, response, SurvIotVirtualDevice.class);
}
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FDeviceOprationMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvDeviceOprationMapper.java
View File

@ -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<FDeviceOpration> {
public interface SurvDeviceOprationMapper extends BaseMapper<SurvDeviceOpration> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotProtocolMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotProtocolMapper.java
View File

@ -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<FIotProtocol> {
public interface SurvIotProtocolMapper extends BaseMapper<SurvIotProtocol> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceGroupMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceGroupMapper.java
View File

@ -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<FIotVirtualDeviceGroup> {
public interface SurvIotVirtualDeviceGroupMapper extends BaseMapper<SurvIotVirtualDeviceGroup> {
}

6
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceMapper.java
View File

@ -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<FIotVirtualDevice> {
public interface SurvIotVirtualDeviceMapper extends BaseMapper<SurvIotVirtualDevice> {
FIotVirtualDevice getDeviceByCode(@Param("deployCode")String deployCode);
SurvIotVirtualDevice getDeviceByCode(@Param("deployCode")String deployCode);
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceModuleMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceModuleMapper.java
View File

@ -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<FIotVirtualDeviceModule> {
public interface SurvIotVirtualDeviceModuleMapper extends BaseMapper<SurvIotVirtualDeviceModule> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/FIotVirtualDeviceNetMapper.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvIotVirtualDeviceNetMapper.java
View File

@ -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<FIotVirtualDeviceNet> {
public interface SurvIotVirtualDeviceNetMapper extends BaseMapper<SurvIotVirtualDeviceNet> {
}

2
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FDeviceOprationMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceOprationMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FDeviceOprationMapper">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvDeviceOprationMapper">
</mapper>

2
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotProtocolMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotProtocolMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FIotProtocolMapper">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvIotProtocolMapper">
</mapper>

3
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceNetMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceGroupMapper.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FIotVirtualDeviceNetMapper">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceGroupMapper">
</mapper>

6
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FIotVirtualDeviceMapper">
<resultMap type="org.jeecg.common.entity.FIotVirtualDevice" id="FIotVirtualDeviceMap">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceMapper">
<resultMap type="org.jeecg.common.entity.SurvIotVirtualDevice" id="FIotVirtualDeviceMap">
<result property="id" column="ID" jdbcType="VARCHAR"/>
<result property="companyId" column="COMPANY_ID" jdbcType="VARCHAR"/>
<result property="farmId" column="FARM_ID" jdbcType="VARCHAR"/>
@ -35,7 +35,7 @@
<result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap id="ext" type="org.jeecg.common.entity.FIotVirtualDevice" extends="FIotVirtualDeviceMap">
<resultMap id="ext" type="org.jeecg.common.entity.SurvIotVirtualDevice" extends="FIotVirtualDeviceMap">
<collection property="modules" column="{deviceId = id}" select="org.jeecg.modules.iot.mapper.FIotVirtualDeviceModuleMapper.getDeviceModule"/>
</resultMap>

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceModuleMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceModuleMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FIotVirtualDeviceModuleMapper">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceModuleMapper">
<resultMap type="org.jeecg.common.entity.FIotVirtualDeviceModule" id="FIotVirtualDeviceModuleMap">
<resultMap type="org.jeecg.common.entity.SurvIotVirtualDeviceModule" id="FIotVirtualDeviceModuleMap">
<result property="id" column="ID" jdbcType="VARCHAR"/>
<result property="companyId" column="COMPANY_ID" jdbcType="VARCHAR"/>
<result property="farmId" column="FARM_ID" jdbcType="VARCHAR"/>

3
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/FIotVirtualDeviceGroupMapper.xml → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvIotVirtualDeviceNetMapper.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.appmana.mapper.FIotVirtualDeviceGroupMapper">
<mapper namespace="org.jeecg.modules.appmana.mapper.SurvIotVirtualDeviceNetMapper">
</mapper>

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFDeviceOprationService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvDeviceOprationService.java
View File

@ -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<FDeviceOpration> {
public interface ISurvDeviceOprationService extends IService<SurvDeviceOpration> {
boolean saveDeviceOpration(DeviceLogVo deviceLogVo);

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotProtocolService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotProtocolService.java
View File

@ -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<FIotProtocol> {
public interface ISurvIotProtocolService extends IService<SurvIotProtocol> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceGroupService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceGroupService.java
View File

@ -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<FIotVirtualDeviceGroup> {
public interface ISurvIotVirtualDeviceGroupService extends IService<SurvIotVirtualDeviceGroup> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceModuleService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceModuleService.java
View File

@ -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<FIotVirtualDeviceModule> {
public interface ISurvIotVirtualDeviceModuleService extends IService<SurvIotVirtualDeviceModule> {
}

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceNetService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceNetService.java
View File

@ -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<FIotVirtualDeviceNet> {
public interface ISurvIotVirtualDeviceNetService extends IService<SurvIotVirtualDeviceNet> {
}

16
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/IFIotVirtualDeviceService.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvIotVirtualDeviceService.java
View File

@ -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<FIotVirtualDevice> {
public interface ISurvIotVirtualDeviceService extends IService<SurvIotVirtualDevice> {
FIotVirtualDevice getDeviceByCode(String deployCode);
SurvIotVirtualDevice getDeviceByCode(String deployCode);
VOFertilizerStats getDeviceStats(SurvDeviceDeploy deploy);
@ -36,14 +36,14 @@ public interface IFIotVirtualDeviceService extends IService<FIotVirtualDevice> {
/**
* 单查寄存器
*/
boolean sendSingleQuery(SurvDeviceDeploy deploy, FIotVirtualDeviceModule module);
boolean sendSingleQuery(SurvDeviceDeploy deploy, SurvIotVirtualDeviceModule module);
/**
* 多查寄存器
*/
boolean sendMutiQuery(SurvDeviceDeploy deploy, List<FIotVirtualDeviceModule> modules);
boolean sendMutiQuery(SurvDeviceDeploy deploy, List<SurvIotVirtualDeviceModule> modules);
FIotVirtualDevice getDeviceByIotCode(String deployCode);
SurvIotVirtualDevice getDeviceByIotCode(String deployCode);
/**
* 处理内部mqtt服务中，设备行为
@ -54,7 +54,7 @@ public interface IFIotVirtualDeviceService extends IService<FIotVirtualDevice> {
ModuleStatusResultVo getDeviceCache(String deployCode);
void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List<FIotVirtualDevice> devices);
void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List<SurvIotVirtualDevice> devices);
/**
* 厂家对接mqtt处理
* @param topic

73
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FDeviceOprationServiceImpl.java
View File

@ -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<FDeviceOprationMapper, FDeviceOpration> 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;
}
}

18
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotProtocolServiceImpl.java
View File

@ -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<FIotProtocolMapper, FIotProtocol> implements IFIotProtocolService {
}

18
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceGroupServiceImpl.java
View File

@ -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<FIotVirtualDeviceGroupMapper, FIotVirtualDeviceGroup> implements IFIotVirtualDeviceGroupService {
}

61
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceModuleServiceImpl.java
View File

@ -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<FIotVirtualDeviceModuleMapper, FIotVirtualDeviceModule> implements IFIotVirtualDeviceModuleService {
@Autowired
@Lazy
private FIotVirtualDeviceServiceImpl deviceService;
public List<FIotVirtualDeviceModule> 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<FIotVirtualDeviceModule> modules = lambdaQuery()
.eq(FIotVirtualDeviceModule::getDeviceId,device.getId())
.eq(FIotVirtualDeviceModule::getIsEnable,1)
.orderByAsc(FIotVirtualDeviceModule::getSortNo)
.orderByDesc(FIotVirtualDeviceModule::getCreateTime)
.list()
;
return modules;
}
public List<FIotVirtualDeviceModule> getModulesByNet(String id) {
List<FIotVirtualDeviceModule> modules = lambdaQuery()
.eq(FIotVirtualDeviceModule::getModuleNetId,id)
.eq(FIotVirtualDeviceModule::getIsEnable,1)
.orderByAsc(FIotVirtualDeviceModule::getSortNo)
.orderByDesc(FIotVirtualDeviceModule::getCreateTime)
.list()
;
return modules;
}
}

28
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceNetServiceImpl.java
View File

@ -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<FIotVirtualDeviceNetMapper, FIotVirtualDeviceNet> 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;
}
}

73
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceOprationServiceImpl.java Normal file
View File

@ -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<SurvDeviceOprationMapper, SurvDeviceOpration> 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;
}
}

18
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotProtocolServiceImpl.java Normal file
View File

@ -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<SurvIotProtocolMapper, SurvIotProtocol> implements ISurvIotProtocolService {
}

18
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceGroupServiceImpl.java Normal file
View File

@ -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<SurvIotVirtualDeviceGroupMapper, SurvIotVirtualDeviceGroup> implements ISurvIotVirtualDeviceGroupService {
}

61
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceModuleServiceImpl.java Normal file
View File

@ -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<SurvIotVirtualDeviceModuleMapper, SurvIotVirtualDeviceModule> implements ISurvIotVirtualDeviceModuleService {
@Autowired
@Lazy
private SurvIotVirtualDeviceServiceImpl deviceService;
public List<SurvIotVirtualDeviceModule> 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<SurvIotVirtualDeviceModule> modules = lambdaQuery()
.eq(SurvIotVirtualDeviceModule::getDeviceId,device.getId())
.eq(SurvIotVirtualDeviceModule::getIsEnable,1)
.orderByAsc(SurvIotVirtualDeviceModule::getSortNo)
.orderByDesc(SurvIotVirtualDeviceModule::getCreateTime)
.list()
;
return modules;
}
public List<SurvIotVirtualDeviceModule> getModulesByNet(String id) {
List<SurvIotVirtualDeviceModule> modules = lambdaQuery()
.eq(SurvIotVirtualDeviceModule::getModuleNetId,id)
.eq(SurvIotVirtualDeviceModule::getIsEnable,1)
.orderByAsc(SurvIotVirtualDeviceModule::getSortNo)
.orderByDesc(SurvIotVirtualDeviceModule::getCreateTime)
.list()
;
return modules;
}
}

28
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceNetServiceImpl.java Normal file
View File

@ -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<SurvIotVirtualDeviceNetMapper, SurvIotVirtualDeviceNet> 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;
}
}

149
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/FIotVirtualDeviceServiceImpl.java → zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java
View File

@ -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<FIotVirtualDeviceMapper, FIotVirtualDevice> implements IFIotVirtualDeviceService {
public class SurvIotVirtualDeviceServiceImpl extends ServiceImpl<SurvIotVirtualDeviceMapper, SurvIotVirtualDevice> 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<FIotVirtualDeviceM
private SurvDeviceDeployServiceImpl deviceDeployService;
@Autowired
@Lazy
private FDeviceOprationServiceImpl deviceOprationService;
private SurvDeviceOprationServiceImpl deviceOprationService;
@Resource
private IOTStatisticMapper iotStatisticMapper;
@Autowired
@ -83,9 +82,9 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
@Override
public FIotVirtualDevice getDeviceByCode(String deployCode) {
FIotVirtualDevice fIotVirtualDevice = baseMapper.getDeviceByCode(deployCode);
return fIotVirtualDevice;
public SurvIotVirtualDevice getDeviceByCode(String deployCode) {
SurvIotVirtualDevice survIotVirtualDevice = baseMapper.getDeviceByCode(deployCode);
return survIotVirtualDevice;
}
@Override
@ -93,11 +92,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
VOFertilizerStats voFertilizerStats = new VOFertilizerStats();
//获取设备信息 todo
FIotVirtualDevice fIotVirtualDevice = baseMapper.getDeviceByCode(deploy.getDeployCode());
Assert.notNull(fIotVirtualDevice,"无效设备。");
SurvIotVirtualDevice survIotVirtualDevice = baseMapper.getDeviceByCode(deploy.getDeployCode());
Assert.notNull(survIotVirtualDevice,"无效设备。");
List<VOFertilizerStatsArr> 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<FIotVirtualDeviceM
}
voFertilizerStats.setStatsList(arrList);
voFertilizerStats.setStatusSupport(fIotVirtualDevice.getStatusSupport());
voFertilizerStats.setRecordSupport(fIotVirtualDevice.getRecordSupport());
voFertilizerStats.setControlSupport(fIotVirtualDevice.getControlSupport());
voFertilizerStats.setUpperUrl(fIotVirtualDevice.getUpperUrl());
voFertilizerStats.setLowerUrl(fIotVirtualDevice.getLowerUrl());
voFertilizerStats.setStatusSupport(survIotVirtualDevice.getStatusSupport());
voFertilizerStats.setRecordSupport(survIotVirtualDevice.getRecordSupport());
voFertilizerStats.setControlSupport(survIotVirtualDevice.getControlSupport());
voFertilizerStats.setUpperUrl(survIotVirtualDevice.getUpperUrl());
voFertilizerStats.setLowerUrl(survIotVirtualDevice.getLowerUrl());
return voFertilizerStats;
}
@ -129,9 +128,9 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
boolean result = false;
if(deploy!=null){
//获取寄存器位置
FIotVirtualDeviceModule module = moduleService.getById(voDeviceCmd.getVariableName());
SurvIotVirtualDeviceModule module = moduleService.getById(voDeviceCmd.getVariableName());
Assert.notNull(module,"模组未正确配置");
FIotVirtualDeviceNet net = netService.getById(module.getModuleNetId());
SurvIotVirtualDeviceNet net = netService.getById(module.getModuleNetId());
Assert.notNull(net,"模组物联网模块未正确配置");
deviceControlResultVo.setDeviceName(module.getModuleName());
deviceControlResultVo.setDeviceKey(module.getRegisterNum()+"");
@ -145,11 +144,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
}
@Override
public boolean sendSingleQuery(SurvDeviceDeploy deploy, FIotVirtualDeviceModule module) {
public boolean sendSingleQuery(SurvDeviceDeploy deploy, SurvIotVirtualDeviceModule module) {
boolean result = false;
Assert.notNull(deploy,"设备未传入");
Assert.notNull(module,"模组未传入");
FIotVirtualDeviceNet net = netService.getById(module.getModuleNetId());
SurvIotVirtualDeviceNet net = netService.getById(module.getModuleNetId());
Assert.notNull(net,"模组物联网模块未正确配置");
String cmdStr = ModbusCommandUtil.buildCommand(1, RegisterType.valueOfCode(module.getRegisterType()), RWType.READ, module.getRegisterNum(), null, 1);
log.warn("设备：{}，成功构造M单查询指令：{}，即将发送至:{}",deploy.getDeployDes(),cmdStr,net.getNetDownTopic());
@ -158,23 +157,23 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
}
@Override
public boolean sendMutiQuery(SurvDeviceDeploy deploy, List<FIotVirtualDeviceModule> modules) {
public boolean sendMutiQuery(SurvDeviceDeploy deploy, List<SurvIotVirtualDeviceModule> modules) {
boolean result = false;
Assert.notNull(deploy,"设备未传入");
Assert.isTrue((modules!=null && !modules.isEmpty()),"模组列表未传入");
Map<String,List<FIotVirtualDeviceModule>> moduleMap = modules.stream().collect(Collectors.groupingBy(FIotVirtualDeviceModule::getModuleNetId));
Comparator<FIotVirtualDeviceModule> nameComparator = Comparator.comparing(FIotVirtualDeviceModule::getRegisterNum);
Map<String,List<SurvIotVirtualDeviceModule>> moduleMap = modules.stream().collect(Collectors.groupingBy(SurvIotVirtualDeviceModule::getModuleNetId));
Comparator<SurvIotVirtualDeviceModule> nameComparator = Comparator.comparing(SurvIotVirtualDeviceModule::getRegisterNum);
for (String netId : moduleMap.keySet()) {
List<FIotVirtualDeviceModule> list = moduleMap.get(netId);
FIotVirtualDeviceNet net = netService.getById(netId);
List<SurvIotVirtualDeviceModule> list = moduleMap.get(netId);
SurvIotVirtualDeviceNet net = netService.getById(netId);
if(net==null){
log.error("无效的物联网id：{},设备：{}",netId,deploy.getDeployDes());
continue;
}
//按寄存器类型分组
Map<Integer,List<FIotVirtualDeviceModule>> regTypeList = list.stream().collect(Collectors.groupingBy(FIotVirtualDeviceModule::getRegisterType));
Map<Integer,List<SurvIotVirtualDeviceModule>> regTypeList = list.stream().collect(Collectors.groupingBy(SurvIotVirtualDeviceModule::getRegisterType));
for (Integer keys : regTypeList.keySet()) {
List<FIotVirtualDeviceModule> regs = regTypeList.get(keys);
List<SurvIotVirtualDeviceModule> 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<FIotVirtualDeviceM
return result;
}
@Override
public FIotVirtualDevice getDeviceByIotCode(String deployCode){
List<FIotVirtualDevice> devices = lambdaQuery()
.eq(FIotVirtualDevice::getIotCode, deployCode)
.eq(FIotVirtualDevice::getIsEnable,1)
public SurvIotVirtualDevice getDeviceByIotCode(String deployCode){
List<SurvIotVirtualDevice> 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<FIotVirtualDeviceM
ModuleStatusResultVo deviceAllChache = getDeviceCache(deploy.getDeployCode());
log.warn("============={}===检查缓存======{}======",deploy.getDeployCode(),deviceAllChache);
if(deviceAllChache!=null){//缓存直接传入设备mqtt
FIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<FIotVirtualDevice> devices = new ArrayList<>();
SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<SurvIotVirtualDevice> devices = new ArrayList<>();
if(device!=null){
devices.add(device);
}
log.warn("============={}====缓存推入蓝海主题：{}=============",deviceAllChache,devices.size());
pubDeviceTopic(deviceAllChache, devices);
}else{//无缓存查询
List<FIotVirtualDeviceModule> modules = moduleService.getModulesByCode(deploy.getDeployCode());
List<SurvIotVirtualDeviceModule> modules = moduleService.getModulesByCode(deploy.getDeployCode());
if(!modules.isEmpty()){
sendMutiQuery(deploy,modules);
}
@ -234,14 +233,14 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
//检查缓存
ModuleStatusResultVo deviceSCache = getDeviceCache(deploy.getDeployCode());
if(deviceSCache!=null){//缓存直接传入设备mqtt
FIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<FIotVirtualDevice> devices = new ArrayList<>();
SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<SurvIotVirtualDevice> 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<FIotVirtualDeviceM
log.warn("主题：{},收到mqtt回执：{}=========，原文：{}", topic, res.toString(), orgStr);
if (res != null && res.isSuccess()) {
//查询网络模块
List<FIotVirtualDeviceModule> modules = getModulesByIdent(ident);
List<SurvIotVirtualDeviceModule> modules = getModulesByIdent(ident);
if (!modules.isEmpty()) {
ModuleStatusResultVo moduleStatusResultVo = processHexToJson(res, modules);
//转发至设备的上下行主题
//模组关联的设备
List<String> deviceId = modules.stream().map(FIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList());
List<String> deviceId = modules.stream().map(SurvIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList());
log.warn("转换modbus=========" + JSONUtil.toJsonStr(moduleStatusResultVo));
List<FIotVirtualDevice> devices = lambdaQuery().in(FIotVirtualDevice::getId, deviceId).list();
List<SurvIotVirtualDevice> devices = lambdaQuery().in(SurvIotVirtualDevice::getId, deviceId).list();
//推送蓝海设备主题
pubDeviceTopic(moduleStatusResultVo, devices);
//保存缓存
@ -339,11 +338,11 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
log.error("========{}==========更新心跳：{}===================", infoStr, ident);
if ("www.usr.cn".equals(infoStr)) {
//查询网络模块
List<FIotVirtualDeviceModule> modules = getModulesByIdent(ident);
List<SurvIotVirtualDeviceModule> modules = getModulesByIdent(ident);
if (!modules.isEmpty()) {
List<String> deviceId = modules.stream().map(FIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList());
List<FIotVirtualDevice> devices = lambdaQuery().in(FIotVirtualDevice::getId, deviceId).list();
List<String> deploys = devices.stream().map(FIotVirtualDevice::getIotId).collect(Collectors.toList());
List<String> deviceId = modules.stream().map(SurvIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList());
List<SurvIotVirtualDevice> devices = lambdaQuery().in(SurvIotVirtualDevice::getId, deviceId).list();
List<String> deploys = devices.stream().map(SurvIotVirtualDevice::getIotId).collect(Collectors.toList());
deviceDeployService.refreshLastSyncTimeByDeployCode(deploys);
}
}
@ -358,9 +357,9 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
* 收到回执时，保存设备缓存
* @param devices
*/
private void saveDeviceCache(ModuleStatusResultVo inComeStaus, List<FIotVirtualDevice> devices) {
private void saveDeviceCache(ModuleStatusResultVo inComeStaus, List<SurvIotVirtualDevice> 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<FIotVirtualDeviceM
/**
* 根据主题获取设备模组
*/
private List<FIotVirtualDeviceModule> getModulesByIdent(String identCode){
private List<SurvIotVirtualDeviceModule> getModulesByIdent(String identCode){
//查询网络模块
FIotVirtualDeviceNet net = netService.matchNetSet(identCode);
SurvIotVirtualDeviceNet net = netService.matchNetSet(identCode);
if (net != null) {
List<FIotVirtualDeviceModule> modules = moduleService.getModulesByNet(net.getId());
List<SurvIotVirtualDeviceModule> modules = moduleService.getModulesByNet(net.getId());
if (!modules.isEmpty()) {
//模组关联的设备
return modules;
@ -423,10 +422,10 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
* 推送消息至设备的主题
* @param moduleStatusResultVo
*/
public void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List<FIotVirtualDevice> devices) {
public void pubDeviceTopic(ModuleStatusResultVo moduleStatusResultVo,List<SurvIotVirtualDevice> 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<FIotVirtualDeviceM
}
}
//虚拟设备中需要订阅的主题
List<FIotVirtualDevice> devices = lambdaQuery().nested(wrapper->
wrapper.isNotNull(FIotVirtualDevice::getUpperUrl)
List<SurvIotVirtualDevice> 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<FIotVirtualDeviceM
}
}
//物联网模块中的主题
List<FIotVirtualDeviceNet> nets = netService.lambdaQuery()
List<SurvIotVirtualDeviceNet> 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<FIotVirtualDeviceM
ModuleStatusResultVo deviceAllChache = getDeviceCache(deploy.getDeployCode());
log.warn("============={}===检查间隔缓存======{}======",deploy.getDeployCode(),deviceAllChache);
if(deviceAllChache!=null){//缓存直接传入设备mqtt
FIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<FIotVirtualDevice> devices = new ArrayList<>();
SurvIotVirtualDevice device = getDeviceByIotCode(deploy.getDeployCode());
List<SurvIotVirtualDevice> devices = new ArrayList<>();
if(device!=null){
devices.add(device);
}
@ -526,7 +525,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
}
//将modus处理为json
public ModuleStatusResultVo processHexToJson(ModbusResponseParser.ModbusResult modbusResult, List<FIotVirtualDeviceModule> modules){
public ModuleStatusResultVo processHexToJson(ModbusResponseParser.ModbusResult modbusResult, List<SurvIotVirtualDeviceModule> modules){
FunctionCode functionCode = FunctionCode.valueOfCode(modbusResult.getFunctionCode());
ModuleStatusResultVo moduleStatusResultVo = null;
switch (functionCode){
@ -545,7 +544,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
}
return moduleStatusResultVo;
}
public ModuleStatusResultVo BitsToHex(boolean[] bits,List<FIotVirtualDeviceModule> modules){
public ModuleStatusResultVo BitsToHex(boolean[] bits,List<SurvIotVirtualDeviceModule> modules){
ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo();
if(bits!=null && bits.length>0){
List<ModuleStatusDetailVo> detailVos = new ArrayList<>();
@ -553,7 +552,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
//遍历对应 模组和寄存器对应关系
if(!modules.isEmpty()){
Map<Integer,String> 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<FIotVirtualDeviceM
}
public ModuleStatusResultVo ByteToHex(Integer address,Integer bytes,List<FIotVirtualDeviceModule> modules){
public ModuleStatusResultVo ByteToHex(Integer address,Integer bytes,List<SurvIotVirtualDeviceModule> modules){
ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo();
if(bytes!=null){
List<ModuleStatusDetailVo> detailVos = new ArrayList<>();
@ -585,7 +584,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
//遍历对应 模组和寄存器对应关系
if(!modules.isEmpty()){
Map<Integer,String> 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<FIotVirtualDeviceM
public ModuleStatusResultVo ByteArrToHex(int[] modbusBytes,List<FIotVirtualDeviceModule> modules){
public ModuleStatusResultVo ByteArrToHex(int[] modbusBytes,List<SurvIotVirtualDeviceModule> modules){
ModuleStatusResultVo moduleStatusResultVo = new ModuleStatusResultVo();
if(modbusBytes!=null && modbusBytes.length>0){
List<ModuleStatusDetailVo> detailVos = new ArrayList<>();
@ -615,7 +614,7 @@ public class FIotVirtualDeviceServiceImpl extends ServiceImpl<FIotVirtualDeviceM
//遍历对应 模组和寄存器对应关系
if(!modules.isEmpty()){
Map<Integer,String> 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<FIotVirtualDeviceM
* @param module
* @return
*/
public Integer HexTransToInteger(String variableValue,FIotVirtualDeviceModule module){
public Integer HexTransToInteger(String variableValue, SurvIotVirtualDeviceModule module){
Integer result = null;
IotControlType controlType = IotControlType.valueOfCode(variableValue);
switch (controlType){

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/MyMqttCallback.java
View File

@ -7,7 +7,7 @@ import org.eclipse.paho.client.mqttv3.MqttCallbackExtended;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.appmana.service.IFIotVirtualDeviceService;
import org.jeecg.modules.appmana.service.ISurvIotVirtualDeviceService;
import org.jeecg.common.iot.enums.IotInerfaceTopicType;
import org.jeecg.common.iot.up.DeviceActionVo;
import org.springframework.data.redis.core.RedisTemplate;
@ -22,7 +22,7 @@ public class MyMqttCallback implements MqttCallbackExtended {
//手动注入
private MqttConfig mqttConfig = SpringContextUtils.getBean(MqttConfig.class);
private IFIotVirtualDeviceService deviceService = SpringContextUtils.getBean(IFIotVirtualDeviceService.class);
private ISurvIotVirtualDeviceService deviceService = SpringContextUtils.getBean(ISurvIotVirtualDeviceService.class);
private static RedisTemplate redisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FDeviceOpration.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceOpration.java
View File

@ -30,7 +30,7 @@ import java.time.LocalDateTime;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "设备操作记录", description = "设备操作记录")
public class FDeviceOpration implements Serializable {
public class SurvDeviceOpration implements Serializable {
private static final long serialVersionUID = 1L;

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotProtocol.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotProtocol.java
View File

@ -29,7 +29,7 @@ import java.util.Date;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="物联网设备协议表", description="物联网设备协议表")
public class FIotProtocol implements Serializable {
public class SurvIotProtocol implements Serializable {
private static final long serialVersionUID = 1L;

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDevice.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDevice.java
View File

@ -24,7 +24,7 @@ import java.util.List;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="虚拟设备表", description="虚拟设备表")
public class FIotVirtualDevice implements Serializable {
public class SurvIotVirtualDevice implements Serializable {
private static final long serialVersionUID = 1L;
@ -182,7 +182,7 @@ public class FIotVirtualDevice implements Serializable {
@TableField(exist = false)
private List<FIotVirtualDeviceModule> modules;
private List<SurvIotVirtualDeviceModule> modules;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceGroup.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceGroup.java
View File

@ -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;

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceModule.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java
View File

@ -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;

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/FIotVirtualDeviceNet.java → zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceNet.java
View File

@ -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;