diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/SisApplication.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/SisApplication.java similarity index 83% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/SisApplication.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/SisApplication.java index 9e2d522..abf1ada 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/SisApplication.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/SisApplication.java @@ -1,4 +1,4 @@ -package org.dromara.iot; +package org.dromara.sis; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; @@ -17,6 +17,6 @@ public class SisApplication { SpringApplication application = new SpringApplication(SisApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ 设备模块启动成功 ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ 安防启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/AccessControlController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AccessControlController.java similarity index 86% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/AccessControlController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AccessControlController.java index 534d27f..c26d76b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/AccessControlController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AccessControlController.java @@ -1,13 +1,13 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.AccessControlService; -import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.iot.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.AccessControlService; +import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/DoorDeviceController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/DoorDeviceController.java similarity index 87% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/DoorDeviceController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/DoorDeviceController.java index f719e25..d202e95 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/DoorDeviceController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/DoorDeviceController.java @@ -1,16 +1,16 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.DoorDeviceService; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes; -import org.dromara.iot.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.DoorDeviceService; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceUpdateReq; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceFindRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceUpdateRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TbAccessControlController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbAccessControlController.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TbAccessControlController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbAccessControlController.java index 5eaaf6f..cf40722 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TbAccessControlController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbAccessControlController.java @@ -1,4 +1,4 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.iot.domain.bo.TbAccessControlBo; -import org.dromara.iot.domain.vo.TbAccessControlVo; -import org.dromara.iot.service.ITbAccessControlService; +import org.dromara.sis.domain.bo.TbAccessControlBo; +import org.dromara.sis.domain.vo.TbAccessControlVo; +import org.dromara.sis.service.ITbAccessControlService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibController.java new file mode 100644 index 0000000..5fddd3c --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibController.java @@ -0,0 +1,106 @@ +package org.dromara.sis.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.sis.domain.vo.TbPersonLibVo; +import org.dromara.sis.domain.bo.TbPersonLibBo; +import org.dromara.sis.service.ITbPersonLibService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 人像库 + * 前端访问路由地址为:/sis/personLib + * + * @author mocheng + * @date 2025-06-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/personLib") +public class TbPersonLibController extends BaseController { + + private final ITbPersonLibService tbPersonLibService; + + /** + * 查询人像库列表 + */ + @SaCheckPermission("sis:personLib:list") + @GetMapping("/list") + public TableDataInfo list(TbPersonLibBo bo, PageQuery pageQuery) { + return tbPersonLibService.queryPageList(bo, pageQuery); + } + + /** + * 导出人像库列表 + */ + @SaCheckPermission("sis:personLib:export") + @Log(title = "人像库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TbPersonLibBo bo, HttpServletResponse response) { + List list = tbPersonLibService.queryList(bo); + ExcelUtil.exportExcel(list, "人像库", TbPersonLibVo.class, response); + } + + /** + * 获取人像库详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("sis:personLib:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(tbPersonLibService.queryById(id)); + } + + /** + * 新增人像库 + */ + @SaCheckPermission("sis:personLib:add") + @Log(title = "人像库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TbPersonLibBo bo) { + return toAjax(tbPersonLibService.insertByBo(bo)); + } + + /** + * 修改人像库 + */ + @SaCheckPermission("sis:personLib:edit") + @Log(title = "人像库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TbPersonLibBo bo) { + return toAjax(tbPersonLibService.updateByBo(bo)); + } + + /** + * 删除人像库 + * + * @param ids 主键串 + */ + @SaCheckPermission("sis:personLib:remove") + @Log(title = "人像库", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibImgController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibImgController.java new file mode 100644 index 0000000..e3fe01c --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbPersonLibImgController.java @@ -0,0 +1,106 @@ +package org.dromara.sis.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.sis.domain.vo.TbPersonLibImgVo; +import org.dromara.sis.domain.bo.TbPersonLibImgBo; +import org.dromara.sis.service.ITbPersonLibImgService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 人像信息 + * 前端访问路由地址为:/sis/personLibImg + * + * @author mocheng + * @date 2025-06-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/personLibImg") +public class TbPersonLibImgController extends BaseController { + + private final ITbPersonLibImgService tbPersonLibImgService; + + /** + * 查询人像信息列表 + */ + @SaCheckPermission("sis:personLibImg:list") + @GetMapping("/list") + public TableDataInfo list(TbPersonLibImgBo bo, PageQuery pageQuery) { + return tbPersonLibImgService.queryPageList(bo, pageQuery); + } + + /** + * 导出人像信息列表 + */ + @SaCheckPermission("sis:personLibImg:export") + @Log(title = "人像信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TbPersonLibImgBo bo, HttpServletResponse response) { + List list = tbPersonLibImgService.queryList(bo); + ExcelUtil.exportExcel(list, "人像信息", TbPersonLibImgVo.class, response); + } + + /** + * 获取人像信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("sis:personLibImg:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(tbPersonLibImgService.queryById(id)); + } + + /** + * 新增人像信息 + */ + @SaCheckPermission("sis:personLibImg:add") + @Log(title = "人像信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TbPersonLibImgBo bo) { + return toAjax(tbPersonLibImgService.insertByBo(bo)); + } + + /** + * 修改人像信息 + */ + @SaCheckPermission("sis:personLibImg:edit") + @Log(title = "人像信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TbPersonLibImgBo bo) { + return toAjax(tbPersonLibImgService.updateByBo(bo)); + } + + /** + * 删除人像信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("sis:personLibImg:remove") + @Log(title = "人像信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(tbPersonLibImgService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdFactoryController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdFactoryController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java index 3afbf83..48bd007 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdFactoryController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java @@ -1,4 +1,4 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import java.util.List; @@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.iot.domain.vo.TdFactoryVo; -import org.dromara.iot.domain.bo.TdFactoryBo; -import org.dromara.iot.service.ITdFactoryService; +import org.dromara.sis.domain.vo.TdFactoryVo; +import org.dromara.sis.domain.bo.TdFactoryBo; +import org.dromara.sis.service.ITdFactoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java index d4299ea..acab525 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java @@ -1,4 +1,4 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import java.util.List; @@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.iot.domain.vo.TdMeterConfigVo; -import org.dromara.iot.domain.bo.TdMeterConfigBo; -import org.dromara.iot.service.ITdMeterConfigService; +import org.dromara.sis.domain.vo.TdMeterConfigVo; +import org.dromara.sis.domain.bo.TdMeterConfigBo; +import org.dromara.sis.service.ITdMeterConfigService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java index 3b5cec2..51cdf57 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java @@ -1,4 +1,4 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.iot.domain.bo.TdMeterBo; -import org.dromara.iot.domain.vo.TdMeterVo; -import org.dromara.iot.service.ITdMeterService; +import org.dromara.sis.domain.bo.TdMeterBo; +import org.dromara.sis.domain.vo.TdMeterVo; +import org.dromara.sis.service.ITdMeterService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java similarity index 90% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java index d26bfec..7d36e47 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java @@ -1,26 +1,27 @@ -package org.dromara.iot.controller; +package org.dromara.sis.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.iot.domain.vo.TdMeterRoomVo; -import org.dromara.iot.domain.bo.TdMeterRoomBo; -import org.dromara.iot.service.ITdMeterRoomService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.sis.domain.bo.TdMeterRoomBo; +import org.dromara.sis.domain.vo.TdMeterRoomVo; +import org.dromara.sis.service.ITdMeterRoomService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 和房间的关联 @@ -65,7 +66,7 @@ public class TdMeterRoomController extends BaseController { @SaCheckPermission("system:meterRoom:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(tdMeterRoomService.queryById(id)); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/VideoAlarmController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/VideoAlarmController.java new file mode 100644 index 0000000..a38b9ed --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/VideoAlarmController.java @@ -0,0 +1,33 @@ +package org.dromara.sis.controller; + +import com.alibaba.fastjson2.JSONObject; +import jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; +import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.unview.service.VideoAlarmService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * 宇视告警书记上报 + * + * @author lxj + * @since 25-06-24 + */ +@RestController +@RequiredArgsConstructor +public class VideoAlarmController { + + @Resource + private VideoAlarmService videoAlarmService; + + @PostMapping("/custom/router") + public UvModel.UniViewResult alarm(@RequestBody String data) { + UvModel.AlarmReportInfo alarmReportData = JSONObject.parseObject(data, UvModel.AlarmReportInfo.class); + videoAlarmService.handleAlarmData(alarmReportData); + return UvModel.UniViewResult.success(null); + } + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TbAccessControl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbAccessControl.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TbAccessControl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbAccessControl.java index 72a34bd..b58be6c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TbAccessControl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbAccessControl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain; +package org.dromara.sis.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceImgRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceImgRef.java new file mode 100644 index 0000000..73cdc12 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceImgRef.java @@ -0,0 +1,71 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 系统图片和设备图片的关联对象 tb_lib_device_img_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tb_lib_device_img_ref") +public class TbLibDeviceImgRef extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 库编码 + */ + private String libCode; + + /** + * 图片编码 + */ + private String imgCode; + + /** + * 设备编码 + */ + private String eqpCode; + + /** + * 设备库id + */ + private Long eqpLibId; + + /** + * 设备库图片id + */ + private Long eqpLibImgId; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceRef.java new file mode 100644 index 0000000..c0ae928 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbLibDeviceRef.java @@ -0,0 +1,66 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 系统库与设备库的关联对象 tb_lib_device_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tb_lib_device_ref") +public class TbLibDeviceRef extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 人员库编码 + */ + private String libCode; + + /** + * 设备编码 + */ + private String eqpCode; + + /** + * 设备上的库id + */ + private Long eqpLibCode; + + /** + * 第三方设备库添加状态 1: 成功，2：失败 + */ + private Long eqpLibState; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLib.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLib.java new file mode 100644 index 0000000..30bb220 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLib.java @@ -0,0 +1,71 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 人像库对象 tb_person_lib + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tb_person_lib") +public class TbPersonLib extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 人员库编码 + */ + private String libCode; + + /** + * 人员库名称 + */ + private String libName; + + /** + * 人员库描述 + */ + private String libDesc; + + /** + * 库类型，1：人员库，2：工服库 + */ + private Long libType; + + /** + * 库的业务类型 1: 门禁库，2: 黑名单库 + */ + private Long busiType; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLibImg.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLibImg.java new file mode 100644 index 0000000..3deae1a --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbPersonLibImg.java @@ -0,0 +1,99 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 人像信息对象 tb_person_lib_img + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tb_person_lib_img") +public class TbPersonLibImg extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 人员库编码 + */ + private String libCode; + + /** + * 人像名称 + */ + private String imgName; + + /** + * 图片编码 + */ + private String imgCode; + + /** + * 图片的存储地址 + */ + private String imgUrl; + + /** + * 性别 1：男 +2：女 99：未说明 + */ + private Long sex; + + /** + * 邮箱 + */ + private String email; + + /** + * 联系方式 + */ + private String tel; + + /** + * 证件类型 +1：身份证 2：护照 +3：行驶证 99：其它 + */ + private Long certificateType; + + /** + * 证件号码 + */ + private String certificateNo; + + /** + * 出生日期 + */ + private String birthDate; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdFactory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdFactory.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java index ea17cf9..a67d410 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdFactory.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java @@ -1,11 +1,10 @@ -package org.dromara.iot.domain; +package org.dromara.sis.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeter.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeter.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java index f04301a..b5378d7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeter.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain; +package org.dromara.sis.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterConfig.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java similarity index 97% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterConfig.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java index fe5695f..4e8e275 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterConfig.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain; +package org.dromara.sis.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterRoom.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterRoom.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java index 1f8f681..f62aeb0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/TdMeterRoom.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain; +package org.dromara.sis.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbAccessControlBo.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbAccessControlBo.java index 05976e7..87d81c3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbAccessControlBo.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain.bo; +package org.dromara.sis.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.iot.domain.TbAccessControl; +import org.dromara.sis.domain.TbAccessControl; /** * 门禁管理业务对象 tb_access_control diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceImgRefBo.java new file mode 100644 index 0000000..dd05149 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceImgRefBo.java @@ -0,0 +1,75 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.TbLibDeviceImgRef; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 系统图片和设备图片的关联业务对象 tb_lib_device_img_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TbLibDeviceImgRef.class, reverseConvertGenerate = false) +public class TbLibDeviceImgRefBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 库编码 + */ + @NotBlank(message = "库编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String libCode; + + /** + * 图片编码 + */ + @NotBlank(message = "图片编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String imgCode; + + /** + * 设备编码 + */ + @NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String eqpCode; + + /** + * 设备库id + */ + @NotNull(message = "设备库id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpLibId; + + /** + * 设备库图片id + */ + @NotNull(message = "设备库图片id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpLibImgId; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceRefBo.java new file mode 100644 index 0000000..cf17f52 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbLibDeviceRefBo.java @@ -0,0 +1,69 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.TbLibDeviceRef; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 系统库与设备库的关联业务对象 tb_lib_device_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TbLibDeviceRef.class, reverseConvertGenerate = false) +public class TbLibDeviceRefBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 人员库编码 + */ + @NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String libCode; + + /** + * 设备编码 + */ + @NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String eqpCode; + + /** + * 设备上的库id + */ + @NotNull(message = "设备上的库id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpLibCode; + + /** + * 第三方设备库添加状态 1: 成功，2：失败 + */ + @NotNull(message = "第三方设备库添加状态 1: 成功，2：失败不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpLibState; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibBo.java new file mode 100644 index 0000000..e59aad2 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibBo.java @@ -0,0 +1,72 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.TbPersonLib; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 人像库业务对象 tb_person_lib + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TbPersonLib.class, reverseConvertGenerate = false) +public class TbPersonLibBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 人员库编码 + */ + @NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String libCode; + + /** + * 人员库名称 + */ + @NotBlank(message = "人员库名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String libName; + + /** + * 人员库描述 + */ + private String libDesc; + + /** + * 库类型，1：人员库，2：工服库 + */ + private Long libType; + + /** + * 库的业务类型 1: 门禁库，2: 黑名单库 + */ + private Long busiType; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibImgBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibImgBo.java new file mode 100644 index 0000000..637d2d7 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbPersonLibImgBo.java @@ -0,0 +1,101 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.TbPersonLibImg; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 人像信息业务对象 tb_person_lib_img + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TbPersonLibImg.class, reverseConvertGenerate = false) +public class TbPersonLibImgBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 人员库编码 + */ + @NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String libCode; + + /** + * 人像名称 + */ + @NotBlank(message = "人像名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String imgName; + + /** + * 图片编码 + */ + private String imgCode; + + /** + * 图片的存储地址 + */ + @NotBlank(message = "图片的存储地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String imgUrl; + + /** + * 性别 1：男 +2：女 99：未说明 + */ + private Long sex; + + /** + * 邮箱 + */ + private String email; + + /** + * 联系方式 + */ + private String tel; + + /** + * 证件类型 +1：身份证 2：护照 +3：行驶证 99：其它 + */ + private Long certificateType; + + /** + * 证件号码 + */ + private String certificateNo; + + /** + * 出生日期 + */ + private String birthDate; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java index cea8685..2cd84c7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain.bo; +package org.dromara.sis.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.iot.domain.TdFactory; +import org.dromara.sis.domain.TdFactory; /** * 厂商管理业务对象 td_factory diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java index f4c69a2..376bf34 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain.bo; +package org.dromara.sis.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.iot.domain.TdMeter; +import org.dromara.sis.domain.TdMeter; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java index 0f0aeb3..13b5216 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java @@ -1,6 +1,6 @@ -package org.dromara.iot.domain.bo; +package org.dromara.sis.domain.bo; -import org.dromara.iot.domain.TdMeterConfig; +import org.dromara.sis.domain.TdMeterConfig; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java index f874962..39f8306 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java @@ -1,6 +1,6 @@ -package org.dromara.iot.domain.bo; +package org.dromara.sis.domain.bo; -import org.dromara.iot.domain.TdMeterRoom; +import org.dromara.sis.domain.TdMeterRoom; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbAccessControlVo.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbAccessControlVo.java index bc7c7f5..b4e9729 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbAccessControlVo.java @@ -1,10 +1,10 @@ -package org.dromara.iot.domain.vo; +package org.dromara.sis.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.iot.domain.TbAccessControl; +import org.dromara.sis.domain.TbAccessControl; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceImgRefVo.java new file mode 100644 index 0000000..80b79cc --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceImgRefVo.java @@ -0,0 +1,86 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.TbLibDeviceImgRef; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 系统图片和设备图片的关联视图对象 tb_lib_device_img_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TbLibDeviceImgRef.class) +public class TbLibDeviceImgRefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 库编码 + */ + @ExcelProperty(value = "库编码") + private String libCode; + + /** + * 图片编码 + */ + @ExcelProperty(value = "图片编码") + private String imgCode; + + /** + * 设备编码 + */ + @ExcelProperty(value = "设备编码") + private String eqpCode; + + /** + * 设备库id + */ + @ExcelProperty(value = "设备库id") + private Long eqpLibId; + + /** + * 设备库图片id + */ + @ExcelProperty(value = "设备库图片id") + private Long eqpLibImgId; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceRefVo.java new file mode 100644 index 0000000..8573a27 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbLibDeviceRefVo.java @@ -0,0 +1,80 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.TbLibDeviceRef; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 系统库与设备库的关联视图对象 tb_lib_device_ref + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TbLibDeviceRef.class) +public class TbLibDeviceRefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 人员库编码 + */ + @ExcelProperty(value = "人员库编码") + private String libCode; + + /** + * 设备编码 + */ + @ExcelProperty(value = "设备编码") + private String eqpCode; + + /** + * 设备上的库id + */ + @ExcelProperty(value = "设备上的库id") + private Long eqpLibCode; + + /** + * 第三方设备库添加状态 1: 成功，2：失败 + */ + @ExcelProperty(value = "第三方设备库添加状态 1: 成功，2：失败") + private Long eqpLibState; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibImgVo.java new file mode 100644 index 0000000..017c40b --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibImgVo.java @@ -0,0 +1,122 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.TbPersonLibImg; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 人像信息视图对象 tb_person_lib_img + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TbPersonLibImg.class) +public class TbPersonLibImgVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 人员库编码 + */ + @ExcelProperty(value = "人员库编码") + private String libCode; + + /** + * 人像名称 + */ + @ExcelProperty(value = "人像名称") + private String imgName; + + /** + * 图片编码 + */ + @ExcelProperty(value = "图片编码") + private String imgCode; + + /** + * 图片的存储地址 + */ + @ExcelProperty(value = "图片的存储地址") + private String imgUrl; + + /** + * 性别 1：男 +2：女 99：未说明 + */ + @ExcelProperty(value = "性别 1：男 +2：女 99：未说明") + private Long sex; + + /** + * 邮箱 + */ + @ExcelProperty(value = "邮箱") + private String email; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String tel; + + /** + * 证件类型 +1：身份证 2：护照 +3：行驶证 99：其它 + */ + @ExcelProperty(value = "证件类型 +1：身份证 2：护照 +3：行驶证 99：其它") + private Long certificateType; + + /** + * 证件号码 + */ + @ExcelProperty(value = "证件号码") + private String certificateNo; + + /** + * 出生日期 + */ + @ExcelProperty(value = "出生日期") + private String birthDate; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibVo.java new file mode 100644 index 0000000..0dd8878 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbPersonLibVo.java @@ -0,0 +1,86 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.TbPersonLib; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 人像库视图对象 tb_person_lib + * + * @author mocheng + * @date 2025-06-24 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TbPersonLib.class) +public class TbPersonLibVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 人员库编码 + */ + @ExcelProperty(value = "人员库编码") + private String libCode; + + /** + * 人员库名称 + */ + @ExcelProperty(value = "人员库名称") + private String libName; + + /** + * 人员库描述 + */ + @ExcelProperty(value = "人员库描述") + private String libDesc; + + /** + * 库类型，1：人员库，2：工服库 + */ + @ExcelProperty(value = "库类型，1：人员库，2：工服库") + private Long libType; + + /** + * 库的业务类型 1: 门禁库，2: 黑名单库 + */ + @ExcelProperty(value = "库的业务类型 1: 门禁库，2: 黑名单库") + private Long busiType; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java index 356b8ec..534a75e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.iot.domain.vo; +package org.dromara.sis.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.iot.domain.TdFactory; +import org.dromara.sis.domain.TdFactory; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java index 24b145d..ca4d7e1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java @@ -1,4 +1,4 @@ -package org.dromara.iot.domain.vo; +package org.dromara.sis.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.iot.domain.TdMeterConfig; +import org.dromara.sis.domain.TdMeterConfig; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java index 487f670..9016933 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java @@ -1,10 +1,10 @@ -package org.dromara.iot.domain.vo; +package org.dromara.sis.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.iot.domain.TdMeterRoom; +import org.dromara.sis.domain.TdMeterRoom; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java index 6a5326d..ab70349 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java @@ -1,10 +1,10 @@ -package org.dromara.iot.domain.vo; +package org.dromara.sis.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.iot.domain.TdMeter; +import org.dromara.sis.domain.TdMeter; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbAccessControlMapper.java similarity index 69% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbAccessControlMapper.java index 7b85fb0..4f9fe94 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbAccessControlMapper.java @@ -1,9 +1,9 @@ -package org.dromara.iot.mapper; +package org.dromara.sis.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.iot.domain.TbAccessControl; -import org.dromara.iot.domain.vo.TbAccessControlVo; +import org.dromara.sis.domain.TbAccessControl; +import org.dromara.sis.domain.vo.TbAccessControlVo; /** * 门禁管理Mapper接口 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceImgRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceImgRefMapper.java new file mode 100644 index 0000000..ff78516 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceImgRefMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.TbLibDeviceImgRef; +import org.dromara.sis.domain.vo.TbLibDeviceImgRefVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 系统图片和设备图片的关联Mapper接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface TbLibDeviceImgRefMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceRefMapper.java new file mode 100644 index 0000000..c921ddc --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbLibDeviceRefMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.TbLibDeviceRef; +import org.dromara.sis.domain.vo.TbLibDeviceRefVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 系统库与设备库的关联Mapper接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface TbLibDeviceRefMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibImgMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibImgMapper.java new file mode 100644 index 0000000..94d7035 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibImgMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.TbPersonLibImg; +import org.dromara.sis.domain.vo.TbPersonLibImgVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 人像信息Mapper接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface TbPersonLibImgMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibMapper.java new file mode 100644 index 0000000..05209e3 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbPersonLibMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.TbPersonLib; +import org.dromara.sis.domain.vo.TbPersonLibVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 人像库Mapper接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface TbPersonLibMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java index 38cbdc1..fb24b53 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.iot.mapper; +package org.dromara.sis.mapper; -import org.dromara.iot.domain.TdFactory; -import org.dromara.iot.domain.vo.TdFactoryVo; +import org.dromara.sis.domain.TdFactory; +import org.dromara.sis.domain.vo.TdFactoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java index c72b1e2..376a108 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java @@ -1,7 +1,7 @@ -package org.dromara.iot.mapper; +package org.dromara.sis.mapper; -import org.dromara.iot.domain.TdMeterConfig; -import org.dromara.iot.domain.vo.TdMeterConfigVo; +import org.dromara.sis.domain.TdMeterConfig; +import org.dromara.sis.domain.vo.TdMeterConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java index b1018c0..dbf0b20 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java @@ -1,7 +1,7 @@ -package org.dromara.iot.mapper; +package org.dromara.sis.mapper; -import org.dromara.iot.domain.TdMeter; -import org.dromara.iot.domain.vo.TdMeterVo; +import org.dromara.sis.domain.TdMeter; +import org.dromara.sis.domain.vo.TdMeterVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java index c0a4324..4cd678c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java @@ -1,8 +1,8 @@ -package org.dromara.iot.mapper; +package org.dromara.sis.mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.iot.domain.TdMeterRoom; -import org.dromara.iot.domain.vo.TdMeterRoomVo; +import org.dromara.sis.domain.TdMeterRoom; +import org.dromara.sis.domain.vo.TdMeterRoomVo; /** * 和房间的关联Mapper接口 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/AccessControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java similarity index 80% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/AccessControlService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java index 24cc66d..00d39f2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/AccessControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java @@ -1,9 +1,9 @@ -package org.dromara.iot.sdk.e8; +package org.dromara.sis.sdk.e8; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.iot.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/CustomerService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/CustomerService.java similarity index 70% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/CustomerService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/CustomerService.java index 1d58e9c..164b1f3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/CustomerService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/CustomerService.java @@ -1,12 +1,12 @@ -package org.dromara.iot.sdk.e8; +package org.dromara.sis.sdk.e8; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomAddReq; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomFindReq; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomUpdateReq; -import org.dromara.iot.sdk.e8.domain.custom.res.CustomAddRes; -import org.dromara.iot.sdk.e8.domain.custom.res.CustomFindRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomAddReq; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomFindReq; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomUpdateReq; +import org.dromara.sis.sdk.e8.domain.custom.res.CustomAddRes; +import org.dromara.sis.sdk.e8.domain.custom.res.CustomFindRes; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/DoorDeviceService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/DoorDeviceService.java similarity index 71% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/DoorDeviceService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/DoorDeviceService.java index 7724731..a0f8603 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/DoorDeviceService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/DoorDeviceService.java @@ -1,12 +1,12 @@ -package org.dromara.iot.sdk.e8; +package org.dromara.sis.sdk.e8; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes; -import org.dromara.iot.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceUpdateReq; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceFindRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceUpdateRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/LiftService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/LiftService.java similarity index 77% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/LiftService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/LiftService.java index fc87014..1045d09 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/LiftService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/LiftService.java @@ -1,11 +1,11 @@ -package org.dromara.iot.sdk.e8; +package org.dromara.sis.sdk.e8; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.domain.lift.req.LiftAddReq; -import org.dromara.iot.sdk.e8.domain.lift.req.LiftUpdateReq; -import org.dromara.iot.sdk.e8.domain.lift.res.LiftFindRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.lift.req.LiftAddReq; +import org.dromara.sis.sdk.e8.domain.lift.req.LiftUpdateReq; +import org.dromara.sis.sdk.e8.domain.lift.res.LiftFindRes; /** * @author zcxlsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/VoucherControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java similarity index 88% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/VoucherControlService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java index a32e8eb..9ee7d3f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/VoucherControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8; +package org.dromara.sis.sdk.e8; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/ApiResp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/ApiResp.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/ApiResp.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/ApiResp.java index 0646f7b..7a9adb2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/ApiResp.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/ApiResp.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain; +package org.dromara.sis.sdk.e8.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/QueryDto.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/QueryDto.java similarity index 89% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/QueryDto.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/QueryDto.java index f56eaab..9011381 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/QueryDto.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/QueryDto.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain; +package org.dromara.sis.sdk.e8.domain; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java index 7bed557..dbe6323 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accesscontrol.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java index 37b35b1..3322910 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accesscontrol.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java index 4f7f577..dcd3cb5 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.accesscontrol.res; +package org.dromara.sis.sdk.e8.domain.accesscontrol.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomAddReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomAddReq.java similarity index 99% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomAddReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomAddReq.java index 9df3db6..fa47940 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomAddReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomAddReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.custom.req; +package org.dromara.sis.sdk.e8.domain.custom.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomFindReq.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomFindReq.java index cd38e86..292d011 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.custom.req; +package org.dromara.sis.sdk.e8.domain.custom.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomUpdateReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomUpdateReq.java similarity index 99% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomUpdateReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomUpdateReq.java index fe65fc8..e532243 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/req/CustomUpdateReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/req/CustomUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.custom.req; +package org.dromara.sis.sdk.e8.domain.custom.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomAddRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomAddRes.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomAddRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomAddRes.java index 31916a5..5245b7c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomAddRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomAddRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.custom.res; +package org.dromara.sis.sdk.e8.domain.custom.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomFindRes.java index bf75d6c..3bf2339 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/custom/res/CustomFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/custom/res/CustomFindRes.java @@ -1,9 +1,9 @@ -package org.dromara.iot.sdk.e8.domain.custom.res; +package org.dromara.sis.sdk.e8.domain.custom.res; import lombok.Data; -import org.dromara.iot.sdk.e8.domain.enums.AreaTypeEnum; -import org.dromara.iot.sdk.e8.domain.enums.UserTypeEnum; +import org.dromara.sis.sdk.e8.domain.enums.AreaTypeEnum; +import org.dromara.sis.sdk.e8.domain.enums.UserTypeEnum; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceAddReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java similarity index 97% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceAddReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java index ecfe359..b2e6690 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceAddReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.req; +package org.dromara.sis.sdk.e8.domain.door.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceFindReq.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceFindReq.java index 1667250..839df53 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.req; +package org.dromara.sis.sdk.e8.domain.door.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java similarity index 97% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java index 549d2e8..ed01e07 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.req; +package org.dromara.sis.sdk.e8.domain.door.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceAddRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceAddRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceAddRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceAddRes.java index 5702a96..c106a8b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceAddRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceAddRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.res; +package org.dromara.sis.sdk.e8.domain.door.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceFindRes.java index c10913c..64d3324 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceFindRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.res; +package org.dromara.sis.sdk.e8.domain.door.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java index d3e0b1a..d9efb13 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/res/DoorDeviceUpdateRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.door.res; +package org.dromara.sis.sdk.e8.domain.door.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/AreaTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/AreaTypeEnum.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/AreaTypeEnum.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/AreaTypeEnum.java index 8ec080a..97d9ee0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/AreaTypeEnum.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/AreaTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.enums; +package org.dromara.sis.sdk.e8.domain.enums; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/UserTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/UserTypeEnum.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/UserTypeEnum.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/UserTypeEnum.java index 56a6f94..747ebb8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/enums/UserTypeEnum.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/enums/UserTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.enums; +package org.dromara.sis.sdk.e8.domain.enums; /** * @author zcxlsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftAddReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftAddReq.java similarity index 86% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftAddReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftAddReq.java index ea36932..0752a0d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftAddReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftAddReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.lift.req; +package org.dromara.sis.sdk.e8.domain.lift.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftFindReq.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftFindReq.java index a55a675..cd3ee77 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.lift.req; +package org.dromara.sis.sdk.e8.domain.lift.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftUpdateReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftUpdateReq.java similarity index 88% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftUpdateReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftUpdateReq.java index 4d8ce04..fbbe19e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/req/LiftUpdateReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/req/LiftUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.lift.req; +package org.dromara.sis.sdk.e8.domain.lift.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftAddRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftAddRes.java similarity index 66% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftAddRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftAddRes.java index 7762c99..ffc9b7d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftAddRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftAddRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.lift.res; +package org.dromara.sis.sdk.e8.domain.lift.res; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftFindRes.java index 0c47ce4..a0ce42f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/domain/lift/res/LiftFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/lift/res/LiftFindRes.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.domain.lift.res; +package org.dromara.sis.sdk.e8.domain.lift.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/AccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java similarity index 89% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/AccessControlServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java index 3d09471..0d57850 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/AccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.impl; +package org.dromara.sis.sdk.e8.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.TypeReference; @@ -6,13 +6,13 @@ import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.AccessControlService; -import org.dromara.iot.sdk.e8.domain.accesscontrol.req.AccessRecordFindReq; -import org.dromara.iot.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.iot.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.iot.sdk.e8.domain.ApiResp; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.utils.E8ApiUtil; +import org.dromara.sis.sdk.e8.AccessControlService; +import org.dromara.sis.sdk.e8.domain.accesscontrol.req.AccessRecordFindReq; +import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.ApiResp; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/CustomerServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/CustomerServiceImpl.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/CustomerServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/CustomerServiceImpl.java index b2d216f..f964521 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/CustomerServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.impl; +package org.dromara.sis.sdk.e8.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.TypeReference; @@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; -import org.dromara.iot.sdk.e8.CustomerService; -import org.dromara.iot.sdk.e8.domain.ApiResp; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomAddReq; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomFindReq; -import org.dromara.iot.sdk.e8.domain.custom.req.CustomUpdateReq; -import org.dromara.iot.sdk.e8.domain.custom.res.CustomAddRes; -import org.dromara.iot.sdk.e8.domain.custom.res.CustomFindRes; -import org.dromara.iot.sdk.e8.utils.E8ApiUtil; +import org.dromara.sis.sdk.e8.CustomerService; +import org.dromara.sis.sdk.e8.domain.ApiResp; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomAddReq; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomFindReq; +import org.dromara.sis.sdk.e8.domain.custom.req.CustomUpdateReq; +import org.dromara.sis.sdk.e8.domain.custom.res.CustomAddRes; +import org.dromara.sis.sdk.e8.domain.custom.res.CustomFindRes; +import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/DoorDeviceServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/DoorDeviceServiceImpl.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/DoorDeviceServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/DoorDeviceServiceImpl.java index 61e14d3..b5c2e4c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/DoorDeviceServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/DoorDeviceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.impl; +package org.dromara.sis.sdk.e8.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.TypeReference; @@ -6,16 +6,16 @@ import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.sdk.e8.DoorDeviceService; -import org.dromara.iot.sdk.e8.domain.ApiResp; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceFindReq; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceUpdateReq; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceFindRes; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceUpdateRes; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.utils.E8ApiUtil; +import org.dromara.sis.sdk.e8.DoorDeviceService; +import org.dromara.sis.sdk.e8.domain.ApiResp; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceFindReq; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceUpdateReq; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceFindRes; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceUpdateRes; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/LiftServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/LiftServiceImpl.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/LiftServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/LiftServiceImpl.java index abfdbc6..079c516 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/impl/LiftServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/LiftServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.e8.impl; +package org.dromara.sis.sdk.e8.impl; import cn.hutool.core.bean.BeanUtil; @@ -7,14 +7,14 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.dubbo.config.annotation.DubboService; -import org.dromara.iot.sdk.e8.LiftService; -import org.dromara.iot.sdk.e8.domain.ApiResp; -import org.dromara.iot.sdk.e8.domain.QueryDto; -import org.dromara.iot.sdk.e8.domain.lift.req.LiftAddReq; -import org.dromara.iot.sdk.e8.domain.lift.req.LiftFindReq; -import org.dromara.iot.sdk.e8.domain.lift.req.LiftUpdateReq; -import org.dromara.iot.sdk.e8.domain.lift.res.LiftFindRes; -import org.dromara.iot.sdk.e8.utils.E8ApiUtil; +import org.dromara.sis.sdk.e8.LiftService; +import org.dromara.sis.sdk.e8.domain.ApiResp; +import org.dromara.sis.sdk.e8.domain.QueryDto; +import org.dromara.sis.sdk.e8.domain.lift.req.LiftAddReq; +import org.dromara.sis.sdk.e8.domain.lift.req.LiftFindReq; +import org.dromara.sis.sdk.e8.domain.lift.req.LiftUpdateReq; +import org.dromara.sis.sdk.e8.domain.lift.res.LiftFindRes; +import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/utils/E8ApiUtil.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/utils/E8ApiUtil.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java index ff3769e..84fd0e7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/e8/utils/E8ApiUtil.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java @@ -1,10 +1,10 @@ -package org.dromara.iot.sdk.e8.utils; +package org.dromara.sis.sdk.e8.utils; import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; -import org.dromara.iot.sdk.e8.domain.ApiResp; +import org.dromara.sis.sdk.e8.domain.ApiResp; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/UnViewAiBoxApi.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/UnViewAiBoxApi.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/UnViewAiBoxApi.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/UnViewAiBoxApi.java index fac0ed7..5b1007e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/UnViewAiBoxApi.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/UnViewAiBoxApi.java @@ -1,7 +1,7 @@ -package org.dromara.iot.sdk.unview; +package org.dromara.sis.sdk.unview; import java.util.List; -import static org.dromara.iot.sdk.unview.model.UvModel.*; +import static org.dromara.sis.sdk.unview.model.UvModel.*; public interface UnViewAiBoxApi { diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/UvModel.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java similarity index 99% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/UvModel.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java index 1fad820..ee14636 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/UvModel.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.unview.model; +package org.dromara.sis.sdk.unview.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmModelEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmModelEnum.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmModelEnum.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmModelEnum.java index e919152..33ddb12 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmModelEnum.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmModelEnum.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.unview.model.enums; +package org.dromara.sis.sdk.unview.model.enums; /** * [ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmTypeEnum.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmTypeEnum.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmTypeEnum.java index d059602..d356e79 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/AlarmTypeEnum.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/AlarmTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.unview.model.enums; +package org.dromara.sis.sdk.unview.model.enums; import java.util.Objects; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/UniViewApiEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/UniViewApiEnum.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/UniViewApiEnum.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/UniViewApiEnum.java index ed1f177..78fa857 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/model/enums/UniViewApiEnum.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/enums/UniViewApiEnum.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.unview.model.enums; +package org.dromara.sis.sdk.unview.model.enums; import lombok.Getter; import org.springframework.http.HttpMethod; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/UnViewAiBoxApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/UnViewAiBoxApiService.java similarity index 97% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/UnViewAiBoxApiService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/UnViewAiBoxApiService.java index d2d6cd1..d44f41d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/UnViewAiBoxApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/UnViewAiBoxApiService.java @@ -1,11 +1,11 @@ -package org.dromara.iot.sdk.unview.service; +package org.dromara.sis.sdk.unview.service; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.dromara.iot.sdk.unview.UnViewAiBoxApi; -import org.dromara.iot.sdk.unview.model.enums.UniViewApiEnum; -import org.dromara.iot.sdk.unview.utils.UniViewHttp; +import org.dromara.sis.sdk.unview.UnViewAiBoxApi; +import org.dromara.sis.sdk.unview.model.enums.UniViewApiEnum; +import org.dromara.sis.sdk.unview.utils.UniViewHttp; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Arrays; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.dromara.iot.sdk.unview.model.UvModel.*; +import static org.dromara.sis.sdk.unview.model.UvModel.*; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/VideoAlarmService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java similarity index 88% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/VideoAlarmService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java index 3905890..5e0dd56 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/service/VideoAlarmService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java @@ -1,8 +1,9 @@ -package org.dromara.iot.sdk.unview.service; +package org.dromara.sis.sdk.unview.service; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.dromara.iot.sdk.unview.model.UvModel; -import org.dromara.iot.sdk.unview.model.enums.AlarmTypeEnum; +import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.unview.model.enums.AlarmTypeEnum; import org.springframework.stereotype.Service; /** @@ -19,7 +20,8 @@ public class VideoAlarmService { Integer type = alarmReportData.getType(); AlarmTypeEnum alarmType = AlarmTypeEnum.getAlarmType(type); if (alarmType == null) { - log.info("未知的数据上报类型。"); + log.error("未知的数据上报类型。"); + log.error("上报数据: {}", JSONObject.toJSONString(alarmReportData)); return; } switch (alarmType) { @@ -88,7 +90,7 @@ public class VideoAlarmService { * @param alarmReportData 告警数据 */ private void handleFacialCapture(UvModel.AlarmReportInfo alarmReportData) { - + //TODO } /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/utils/UniViewHttp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java similarity index 97% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/utils/UniViewHttp.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java index 9e05d04..81b4ea8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/sdk/unview/utils/UniViewHttp.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java @@ -1,4 +1,4 @@ -package org.dromara.iot.sdk.unview.utils; +package org.dromara.sis.sdk.unview.utils; import cn.hutool.core.util.IdUtil; @@ -7,8 +7,8 @@ import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import lombok.extern.slf4j.Slf4j; -import org.dromara.iot.sdk.unview.model.UvModel; -import org.dromara.iot.sdk.unview.model.enums.UniViewApiEnum; +import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.unview.model.enums.UniViewApiEnum; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.dromara.iot.sdk.unview.model.UvModel.*; +import static org.dromara.sis.sdk.unview.model.UvModel.*; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITbAccessControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbAccessControlService.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITbAccessControlService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbAccessControlService.java index a2c7ee9..2a52d46 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITbAccessControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbAccessControlService.java @@ -1,9 +1,9 @@ -package org.dromara.iot.service; +package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.bo.TbAccessControlBo; -import org.dromara.iot.domain.vo.TbAccessControlVo; +import org.dromara.sis.domain.bo.TbAccessControlBo; +import org.dromara.sis.domain.vo.TbAccessControlVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceImgRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceImgRefService.java new file mode 100644 index 0000000..cadee62 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceImgRefService.java @@ -0,0 +1,69 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.TbLibDeviceImgRef; +import org.dromara.sis.domain.vo.TbLibDeviceImgRefVo; +import org.dromara.sis.domain.bo.TbLibDeviceImgRefBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 系统图片和设备图片的关联Service接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface ITbLibDeviceImgRefService { + + /** + * 查询系统图片和设备图片的关联 + * + * @param id 主键 + * @return 系统图片和设备图片的关联 + */ + TbLibDeviceImgRefVo queryById(Long id); + + /** + * 分页查询系统图片和设备图片的关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 系统图片和设备图片的关联分页列表 + */ + TableDataInfo queryPageList(TbLibDeviceImgRefBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的系统图片和设备图片的关联列表 + * + * @param bo 查询条件 + * @return 系统图片和设备图片的关联列表 + */ + List queryList(TbLibDeviceImgRefBo bo); + + /** + * 新增系统图片和设备图片的关联 + * + * @param bo 系统图片和设备图片的关联 + * @return 是否新增成功 + */ + Boolean insertByBo(TbLibDeviceImgRefBo bo); + + /** + * 修改系统图片和设备图片的关联 + * + * @param bo 系统图片和设备图片的关联 + * @return 是否修改成功 + */ + Boolean updateByBo(TbLibDeviceImgRefBo bo); + + /** + * 校验并批量删除系统图片和设备图片的关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceRefService.java new file mode 100644 index 0000000..d109e6d --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbLibDeviceRefService.java @@ -0,0 +1,69 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.TbLibDeviceRef; +import org.dromara.sis.domain.vo.TbLibDeviceRefVo; +import org.dromara.sis.domain.bo.TbLibDeviceRefBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 系统库与设备库的关联Service接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface ITbLibDeviceRefService { + + /** + * 查询系统库与设备库的关联 + * + * @param id 主键 + * @return 系统库与设备库的关联 + */ + TbLibDeviceRefVo queryById(Long id); + + /** + * 分页查询系统库与设备库的关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 系统库与设备库的关联分页列表 + */ + TableDataInfo queryPageList(TbLibDeviceRefBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的系统库与设备库的关联列表 + * + * @param bo 查询条件 + * @return 系统库与设备库的关联列表 + */ + List queryList(TbLibDeviceRefBo bo); + + /** + * 新增系统库与设备库的关联 + * + * @param bo 系统库与设备库的关联 + * @return 是否新增成功 + */ + Boolean insertByBo(TbLibDeviceRefBo bo); + + /** + * 修改系统库与设备库的关联 + * + * @param bo 系统库与设备库的关联 + * @return 是否修改成功 + */ + Boolean updateByBo(TbLibDeviceRefBo bo); + + /** + * 校验并批量删除系统库与设备库的关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibImgService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibImgService.java new file mode 100644 index 0000000..aea837f --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibImgService.java @@ -0,0 +1,69 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.TbPersonLibImg; +import org.dromara.sis.domain.vo.TbPersonLibImgVo; +import org.dromara.sis.domain.bo.TbPersonLibImgBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 人像信息Service接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface ITbPersonLibImgService { + + /** + * 查询人像信息 + * + * @param id 主键 + * @return 人像信息 + */ + TbPersonLibImgVo queryById(Long id); + + /** + * 分页查询人像信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像信息分页列表 + */ + TableDataInfo queryPageList(TbPersonLibImgBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人像信息列表 + * + * @param bo 查询条件 + * @return 人像信息列表 + */ + List queryList(TbPersonLibImgBo bo); + + /** + * 新增人像信息 + * + * @param bo 人像信息 + * @return 是否新增成功 + */ + Boolean insertByBo(TbPersonLibImgBo bo); + + /** + * 修改人像信息 + * + * @param bo 人像信息 + * @return 是否修改成功 + */ + Boolean updateByBo(TbPersonLibImgBo bo); + + /** + * 校验并批量删除人像信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibService.java new file mode 100644 index 0000000..85bcf22 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbPersonLibService.java @@ -0,0 +1,69 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.TbPersonLib; +import org.dromara.sis.domain.vo.TbPersonLibVo; +import org.dromara.sis.domain.bo.TbPersonLibBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 人像库Service接口 + * + * @author mocheng + * @date 2025-06-24 + */ +public interface ITbPersonLibService { + + /** + * 查询人像库 + * + * @param id 主键 + * @return 人像库 + */ + TbPersonLibVo queryById(Long id); + + /** + * 分页查询人像库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像库分页列表 + */ + TableDataInfo queryPageList(TbPersonLibBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人像库列表 + * + * @param bo 查询条件 + * @return 人像库列表 + */ + List queryList(TbPersonLibBo bo); + + /** + * 新增人像库 + * + * @param bo 人像库 + * @return 是否新增成功 + */ + Boolean insertByBo(TbPersonLibBo bo); + + /** + * 修改人像库 + * + * @param bo 人像库 + * @return 是否修改成功 + */ + Boolean updateByBo(TbPersonLibBo bo); + + /** + * 校验并批量删除人像库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdFactoryService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdFactoryService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java index ecfafd4..e29940b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdFactoryService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java @@ -1,9 +1,9 @@ -package org.dromara.iot.service; +package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.bo.TdFactoryBo; -import org.dromara.iot.domain.vo.TdFactoryVo; +import org.dromara.sis.domain.bo.TdFactoryBo; +import org.dromara.sis.domain.vo.TdFactoryVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java index 5eac778..f2766b0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.iot.service; +package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.bo.TdMeterConfigBo; -import org.dromara.iot.domain.vo.TdMeterConfigVo; +import org.dromara.sis.domain.bo.TdMeterConfigBo; +import org.dromara.sis.domain.vo.TdMeterConfigVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java similarity index 91% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java index 97d2d1f..ab3e937 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java @@ -1,10 +1,10 @@ -package org.dromara.iot.service; +package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.TdMeterRoom; -import org.dromara.iot.domain.bo.TdMeterRoomBo; -import org.dromara.iot.domain.vo.TdMeterRoomVo; +import org.dromara.sis.domain.TdMeterRoom; +import org.dromara.sis.domain.bo.TdMeterRoomBo; +import org.dromara.sis.domain.vo.TdMeterRoomVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java index b0189e2..ba2f4da 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/ITdMeterService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java @@ -1,9 +1,9 @@ -package org.dromara.iot.service; +package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.bo.TdMeterBo; -import org.dromara.iot.domain.vo.TdMeterVo; +import org.dromara.sis.domain.bo.TdMeterBo; +import org.dromara.sis.domain.vo.TdMeterVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbAccessControlServiceImpl.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbAccessControlServiceImpl.java index b9d3f0e..74e8d3e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbAccessControlServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.service.impl; +package org.dromara.sis.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,15 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.iot.sdk.e8.DoorDeviceService; -import org.dromara.iot.sdk.e8.domain.door.req.DoorDeviceAddReq; -import org.dromara.iot.sdk.e8.domain.door.res.DoorDeviceAddRes; +import org.dromara.sis.sdk.e8.DoorDeviceService; +import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq; +import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes; import org.springframework.stereotype.Service; -import org.dromara.iot.domain.bo.TbAccessControlBo; -import org.dromara.iot.domain.vo.TbAccessControlVo; -import org.dromara.iot.domain.TbAccessControl; -import org.dromara.iot.mapper.TbAccessControlMapper; -import org.dromara.iot.service.ITbAccessControlService; +import org.dromara.sis.domain.bo.TbAccessControlBo; +import org.dromara.sis.domain.vo.TbAccessControlVo; +import org.dromara.sis.domain.TbAccessControl; +import org.dromara.sis.mapper.TbAccessControlMapper; +import org.dromara.sis.service.ITbAccessControlService; import java.util.List; import java.util.Map; import java.util.Collection; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceImgRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceImgRefServiceImpl.java new file mode 100644 index 0000000..b8a37e8 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceImgRefServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.sis.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.TbLibDeviceImgRefBo; +import org.dromara.sis.domain.vo.TbLibDeviceImgRefVo; +import org.dromara.sis.domain.TbLibDeviceImgRef; +import org.dromara.sis.mapper.TbLibDeviceImgRefMapper; +import org.dromara.sis.service.ITbLibDeviceImgRefService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 系统图片和设备图片的关联Service业务层处理 + * + * @author mocheng + * @date 2025-06-24 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TbLibDeviceImgRefServiceImpl implements ITbLibDeviceImgRefService { + + private final TbLibDeviceImgRefMapper baseMapper; + + /** + * 查询系统图片和设备图片的关联 + * + * @param id 主键 + * @return 系统图片和设备图片的关联 + */ + @Override + public TbLibDeviceImgRefVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询系统图片和设备图片的关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 系统图片和设备图片的关联分页列表 + */ + @Override + public TableDataInfo queryPageList(TbLibDeviceImgRefBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的系统图片和设备图片的关联列表 + * + * @param bo 查询条件 + * @return 系统图片和设备图片的关联列表 + */ + @Override + public List queryList(TbLibDeviceImgRefBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbLibDeviceImgRefBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TbLibDeviceImgRef::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), TbLibDeviceImgRef::getLibCode, bo.getLibCode()); + lqw.eq(StringUtils.isNotBlank(bo.getImgCode()), TbLibDeviceImgRef::getImgCode, bo.getImgCode()); + lqw.eq(StringUtils.isNotBlank(bo.getEqpCode()), TbLibDeviceImgRef::getEqpCode, bo.getEqpCode()); + lqw.eq(bo.getEqpLibId() != null, TbLibDeviceImgRef::getEqpLibId, bo.getEqpLibId()); + lqw.eq(bo.getEqpLibImgId() != null, TbLibDeviceImgRef::getEqpLibImgId, bo.getEqpLibImgId()); + lqw.eq(bo.getCreateById() != null, TbLibDeviceImgRef::getCreateById, bo.getCreateById()); + lqw.eq(bo.getUpdateById() != null, TbLibDeviceImgRef::getUpdateById, bo.getUpdateById()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbLibDeviceImgRef::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增系统图片和设备图片的关联 + * + * @param bo 系统图片和设备图片的关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TbLibDeviceImgRefBo bo) { + TbLibDeviceImgRef add = MapstructUtils.convert(bo, TbLibDeviceImgRef.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改系统图片和设备图片的关联 + * + * @param bo 系统图片和设备图片的关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TbLibDeviceImgRefBo bo) { + TbLibDeviceImgRef update = MapstructUtils.convert(bo, TbLibDeviceImgRef.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TbLibDeviceImgRef entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除系统图片和设备图片的关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceRefServiceImpl.java new file mode 100644 index 0000000..ddae80a --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbLibDeviceRefServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.sis.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.TbLibDeviceRefBo; +import org.dromara.sis.domain.vo.TbLibDeviceRefVo; +import org.dromara.sis.domain.TbLibDeviceRef; +import org.dromara.sis.mapper.TbLibDeviceRefMapper; +import org.dromara.sis.service.ITbLibDeviceRefService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 系统库与设备库的关联Service业务层处理 + * + * @author mocheng + * @date 2025-06-24 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TbLibDeviceRefServiceImpl implements ITbLibDeviceRefService { + + private final TbLibDeviceRefMapper baseMapper; + + /** + * 查询系统库与设备库的关联 + * + * @param id 主键 + * @return 系统库与设备库的关联 + */ + @Override + public TbLibDeviceRefVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询系统库与设备库的关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 系统库与设备库的关联分页列表 + */ + @Override + public TableDataInfo queryPageList(TbLibDeviceRefBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的系统库与设备库的关联列表 + * + * @param bo 查询条件 + * @return 系统库与设备库的关联列表 + */ + @Override + public List queryList(TbLibDeviceRefBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbLibDeviceRefBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TbLibDeviceRef::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), TbLibDeviceRef::getLibCode, bo.getLibCode()); + lqw.eq(StringUtils.isNotBlank(bo.getEqpCode()), TbLibDeviceRef::getEqpCode, bo.getEqpCode()); + lqw.eq(bo.getEqpLibCode() != null, TbLibDeviceRef::getEqpLibCode, bo.getEqpLibCode()); + lqw.eq(bo.getEqpLibState() != null, TbLibDeviceRef::getEqpLibState, bo.getEqpLibState()); + lqw.eq(bo.getCreateById() != null, TbLibDeviceRef::getCreateById, bo.getCreateById()); + lqw.eq(bo.getUpdateById() != null, TbLibDeviceRef::getUpdateById, bo.getUpdateById()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbLibDeviceRef::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增系统库与设备库的关联 + * + * @param bo 系统库与设备库的关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TbLibDeviceRefBo bo) { + TbLibDeviceRef add = MapstructUtils.convert(bo, TbLibDeviceRef.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改系统库与设备库的关联 + * + * @param bo 系统库与设备库的关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TbLibDeviceRefBo bo) { + TbLibDeviceRef update = MapstructUtils.convert(bo, TbLibDeviceRef.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TbLibDeviceRef entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除系统库与设备库的关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibImgServiceImpl.java new file mode 100644 index 0000000..ccf0962 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibImgServiceImpl.java @@ -0,0 +1,144 @@ +package org.dromara.sis.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.TbPersonLibImgBo; +import org.dromara.sis.domain.vo.TbPersonLibImgVo; +import org.dromara.sis.domain.TbPersonLibImg; +import org.dromara.sis.mapper.TbPersonLibImgMapper; +import org.dromara.sis.service.ITbPersonLibImgService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人像信息Service业务层处理 + * + * @author mocheng + * @date 2025-06-24 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TbPersonLibImgServiceImpl implements ITbPersonLibImgService { + + private final TbPersonLibImgMapper baseMapper; + + /** + * 查询人像信息 + * + * @param id 主键 + * @return 人像信息 + */ + @Override + public TbPersonLibImgVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询人像信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像信息分页列表 + */ + @Override + public TableDataInfo queryPageList(TbPersonLibImgBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的人像信息列表 + * + * @param bo 查询条件 + * @return 人像信息列表 + */ + @Override + public List queryList(TbPersonLibImgBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbPersonLibImgBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TbPersonLibImg::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), TbPersonLibImg::getLibCode, bo.getLibCode()); + lqw.like(StringUtils.isNotBlank(bo.getImgName()), TbPersonLibImg::getImgName, bo.getImgName()); + lqw.eq(StringUtils.isNotBlank(bo.getImgCode()), TbPersonLibImg::getImgCode, bo.getImgCode()); + lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), TbPersonLibImg::getImgUrl, bo.getImgUrl()); + lqw.eq(bo.getSex() != null, TbPersonLibImg::getSex, bo.getSex()); + lqw.eq(StringUtils.isNotBlank(bo.getEmail()), TbPersonLibImg::getEmail, bo.getEmail()); + lqw.eq(StringUtils.isNotBlank(bo.getTel()), TbPersonLibImg::getTel, bo.getTel()); + lqw.eq(bo.getCertificateType() != null, TbPersonLibImg::getCertificateType, bo.getCertificateType()); + lqw.eq(StringUtils.isNotBlank(bo.getCertificateNo()), TbPersonLibImg::getCertificateNo, bo.getCertificateNo()); + lqw.eq(StringUtils.isNotBlank(bo.getBirthDate()), TbPersonLibImg::getBirthDate, bo.getBirthDate()); + lqw.eq(bo.getCreateById() != null, TbPersonLibImg::getCreateById, bo.getCreateById()); + lqw.eq(bo.getUpdateById() != null, TbPersonLibImg::getUpdateById, bo.getUpdateById()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbPersonLibImg::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增人像信息 + * + * @param bo 人像信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TbPersonLibImgBo bo) { + TbPersonLibImg add = MapstructUtils.convert(bo, TbPersonLibImg.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改人像信息 + * + * @param bo 人像信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TbPersonLibImgBo bo) { + TbPersonLibImg update = MapstructUtils.convert(bo, TbPersonLibImg.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TbPersonLibImg entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除人像信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibServiceImpl.java new file mode 100644 index 0000000..b321334 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.sis.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.TbPersonLibBo; +import org.dromara.sis.domain.vo.TbPersonLibVo; +import org.dromara.sis.domain.TbPersonLib; +import org.dromara.sis.mapper.TbPersonLibMapper; +import org.dromara.sis.service.ITbPersonLibService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人像库Service业务层处理 + * + * @author mocheng + * @date 2025-06-24 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TbPersonLibServiceImpl implements ITbPersonLibService { + + private final TbPersonLibMapper baseMapper; + + /** + * 查询人像库 + * + * @param id 主键 + * @return 人像库 + */ + @Override + public TbPersonLibVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询人像库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像库分页列表 + */ + @Override + public TableDataInfo queryPageList(TbPersonLibBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的人像库列表 + * + * @param bo 查询条件 + * @return 人像库列表 + */ + @Override + public List queryList(TbPersonLibBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbPersonLibBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TbPersonLib::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), TbPersonLib::getLibCode, bo.getLibCode()); + lqw.like(StringUtils.isNotBlank(bo.getLibName()), TbPersonLib::getLibName, bo.getLibName()); + lqw.eq(StringUtils.isNotBlank(bo.getLibDesc()), TbPersonLib::getLibDesc, bo.getLibDesc()); + lqw.eq(bo.getLibType() != null, TbPersonLib::getLibType, bo.getLibType()); + lqw.eq(bo.getBusiType() != null, TbPersonLib::getBusiType, bo.getBusiType()); + lqw.eq(bo.getCreateById() != null, TbPersonLib::getCreateById, bo.getCreateById()); + lqw.eq(bo.getUpdateById() != null, TbPersonLib::getUpdateById, bo.getUpdateById()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbPersonLib::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增人像库 + * + * @param bo 人像库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TbPersonLibBo bo) { + TbPersonLib add = MapstructUtils.convert(bo, TbPersonLib.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改人像库 + * + * @param bo 人像库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TbPersonLibBo bo) { + TbPersonLib update = MapstructUtils.convert(bo, TbPersonLib.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TbPersonLib entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除人像库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java index 978dd8d..5920ca6 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.service.impl; +package org.dromara.sis.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.iot.domain.bo.TdFactoryBo; -import org.dromara.iot.domain.vo.TdFactoryVo; -import org.dromara.iot.domain.TdFactory; -import org.dromara.iot.mapper.TdFactoryMapper; -import org.dromara.iot.service.ITdFactoryService; +import org.dromara.sis.domain.bo.TdFactoryBo; +import org.dromara.sis.domain.vo.TdFactoryVo; +import org.dromara.sis.domain.TdFactory; +import org.dromara.sis.mapper.TdFactoryMapper; +import org.dromara.sis.service.ITdFactoryService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java index b9b1361..ea2621a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java @@ -1,7 +1,6 @@ -package org.dromara.iot.service.impl; +package org.dromara.sis.service.impl; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,11 +9,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.iot.domain.bo.TdMeterConfigBo; -import org.dromara.iot.domain.vo.TdMeterConfigVo; -import org.dromara.iot.domain.TdMeterConfig; -import org.dromara.iot.mapper.TdMeterConfigMapper; -import org.dromara.iot.service.ITdMeterConfigService; +import org.dromara.sis.domain.bo.TdMeterConfigBo; +import org.dromara.sis.domain.vo.TdMeterConfigVo; +import org.dromara.sis.domain.TdMeterConfig; +import org.dromara.sis.mapper.TdMeterConfigMapper; +import org.dromara.sis.service.ITdMeterConfigService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java index 5f7561e..ef2323a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.service.impl; +package org.dromara.sis.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,11 +10,11 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.TdMeterRoom; -import org.dromara.iot.domain.bo.TdMeterRoomBo; -import org.dromara.iot.domain.vo.TdMeterRoomVo; -import org.dromara.iot.mapper.TdMeterRoomMapper; -import org.dromara.iot.service.ITdMeterRoomService; +import org.dromara.sis.domain.TdMeterRoom; +import org.dromara.sis.domain.bo.TdMeterRoomBo; +import org.dromara.sis.domain.vo.TdMeterRoomVo; +import org.dromara.sis.mapper.TdMeterRoomMapper; +import org.dromara.sis.service.ITdMeterRoomService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java similarity index 94% rename from ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java index d1b95c7..6e6cd40 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.iot.service.impl; +package org.dromara.sis.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,13 +11,13 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.iot.domain.TdMeter; -import org.dromara.iot.domain.TdMeterRoom; -import org.dromara.iot.domain.bo.TdMeterBo; -import org.dromara.iot.domain.vo.TdMeterVo; -import org.dromara.iot.mapper.TdMeterMapper; -import org.dromara.iot.service.ITdMeterRoomService; -import org.dromara.iot.service.ITdMeterService; +import org.dromara.sis.domain.TdMeter; +import org.dromara.sis.domain.TdMeterRoom; +import org.dromara.sis.domain.bo.TdMeterBo; +import org.dromara.sis.domain.vo.TdMeterVo; +import org.dromara.sis.mapper.TdMeterMapper; +import org.dromara.sis.service.ITdMeterRoomService; +import org.dromara.sis.service.ITdMeterService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceImgRefMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceImgRefMapper.xml new file mode 100644 index 0000000..daf419f --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceImgRefMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceRefMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceRefMapper.xml new file mode 100644 index 0000000..1ae4565 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/TbLibDeviceRefMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibImgMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibImgMapper.xml new file mode 100644 index 0000000..1196c41 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibImgMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibMapper.xml new file mode 100644 index 0000000..6c6978b --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/TbPersonLibMapper.xml @@ -0,0 +1,7 @@ + + + + +