From 365ca2d7bccfc1b2230a6e80dc26b8a524b3b50c Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Mon, 21 Jul 2025 03:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8E=82=E5=95=86=20=E5=AE=89=E9=98=B2=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=95=86=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=A8=A1=E5=9D=97=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ++--- ruoyi-modules/Property/pom.xml | 7 --- .../service/impl/CleanOrderServiceImpl.java | 46 ++++++++----------- .../service/impl/MachineTypeServiceImpl.java | 36 ++++++++------- .../service/impl/MeetBookingServiceImpl.java | 4 +- .../sis}/controller/TbFactoryController.java | 45 +++++++++--------- .../dromara/sis/domain/SisDeviceChannel.java | 4 +- .../org/dromara/sis}/domain/TbFactory.java | 9 ++-- .../sis/domain/bo/SisDeviceChannelBo.java | 4 +- .../sis/domain/bo/SisDeviceManageBo.java | 1 + .../dromara/sis}/domain/bo/TbFactoryBo.java | 13 +++--- .../sis/domain/enums/DeviceTypeEnum.java | 21 +++++++++ .../sis/domain/enums/FactoryNoEnum.java | 20 ++++++++ .../sis/domain/vo/SisDeviceChannelVo.java | 4 +- .../sis/domain/vo/SisDeviceManageVo.java | 12 +++++ .../dromara/sis}/domain/vo/TbFactoryVo.java | 4 +- .../sis/mapper/SisDeviceManageMapper.java | 10 ++++ .../dromara/sis}/mapper/TbFactoryMapper.java | 6 +-- .../runner/HikDeviceApplicationRunner.java | 8 ++-- .../dromara/sis/sdk/hik/HikApiService.java | 28 +++++++++-- .../dromara/sis/sdk/hik/HikSdkConstans.java | 10 ++++ .../sis/sdk/hik/service/CamearService.java | 30 ++++++++++++ .../sis/service/ISisDeviceChannelService.java | 13 ++++++ .../sis}/service/ITbFactoryService.java | 8 ++-- .../impl/SisDeviceChannelServiceImpl.java | 40 ++++++++++++++++ .../impl/SisDeviceManageServiceImpl.java | 20 ++++++-- .../service/impl/TbFactoryServiceImpl.java | 24 +++++----- .../mapper/sis/SisDeviceManageMapper.xml | 44 ++++++++++++++++++ .../resources/mapper/sis/TbFactoryMapper.xml | 7 +++ 29 files changed, 364 insertions(+), 125 deletions(-) rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/controller/TbFactoryController.java (84%) rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/domain/TbFactory.java (79%) rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/domain/bo/TbFactoryBo.java (85%) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/DeviceTypeEnum.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/FactoryNoEnum.java rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/domain/vo/TbFactoryVo.java (91%) rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/mapper/TbFactoryMapper.java (67%) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikSdkConstans.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/CamearService.java rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/service/ITbFactoryService.java (91%) rename ruoyi-modules/{Property/src/main/java/org/dromara/property => Sis/src/main/java/org/dromara/sis}/service/impl/TbFactoryServiceImpl.java (92%) create mode 100644 ruoyi-modules/Sis/src/main/resources/mapper/sis/TbFactoryMapper.xml diff --git a/pom.xml b/pom.xml index f2ed45bd..0cc0302b 100644 --- a/pom.xml +++ b/pom.xml @@ -73,9 +73,9 @@ local - dev - 127.0.0.1:8848 - 127.0.0.1:4560 + local + 172.18.128.1:8848 + 172.18.128.1:4560 DEFAULT_GROUP DEFAULT_GROUP nacos @@ -91,14 +91,13 @@ dev - 192.168.24.101:8848 - 192.168.24.101:4560 + 192.168.0.108:8848 + 192.168.0.108:4560 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - prod diff --git a/ruoyi-modules/Property/pom.xml b/ruoyi-modules/Property/pom.xml index 76a41824..40ad288a 100644 --- a/ruoyi-modules/Property/pom.xml +++ b/ruoyi-modules/Property/pom.xml @@ -17,13 +17,6 @@ - - cn.hutool - hutool-all - 5.5.8 - - - org.dromara ruoyi-common-nacos diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java index 37cad524..544446f2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java @@ -1,42 +1,36 @@ package org.dromara.property.service.impl; import cn.hutool.core.date.DateTime; -import cn.idev.excel.event.Order; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.Mapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -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.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +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.property.domain.Clean; +import org.dromara.property.domain.CleanOrder; import org.dromara.property.domain.CleanRelation; import org.dromara.property.domain.CleanserverOrder; -import org.dromara.property.domain.vo.CleanserverOrderVo; -import org.dromara.property.mapper.CleanMapper; -import org.dromara.property.mapper.CleanRelationMapper; -import org.dromara.property.mapper.CleanserverOrderMapper; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CleanOrderBo; import org.dromara.property.domain.vo.CleanOrderVo; -import org.dromara.property.domain.CleanOrder; +import org.dromara.property.mapper.CleanMapper; import org.dromara.property.mapper.CleanOrderMapper; +import org.dromara.property.mapper.CleanRelationMapper; +import org.dromara.property.mapper.CleanserverOrderMapper; import org.dromara.property.service.ICleanOrderService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.stringtemplate.v4.ST; -import java.time.LocalDateTime; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; -import static kotlin.reflect.jvm.internal.impl.builtins.StandardNames.FqNames.list; - /** * 保洁订单Service业务层处理 * @@ -102,7 +96,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService { public TableDataInfo queryPageList(CleanOrderBo bo, PageQuery pageQuery) { // 构造条件查询器，返回的是一个集合 LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw,CleanOrderVo.class); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw, CleanOrderVo.class); // Page result = baseMapper.selectForPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -158,8 +152,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService { CleanOrder add = new CleanOrder(); validEntityBeforeSave(add); BeanUtils.copyProperties(bo, add); - add.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime())); - add.setEndTime(String.valueOf(new DateTime(bo.getEndTime()).toLocalDateTime())); + add.setStarTime(bo.getStarTime()); + add.setEndTime(bo.getEndTime()); add.setIsUnbooking(NOTUNBOOKING); boolean flag = baseMapper.insert(add) > 0; @@ -209,8 +203,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService { public Boolean updateByBo(CleanOrderBo bo) { CleanOrder update = MapstructUtils.convert(bo, CleanOrder.class); validEntityBeforeSave(update); - update.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime())); - update.setEndTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime())); + update.setStarTime(bo.getStarTime()); + update.setEndTime(bo.getStarTime()); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java index eda62d62..ce2e4695 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java @@ -1,24 +1,22 @@ package org.dromara.property.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -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 com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.property.domain.vo.MachineTypeTreeVo; -import org.springframework.stereotype.Service; -import org.dromara.property.domain.bo.MachineTypeBo; -import org.dromara.property.domain.vo.MachineTypeVo; +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.property.domain.MachineType; +import org.dromara.property.domain.bo.MachineTypeBo; +import org.dromara.property.domain.vo.MachineTypeTreeVo; +import org.dromara.property.domain.vo.MachineTypeVo; import org.dromara.property.mapper.MachineTypeMapper; import org.dromara.property.service.IMachineTypeService; +import org.springframework.stereotype.Service; import java.util.*; @@ -42,7 +40,7 @@ public class MachineTypeServiceImpl implements IMachineTypeService { * @return 设备类型 */ @Override - public MachineTypeVo queryById(Long id){ + public MachineTypeVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -117,7 +115,7 @@ public class MachineTypeServiceImpl implements IMachineTypeService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(MachineType entity){ + private void validEntityBeforeSave(MachineType entity) { //TODO 做一些数据校验,如唯一约束 } @@ -130,11 +128,12 @@ public class MachineTypeServiceImpl implements IMachineTypeService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; } + /** * 获取设备类型树列表 * @@ -146,15 +145,17 @@ public class MachineTypeServiceImpl implements IMachineTypeService { LambdaQueryWrapper lqw = buildQueryWrapper(type); List machineTypeVoList = baseMapper.selectVoList(lqw); if (CollUtil.isEmpty(machineTypeVoList)) { - return Collections.emptyList(); + return Collections.emptyList(); } - List machineTypeTreeVoList = BeanUtil.copyToList(machineTypeVoList, MachineTypeTreeVo.class); + List machineTypeTreeVoList = MapstructUtils.convert(machineTypeVoList, MachineTypeTreeVo.class); // 2. 构建树结构 return buildMachineTypeTree(machineTypeTreeVoList); } + /** * 构建设备类型树 + * * @param nodeList 所有节点 * @return 树形结构列表 */ @@ -185,4 +186,5 @@ public class MachineTypeServiceImpl implements IMachineTypeService { } } return treeList; - }} + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index c82cc5e5..a0a71154 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -123,7 +123,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { if (CollectionUtil.isEmpty(meetBookings)) { return new ArrayList<>(); } - List meetBookingAppointmentVoList = BeanUtil.copyToList(meetBookings, MeetBookingAppointmentVo.class); + List meetBookingAppointmentVoList = MapstructUtils.convert(meetBookings, MeetBookingAppointmentVo.class); SimpleDateFormat df = new SimpleDateFormat("HH"); List units = meetBookingAppointmentVoList.stream() .map(vo -> vo.getUnit()) @@ -184,7 +184,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { if (CollectionUtil.isEmpty(meetBookingVoList)) { return new ArrayList<>(); } - List meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class); + List meetBookingWeekVoList = MapstructUtils.convert(meetBookingVoList, MeetBookingWeekVo.class); String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; List meetBookingWeekList = new ArrayList<>(); SimpleDateFormat df = new SimpleDateFormat("HH"); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbFactoryController.java similarity index 84% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbFactoryController.java index bfa875ec..e589f2f4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TbFactoryController.java @@ -1,26 +1,27 @@ -package org.dromara.property.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.dromara.property.domain.bo.TbFactoryBo; -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.property.domain.vo.TbFactoryVo; -import org.dromara.property.service.ITbFactoryService; +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.TbFactoryBo; +import org.dromara.sis.domain.vo.TbFactoryVo; +import org.dromara.sis.service.ITbFactoryService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 厂商管理 @@ -40,7 +41,7 @@ public class TbFactoryController extends BaseController { /** * 查询厂商管理列表 */ - @SaCheckPermission("property:factory:list") + @SaCheckPermission("sis:factory:list") @GetMapping("/list") public TableDataInfo list(TbFactoryBo bo, PageQuery pageQuery) { return tdFactoryService.queryPageList(bo, pageQuery); @@ -49,7 +50,7 @@ public class TbFactoryController extends BaseController { /** * 导出厂商管理列表 */ - @SaCheckPermission("property:factory:export") + @SaCheckPermission("sis:factory:export") @Log(title = "厂商管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(TbFactoryBo bo, HttpServletResponse response) { @@ -62,7 +63,7 @@ public class TbFactoryController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("property:factory:query") + @SaCheckPermission("sis:factory:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +73,7 @@ public class TbFactoryController extends BaseController { /** * 新增厂商管理 */ - @SaCheckPermission("property:factory:add") + @SaCheckPermission("sis:factory:add") @Log(title = "厂商管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +84,7 @@ public class TbFactoryController extends BaseController { /** * 修改厂商管理 */ - @SaCheckPermission("property:factory:edit") + @SaCheckPermission("sis:factory:edit") @Log(title = "厂商管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +97,7 @@ public class TbFactoryController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("property:factory:remove") + @SaCheckPermission("sis:factory:remove") @Log(title = "厂商管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java index 167aa387..3132edd3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java @@ -50,7 +50,9 @@ public class SisDeviceChannel extends TenantEntity { /** * 设备端口 */ - private Long devicePort; + private Integer devicePort; + + private String factoryNo; /** * 设备账号 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java similarity index 79% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java index 3579da60..7d624037 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TbFactory.java @@ -1,9 +1,10 @@ -package org.dromara.property.domain; +package org.dromara.sis.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; @@ -15,7 +16,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("td_factory") +@TableName("tb_factory") public class TbFactory extends TenantEntity { @Serial diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java index 24fd340a..8ea5aaac 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java @@ -37,6 +37,8 @@ public class SisDeviceChannelBo extends BaseEntity { */ private String channelName; + private String factoryNo; + /** * 通道分组组id */ @@ -53,7 +55,7 @@ public class SisDeviceChannelBo extends BaseEntity { * 设备端口 */ @NotNull(message = "设备端口不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long devicePort; + private Integer devicePort; /** * 设备账号 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java index c5e1fc48..f5cef48b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java @@ -8,6 +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.common.translation.annotation.Translation; import org.dromara.sis.domain.SisDeviceManage; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java similarity index 85% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java index ff02c0a4..e3a13218 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TbFactoryBo.java @@ -1,13 +1,14 @@ -package org.dromara.property.domain.bo; +package org.dromara.sis.domain.bo; -import org.dromara.property.domain.TbFactory; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +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.sis.domain.TbFactory; /** * 厂商管理业务对象 td_factory diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/DeviceTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/DeviceTypeEnum.java new file mode 100644 index 00000000..16984778 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/DeviceTypeEnum.java @@ -0,0 +1,21 @@ +package org.dromara.sis.domain.enums; + +import lombok.Getter; + +/** + * 设备类型枚举 + * @author lxj + */ +@Getter +public enum DeviceTypeEnum { + IPC(1), + NVR(2), + DVR(3); + + private final Integer type; + + DeviceTypeEnum(Integer type) { + this.type = type; + } + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/FactoryNoEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/FactoryNoEnum.java new file mode 100644 index 00000000..48fb1d9b --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/FactoryNoEnum.java @@ -0,0 +1,20 @@ +package org.dromara.sis.domain.enums; + +import lombok.Getter; + +/** + * 设备厂商类型枚举 + * @author lxj + */ +@Getter +public enum FactoryNoEnum { + + HIK("DS1013"); + + private final String code; + + FactoryNoEnum(String code) { + this.code = code; + } + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java index f7e084be..cb8136de 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java @@ -46,6 +46,8 @@ public class SisDeviceChannelVo implements Serializable { @ExcelProperty(value = "设备名称") private String channelName; + private String factoryNo; + /** * 通道分组组id */ @@ -62,7 +64,7 @@ public class SisDeviceChannelVo implements Serializable { * 设备端口 */ @ExcelProperty(value = "设备端口") - private Long devicePort; + private Integer devicePort; /** * 设备账号 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java index adbf9402..0e0249d4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java @@ -4,6 +4,8 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.sis.domain.SisDeviceManage; import java.io.Serial; @@ -69,14 +71,24 @@ public class SisDeviceManageVo implements Serializable { */ private Integer deviceType; + /** + * 设备类型 + */ + @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "deviceType", other = "sis_ipc_device_type") + private Integer deviceTypeName; + /** * 设备厂商编号 */ private String factoryNo; + private String factoryName; + /** * 设备组id */ private Long groupId; + private String groupName; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java index 2f43b1fc..81a045cb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TbFactoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.property.domain.vo; +package org.dromara.sis.domain.vo; -import org.dromara.property.domain.TbFactory; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.sis.domain.TbFactory; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java index 4e9f8018..f70b28da 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceManageMapper.java @@ -1,6 +1,9 @@ package org.dromara.sis.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.dromara.sis.domain.SisDeviceManage; +import org.dromara.sis.domain.bo.SisDeviceManageBo; import org.dromara.sis.domain.vo.SisDeviceManageVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -12,4 +15,11 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SisDeviceManageMapper extends BaseMapperPlus { + /** + * 分页查询设备信息 + * @param build 分页对象 + * @param bo 查询对象 + * @return 返回分页数据 + */ + Page selectByPage(@Param("page") Page build,@Param("bo") SisDeviceManageBo bo); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java similarity index 67% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java index b7e99ad4..8718d0b9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TbFactoryMapper.java @@ -1,9 +1,9 @@ -package org.dromara.property.mapper; +package org.dromara.sis.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.property.domain.TbFactory; -import org.dromara.property.domain.vo.TbFactoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.sis.domain.TbFactory; +import org.dromara.sis.domain.vo.TbFactoryVo; /** * 厂商管理Mapper接口 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java index 9d5c1ac9..8cfb4fab 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java @@ -72,10 +72,10 @@ public class HikDeviceApplicationRunner implements ApplicationRunner { return; } deviceList.forEach(item -> { - int handler = HikApiService.getInstance().login(item.getDeviceIp(), item.getDevicePort().shortValue(), item.getDeviceAccount(), item.getDevicePwd()); - log.info("设备[{}]执行登录完成，result={}", item.getDeviceIp(), handler); - if (handler != -1) { - HikApiService.getInstance().setAlarmChan(handler); + boolean isLogin = HikApiService.getInstance().login(item.getDeviceIp(), item.getDevicePort().shortValue(), item.getDeviceAccount(), item.getDevicePwd()); + log.info("设备[{}]执行登录完成，result={}", item.getDeviceIp(), isLogin); + if (isLogin) { + HikApiService.getInstance().setAlarmChan(item.getDeviceIp()); } }); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java index 4280851a..099b1b0b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java @@ -51,13 +51,13 @@ public class HikApiService { * @param psw 设备密码 * @return 返回会否登录成功 */ - public int login(String ip, short port, String user, String psw) { + public boolean login(String ip, short port, String user, String psw) { int i = LoginService.loginDevice(ip, port, user, psw); boolean result = (i != SdkBaseServer.LOGIN_FAIL_CODE); if (result) { CACHE.put(ip, i); } - return i; + return result; } /** @@ -121,7 +121,27 @@ public class HikApiService { return logout; } - public void setAlarmChan(int handler) { - SdkBaseServer.setAlarmChan(handler); + /** + * 设备报警 + * + * @param deviceIp + * @return + */ + public Boolean setAlarmChan(String deviceIp) { + Integer lHandel = CACHE.get(deviceIp); + return SdkBaseServer.setAlarmChan(lHandel); } + + /** + * 通过sdk 获取hik设备通道信息 + * + * @param deviceIp 设备ip + * @return 范湖通道信息 + */ + public Object getChannelInfo(String deviceIp) { + + + return null; + } + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikSdkConstans.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikSdkConstans.java new file mode 100644 index 00000000..3b86814e --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikSdkConstans.java @@ -0,0 +1,10 @@ +package org.dromara.sis.sdk.hik; + +public class HikSdkConstans { + + /** + * IPc 的默认通道信息 + */ + public static final String DEFAULT_CHANNEL = "101"; + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/CamearService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/CamearService.java new file mode 100644 index 00000000..0c648632 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/CamearService.java @@ -0,0 +1,30 @@ +package org.dromara.sis.sdk.hik.service; + + +import com.sun.jna.ptr.IntByReference; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sis.sdk.hik.HCNetSDK; + +import static org.dromara.sis.sdk.hik.HCNetSDK.NET_DVR_GET_IPPARACFG_V40; + +@Slf4j +public class CamearService extends SdkBaseServer { + + /** + * 获取设备通道信息 + * + * @return + */ + public static Object getDeviceChannelInfo(int lUserID) { + HCNetSDK.NET_DVR_IPPARACFG_V40 lpOutBuffer = new HCNetSDK.NET_DVR_IPPARACFG_V40(); + lpOutBuffer.read(); + lpOutBuffer.dwSize = lpOutBuffer.size(); + IntByReference bytesReturned = new IntByReference(0); + boolean success = getHcNetSDK().NET_DVR_GetDVRConfig(lUserID, NET_DVR_GET_IPPARACFG_V40, 0, lpOutBuffer.getPointer(), lpOutBuffer.size(), bytesReturned); + if (success) { + lpOutBuffer.read(); + } + return null; + } + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java index e917a499..f1c3b650 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java @@ -3,7 +3,9 @@ package org.dromara.sis.service; import org.dromara.common.core.domain.TreeNode; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.SisDeviceChannel; import org.dromara.sis.domain.bo.SisDeviceChannelBo; +import org.dromara.sis.domain.bo.SisDeviceManageBo; import org.dromara.sis.domain.vo.SisDeviceChannelVo; import java.util.Collection; @@ -50,6 +52,14 @@ public interface ISisDeviceChannelService { */ Boolean insertByBo(SisDeviceChannelBo bo); + /** + * 新增设备通道管理 + * + * @param channel 设备通道管理 + * @return 是否新增成功 + */ + Boolean insert(SisDeviceChannel channel); + /** * 修改设备通道管理 * @@ -75,4 +85,7 @@ public interface ISisDeviceChannelService { List> queryTree(); + Boolean handleHikDeviceChannel(SisDeviceManageBo bo); + + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbFactoryService.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbFactoryService.java index 38755648..f0db0f31 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITbFactoryService.java @@ -1,9 +1,9 @@ -package org.dromara.property.service; +package org.dromara.sis.service; -import org.dromara.property.domain.bo.TbFactoryBo; -import org.dromara.property.domain.vo.TbFactoryVo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.bo.TbFactoryBo; +import org.dromara.sis.domain.vo.TbFactoryVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java index 164a8002..c7046074 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java @@ -14,9 +14,13 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisDeviceChannel; import org.dromara.sis.domain.bo.SisDeviceChannelBo; +import org.dromara.sis.domain.bo.SisDeviceManageBo; +import org.dromara.sis.domain.enums.DeviceTypeEnum; import org.dromara.sis.domain.vo.SisDeviceChannelVo; import org.dromara.sis.domain.vo.SisDeviceGroupVo; import org.dromara.sis.mapper.SisDeviceChannelMapper; +import org.dromara.sis.sdk.hik.HikApiService; +import org.dromara.sis.sdk.hik.HikSdkConstans; import org.dromara.sis.service.ISisDeviceChannelService; import org.dromara.sis.service.ISisDeviceGroupService; import org.springframework.stereotype.Service; @@ -110,6 +114,11 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService { return flag; } + @Override + public Boolean insert(SisDeviceChannel channel) { + return baseMapper.insert(channel) > 0; + } + /** * 修改设备通道管理 * @@ -183,4 +192,35 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService { }); return TreeUtils.build(treeNodes, -1L); } + + @Override + public Boolean handleHikDeviceChannel(SisDeviceManageBo bo) { + if (DeviceTypeEnum.IPC.getType().equals(bo.getDeviceType())) { + // 只需要验证hik设备能能否登录即可 + // 调用hik sdk登录 + boolean isLogin = HikApiService.getInstance().login(bo.getDeviceIp(), bo.getDevicePort().shortValue(), bo.getDeviceAccount(), bo.getDevicePwd()); + if (!isLogin) { + throw new RuntimeException("海康设备添加失败."); + } + // 写入设备通道信息 + SisDeviceChannel channel = new SisDeviceChannel(); + channel.setDeviceId(bo.getId()); + channel.setChannelName(bo.getDeviceName()); + channel.setGroupId(bo.getGroupId()); + channel.setDeviceIp(bo.getDeviceIp()); + channel.setDevicePort(bo.getDevicePort()); + channel.setFactoryNo(bo.getFactoryNo()); + channel.setDeviceAccount(bo.getDeviceAccount()); + channel.setDevicePwd(bo.getDevicePwd()); + channel.setDeviceMac(bo.getDeviceMac()); + channel.setChannelNo(HikSdkConstans.DEFAULT_CHANNEL); + this.insert(channel); + return true; + } else if (DeviceTypeEnum.NVR.getType().equals(bo.getDeviceType())) { + //TODO + } else if (DeviceTypeEnum.DVR.getType().equals(bo.getDeviceType())) { + + } + return false; + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java index e6042506..8245c845 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java @@ -12,14 +12,19 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisDeviceManage; import org.dromara.sis.domain.bo.SisDeviceManageBo; +import org.dromara.sis.domain.enums.FactoryNoEnum; import org.dromara.sis.domain.vo.SisDeviceManageVo; import org.dromara.sis.mapper.SisDeviceManageMapper; +import org.dromara.sis.service.ISisDeviceChannelService; import org.dromara.sis.service.ISisDeviceManageService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; + /** * 设备管理Service业务层处理 @@ -33,6 +38,7 @@ import java.util.Map; public class SisDeviceManageServiceImpl implements ISisDeviceManageService { private final SisDeviceManageMapper baseMapper; + private final ISisDeviceChannelService hikDeviceChannelService; /** * 查询设备管理 @@ -54,8 +60,7 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService { */ @Override public TableDataInfo queryPageList(SisDeviceManageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result =baseMapper.selectByPage(pageQuery.build(), bo); return TableDataInfo.build(result); } @@ -91,16 +96,25 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService { * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SisDeviceManageBo bo) { SisDeviceManage add = MapstructUtils.convert(bo, SisDeviceManage.class); - validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); + // 获取设备通道信息 + handleDeviceChannelInfo(bo); } return flag; } + public void handleDeviceChannelInfo(SisDeviceManageBo bo) { + if (Objects.equals(bo.getFactoryNo(), FactoryNoEnum.HIK.getCode())) { + hikDeviceChannelService.handleHikDeviceChannel(bo); + } + } + + /** * 修改设备管理 * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java index a4429539..450127ae 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbFactoryServiceImpl.java @@ -1,24 +1,24 @@ -package org.dromara.property.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; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.property.domain.TbFactory; -import org.dromara.property.domain.bo.TbFactoryBo; -import org.dromara.property.domain.vo.TbFactoryVo; +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.sis.domain.TbFactory; +import org.dromara.sis.domain.bo.TbFactoryBo; +import org.dromara.sis.domain.vo.TbFactoryVo; +import org.dromara.sis.mapper.TbFactoryMapper; +import org.dromara.sis.service.ITbFactoryService; import org.springframework.stereotype.Service; -import org.dromara.property.mapper.TbFactoryMapper; -import org.dromara.property.service.ITbFactoryService; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 厂商管理Service业务层处理 diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceManageMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceManageMapper.xml index 62440a20..56ea0b63 100644 --- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceManageMapper.xml +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceManageMapper.xml @@ -4,4 +4,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/TbFactoryMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/TbFactoryMapper.xml new file mode 100644 index 00000000..eba69e09 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/TbFactoryMapper.xml @@ -0,0 +1,7 @@ + + + + +