by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source 
# Conflicts:
#	ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
This commit is contained in:
dy
2025-06-25 17:05:04 +08:00
parent f615486c55 d81564f435
commit 2753a01842
185 changed files with 10761 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
.gitea/workflows/dev.yml Normal file
View File

@@ -0,0 +1,52 @@
name: Gitea Actions Demo
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
on: [push]
jobs:
Explore-Gitea-Actions:
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: http://127.0.0.1:3000/bichangxiong/checkout@v4 # 使用 Gitea 镜像
with:
fetch-depth: 1 # 只拉取最新一次提交
- name: Maven
run: mvn clean install
- name: Build with Maven
run: mvn -B package -DskipTests -pl ruoyi-modules/Property -am
- name: cp
run: copy ./ruoyi-modules/Property/target/Property.jar C:\devtool\server
- name: kill
run: Get-NetTCPConnection -LocalPort 10001 -State Listening -ErrorAction SilentlyContinue | ForEach-Object -Process { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }
- name: run
run: java -jar C:\devtool\server\Property.jar
# - copy ./ruoyi-modules/Property/target/Property.jar C:\devtool\server
# - pwd
# - java -jar ./docker/jar/Property.jar
# - name: cd
# run: cd ruoyi-modules/Property
# - name: Build with Maven
# run: mvn -B clean package -DskipTests --file pom.xml
# - name: Start Spring Cloud Services
# run: |
# # 启动顺序示例：注册中心 -> 配置中心 -> 网关 -> 业务服务
# echo "Starting Server..."
# java -jar Property.jar
# SERVER_PIDS[0]=$!
# # 等待注册中心启动
# sleep 30
# done
# 保持工作流运行，避免服务被终止
# wait
# env:
# JAVA_OPTS: "-Xmx512m -Xms256m"
# timeout-minutes: 20

8
pom.xml
View File

@@ -73,10 +73,10 @@
<properties>
<!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<logstash.address>127.0.0.1:4560</logstash.address>
<!-- <nacos.server>47.109.37.87:8848</nacos.server>-->
<!-- <logstash.address>47.109.37.87:4560</logstash.address>-->
<!-- <nacos.server>127.0.0.1:8848</nacos.server>-->
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
<nacos.server>47.109.37.87:8848</nacos.server>
<logstash.address>47.109.37.87:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>

17
ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java
View File

@@ -1,17 +0,0 @@
package org.dromara.iot.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;
/**
* 门禁管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
*/
@Mapper
public interface TbAccessControlMapper extends BaseMapperPlus<TbAccessControl, TbAccessControlVo> {
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AssetTypeController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.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.property.domain.vo.AssetTypeVo;
import org.dromara.property.domain.bo.AssetTypeBo;
import org.dromara.property.service.IAssetTypeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 资产类型
* 前端访问路由地址为:/property/assetType
*
* @author mocheng
* @date 2025-06-23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/assetType")
public class AssetTypeController extends BaseController {
private final IAssetTypeService assetTypeService;
/**
* 查询资产类型列表
*/
@SaCheckPermission("property:assetType:list")
@GetMapping("/list")
public TableDataInfo<AssetTypeVo> list(AssetTypeBo bo, PageQuery pageQuery) {
return assetTypeService.queryPageList(bo, pageQuery);
}
/**
* 导出资产类型列表
*/
@SaCheckPermission("property:assetType:export")
@Log(title = "资产类型", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(AssetTypeBo bo, HttpServletResponse response) {
List<AssetTypeVo> list = assetTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "资产类型", AssetTypeVo.class, response);
}
/**
* 获取资产类型详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:assetType:query")
@GetMapping("/{id}")
public R<AssetTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(assetTypeService.queryById(id));
}
/**
* 新增资产类型
*/
@SaCheckPermission("property:assetType:add")
@Log(title = "资产类型", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody AssetTypeBo bo) {
return toAjax(assetTypeService.insertByBo(bo));
}
/**
* 修改资产类型
*/
@SaCheckPermission("property:assetType:edit")
@Log(title = "资产类型", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AssetTypeBo bo) {
return toAjax(assetTypeService.updateByBo(bo));
}
/**
* 删除资产类型
*
* @param ids 主键串
*/
@SaCheckPermission("property:assetType:remove")
@Log(title = "资产类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(assetTypeService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.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.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.domain.bo.CleanserverOrderBo;
import org.dromara.property.service.ICleanserverOrderService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 保洁服务订单
* 前端访问路由地址为:/property/cleanServerOrder
*
* @author mocheng
* @date 2025-06-23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cleanServerOrder")
public class CleanserverOrderController extends BaseController {
private final ICleanserverOrderService cleanserverOrderService;
/**
* 查询保洁服务订单列表
*/
@SaCheckPermission("property:cleanServerOrder:list")
@GetMapping("/list")
public TableDataInfo<CleanserverOrderVo> list(CleanserverOrderBo bo, PageQuery pageQuery) {
return cleanserverOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出保洁服务订单列表
*/
@SaCheckPermission("property:cleanServerOrder:export")
@Log(title = "保洁服务订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CleanserverOrderBo bo, HttpServletResponse response) {
List<CleanserverOrderVo> list = cleanserverOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "保洁服务订单", CleanserverOrderVo.class, response);
}
/**
* 获取保洁服务订单详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:cleanServerOrder:query")
@GetMapping("/{id}")
public R<CleanserverOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(cleanserverOrderService.queryById(id));
}
/**
* 新增保洁服务订单
*/
@SaCheckPermission("property:cleanServerOrder:add")
@Log(title = "保洁服务订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CleanserverOrderBo bo) {
return toAjax(cleanserverOrderService.insertByBo(bo));
}
/**
* 修改保洁服务订单
*/
@SaCheckPermission("property:cleanServerOrder:edit")
@Log(title = "保洁服务订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CleanserverOrderBo bo) {
return toAjax(cleanserverOrderService.updateByBo(bo));
}
/**
* 删除保洁服务订单
*
* @param ids 主键串
*/
@SaCheckPermission("property:cleanServerOrder:remove")
@Log(title = "保洁服务订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(cleanserverOrderService.deleteWithValidByIds(List.of(ids), true));
}
}

11
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/SysCityAreaController.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson2.JSONObject;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@@ -20,8 +19,6 @@ import org.dromara.property.domain.bo.SysCityAreaBo;
import org.dromara.property.domain.vo.CityAreaTreeVo;
import org.dromara.property.domain.vo.SysCityAreaVo;
import org.dromara.property.service.ISysCityAreaService;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +36,7 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/cityArea")
public class SysCityAreaController extends BaseController implements ApplicationRunner {
public class SysCityAreaController extends BaseController {
private final ISysCityAreaService SysCityAreaService;
@@ -126,10 +123,4 @@ public class SysCityAreaController extends BaseController implements Application
return R.ok(list);
}
@Override
public void run(ApplicationArguments args) throws Exception {
R<List<CityAreaTreeVo>> listR = queryTreeList();
System.out.println(JSONObject.toJSONString(listR));
}
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java
View File

@@ -1,106 +0,0 @@
package org.dromara.property.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.property.domain.vo.TbAccessControlVo;
import org.dromara.property.domain.bo.TbAccessControlBo;
import org.dromara.property.service.ITbAccessControlService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 门禁管理
* 前端访问路由地址为:/property/accessControl
*
* @author mocheng
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/accessControl")
public class TbAccessControlController extends BaseController {
private final ITbAccessControlService tbAccessControlService;
/**
* 查询门禁管理列表
*/
@SaCheckPermission("property:accessControl:list")
@GetMapping("/list")
public TableDataInfo<TbAccessControlVo> list(TbAccessControlBo bo, PageQuery pageQuery) {
return tbAccessControlService.queryPageList(bo, pageQuery);
}
/**
* 导出门禁管理列表
*/
@SaCheckPermission("property:accessControl:export")
@Log(title = "门禁管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbAccessControlBo bo, HttpServletResponse response) {
List<TbAccessControlVo> list = tbAccessControlService.queryList(bo);
ExcelUtil.exportExcel(list, "门禁管理", TbAccessControlVo.class, response);
}
/**
* 获取门禁管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:accessControl:query")
@GetMapping("/{id}")
public R<TbAccessControlVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tbAccessControlService.queryById(id));
}
/**
* 新增门禁管理
*/
@SaCheckPermission("property:accessControl:add")
@Log(title = "门禁管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbAccessControlBo bo) {
return toAjax(tbAccessControlService.insertByBo(bo));
}
/**
* 修改门禁管理
*/
@SaCheckPermission("property:accessControl:edit")
@Log(title = "门禁管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbAccessControlBo bo) {
return toAjax(tbAccessControlService.updateByBo(bo));
}
/**
* 删除门禁管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:accessControl:remove")
@Log(title = "门禁管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tbAccessControlService.deleteWithValidByIds(List.of(ids), true));
}
}

56
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AssetType.java Normal file
View File

@@ -0,0 +1,56 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 资产类型对象 asset_type
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("asset_type")
public class AssetType extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id")
private Long id;
/**
* 分类名称
*/
private String assetTypeName;
/**
* 排序
*/
private Long sort;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java
View File

@@ -89,6 +89,11 @@ public class CleanOrder extends TenantEntity {
*/
private String persion;
/**
* 状态
*/
private int state;
/**
* 联系电话
*/

41
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanserverOrder.java Normal file
View File

@@ -0,0 +1,41 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 保洁服务订单对象 cleanserver_order
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cleanserver_order")
public class CleanserverOrder extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id")
private Long id;
/**
* 订单id
*/
private Long orderId;
/**
* 保洁服务id
*/
private Long cleanServerId;
}

101
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java
View File

@@ -1,101 +0,0 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 门禁管理对象 tb_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_access_control")
public class TbAccessControl extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 门禁设备编码
*/
private String accessCode;
/**
* 门禁名称
*/
private String accessName;
/**
* 园区编码
*/
private String communityCode;
/**
* 建筑编码
*/
private String buildingCode;
/**
* 门禁设备ip
*/
private String accessIp;
/**
*
*/
private Long accessPort;
/**
* 门禁设备类型
*/
private Long accssType;
/**
*
*/
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
private Long controlType;
/**
* 控制卡类型编码
*/
private String controlCode;
/**
* 外部编码
*/
private String outCode;
/**
* 组织编码
*/
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

40
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AssetTypeBo.java Normal file
View File

@@ -0,0 +1,40 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.AssetType;
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.*;
/**
* 资产类型业务对象 asset_type
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = AssetType.class, reverseConvertGenerate = false)
public class AssetTypeBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
* 分类名称
*/
private String assetTypeName;
/**
* 排序
*/
private Long sort;
}

9
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.domain.bo;
import org.dromara.common.core.validate.enumd.EnumPattern;
import org.dromara.property.domain.Clean;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@@ -9,6 +10,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.List;
/**
* 保洁管理业务对象 clean
*
@@ -32,6 +35,12 @@ public class CleanBo extends BaseEntity {
@NotBlank(message = "劳务名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 劳务id
*/
@NotBlank(message = "劳务id不能为空", groups = { AddGroup.class, EditGroup.class })
private List<Long> ids;
/**
* 计量单位
*/

9
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java
View File

@@ -9,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
@@ -43,7 +45,7 @@ public class CleanOrderBo extends BaseEntity {
* 保洁id
*/
@NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long cleanId;
private List<Long> cleanIds;
/**
* 名称
@@ -104,5 +106,10 @@ public class CleanOrderBo extends BaseEntity {
@NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String phone;
/**
* 状态
*/
private int state;
}

40
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java Normal file
View File

@@ -0,0 +1,40 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.CleanserverOrder;
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.*;
/**
* 保洁服务订单业务对象 cleanserver_order
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = CleanserverOrder.class, reverseConvertGenerate = false)
public class CleanserverOrderBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
* 订单id
*/
private Long orderId;
/**
* 保洁服务id
*/
private Long cleanServerId;
}

109
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java
View File

@@ -1,109 +0,0 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbAccessControl;
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_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TbAccessControl.class, reverseConvertGenerate = false)
public class TbAccessControlBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
* 门禁设备编码
*/
@NotBlank(message = "门禁设备编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String accessCode;
/**
* 门禁名称
*/
@NotBlank(message = "门禁名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String accessName;
/**
* 园区编码
*/
@NotBlank(message = "园区编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String communityCode;
/**
* 建筑编码
*/
@NotBlank(message = "建筑编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String buildingCode;
/**
* 门禁设备ip
*/
private String accessIp;
/**
*
*/
private Long accessPort;
/**
* 门禁设备类型
*/
@NotNull(message = "门禁设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long accssType;
/**
*
*/
@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
@NotNull(message = "控制卡类型：1-系统，2-E8不能为空", groups = { AddGroup.class, EditGroup.class })
private Long controlType;
/**
* 控制卡类型编码
*/
private String controlCode;
/**
* 外部编码
*/
private String outCode;
/**
* 组织编码
*/
@NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ApplicationVo.java
View File

@@ -42,12 +42,24 @@ public class ApplicationVo implements Serializable {
@ExcelProperty(value = "资产id")
private Long assetId;
/**
* 资产名称
*/
@ExcelProperty(value = "资产名称")
private String assetName;
/**
* 领用人id
*/
@ExcelProperty(value = "领用人id")
private Long userId;
/**
* 领用人姓名
*/
@ExcelProperty(value = "领用人姓名")
private String userName;
/**
* 数量
*/
@@ -66,6 +78,12 @@ public class ApplicationVo implements Serializable {
@ExcelProperty(value = "审批人id")
private Long acceptanceUserId;
/**
* 审批人姓名
*/
@ExcelProperty(value = "审批人姓名")
private String acceptanceUserName;
/**
* 审批时间
*/
@@ -85,4 +103,5 @@ public class ApplicationVo implements Serializable {
private Date createTime;
}

62
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetTypeVo.java Normal file
View File

@@ -0,0 +1,62 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.AssetType;
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;
/**
* 资产类型视图对象 asset_type
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = AssetType.class)
public class AssetTypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 分类名称
*/
@ExcelProperty(value = "分类名称")
private String assetTypeName;
/**
* 排序
*/
@ExcelProperty(value = "排序")
private Long sort;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
private String createBy;
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetVo.java
View File

@@ -48,6 +48,12 @@ public class AssetVo implements Serializable {
@ExcelProperty(value = "类型")
private String model;
/**
* 类型名称
*/
@ExcelProperty(value = "类型名称")
private String modelName;
/**
* 规格
*/
@@ -78,6 +84,12 @@ public class AssetVo implements Serializable {
@ExcelProperty(value = "仓库id")
private Long depotId;
/**
* 仓库名称
*/
@ExcelProperty(value = "仓库名称")
private String depotName;
/**
* 描述信息
*/
@@ -88,8 +100,13 @@ public class AssetVo implements Serializable {
* 供应商id
*/
@ExcelProperty(value = "供应商id")
private Long suppliersId;
private String suppliersId;
/**
* 供应商名称
*/
@ExcelProperty(value = "供应商名称")
private String suppliersName;
/**
* 入库时间
*/

13
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java
View File

@@ -2,6 +2,7 @@ package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import kotlin.text.UStringsKt;
import org.dromara.property.domain.CleanOrder;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -13,7 +14,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@@ -51,8 +52,8 @@ public class CleanOrderVo implements Serializable {
/**
* 保洁id
*/
@ExcelProperty(value = "保洁id")
private Long cleanId;
@ExcelProperty(value = "保洁")
private List<String> clean;
/**
* 名称
@@ -114,5 +115,11 @@ public class CleanOrderVo implements Serializable {
@ExcelProperty(value = "联系电话")
private String phone;
/**
* 状态
*/
@ExcelProperty(value = "状态")
private int state;
}

50
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java Normal file
View File

@@ -0,0 +1,50 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.CleanserverOrder;
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;
/**
* 保洁服务订单视图对象 cleanserver_order
*
* @author mocheng
* @date 2025-06-23
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CleanserverOrder.class)
public class CleanserverOrderVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 订单id
*/
@ExcelProperty(value = "订单id")
private Long orderId;
/**
* 保洁服务id
*/
@ExcelProperty(value = "保洁服务id")
private Long cleanServerId;
}

123
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java
View File

@@ -1,123 +0,0 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbAccessControl;
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_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TbAccessControl.class)
public class TbAccessControlVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 门禁设备编码
*/
@ExcelProperty(value = "门禁设备编码")
private String accessCode;
/**
* 门禁名称
*/
@ExcelProperty(value = "门禁名称")
private String accessName;
/**
* 园区编码
*/
@ExcelProperty(value = "园区编码")
private String communityCode;
/**
* 建筑编码
*/
@ExcelProperty(value = "建筑编码")
private String buildingCode;
/**
* 门禁设备ip
*/
@ExcelProperty(value = "门禁设备ip")
private String accessIp;
/**
*
*/
@ExcelProperty(value = "")
private Long accessPort;
/**
* 门禁设备类型
*/
@ExcelProperty(value = "门禁设备类型")
private Long accssType;
/**
*
*/
@ExcelProperty(value = "")
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
@ExcelProperty(value = "控制卡类型：1-系统，2-E8", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_kzklx")
private Long controlType;
/**
* 控制卡类型编码
*/
@ExcelProperty(value = "控制卡类型编码")
private String controlCode;
/**
* 外部编码
*/
@ExcelProperty(value = "外部编码")
private String outCode;
/**
* 组织编码
*/
@ExcelProperty(value = "组织编码")
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.AssetType;
import org.dromara.property.domain.vo.AssetTypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 资产类型Mapper接口
*
* @author mocheng
* @date 2025-06-23
*/
public interface AssetTypeMapper extends BaseMapperPlus<AssetType, AssetTypeVo> {
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 保洁服务订单Mapper接口
*
* @author mocheng
* @date 2025-06-23
*/
public interface CleanserverOrderMapper extends BaseMapperPlus<CleanserverOrder, CleanserverOrderVo> {
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAssetTypeService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.AssetType;
import org.dromara.property.domain.vo.AssetTypeVo;
import org.dromara.property.domain.bo.AssetTypeBo;
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-23
*/
public interface IAssetTypeService {
/**
* 查询资产类型
*
* @param id 主键
* @return 资产类型
*/
AssetTypeVo queryById(Long id);
/**
* 分页查询资产类型列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 资产类型分页列表
*/
TableDataInfo<AssetTypeVo> queryPageList(AssetTypeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的资产类型列表
*
* @param bo 查询条件
* @return 资产类型列表
*/
List<AssetTypeVo> queryList(AssetTypeBo bo);
/**
* 新增资产类型
*
* @param bo 资产类型
* @return 是否新增成功
*/
Boolean insertByBo(AssetTypeBo bo);
/**
* 修改资产类型
*
* @param bo 资产类型
* @return 是否修改成功
*/
Boolean updateByBo(AssetTypeBo bo);
/**
* 校验并批量删除资产类型信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.domain.bo.CleanserverOrderBo;
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-23
*/
public interface ICleanserverOrderService {
/**
* 查询保洁服务订单
*
* @param id 主键
* @return 保洁服务订单
*/
CleanserverOrderVo queryById(Long id);
/**
* 分页查询保洁服务订单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 保洁服务订单分页列表
*/
TableDataInfo<CleanserverOrderVo> queryPageList(CleanserverOrderBo bo, PageQuery pageQuery);
/**
* 查询符合条件的保洁服务订单列表
*
* @param bo 查询条件
* @return 保洁服务订单列表
*/
List<CleanserverOrderVo> queryList(CleanserverOrderBo bo);
/**
* 新增保洁服务订单
*
* @param bo 保洁服务订单
* @return 是否新增成功
*/
Boolean insertByBo(CleanserverOrderBo bo);
/**
* 修改保洁服务订单
*
* @param bo 保洁服务订单
* @return 是否修改成功
*/
Boolean updateByBo(CleanserverOrderBo bo);
/**
* 校验并批量删除保洁服务订单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java
View File

@@ -1,69 +0,0 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbAccessControl;
import org.dromara.property.domain.vo.TbAccessControlVo;
import org.dromara.property.domain.bo.TbAccessControlBo;
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-18
*/
public interface ITbAccessControlService {
/**
* 查询门禁管理
*
* @param id 主键
* @return 门禁管理
*/
TbAccessControlVo queryById(Long id);
/**
* 分页查询门禁管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 门禁管理分页列表
*/
TableDataInfo<TbAccessControlVo> queryPageList(TbAccessControlBo bo, PageQuery pageQuery);
/**
* 查询符合条件的门禁管理列表
*
* @param bo 查询条件
* @return 门禁管理列表
*/
List<TbAccessControlVo> queryList(TbAccessControlBo bo);
/**
* 新增门禁管理
*
* @param bo 门禁管理
* @return 是否新增成功
*/
Boolean insertByBo(TbAccessControlBo bo);
/**
* 修改门禁管理
*
* @param bo 门禁管理
* @return 是否修改成功
*/
Boolean updateByBo(TbAccessControlBo bo);
/**
* 校验并批量删除门禁管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

53
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java
View File

@@ -1,5 +1,7 @@
package org.dromara.property.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +11,10 @@ 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.property.domain.Asset;
import org.dromara.property.domain.vo.AssetVo;
import org.dromara.property.mapper.AssetMapper;
import org.dromara.system.api.RemoteUserService;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.ApplicationBo;
import org.dromara.property.domain.vo.ApplicationVo;
@@ -16,6 +22,8 @@ import org.dromara.property.domain.Application;
import org.dromara.property.mapper.ApplicationMapper;
import org.dromara.property.service.IApplicationService;
import java.sql.Array;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -32,6 +40,8 @@ import java.util.Collection;
public class ApplicationServiceImpl implements IApplicationService {
private final ApplicationMapper baseMapper;
private final AssetMapper assetMapper;
private final RemoteUserService remoteUserService;
/**
* 查询资产领用
@@ -41,7 +51,12 @@ public class ApplicationServiceImpl implements IApplicationService {
*/
@Override
public ApplicationVo queryById(Long id){
return baseMapper.selectVoById(id);
ApplicationVo applicationVo = baseMapper.selectVoById(id);
applicationVo.setUserName(remoteUserService.selectUserNameById(applicationVo.getUserId()));
applicationVo.setAcceptanceUserName(remoteUserService.selectUserNameById(applicationVo.getAcceptanceUserId()));
AssetVo assetVo = assetMapper.selectVoById(applicationVo.getAssetId());
applicationVo.setAssetName(assetVo==null?"资产不存在" : assetVo.getName());
return applicationVo;
}
/**
@@ -55,6 +70,18 @@ public class ApplicationServiceImpl implements IApplicationService {
public TableDataInfo<ApplicationVo> queryPageList(ApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Application> lqw = buildQueryWrapper(bo);
Page<ApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
ArrayList<Long> ids = new ArrayList<>();
result.getRecords().forEach(r -> ids.add(r.getUserId()));
result.getRecords().forEach(r -> ids.add(r.getAcceptanceUserId()));
Map<Long, String> userNamesByIds = remoteUserService.selectUserNamesByIds(ids);
result.getRecords().forEach(r ->r.setUserName(userNamesByIds.get(r.getUserId())));
result.getRecords().forEach(r ->r.setAcceptanceUserName(userNamesByIds.get(r.getUserId())));
// result.getRecords().forEach(r -> r.setUserName(remoteUserService.selectUserNameById(r.getUserId())));
// result.getRecords().forEach(r -> r.setAcceptanceUserName(remoteUserService.selectUserNameById(r.getAcceptanceUserId())));
result.getRecords().forEach(r -> {
AssetVo assetVo = assetMapper.selectVoById(r.getAssetId());
r.setAssetName(assetVo==null?"资产不存在" : assetVo.getName());
});
return TableDataInfo.build(result);
}
@@ -67,7 +94,14 @@ public class ApplicationServiceImpl implements IApplicationService {
@Override
public List<ApplicationVo> queryList(ApplicationBo bo) {
LambdaQueryWrapper<Application> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
List<ApplicationVo> applicationVos = baseMapper.selectVoList(lqw);
applicationVos.forEach(r -> r.setUserName(remoteUserService.selectUserNameById(r.getUserId())));
applicationVos.forEach(r -> r.setAcceptanceUserName(remoteUserService.selectUserNameById(r.getAcceptanceUserId())));
applicationVos.forEach(r -> {
AssetVo assetVo = assetMapper.selectVoById(r.getAssetId());
r.setAssetName(assetVo==null?"资产不存在" : assetVo.getName());
});
return applicationVos;
}
private LambdaQueryWrapper<Application> buildQueryWrapper(ApplicationBo bo) {
@@ -106,12 +140,25 @@ public class ApplicationServiceImpl implements IApplicationService {
*
* @param bo 资产领用
* @return 是否修改成功
*
*
*/
@Override
public Boolean updateByBo(ApplicationBo bo) {
Application update = MapstructUtils.convert(bo, Application.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
boolean b = baseMapper.updateById(update) > 0;
if (b&&bo.getState()==1){
Asset asset = assetMapper.selectById(bo.getAssetId());
if (asset.getStock()>=update.getNumber()) {
UpdateWrapper<Asset> assetUpdateWrapper = new UpdateWrapper<>();
assetUpdateWrapper.eq("id",bo.getAssetId())
.set("stock",assetMapper.selectVoById(bo.getAssetId()).getStock()-update.getNumber());
assetMapper.update(assetUpdateWrapper);
}
}
return b;
}
/**

45
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java
View File

@@ -9,6 +9,12 @@ 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.property.domain.AssetType;
import org.dromara.property.domain.Depot;
import org.dromara.property.domain.Suppliers;
import org.dromara.property.mapper.AssetTypeMapper;
import org.dromara.property.mapper.DepotMapper;
import org.dromara.property.mapper.SuppliersMapper;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AssetBo;
import org.dromara.property.domain.vo.AssetVo;
@@ -32,6 +38,9 @@ import java.util.Collection;
public class AssetServiceImpl implements IAssetService {
private final AssetMapper baseMapper;
private final DepotMapper depotMapper;
private final SuppliersMapper suppliersMapper;
private final AssetTypeMapper assetTypeMapper;
/**
* 查询资产管理
@@ -41,7 +50,14 @@ public class AssetServiceImpl implements IAssetService {
*/
@Override
public AssetVo queryById(Long id){
return baseMapper.selectVoById(id);
AssetVo assetVo = baseMapper.selectVoById(id);
Depot depot = depotMapper.selectById(assetVo.getDepotId());
assetVo.setDepotName(depot ==null ? "类型不存在" : depot.getDepotName());
Suppliers suppliers = suppliersMapper.selectById(assetVo.getSuppliersId());
assetVo.setSuppliersName(suppliers ==null ? "供应商不存在" : suppliers.getSuppliersName());
AssetType assetType = assetTypeMapper.selectById(assetVo.getModel());
assetVo.setModelName(assetType ==null ? "类型不存在" : assetType.getAssetTypeName());
return assetVo;
}
/**
@@ -55,6 +71,18 @@ public class AssetServiceImpl implements IAssetService {
public TableDataInfo<AssetVo> queryPageList(AssetBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Asset> lqw = buildQueryWrapper(bo);
Page<AssetVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(r -> {
AssetType assetType = assetTypeMapper.selectById(r.getModel());
r.setModelName(assetType==null ? "资产类型不存在" : assetType.getAssetTypeName());
});
result.getRecords().forEach(r -> {
Suppliers suppliers = suppliersMapper.selectById(r.getSuppliersId());
r.setSuppliersName(suppliers==null? "供应商不存在" : suppliers.getSuppliersName());
});
result.getRecords().forEach(r -> {
Depot depot = depotMapper.selectById(r.getDepotId());
r.setDepotName(depot==null? "仓库不存在" : depot.getDepotName());
});
return TableDataInfo.build(result);
}
@@ -67,7 +95,20 @@ public class AssetServiceImpl implements IAssetService {
@Override
public List<AssetVo> queryList(AssetBo bo) {
LambdaQueryWrapper<Asset> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
List<AssetVo> assetVos = baseMapper.selectVoList(lqw);
assetVos.forEach(r -> {
AssetType assetType = assetTypeMapper.selectById(r.getModel());
r.setModelName(assetType==null? "类型不存在" : assetType.getAssetTypeName());
});
assetVos.forEach(r -> {
Suppliers suppliers = suppliersMapper.selectById(r.getModel());
r.setSuppliersName(suppliers==null? "供应商不存在" : suppliers.getSuppliersName());
});
assetVos.forEach(r -> {
Depot depot = depotMapper.selectById(r.getModel());
r.setDepotName(depot==null? "仓库不存在" : depot.getDepotName());
});
return assetVos;
}
private LambdaQueryWrapper<Asset> buildQueryWrapper(AssetBo bo) {

133
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java Normal file
View File

@@ -0,0 +1,133 @@
package org.dromara.property.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.property.domain.bo.AssetTypeBo;
import org.dromara.property.domain.vo.AssetTypeVo;
import org.dromara.property.domain.AssetType;
import org.dromara.property.mapper.AssetTypeMapper;
import org.dromara.property.service.IAssetTypeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 资产类型Service业务层处理
*
* @author mocheng
* @date 2025-06-23
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class AssetTypeServiceImpl implements IAssetTypeService {
private final AssetTypeMapper baseMapper;
/**
* 查询资产类型
*
* @param id 主键
* @return 资产类型
*/
@Override
public AssetTypeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询资产类型列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 资产类型分页列表
*/
@Override
public TableDataInfo<AssetTypeVo> queryPageList(AssetTypeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<AssetType> lqw = buildQueryWrapper(bo);
Page<AssetTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的资产类型列表
*
* @param bo 查询条件
* @return 资产类型列表
*/
@Override
public List<AssetTypeVo> queryList(AssetTypeBo bo) {
LambdaQueryWrapper<AssetType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<AssetType> buildQueryWrapper(AssetTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AssetType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AssetType::getId);
lqw.like(StringUtils.isNotBlank(bo.getAssetTypeName()), AssetType::getAssetTypeName, bo.getAssetTypeName());
lqw.eq(bo.getSort() != null, AssetType::getSort, bo.getSort());
return lqw;
}
/**
* 新增资产类型
*
* @param bo 资产类型
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(AssetTypeBo bo) {
AssetType add = MapstructUtils.convert(bo, AssetType.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改资产类型
*
* @param bo 资产类型
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(AssetTypeBo bo) {
AssetType update = MapstructUtils.convert(bo, AssetType.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(AssetType entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除资产类型信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

31
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java
View File

@@ -1,5 +1,8 @@
package org.dromara.property.service.impl;
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;
@@ -9,16 +12,20 @@ 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.property.domain.CleanserverOrder;
import org.dromara.property.mapper.CleanserverOrderMapper;
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.CleanOrderMapper;
import org.dromara.property.service.ICleanOrderService;
import org.stringtemplate.v4.ST;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
import java.util.stream.Collectors;
import static kotlin.reflect.jvm.internal.impl.builtins.StandardNames.FqNames.list;
/**
* 保洁订单Service业务层处理
@@ -32,6 +39,7 @@ import java.util.Collection;
public class CleanOrderServiceImpl implements ICleanOrderService {
private final CleanOrderMapper baseMapper;
private final CleanserverOrderMapper cleanserverOrderMapper;
/**
* 查询保洁订单
@@ -69,14 +77,14 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CleanOrder> buildQueryWrapper(CleanOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CleanOrder::getId);
lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation());
lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea());
lqw.eq(bo.getCleanId() != null, CleanOrder::getCleanId, bo.getCleanId());
// lqw.eq(bo.getCleanIds() != null, CleanOrder::getCleanId, bo.getCleanIds());
lqw.like(StringUtils.isNotBlank(bo.getName()), CleanOrder::getName, bo.getName());
lqw.eq(bo.getPrices() != null, CleanOrder::getPrices, bo.getPrices());
lqw.eq(bo.getSumPeices() != null, CleanOrder::getSumPeices, bo.getSumPeices());
@@ -84,9 +92,11 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime());
lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime());
lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit());
lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone());
return lqw;
}
@@ -100,9 +110,20 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
public Boolean insertByBo(CleanOrderBo bo) {
CleanOrder add = MapstructUtils.convert(bo, CleanOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
ArrayList<CleanserverOrder> cleanserverOrders = new ArrayList<>();
for (Long cleanId : bo.getCleanIds()) {
CleanserverOrder cleanserverOrder = new CleanserverOrder();
cleanserverOrder.setCleanServerId(cleanId);
cleanserverOrder.setOrderId(add.getId());
CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class);
cleanserverOrders.add(convert);
}
cleanserverOrderMapper.insert(cleanserverOrders);
}
return flag;
}

134
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java Normal file
View File

@@ -0,0 +1,134 @@
package org.dromara.property.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.property.domain.bo.CleanserverOrderBo;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.mapper.CleanserverOrderMapper;
import org.dromara.property.service.ICleanserverOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 保洁服务订单Service业务层处理
*
* @author mocheng
* @date 2025-06-23
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class CleanserverOrderServiceImpl implements ICleanserverOrderService {
private final CleanserverOrderMapper baseMapper;
/**
* 查询保洁服务订单
*
* @param id 主键
* @return 保洁服务订单
*/
@Override
public CleanserverOrderVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询保洁服务订单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 保洁服务订单分页列表
*/
@Override
public TableDataInfo<CleanserverOrderVo> queryPageList(CleanserverOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CleanserverOrder> lqw = buildQueryWrapper(bo);
Page<CleanserverOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的保洁服务订单列表
*
* @param bo 查询条件
* @return 保洁服务订单列表
*/
@Override
public List<CleanserverOrderVo> queryList(CleanserverOrderBo bo) {
LambdaQueryWrapper<CleanserverOrder> lqw = buildQueryWrapper(bo);
List<CleanserverOrderVo> cleanserverOrderVos = baseMapper.selectVoList(lqw);
return cleanserverOrderVos;
}
private LambdaQueryWrapper<CleanserverOrder> buildQueryWrapper(CleanserverOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CleanserverOrder> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CleanserverOrder::getId);
lqw.eq(bo.getOrderId() != null, CleanserverOrder::getOrderId, bo.getOrderId());
lqw.eq(bo.getCleanServerId() != null, CleanserverOrder::getCleanServerId, bo.getCleanServerId());
return lqw;
}
/**
* 新增保洁服务订单
*
* @param bo 保洁服务订单
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(CleanserverOrderBo bo) {
CleanserverOrder add = MapstructUtils.convert(bo, CleanserverOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改保洁服务订单
*
* @param bo 保洁服务订单
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(CleanserverOrderBo bo) {
CleanserverOrder update = MapstructUtils.convert(bo, CleanserverOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CleanserverOrder entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除保洁服务订单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

145
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java
View File

@@ -1,145 +0,0 @@
package org.dromara.property.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.property.domain.bo.TbAccessControlBo;
import org.dromara.property.domain.vo.TbAccessControlVo;
import org.dromara.property.domain.TbAccessControl;
import org.dromara.property.mapper.TbAccessControlMapper;
import org.dromara.property.service.ITbAccessControlService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 门禁管理Service业务层处理
*
* @author mocheng
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TbAccessControlServiceImpl implements ITbAccessControlService {
private final TbAccessControlMapper baseMapper;
/**
* 查询门禁管理
*
* @param id 主键
* @return 门禁管理
*/
@Override
public TbAccessControlVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询门禁管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 门禁管理分页列表
*/
@Override
public TableDataInfo<TbAccessControlVo> queryPageList(TbAccessControlBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TbAccessControl> lqw = buildQueryWrapper(bo);
Page<TbAccessControlVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的门禁管理列表
*
* @param bo 查询条件
* @return 门禁管理列表
*/
@Override
public List<TbAccessControlVo> queryList(TbAccessControlBo bo) {
LambdaQueryWrapper<TbAccessControl> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TbAccessControl> buildQueryWrapper(TbAccessControlBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbAccessControl> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbAccessControl::getId);
lqw.eq(StringUtils.isNotBlank(bo.getAccessCode()), TbAccessControl::getAccessCode, bo.getAccessCode());
lqw.like(StringUtils.isNotBlank(bo.getAccessName()), TbAccessControl::getAccessName, bo.getAccessName());
lqw.eq(StringUtils.isNotBlank(bo.getCommunityCode()), TbAccessControl::getCommunityCode, bo.getCommunityCode());
lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), TbAccessControl::getBuildingCode, bo.getBuildingCode());
lqw.eq(StringUtils.isNotBlank(bo.getAccessIp()), TbAccessControl::getAccessIp, bo.getAccessIp());
lqw.eq(bo.getAccessPort() != null, TbAccessControl::getAccessPort, bo.getAccessPort());
lqw.eq(bo.getAccssType() != null, TbAccessControl::getAccssType, bo.getAccssType());
lqw.eq(StringUtils.isNotBlank(bo.getFactoryCode()), TbAccessControl::getFactoryCode, bo.getFactoryCode());
lqw.eq(bo.getControlType() != null, TbAccessControl::getControlType, bo.getControlType());
lqw.eq(StringUtils.isNotBlank(bo.getControlCode()), TbAccessControl::getControlCode, bo.getControlCode());
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), TbAccessControl::getOutCode, bo.getOutCode());
lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbAccessControl::getOrgCode, bo.getOrgCode());
lqw.eq(bo.getDataState() != null, TbAccessControl::getDataState, bo.getDataState());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbAccessControl::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增门禁管理
*
* @param bo 门禁管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TbAccessControlBo bo) {
TbAccessControl add = MapstructUtils.convert(bo, TbAccessControl.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改门禁管理
*
* @param bo 门禁管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TbAccessControlBo bo) {
TbAccessControl update = MapstructUtils.convert(bo, TbAccessControl.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbAccessControl entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除门禁管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.AssetTypeMapper">
</mapper>

7
ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.CleanserverOrderMapper">
</mapper>

7
ruoyi-modules/Property/src/main/resources/mapper/Property/TbAccessControlMapper.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.TbAccessControlMapper">
</mapper>

12
ruoyi-modules/Iot/Dockerfile → ruoyi-modules/Sis/Dockerfile
View File

@@ -3,11 +3,11 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
LABEL maintainer="Lxj"
RUN mkdir -p /smartparks/iot/logs \
/smartparks/iot/temp \
/smartparks/iot/agent
RUN mkdir -p /smartparks/Sis/logs \
/smartparks/Sis/temp \
/smartparks/Sis/agent
WORKDIR /ruoyi/system
@@ -15,7 +15,7 @@ ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
ADD ./target/iot.jar ./iot.jar
ADD ./target/Sis.jar ./app.jar
SHELL ["/bin/bash", "-c"]
@@ -23,5 +23,5 @@ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_P
#-Dskywalking.agent.service_name=ruoyi-system \
#-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
-jar iot.jar
-jar app.jar

BIN
ruoyi-modules/Sis/doc/宇视AIBOX对外标准接口20240626.pdf Normal file
View File

Binary file not shown.

7
ruoyi-modules/Iot/pom.xml → ruoyi-modules/Sis/pom.xml
View File

@@ -9,11 +9,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Iot</artifactId>
<description>
物业管理模块
</description>
<artifactId>Sis</artifactId>
<description>Smart Intelligent Security 智能安防管理系统</description>
<dependencies>

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/IotyApplication.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/SisApplication.java
View File

@@ -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;
@@ -12,11 +12,11 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*/
@EnableDubbo
@SpringBootApplication
public class IotyApplication {
public class SisApplication {
public static void main(String[] args) {
SpringApplication application = new SpringApplication(IotyApplication.class);
SpringApplication application = new SpringApplication(SisApplication.class);
application.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args);
System.out.println("(♥◠‿◠)ﾉﾞ 设备模块启动成功 ლ(´ڡ`ლ)ﾞ ");
System.out.println("(♥◠‿◠)ﾉﾞ 安防启动成功 ლ(´ڡ`ლ)ﾞ ");
}
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RestTemplateConfig.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
// 使用JDK自带的HttpURLConnection作为客户端
return new RestTemplate();
}
}

26
ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TbAccessControlController.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlController.java
View File

@@ -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.SisAccessControlBo;
import org.dromara.sis.domain.vo.SisAccessControlVo;
import org.dromara.sis.service.ISisAccessControlService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -34,16 +34,16 @@ import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/accessControl")
public class TbAccessControlController extends BaseController {
public class SisAccessControlController extends BaseController {
private final ITbAccessControlService tbAccessControlService;
private final ISisAccessControlService tbAccessControlService;
/**
* 查询门禁管理列表
*/
@SaCheckPermission("property:accessControl:list")
@GetMapping("/list")
public TableDataInfo<TbAccessControlVo> list(TbAccessControlBo bo, PageQuery pageQuery) {
public TableDataInfo<SisAccessControlVo> list(SisAccessControlBo bo, PageQuery pageQuery) {
return tbAccessControlService.queryPageList(bo, pageQuery);
}
@@ -53,9 +53,9 @@ public class TbAccessControlController extends BaseController {
@SaCheckPermission("property:accessControl:export")
@Log(title = "门禁管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbAccessControlBo bo, HttpServletResponse response) {
List<TbAccessControlVo> list = tbAccessControlService.queryList(bo);
ExcelUtil.exportExcel(list, "门禁管理", TbAccessControlVo.class, response);
public void export(SisAccessControlBo bo, HttpServletResponse response) {
List<SisAccessControlVo> list = tbAccessControlService.queryList(bo);
ExcelUtil.exportExcel(list, "门禁管理", SisAccessControlVo.class, response);
}
/**
@@ -65,7 +65,7 @@ public class TbAccessControlController extends BaseController {
*/
@SaCheckPermission("property:accessControl:query")
@GetMapping("/{id}")
public R<TbAccessControlVo> getInfo(@NotNull(message = "主键不能为空")
public R<SisAccessControlVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tbAccessControlService.queryById(id));
}
@@ -77,7 +77,7 @@ public class TbAccessControlController extends BaseController {
@Log(title = "门禁管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbAccessControlBo bo) {
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisAccessControlBo bo) {
return toAjax(tbAccessControlService.insertByBo(bo));
}
@@ -88,7 +88,7 @@ public class TbAccessControlController extends BaseController {
@Log(title = "门禁管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbAccessControlBo bo) {
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisAccessControlBo bo) {
return toAjax(tbAccessControlService.updateByBo(bo));
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlDeviceController.java Normal file
View File

@@ -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.SisAccessControlDeviceVo;
import org.dromara.sis.domain.bo.SisAccessControlDeviceBo;
import org.dromara.sis.service.ISisAccessControlDeviceService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 门禁设备
* 前端访问路由地址为:/sis/accessControlDevice
*
* @author mocheng
* @date 2025-06-25
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/accessControlDevice")
public class SisAccessControlDeviceController extends BaseController {
private final ISisAccessControlDeviceService sisAccessControlDeviceService;
/**
* 查询门禁设备列表
*/
@SaCheckPermission("sis:accessControlDevice:list")
@GetMapping("/list")
public TableDataInfo<SisAccessControlDeviceVo> list(SisAccessControlDeviceBo bo, PageQuery pageQuery) {
return sisAccessControlDeviceService.queryPageList(bo, pageQuery);
}
/**
* 导出门禁设备列表
*/
@SaCheckPermission("sis:accessControlDevice:export")
@Log(title = "门禁设备", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisAccessControlDeviceBo bo, HttpServletResponse response) {
List<SisAccessControlDeviceVo> list = sisAccessControlDeviceService.queryList(bo);
ExcelUtil.exportExcel(list, "门禁设备", SisAccessControlDeviceVo.class, response);
}
/**
* 获取门禁设备详细信息
*
* @param id 主键
*/
@SaCheckPermission("sis:accessControlDevice:query")
@GetMapping("/{id}")
public R<SisAccessControlDeviceVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(sisAccessControlDeviceService.queryById(id));
}
/**
* 新增门禁设备
*/
@SaCheckPermission("sis:accessControlDevice:add")
@Log(title = "门禁设备", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisAccessControlDeviceBo bo) {
return toAjax(sisAccessControlDeviceService.insertByBo(bo));
}
/**
* 修改门禁设备
*/
@SaCheckPermission("sis:accessControlDevice:edit")
@Log(title = "门禁设备", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisAccessControlDeviceBo bo) {
return toAjax(sisAccessControlDeviceService.updateByBo(bo));
}
/**
* 删除门禁设备
*
* @param ids 主键串
*/
@SaCheckPermission("sis:accessControlDevice:remove")
@Log(title = "门禁设备", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(sisAccessControlDeviceService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDevicePointController.java Normal file
View File

@@ -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.SisDevicePointVo;
import org.dromara.sis.domain.bo.SisDevicePointBo;
import org.dromara.sis.service.ISisDevicePointService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 宇视设备点位(通道)
* 前端访问路由地址为:/sis/devicePoint
*
* @author mocheng
* @date 2025-06-25
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/devicePoint")
public class SisDevicePointController extends BaseController {
private final ISisDevicePointService sisDevicePointService;
/**
* 查询宇视设备点位(通道)列表
*/
@SaCheckPermission("sis:devicePoint:list")
@GetMapping("/list")
public TableDataInfo<SisDevicePointVo> list(SisDevicePointBo bo, PageQuery pageQuery) {
return sisDevicePointService.queryPageList(bo, pageQuery);
}
/**
* 导出宇视设备点位(通道)列表
*/
@SaCheckPermission("sis:devicePoint:export")
@Log(title = "宇视设备点位(通道)", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisDevicePointBo bo, HttpServletResponse response) {
List<SisDevicePointVo> list = sisDevicePointService.queryList(bo);
ExcelUtil.exportExcel(list, "宇视设备点位(通道)", SisDevicePointVo.class, response);
}
/**
* 获取宇视设备点位(通道)详细信息
*
* @param id 主键
*/
@SaCheckPermission("sis:devicePoint:query")
@GetMapping("/{id}")
public R<SisDevicePointVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(sisDevicePointService.queryById(id));
}
/**
* 新增宇视设备点位(通道)
*/
@SaCheckPermission("sis:devicePoint:add")
@Log(title = "宇视设备点位(通道)", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisDevicePointBo bo) {
return toAjax(sisDevicePointService.insertByBo(bo));
}
/**
* 修改宇视设备点位(通道)
*/
@SaCheckPermission("sis:devicePoint:edit")
@Log(title = "宇视设备点位(通道)", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisDevicePointBo bo) {
return toAjax(sisDevicePointService.updateByBo(bo));
}
/**
* 删除宇视设备点位(通道)
*
* @param ids 主键串
*/
@SaCheckPermission("sis:devicePoint:remove")
@Log(title = "宇视设备点位(通道)", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(sisDevicePointService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java Normal file
View File

@@ -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.SisPersonLibVo;
import org.dromara.sis.domain.bo.SisPersonLibBo;
import org.dromara.sis.service.ISisPersonLibService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 人像库
* 前端访问路由地址为:/sis/personLib
*
* @author mocheng
* @date 2025-06-24
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/personLib")
public class SisPersonLibController extends BaseController {
private final ISisPersonLibService tbPersonLibService;
/**
* 查询人像库列表
*/
@SaCheckPermission("sis:personLib:list")
@GetMapping("/list")
public TableDataInfo<SisPersonLibVo> list(SisPersonLibBo bo, PageQuery pageQuery) {
return tbPersonLibService.queryPageList(bo, pageQuery);
}
/**
* 导出人像库列表
*/
@SaCheckPermission("sis:personLib:export")
@Log(title = "人像库", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisPersonLibBo bo, HttpServletResponse response) {
List<SisPersonLibVo> list = tbPersonLibService.queryList(bo);
ExcelUtil.exportExcel(list, "人像库", SisPersonLibVo.class, response);
}
/**
* 获取人像库详细信息
*
* @param id 主键
*/
@SaCheckPermission("sis:personLib:query")
@GetMapping("/{id}")
public R<SisPersonLibVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibBo bo) {
return toAjax(tbPersonLibService.insertByBo(bo));
}
/**
* 修改人像库
*/
@SaCheckPermission("sis:personLib:edit")
@Log(title = "人像库", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisPersonLibBo bo) {
return toAjax(tbPersonLibService.updateByBo(bo));
}
/**
* 删除人像库
*
* @param ids 主键串
*/
@SaCheckPermission("sis:personLib:remove")
@Log(title = "人像库", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java Normal file
View File

@@ -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.SisPersonLibImgVo;
import org.dromara.sis.domain.bo.SisPersonLibImgBo;
import org.dromara.sis.service.ISisPersonLibImgService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 人像信息
* 前端访问路由地址为:/sis/personLibImg
*
* @author mocheng
* @date 2025-06-24
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/personLibImg")
public class SisPersonLibImgController extends BaseController {
private final ISisPersonLibImgService tbPersonLibImgService;
/**
* 查询人像信息列表
*/
@SaCheckPermission("sis:personLibImg:list")
@GetMapping("/list")
public TableDataInfo<SisPersonLibImgVo> list(SisPersonLibImgBo bo, PageQuery pageQuery) {
return tbPersonLibImgService.queryPageList(bo, pageQuery);
}
/**
* 导出人像信息列表
*/
@SaCheckPermission("sis:personLibImg:export")
@Log(title = "人像信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisPersonLibImgBo bo, HttpServletResponse response) {
List<SisPersonLibImgVo> list = tbPersonLibImgService.queryList(bo);
ExcelUtil.exportExcel(list, "人像信息", SisPersonLibImgVo.class, response);
}
/**
* 获取人像信息详细信息
*
* @param id 主键
*/
@SaCheckPermission("sis:personLibImg:query")
@GetMapping("/{id}")
public R<SisPersonLibImgVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibImgBo bo) {
return toAjax(tbPersonLibImgService.insertByBo(bo));
}
/**
* 修改人像信息
*/
@SaCheckPermission("sis:personLibImg:edit")
@Log(title = "人像信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisPersonLibImgBo bo) {
return toAjax(tbPersonLibImgService.updateByBo(bo));
}
/**
* 删除人像信息
*
* @param ids 主键串
*/
@SaCheckPermission("sis:personLibImg:remove")
@Log(title = "人像信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tbPersonLibImgService.deleteWithValidByIds(List.of(ids), true));
}
}

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java
View File

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

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java
View File

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

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterController.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java
View File

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

33
ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java
View File

@@ -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;
/**
* 和房间的关联

33
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/VideoAlarmController.java Normal file
View File

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

108
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java Normal file
View File

@@ -0,0 +1,108 @@
package org.dromara.sis.controller.e8;
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.sis.sdk.e8.AccessControlService;
import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq;
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.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author lsm
* @apiNote AccessControlController
* @since 2025/6/24
*/
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/e8AccessControl")
public class AccessControlController {
private final AccessControlService accessControlService;
/**
* 远程开门
*
* @param req 传参
* @return Boolean
*/
@PostMapping("/remoteOpenDoor")
public R<Boolean> remoteOpenDoor(@RequestBody RemoteOpenDoorReq req) {
log.info("E8远程开门 入参：{}", req);
Boolean flag = accessControlService.remoteOpenDoor(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8远程开门，调用失败！");
}
}
/**
* 获取门禁记录列表
*
* @param dto 查询参数
* @return IPage<AccessRecordFindRes>
* @apiNote 获取参数示例 {"maxResultCount":10,"pageIndex":1,"queryDto":{"isViewFullData":false}}
*/
@PostMapping("/getPageAccessRecordList")
public R<TableDataInfo<AccessRecordFindRes>> getPageAccessRecordList(@RequestBody QueryDto dto) {
log.info("E8获取门禁记录列表 入参：{}", dto);
TableDataInfo<AccessRecordFindRes> page = accessControlService.getPageAccessRecordList(dto);
if (page == null) {
return R.fail("E8获取门禁记录列表，调用失败！");
} else {
return R.ok(page);
}
}
/**
* 人员授权
*
* @param req 传参
* @return Boolean
* @apiNote 参数示例 {"accessAuthModel":0,"authData":[{"floors":[],"gatewayType":1,"id":528705580163141,"type":0}],"authType":0,"elevatorAuthModel":1,"endTime":"2025-07-2511: 23: 39","personIds":[539696740646981],"scheduleId":1,"startTime":"2025-06-2511: 23: 39"}
*/
@PostMapping("/addCustomerAuth")
public R<Boolean> addCustomerAuth(@RequestBody CustomerAuthAddReq req) {
log.info("E8人员授权 入参：{}", req);
Boolean flag = accessControlService.addCustomerAuth(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8人员授权，调用失败！");
}
}
/**
* 获取人员权限分页列表
*
* @param dto 获取参数
* @return TableDataInfo<CustomerAuthFindRes>
* @apiNote 获取参数示例 {"maxResultCount":10,"pageIndex":1,"queryDto":{"isViewFullData":false}}
*/
@PostMapping("getPageCustomerAuth")
public R<TableDataInfo<CustomerAuthFindRes>> getPageCustomerAuth(@RequestBody QueryDto dto) {
log.info("E8获取人员权限分页列表 入参：{}", dto);
TableDataInfo<CustomerAuthFindRes> page = accessControlService.getPageCustomerAuth(dto);
if (page == null) {
return R.fail("E8获取人员权限分页列表，调用失败！");
} else {
return R.ok(page);
}
}
}

115
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/DoorDeviceController.java Normal file
View File

@@ -0,0 +1,115 @@
package org.dromara.sis.controller.e8;
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.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.QueryDto;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
/**
* @author lsm
* @apiNote DoorDeviceController
* @since 2025/6/23
*/
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/e8DoorDevice")
public class DoorDeviceController {
private final DoorDeviceService doorDeviceService;
/**
* 查询门禁信息
*
* @param id 入参
* @return Result
*/
@PostMapping("/findDoorDevice/{id}")
public R<DoorDeviceFindRes> findDoorDevice(@PathVariable Long id) {
log.info("E8接口 查询门禁信息 入参={}", id);
DoorDeviceFindRes doorDeviceInfo = doorDeviceService.findDoorDevice(id);
if (doorDeviceInfo == null) {
return R.fail("E8接口查询门禁信息，调用失败！");
} else {
return R.ok(doorDeviceInfo);
}
}
/**
* 新增门禁信息
*
* @param addReq 入参
* @return Boolean
*/
@PostMapping("/addDoorDevice")
public R<DoorDeviceAddRes> addDoorDevice(@RequestBody DoorDeviceAddReq addReq) {
log.info("E8接口新增门禁信息 入参={}", addReq);
DoorDeviceAddRes doorDevice = doorDeviceService.addDoorDevice(addReq);
if (doorDevice == null) {
return R.fail("E8接口新增门禁信息，调用失败！");
} else {
return R.ok(doorDevice);
}
}
/**
* 门禁信息修改
*
* @param updateReq 入参
* @return Boolean
*/
@PostMapping("/updateDoorDevice")
public R<Boolean> updateDoorDevice(@RequestBody DoorDeviceUpdateReq updateReq) {
log.info("E8接口门禁信息修改 入参={}", updateReq);
Boolean flag = doorDeviceService.updateDoorDevice(updateReq);
if (flag) {
return R.ok();
} else {
return R.fail("E8接口门禁信息修改，调用失败！");
}
}
/**
* 删除门禁信息
*
* @param id 入参
* @return Boolean
*/
@PostMapping("/deleteDoorDevice/{id}")
public R<Boolean> deleteDoorDevice(@PathVariable Integer id) {
log.info("E8接口删除门禁信息 入参={}", id);
Boolean flag = doorDeviceService.deleteDoorDevice(id);
return flag ? R.ok() : R.fail("E8接口删除门禁信息，调用失败！");
}
/**
* 查询门禁信息列表
*
* @param dto 入参
* @return IPage<DoorDeviceFindRes>
*/
@PostMapping("/findDoorDeviceList")
public R<TableDataInfo<DoorDeviceFindRes>> findDoorDeviceList(@RequestBody QueryDto dto) {
log.info("E8接口查询门禁信息列表 入参={}", dto);
TableDataInfo<DoorDeviceFindRes> doorDeviceList = doorDeviceService.findDoorDeviceList(dto);
if (ObjectUtils.isEmpty(doorDeviceList)) {
return R.fail("E8接口查询门禁信息列表，调用失败！");
} else {
return R.ok(doorDeviceList);
}
}
}

153
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java Normal file
View File

@@ -0,0 +1,153 @@
package org.dromara.sis.controller.e8;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.sis.sdk.e8.VoucherControlService;
import org.dromara.sis.sdk.e8.domain.voucher.req.CancelVoucherReq;
import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq;
import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq;
import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
* @author lsm
* @apiNote VoucherControlController
* @since 2025/6/25
*/
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/e8VoucherControl")
public class VoucherControlController {
private final VoucherControlService voucherControlService;
/**
* 发行凭证
*
* @param req 入参
* @return 是否成功
*/
@PostMapping("/issueVoucher")
public R<Boolean> issueVoucher(@RequestBody IssueVoucherReq req) {
log.info("E8发行凭证入参：{}", req);
Boolean flag = voucherControlService.issueVoucher(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8发行凭证，调用失败！");
}
}
/**
* 批量发行凭证
*
* @param req 凭证数据
* @return Boolean
*/
@PostMapping("/issueVoucherMany")
public R<Boolean> issueVoucherMany(@RequestBody List<IssueVoucherReq> req) {
log.info("E8批量发行凭证入参：{}", req);
Boolean flag = voucherControlService.issueVoucherMany(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8批量发行凭证，调用失败！");
}
}
/**
* 操作凭证
*
* @param req 入参
* @return Boolean
*/
@PostMapping("/operateVoucher")
public R<Boolean> operateVoucher(@RequestBody OperateVoucherReq req) {
log.info("E8操作凭证入参：{}", req);
Boolean flag = voucherControlService.operateVoucher(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8操作凭证，调用失败！");
}
}
/**
* 换卡补卡
*
* @param req 入参
* @return Boolean
*/
@PostMapping("/changeCard")
public R<Boolean> changeCard(@RequestBody ChangeCardReq req) {
log.info("E8换卡补卡入参：{}", req);
Boolean flag = voucherControlService.changeCard(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8换卡补卡，调用失败！");
}
}
/**
* 注销人员凭证
*
* @param req 入参
* @return Boolean
*/
@PostMapping("/cancelVoucher")
public R<Boolean> cancelVoucher(@RequestBody CancelVoucherReq req) {
log.info("E8注销人员凭证入参：{}", req);
Boolean flag = voucherControlService.cancelVoucher(req);
if (flag) {
return R.ok();
} else {
return R.fail("E8注销人员凭证，调用失败！");
}
}
/**
* 上传人脸
*
* @param file 入参
* @return imageUrl 人脸图片地址
*/
@PostMapping("/uploadFace")
public R<String> uploadFace(@RequestParam("file") MultipartFile file) {
log.info("E8上传人脸入参：{}", file.getOriginalFilename());
// 获取文件字节数组
byte[] imageByte;
try {
imageByte = file.getBytes();
} catch (IOException e) {
log.error("获取上传文件字节失败：{}", e.getMessage());
return R.fail("E8上传人脸，获取文件字节失败！");
}
String imageUrl = voucherControlService.uploadFace(imageByte);
if (imageUrl != null) {
return R.ok(imageUrl);
} else {
return R.fail("E8上传人脸，调用失败！");
}
}
}

6
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TbAccessControl.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java
View File

@@ -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.*;
@@ -16,8 +16,8 @@ import java.io.Serial;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_access_control")
public class TbAccessControl extends BaseEntity {
@TableName("sis_access_control")
public class SisAccessControl extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;

91
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java Normal file
View File

@@ -0,0 +1,91 @@
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;
/**
* 门禁设备对象 sis_access_control_device
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sis_access_control_device")
public class SisAccessControlDevice extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 设备编码
*/
private String eqpNo;
/**
* 设备名称
*/
private String eqpName;
/**
* 厂商编码
*/
private String factoryNo;
/**
* 设备类型
*/
private Long eqpType;
/**
* 接入类型(1: 平台接入，2:设备接入)
*/
private Long accessType;
/**
* 设备ip
*/
private String eqpIp;
/**
* 设备端口
*/
private Long eqpPort;
/**
* 设备账号
*/
private String eqpAccount;
/**
* 设备密码
*/
private String eqpPwd;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

110
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java Normal file
View File

@@ -0,0 +1,110 @@
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;
/**
* 宇视设备点位(通道)对象 sis_device_point
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sis_device_point")
public class SisDevicePoint extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 设备编码
*/
private String eqpCode;
/**
* 视频协议 1：onvif 2：
rtsp
*/
private Long video;
/**
* 传输协议(AIBOX 需要，一
体机不需要) 1: tcp 2:
udp
*/
private Long transportType;
/**
* 点位名称
*/
private String channelName;
/**
* rtsp 地址（当视频协议为
rtsp 时，该字段必填）
*/
private String rtspAddr;
/**
* 点位名称
*/
private String ip;
/**
* 端口
*/
private Long port;
/**
* 通道相机账号
*/
private String username;
/**
* 相机密码
*/
private String pwd;
/**
* onvif 设备码流添加方
式：1：主码流 2：自定
义码流
*/
private Long videoType;
/**
* 码流 id：当选择自定义码
流时，该字段必填，值为
获取设备码流信息接口返
回的码流 id
*/
private Long videoId;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

71
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java Normal file
View File

@@ -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("sis_lib_device_img_ref")
public class SisLibDeviceImgRef 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;
}

66
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java Normal file
View File

@@ -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("sis_lib_device_ref")
public class SisLibDeviceRef 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;
}

71
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java Normal file
View File

@@ -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("sis_person_lib")
public class SisPersonLib 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;
}

99
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java Normal file
View File

@@ -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("sis_person_lib_img")
public class SisPersonLibImg 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;
}

3
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdFactory.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java
View File

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

2
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeter.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java
View File

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

2
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterConfig.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java
View File

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

2
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterRoom.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java
View File

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

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java
View File

@@ -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.SisAccessControl;
/**
* 门禁管理业务对象 tb_access_control
@@ -18,8 +18,8 @@ import org.dromara.iot.domain.TbAccessControl;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TbAccessControl.class, reverseConvertGenerate = false)
public class TbAccessControlBo extends BaseEntity {
@AutoMapper(target = SisAccessControl.class, reverseConvertGenerate = false)
public class SisAccessControlBo extends BaseEntity {
/**
* id

96
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java Normal file
View File

@@ -0,0 +1,96 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisAccessControlDevice;
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.*;
/**
* 门禁设备业务对象 sis_access_control_device
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SisAccessControlDevice.class, reverseConvertGenerate = false)
public class SisAccessControlDeviceBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 设备编码
*/
@NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpNo;
/**
* 设备名称
*/
@NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpName;
/**
* 厂商编码
*/
private String factoryNo;
/**
* 设备类型
*/
private Long eqpType;
/**
* 接入类型(1: 平台接入，2:设备接入)
*/
private Long accessType;
/**
* 设备ip
*/
@NotBlank(message = "设备ip不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpIp;
/**
* 设备端口
*/
@NotNull(message = "设备端口不能为空", groups = { AddGroup.class, EditGroup.class })
private Long eqpPort;
/**
* 设备账号
*/
@NotBlank(message = "设备账号不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpAccount;
/**
* 设备密码
*/
@NotBlank(message = "设备密码不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpPwd;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

110
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java Normal file
View File

@@ -0,0 +1,110 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisDevicePoint;
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.*;
/**
* 宇视设备点位(通道)业务对象 sis_device_point
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SisDevicePoint.class, reverseConvertGenerate = false)
public class SisDevicePointBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 设备编码
*/
@NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpCode;
/**
* 视频协议 1：onvif 2：
rtsp
*/
private Long video;
/**
* 传输协议(AIBOX 需要，一
体机不需要) 1: tcp 2:
udp
*/
private Long transportType;
/**
* 点位名称
*/
private String channelName;
/**
* rtsp 地址（当视频协议为
rtsp 时，该字段必填）
*/
private String rtspAddr;
/**
* 点位名称
*/
private String ip;
/**
* 端口
*/
private Long port;
/**
* 通道相机账号
*/
private String username;
/**
* 相机密码
*/
private String pwd;
/**
* onvif 设备码流添加方
式：1：主码流 2：自定
义码流
*/
private Long videoType;
/**
* 码流 id：当选择自定义码
流时，该字段必填，值为
获取设备码流信息接口返
回的码流 id
*/
private Long videoId;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

75
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java Normal file
View File

@@ -0,0 +1,75 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisLibDeviceImgRef;
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 = SisLibDeviceImgRef.class, reverseConvertGenerate = false)
public class SisLibDeviceImgRefBo 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;
}

69
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisLibDeviceRef;
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 = SisLibDeviceRef.class, reverseConvertGenerate = false)
public class SisLibDeviceRefBo 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;
}

72
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java Normal file
View File

@@ -0,0 +1,72 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisPersonLib;
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 = SisPersonLib.class, reverseConvertGenerate = false)
public class SisPersonLibBo 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;
}

101
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java Normal file
View File

@@ -0,0 +1,101 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisPersonLibImg;
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 = SisPersonLibImg.class, reverseConvertGenerate = false)
public class SisPersonLibImgBo 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;
}

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java
View File

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

110
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java Normal file
View File

@@ -0,0 +1,110 @@
package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisAccessControlDevice;
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;
/**
* 门禁设备视图对象 sis_access_control_device
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisAccessControlDevice.class)
public class SisAccessControlDeviceVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 设备编码
*/
@ExcelProperty(value = "设备编码")
private String eqpNo;
/**
* 设备名称
*/
@ExcelProperty(value = "设备名称")
private String eqpName;
/**
* 厂商编码
*/
@ExcelProperty(value = "厂商编码")
private String factoryNo;
/**
* 设备类型
*/
@ExcelProperty(value = "设备类型")
private Long eqpType;
/**
* 接入类型(1: 平台接入，2:设备接入)
*/
@ExcelProperty(value = "接入类型(1: 平台接入，2:设备接入)")
private Long accessType;
/**
* 设备ip
*/
@ExcelProperty(value = "设备ip")
private String eqpIp;
/**
* 设备端口
*/
@ExcelProperty(value = "设备端口")
private Long eqpPort;
/**
* 设备账号
*/
@ExcelProperty(value = "设备账号")
private String eqpAccount;
/**
* 设备密码
*/
@ExcelProperty(value = "设备密码")
private String eqpPwd;
/**
* 创建人id
*/
@ExcelProperty(value = "创建人id")
private Long createById;
/**
* 更新人id
*/
@ExcelProperty(value = "更新人id")
private Long updateById;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

8
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java
View File

@@ -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.SisAccessControl;
import java.io.Serial;
import java.io.Serializable;
@@ -18,8 +18,8 @@ import java.io.Serializable;
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TbAccessControl.class)
public class TbAccessControlVo implements Serializable {
@AutoMapper(target = SisAccessControl.class)
public class SisAccessControlVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

131
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java Normal file
View File

@@ -0,0 +1,131 @@
package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisDevicePoint;
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;
/**
* 宇视设备点位(通道)视图对象 sis_device_point
*
* @author mocheng
* @date 2025-06-25
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisDevicePoint.class)
public class SisDevicePointVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 设备编码
*/
@ExcelProperty(value = "设备编码")
private String eqpCode;
/**
* 视频协议 1：onvif 2：
* rtsp
*/
@ExcelProperty(value = "视频协议 1：onvif 2：rtsp")
private Long video;
/**
* 传输协议(AIBOX 需要，一
* 体机不需要) 1: tcp 2:
* udp
*/
@ExcelProperty(value = "传输协议(AIBOX 需要，一体机不需要) 1:tcp 2:udp")
private Long transportType;
/**
* 点位名称
*/
@ExcelProperty(value = "点位名称")
private String channelName;
/**
* rtsp 地址（当视频协议为
* rtsp 时，该字段必填）
*/
@ExcelProperty(value = "rtsp 地址", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "当=视频协议为rtsp, 时 =，该字段必填")
private String rtspAddr;
/**
* 点位名称
*/
@ExcelProperty(value = "点位名称")
private String ip;
/**
* 端口
*/
@ExcelProperty(value = "端口")
private Long port;
/**
* 通道相机账号
*/
@ExcelProperty(value = "通道相机账号")
private String username;
/**
* 相机密码
*/
@ExcelProperty(value = "相机密码")
private String pwd;
/**
* onvif 设备码流添加方
式：1：主码流 2：自定
义码流
*/
@ExcelProperty(value = "onvif 设备码流添加方式：1：主码流 2：自定义码流")
private Long videoType;
/**
* 码流 id：当选择自定义码
流时，该字段必填，值为
获取设备码流信息接口返
回的码流 id
*/
@ExcelProperty(value = "码流 id：当选择自定义码流时，该字段必填，值为获取设备码流信息接口返回的码流 id")
private Long videoId;
/**
* 创建人id
*/
@ExcelProperty(value = "创建人id")
private Long createById;
/**
* 更新人id
*/
@ExcelProperty(value = "更新人id")
private Long updateById;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

82
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java Normal file
View File

@@ -0,0 +1,82 @@
package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisLibDeviceImgRef;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 系统图片和设备图片的关联视图对象 tb_lib_device_img_ref
*
* @author mocheng
* @date 2025-06-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisLibDeviceImgRef.class)
public class SisLibDeviceImgRefVo 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;
}

76
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java Normal file
View File

@@ -0,0 +1,76 @@
package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisLibDeviceRef;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 系统库与设备库的关联视图对象 tb_lib_device_ref
*
* @author mocheng
* @date 2025-06-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisLibDeviceRef.class)
public class SisLibDeviceRefVo 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;
}

116
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java Normal file
View File

@@ -0,0 +1,116 @@
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.sis.domain.SisPersonLibImg;
import java.io.Serial;
import java.io.Serializable;
/**
* 人像信息视图对象 tb_person_lib_img
*
* @author mocheng
* @date 2025-06-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisPersonLibImg.class)
public class SisPersonLibImgVo 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")
private Long sex;
/**
* 邮箱
*/
@ExcelProperty(value = "邮箱")
private String email;
/**
* 联系方式
*/
@ExcelProperty(value = "联系方式")
private String tel;
/**
* 证件类型
1：身份证 2：护照
3：行驶证 99：其它
*/
@ExcelProperty(value = "证件类型")
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;
}

82
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java Normal file
View File

@@ -0,0 +1,82 @@
package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisPersonLib;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 人像库视图对象 tb_person_lib
*
* @author mocheng
* @date 2025-06-24
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisPersonLib.class)
public class SisPersonLibVo 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;
}

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java
View File

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

4
ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java
View File

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

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlDeviceMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisAccessControlDevice;
import org.dromara.sis.domain.vo.SisAccessControlDeviceVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 门禁设备Mapper接口
*
* @author mocheng
* @date 2025-06-25
*/
public interface SisAccessControlDeviceMapper extends BaseMapperPlus<SisAccessControlDevice, SisAccessControlDeviceVo> {
}

17
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package org.dromara.sis.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.sis.domain.SisAccessControl;
import org.dromara.sis.domain.vo.SisAccessControlVo;
/**
* 门禁管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
*/
@Mapper
public interface SisAccessControlMapper extends BaseMapperPlus<SisAccessControl, SisAccessControlVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDevicePointMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisDevicePoint;
import org.dromara.sis.domain.vo.SisDevicePointVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 宇视设备点位(通道)Mapper接口
*
* @author mocheng
* @date 2025-06-25
*/
public interface SisDevicePointMapper extends BaseMapperPlus<SisDevicePoint, SisDevicePointVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceImgRefMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisLibDeviceImgRef;
import org.dromara.sis.domain.vo.SisLibDeviceImgRefVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 系统图片和设备图片的关联Mapper接口
*
* @author mocheng
* @date 2025-06-24
*/
public interface SisLibDeviceImgRefMapper extends BaseMapperPlus<SisLibDeviceImgRef, SisLibDeviceImgRefVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisLibDeviceRef;
import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 系统库与设备库的关联Mapper接口
*
* @author mocheng
* @date 2025-06-24
*/
public interface SisLibDeviceRefMapper extends BaseMapperPlus<SisLibDeviceRef, SisLibDeviceRefVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibImgMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisPersonLibImg;
import org.dromara.sis.domain.vo.SisPersonLibImgVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 人像信息Mapper接口
*
* @author mocheng
* @date 2025-06-24
*/
public interface SisPersonLibImgMapper extends BaseMapperPlus<SisPersonLibImg, SisPersonLibImgVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisPersonLibMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisPersonLib;
import org.dromara.sis.domain.vo.SisPersonLibVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 人像库Mapper接口
*
* @author mocheng
* @date 2025-06-24
*/
public interface SisPersonLibMapper extends BaseMapperPlus<SisPersonLib, SisPersonLibVo> {
}

6
ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java
View File

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

6
ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java
View File

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

6
ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java
View File

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

6
ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java
View File

@@ -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接口

49
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java Normal file
View File

@@ -0,0 +1,49 @@
package org.dromara.sis.sdk.e8;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq;
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.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes;
/**
* @author lsm
* @apiNote AccessControlService
* @since 2025/6/24
*/
public interface AccessControlService {
/**
* 远程开门
*
* @param req 传参
* @return Boolean
*/
Boolean remoteOpenDoor(RemoteOpenDoorReq req);
/**
* 获取通行记录分页列表
*
* @param dto 传参
* @return IPage<AccessRecordFindRes>
*/
TableDataInfo<AccessRecordFindRes> getPageAccessRecordList(QueryDto dto);
/**
* 人员授权
*
* @param req 传参
* @return Boolean
*/
Boolean addCustomerAuth(CustomerAuthAddReq req);
/**
* 获取人员权限分页列表
*
* @param dto 传参
* @return TableDataInfo<CustomerAuthFindRes>
*/
TableDataInfo<CustomerAuthFindRes> getPageCustomerAuth(QueryDto dto);
}

57
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/CustomerService.java Normal file
View File

@@ -0,0 +1,57 @@
package org.dromara.sis.sdk.e8;
import com.baomidou.mybatisplus.core.metadata.IPage;
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
* @apiNote CustomerService
* @since 2025/6/23
*/
public interface CustomerService {
/**
* 查询单个人员信息
*
* @param findReq 传参
* @return CustomFindRes
*/
CustomFindRes findCustomer(CustomFindReq findReq);
/**
* 人员信息分页查询
*
* @param dto 传参
* @return IPage<CustomFindRes>
*/
IPage<CustomFindRes> findCustomerList(QueryDto dto);
/**
* 新增人员信息
*
* @param addReq 传参
* @return CustomAddRes
*/
CustomAddRes addCustomer(CustomAddReq addReq);
/**
* 人员信息修改
*
* @param updateReq 传参
* @return Boolean
*/
Boolean updateCustomer(CustomUpdateReq updateReq);
/**
* 删除人员信息
*
* @param id 传参
* @return Boolean
*/
Boolean deleteCustomer(Long id);
}

Some files were not shown because too many files have changed in this diff Show More