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
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
dy
2025-08-05 11:22:04 +08:00
parent 6d9266ee21 2a36ddf688
commit eb03629e84
47 changed files with 1033 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-api/property-api/pom.xml
View File

@@ -23,6 +23,11 @@
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
</dependency>
</dependencies>

1
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java
View File

@@ -14,4 +14,5 @@ public interface RemoteConfigService {
*/
boolean selectRegisterEnabled(String tenantId);
String selectQrTimeOut();
}

2
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java
View File

@@ -196,4 +196,6 @@ public interface RemoteUserService {
*/
Map<Long, String> selectPostNamesByIds(List<Long> postIds);
Map<String ,Integer> seelectOrgcount();
}

11
ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemotePrecautionary.java Normal file
View File

@@ -0,0 +1,11 @@
package org.dromara.sis.api;
import org.dromara.sis.api.domain.RemotePrecautionaryVo;
import java.util.List;
import java.util.Map;
public interface RemotePrecautionary {
List<RemotePrecautionaryVo> getList();
Map count();
}

12
ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteSos.java Normal file
View File

@@ -0,0 +1,12 @@
package org.dromara.sis.api;
import org.dromara.sis.api.domain.RemoteAlarmRecord;
import java.util.List;
import java.util.Map;
public interface RemoteSos {
List<RemoteAlarmRecord> getSoslist();
Map sosCount();
}

201
ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteAlarmRecord.java Normal file
View File

@@ -0,0 +1,201 @@
package org.dromara.sis.api.domain;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 报警记录实体类，对应数据库表 alarm_record
* 存储系统中的报警事件信息，包括设备信息、时间信息、处理状态等
*/
@Data
public class RemoteAlarmRecord implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 报警记录唯一标识，对应 API 返回的 Id 字段
* 采用 INPUT 策略，使用 API 返回的实际 ID 值
*/
private Long id;
/**
* 任务编码，用于标识特定的报警任务
*/
private String taskCode;
/**
* 设备ID，关联具体的报警设备
*/
private Integer deviceId;
/**
* 设备名称，如 "7楼办公室"
*/
private String deviceName;
/**
* 设备许可证ID，用于唯一标识设备
*/
private String deviceLicenseId;
/**
* 设备SIP号码，用于通信
*/
private String deviceSipNum;
/**
* 设备所在经度
*/
private Double deviceLng;
/**
* 设备所在纬度
*/
private Double deviceLat;
/**
* 会议ID，关联报警处理过程中的会议
*/
private Long conferenceId;
/**
* 会议SIP编码
*/
private String confSipCode;
/**
* 报警状态，如 "finished"（已完成）、"noAnswer"（未接听）等
*/
private String state;
/**
* 报警开始时间（Java Date 类型）
*/
private Date startTime;
/**
* 报警开始时间的 Unix 时间戳（毫秒）
*/
private Long startTimeUnix;
/**
* 报警结束时间（Java Date 类型）
*/
private Date finishTime;
/**
* 报警结束时间的 Unix 时间戳（毫秒）
*/
private Long finishTimeUnix;
/**
* 响铃开始时间（Java Date 类型）
*/
private Date ringingTime;
/**
* 响铃开始时间的 Unix 时间戳（毫秒）
*/
private Long ringingTimeUnix;
/**
* 过期时间（Java Date 类型）
*/
private Date expireTime;
/**
* 过期时间的 Unix 时间戳（毫秒）
*/
private Long expireTimeUnix;
/**
* 呼叫过期时间（Java Date 类型）
*/
private Date callExpireTime;
/**
* 呼叫过期时间的 Unix 时间戳（毫秒）
*/
private Long callExpireTimeUnix;
/**
* 呼叫开始时间（Java Date 类型）
*/
private Date callTime;
/**
* 呼叫开始时间的 Unix 时间戳（毫秒）
*/
private Long callTimeUnix;
/**
* 设备是否带有摄像头（0-不带，1-带）
*/
private Integer deviceWithCamera;
/**
* 公司编码，标识所属公司
*/
private String companyCode;
/**
* 报警类型，如 "button"（按钮报警）
*/
private String alarmType;
/**
* 业务类型，如 "normal"（正常业务）
*/
private String businessType;
/**
* 分组ID，用于对设备进行分组管理
*/
private Integer groupId;
/**
* 报告通知级别
*/
private Integer reportNotifyLevel;
/**
* 是否挂起（0-未挂起，1-挂起）
*/
private Integer isHold;
/**
* 显示的报警类型（可能为空）
*/
private String displayAlarmType;
/**
* 接收类型（可能为空）
*/
private String acceptType;
/**
* 分组名称（可能为空）
*/
private String groupName;
/**
* 设备联系人（可能为空）
*/
private String deviceLinkman;
/**
* 设备联系电话（可能为空）
*/
private String devicePhoneNum;
/**
* 记录创建时间，由数据库自动填充
* 使用 MyBatis-Plus 的自动填充功能，插入时自动设置为当前时间
*/
private Date createTime;
}

63
ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemotePrecautionaryVo.java Normal file
View File

@@ -0,0 +1,63 @@
package org.dromara.sis.api.domain;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 预警视图对象 precautionary
*
* @author mocheng
* @date 2025-08-01
*/
@Data
public class RemotePrecautionaryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long id;
/**
* 预警类型
*/
private Long type;
/**
* 时间
*/
private Date time;
/**
* 位置
*/
private String address;
/**
* 预警内容
*/
private String msg;
/**
* 状态
*/
private Long status;
/**
* 详情id
*/
private Long taskId;
}

59
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java
View File

@@ -1,11 +1,21 @@
package org.dromara.property.controller;
import java.util.List;
import java.util.UUID;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.config.ConfigService;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.property.domain.bo.QrCodeInfo;
import org.dromara.resource.api.RemoteMessageService;
import org.dromara.system.api.RemoteConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -36,6 +46,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
public class TbVisitorManagementController extends BaseController {
private final ITbVisitorManagementService tbVisitorManagementService;
@DubboReference
private final RemoteConfigService remoteConfigService;
@DubboReference(stub = "true")
private final RemoteMessageService remoteMessageService;
/**
* 查询访客管理列表
@@ -46,6 +63,42 @@ public class TbVisitorManagementController extends BaseController {
return tbVisitorManagementService.queryPageList(bo, pageQuery);
}
/**
* 获取二维码uuid
* @param qrCodeInfo
* @return
*/
@PostMapping("/getcode")
public R<String> getcode(QrCodeInfo qrCodeInfo) {
Long string = (Long) StpUtil.getLoginId();
qrCodeInfo.setUserid(string);
String s = remoteConfigService.selectQrTimeOut();
int i = Integer.parseInt(s);
UUID value = UUID.randomUUID();
RedisUtils.setCacheObject("Qrcode"+value, qrCodeInfo);
RedisUtils.expire("Qrcode", i);
return R.ok(value.toString());
}
/**
* 推送二维码被扫信息
* @param qrcode
* @return
*/
@PostMapping("/useqr")
public R<String> useqr(String qrcode) {
QrCodeInfo qrCodeInfo = RedisUtils.getCacheObject("Qrcode" + qrcode);
if (qrCodeInfo==null) {
return R.fail("二维码已过期");
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("type","qrcode");
jsonObject.put("date",qrcode);
remoteMessageService.publishMessage(List.of(qrCodeInfo.getUserid()),jsonObject.toString());
return R.ok("二维码可用");
}
/**
* 导出访客管理列表
*/
@@ -75,8 +128,12 @@ public class TbVisitorManagementController extends BaseController {
@SaCheckPermission("property:visitorManagement:add")
@Log(title = "访客管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@PostMapping("/add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) {
QrCodeInfo info = RedisUtils.getCacheObject("Qrcode" + bo.getQrCodeId());
if (info==null){
return R.fail("请确认Qr码有效");
}
return toAjax(tbVisitorManagementService.insertByBo(bo));
}

66
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/BookingController.java Normal file
View File

@@ -0,0 +1,66 @@
package org.dromara.property.controller.cockpit;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.domain.R;
import org.dromara.property.domain.vo.TbVisitorManagementVo;
import org.dromara.property.service.ITbVisitorManagementService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 大屏预约接口
*/
@RestController
@RequestMapping("/cockpit")
public class BookingController {
@Resource
private ITbVisitorManagementService tbVisitorManagementService;
@RequestMapping("visitor")
public R<Map> visitor() {
// 创建查询条件包装器
QueryWrapper<TbVisitorManagementVo> queryWrapper = new QueryWrapper<>();
// 添加时间条件，查询近七天的数据
LocalDateTime sevenDaysAgo = LocalDateTime.now().minusDays(7);
queryWrapper.ge("create_time", sevenDaysAgo); // 假设创建时间字段为create_time
// 执行查询
List<TbVisitorManagementVo> tbVisitorManagementVos = tbVisitorManagementService.queryListByWapper(queryWrapper);
// 按天分组统计
Map<String, Long> typeCountMap = tbVisitorManagementVos.stream()
.collect(Collectors.groupingBy(
vo -> {
// 如果 getVisitingBeginTime() 返回 Date 类型
return vo.getVisitingBeginTime().toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate()
.toString();
},
Collectors.counting()
));
ArrayList<String> keys = new ArrayList<>();
ArrayList<String> values = new ArrayList<>();
for (String s : typeCountMap.keySet()) {
keys.add(s);
}
for (Long value : typeCountMap.values()) {
values.add(value.toString());
}
HashMap<String, List> stringListHashMap = new HashMap<>();
stringListHashMap.put("keys",keys);
stringListHashMap.put("values",values);
return R.ok(stringListHashMap);
}
}

13
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/DriverController.java Normal file
View File

@@ -0,0 +1,13 @@
package org.dromara.property.controller.cockpit;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 大屏设备接口
*/
@RestController
@RequestMapping("/cockpit")
public class DriverController {
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/EnergyConsumptionController.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.controller.cockpit;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 大屏能耗接口
*/
@RestController
@RequestMapping("/cockpit")
public class EnergyConsumptionController {
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/EventController.java Normal file
View File

@@ -0,0 +1,12 @@
package org.dromara.property.controller.cockpit;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 大屏事件接口
*/
@RestController
@RequestMapping("/cockpit")
public class EventController {
}

49
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/ExpensesController.java Normal file
View File

@@ -0,0 +1,49 @@
package org.dromara.property.controller.cockpit;
import org.dromara.common.core.domain.R;
import org.dromara.property.domain.bo.CostPayFeeAuditBo;
import org.dromara.property.domain.vo.CostPayFeeAuditVo;
import org.dromara.property.service.ICostPayFeeAuditService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
/**
* 大屏费用接口
*/
@RestController
@RequestMapping("/cockpit")
public class ExpensesController {
@Autowired
private ICostPayFeeAuditService costPayFeeAuditService;
@RequestMapping("/expenses")
public R<HashMap<String, BigDecimal>> expenses(){
List<CostPayFeeAuditVo> costPayFeeAuditVos = costPayFeeAuditService.queryList(new CostPayFeeAuditBo());
// 按 chargeItem 分组统计数量
List<String> collect = costPayFeeAuditVos.stream()
.filter(vo -> vo.getChargeItem() != null)
.map(a -> a.getChargeItem())
.distinct()
.collect(Collectors.toList());
HashMap<String, BigDecimal> stringBigDecimalHashMap = new HashMap<>();
for (String s : collect) {
BigDecimal bigDecimal = costPayFeeAuditVos.stream()
.filter(a -> a.getReceivedAmount() == null)
.filter(a -> a.getChargeItem() .equals(s))
.map(CostPayFeeAuditVo::getReceivedAmount)
.reduce(BigDecimal::add)
.get();
stringBigDecimalHashMap.put(s, bigDecimal);
}
return R.ok(stringBigDecimalHashMap);
}
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/FlowController.java Normal file
View File

@@ -0,0 +1,12 @@
package org.dromara.property.controller.cockpit;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 大屏流量接口
*/
@RestController
@RequestMapping("/cockpit")
public class FlowController {
}

25
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/PropertyPersonController.java Normal file
View File

@@ -0,0 +1,25 @@
package org.dromara.property.controller.cockpit;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.domain.R;
import org.dromara.system.api.RemoteUserService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
* 大屏物业人员接口
*/
@RestController
@RequestMapping("/cockpit")
public class PropertyPersonController {
@DubboReference
private RemoteUserService remoteUserService;
@RequestMapping("propertyperson")
public R<Map<String, Integer>> propertyPerson() {
return R.ok(remoteUserService.seelectOrgcount());
}
}

30
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/SosController.java Normal file
View File

@@ -0,0 +1,30 @@
package org.dromara.property.controller.cockpit;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.domain.R;
import org.dromara.sis.api.RemoteSos;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* 大屏报警接口
*/
@RestController
@RequestMapping("/cockpit")
public class SosController {
@DubboReference
private RemoteSos remoteSos;
@RequestMapping("sos")
public R<Map<String, Integer>> sos(){
return R.ok(remoteSos.sosCount());
}
@RequestMapping("soslist")
public R<List> sosList(){
return R.ok(remoteSos.getSoslist());
}
}

62
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cockpit/WorkOrderController.java Normal file
View File

@@ -0,0 +1,62 @@
package org.dromara.property.controller.cockpit;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.web.core.BaseController;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
import org.dromara.property.domain.vo.ServiceWorkOrderAnalysisVo;
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
import org.dromara.property.service.IServiceWorkOrdersService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 大屏工单接口
*/
@RestController
@RequestMapping("/cockpit")
public class WorkOrderController {
@Resource
private IServiceWorkOrdersService serviceWorkOrdersService;
/**
* 获取服务工单统计信息
*
* @return 返回服务工单分析数据的封装结果
*/
@GetMapping("/workcount")
public R<HashMap> counts() {
// 调用服务层获取工单统计信息并返回成功结果
List<ServiceWorkOrdersVo> serviceWorkOrdersVos = serviceWorkOrdersService.queryList(new ServiceWorkOrdersBo());
// 按type分组统计
Map<String, Long> typeCountMap = serviceWorkOrdersVos.stream()
.collect(Collectors.groupingBy(
vo -> String.valueOf(vo.getTypeName()),
Collectors.counting()
));
ArrayList<String> keys = new ArrayList<>();
ArrayList<String> values = new ArrayList<>();
for (String s : typeCountMap.keySet()) {
keys.add(s);
}
for (Long value : typeCountMap.values()) {
values.add(value.toString());
}
HashMap<String, List> stringListHashMap = new HashMap<>();
stringListHashMap.put("keys",keys);
stringListHashMap.put("values",values);
return R.ok(stringListHashMap);
}
}

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

@@ -0,0 +1,10 @@
package org.dromara.property.domain.bo;
import lombok.Data;
@Data
public class QrCodeInfo {
private String deviceCode; // 对应“设备码”
private String generateTime; // 对应“生成时间”
private String qrCodeId; // 对应“二维码ID”
private Long userid;
}

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

@@ -22,6 +22,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
@AutoMapper(target = TbVisitorManagement.class, reverseConvertGenerate = false)
public class TbVisitorManagementBo extends BaseEntity {
/**
* qr码id
*/
@NotNull(message = "qr码id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long qrCodeId;
/**
* id
*/

1
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;

6
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java
View File

@@ -1,5 +1,7 @@
package org.dromara.property.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.property.domain.TbVisitorManagement;
import org.dromara.property.domain.vo.TbVisitorManagementVo;
import org.dromara.property.domain.bo.TbVisitorManagementBo;
@@ -42,6 +44,10 @@ public interface ITbVisitorManagementService {
*/
List<TbVisitorManagementVo> queryList(TbVisitorManagementBo bo);
List<TbVisitorManagementVo> queryListByWapper(QueryWrapper wapper);
/**
* 新增访客管理
*

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

@@ -140,7 +140,23 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
@Override
public List<ServiceWorkOrdersVo> queryList(ServiceWorkOrdersBo bo) {
LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
List<ServiceWorkOrdersVo> result = baseMapper.selectVoList(lqw);
if (ObjectUtil.isEmpty(result)) {
return result;
}
List<Long> typeList = result.stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList());
List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
if (ObjectUtil.isEmpty(serviceWorkOrdersTypeVoList)) {
return result;
}
List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
result.stream().forEach(s -> {
ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null);
serviceWorkOrdersVoList.add(s);
});
return serviceWorkOrdersVoList;
}
private LambdaQueryWrapper<ServiceWorkOrders> buildQueryWrapper(ServiceWorkOrdersBo bo) {

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

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +10,8 @@ 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.common.redis.utils.RedisUtils;
import org.dromara.property.domain.bo.QrCodeInfo;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbVisitorManagementBo;
import org.dromara.property.domain.vo.TbVisitorManagementVo;
@@ -58,16 +61,15 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
return TableDataInfo.build(result);
}
/**
* 查询符合条件的访客管理列表
*
* @param bo 查询条件
* @return 访客管理列表
*/
@Override
public List<TbVisitorManagementVo> queryList(TbVisitorManagementBo bo) {
LambdaQueryWrapper<TbVisitorManagement> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<TbVisitorManagement> tbVisitorManagementLambdaQueryWrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(tbVisitorManagementLambdaQueryWrapper);
}
@Override
public List<TbVisitorManagementVo> queryListByWapper(QueryWrapper wapper) {
return baseMapper.selectVoList(wapper);
}
private LambdaQueryWrapper<TbVisitorManagement> buildQueryWrapper(TbVisitorManagementBo bo) {
@@ -98,8 +100,10 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
*/
@Override
public Boolean insertByBo(TbVisitorManagementBo bo) {
QrCodeInfo info = RedisUtils.getCacheObject("Qrcode" + bo.getQrCodeId());
TbVisitorManagement add = MapstructUtils.convert(bo, TbVisitorManagement.class);
validEntityBeforeSave(add);
add.setCreateById(info.getUserid());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());

16
ruoyi-modules/Sis/pom.xml
View File

@@ -123,17 +123,23 @@
<artifactId>examples</artifactId>
</dependency>
<dependency>
<groupId>com.hik</groupId>
<artifactId>jna</artifactId>
<version>4.5.2_1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.hik</groupId>-->
<!-- <artifactId>jna</artifactId>-->
<!-- <version>4.5.2_1</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.ghgande</groupId>
<artifactId>j2mod</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.17.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEventAttachments.java
View File

@@ -36,7 +36,7 @@ public class SisAlarmEventAttachments extends TenantEntity {
/**
* 时间图片id
*/
private String ossId;
private Long ossId;
/**
* 1：图片，2：文件；3视频

3
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
View File

@@ -77,4 +77,7 @@ public class SisDeviceManage extends BaseEntity {
* 设备组id
*/
private Long groupId;
private String tenantId;
}

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java
View File

@@ -42,5 +42,15 @@ public class SisElevatorFloorRef extends TenantEntity {
*/
private Long authGroupId;
/**
* 内部通道号
*/
private Long inChannel;
/**
* 外部通道号
*/
private Long outChannel;
}

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventAttachmentsBo.java
View File

@@ -35,7 +35,7 @@ public class SisAlarmEventAttachmentsBo extends BaseEntity {
/**
* 时间图片id
*/
private String ossId;
private Long ossId;
/**
* 1：图片，2：文件；3视频

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventAttachmentsVo.java
View File

@@ -40,7 +40,7 @@ public class SisAlarmEventAttachmentsVo implements Serializable {
* 时间图片id
*/
@ExcelProperty(value = "时间图片id")
private String ossId;
private Long ossId;
/**
* 1：图片，2：文件；3视频

35
ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemotePrecautionaryImpl.java Normal file
View File

@@ -0,0 +1,35 @@
package org.dromara.sis.dubbo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.sis.api.RemotePrecautionary;
import org.dromara.sis.api.domain.RemotePrecautionaryVo;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@Slf4j
@DubboService
@RequiredArgsConstructor
public class RemotePrecautionaryImpl implements RemotePrecautionary {
private final PrecautionaryMapper precautionaryMapper;
@Override
public List<RemotePrecautionaryVo> getList() {
Page<Precautionary> Page = new Page<>(1, 10);
QueryWrapper<Precautionary> wrapper = new QueryWrapper<>();
wrapper.orderByAsc("time");
return precautionaryMapper.selectVoPage(Page, wrapper);
}
@Override
public Map count() {
List<Precautionary> precautionaries = precautionaryMapper.selectList();
Stream<Long> longStream = precautionaries.stream().map(Precautionary::getType);
return Map.of();
}
}

49
ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSosImpl.java Normal file
View File

@@ -0,0 +1,49 @@
package org.dromara.sis.dubbo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.sis.api.RemoteSos;
import org.dromara.sis.api.domain.RemoteAlarmRecord;
import org.dromara.sis.domain.AlarmRecord;
import org.dromara.sis.service.AlarmRecordService;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@DubboService
@RequiredArgsConstructor
public class RemoteSosImpl implements RemoteSos {
private final AlarmRecordService alarmRecordService;
@Override
public List<RemoteAlarmRecord> getSoslist() {
QueryWrapper<AlarmRecord> startTime = new QueryWrapper<AlarmRecord>();
Page<AlarmRecord> page = alarmRecordService.page(new Page<>(1, 10));
List<AlarmRecord> records = page.getRecords();
List<RemoteAlarmRecord> remoteAlarmRecordList = new ArrayList<>();
records.forEach(alarmRecord -> {
RemoteAlarmRecord remoteAlarmRecord = new RemoteAlarmRecord();
BeanUtils.copyProperties(alarmRecord, remoteAlarmRecord);
remoteAlarmRecordList.add(remoteAlarmRecord);
});
return remoteAlarmRecordList;
};
@Override
public Map sosCount() {
List<AlarmRecord> list = alarmRecordService.list();
//进行中
long inprogress = list.stream().filter(alarmRecord -> alarmRecord.getState().equals("inprogress")).count();
//已结束
long finished = list.stream().filter(alarmRecord -> alarmRecord.getState().equals("finished")).count();
//未接通
long noAnswer = list.stream().filter(alarmRecord -> alarmRecord.getState().equals("noAnswer")).count();
return Map.of("进行中", inprogress, "已结束", finished, "未接通", noAnswer,"总计", list.size());
}
}

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java
View File

@@ -1,9 +1,11 @@
package org.dromara.sis.sdk.huawei;
import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq;
import org.dromara.sis.sdk.huawei.domain.HWResult;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* @apiNote HuaWeiBoxApi
@@ -32,7 +34,7 @@ public interface HuaWeiBoxApi {
* 根据抓拍图片比对，返回人员ID
*
* @param base64Img 入参
* @return Long
* @return Map<String, Object>
*/
Long findPerson(String base64Img);
HWResult findPerson(String base64Img);
}

18
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/HWResult.java Normal file
View File

@@ -0,0 +1,18 @@
package org.dromara.sis.sdk.huawei.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @author lsm
* @apiNote HWResult
* @since 2025/8/5
*/
@Data
@AllArgsConstructor
public class HWResult {
public Integer code;
public String message;
}

18
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java
View File

@@ -8,11 +8,14 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.sis.sdk.huawei.HuaWeiBoxApi;
import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq;
import org.dromara.sis.sdk.huawei.domain.FinaHWPersonReq;
import org.dromara.sis.sdk.huawei.domain.HWResult;
import org.dromara.sis.sdk.huawei.utils.HuaWeiHttp;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -86,7 +89,7 @@ public class HuaWeiBoxApiService implements HuaWeiBoxApi {
* @return Long
*/
@Override
public Long findPerson(String base64Img) {
public HWResult findPerson(String base64Img) {
String url = "/sdk_service/rest/facerepositories/peoples";
FinaHWPersonReq req = new FinaHWPersonReq();
@@ -99,21 +102,24 @@ public class HuaWeiBoxApiService implements HuaWeiBoxApi {
JSONObject jsonRes = JSONUtil.parseObj(jsonStrRes);
if (jsonRes.getInt("resultCode") != 0) {
log.error("调用华为盒子人脸比对接口失败，code:{}，msg：{}", jsonRes.getInt("resultCode"), jsonRes.getStr("resultMsg"));
return null;
return switch (jsonRes.getInt("resultCode")) {
case 912322041 -> new HWResult(912322041, "特征值提取失败");
case 912333003 -> new HWResult(912333003, "base64参数非法");
default -> new HWResult(jsonRes.getInt("resultCode"), jsonRes.getStr("resultMsg"));
};
}
JSONArray jsonArr = jsonRes.getJSONArray("algorithmResults");
JSONObject obj = jsonArr.getJSONObject(0);
if (Integer.parseInt(obj.getStr("number")) == 0) {
log.error("无人脸比对数据");
return null;
log.info("无人脸比对数据");
return new HWResult(201, "无匹配数据");
}
JSONArray peopleList = obj.getJSONArray("peopleList");
JSONObject people = peopleList.getJSONObject(0);
return Long.parseLong(people.getStr("peopleId"));
return new HWResult(200, people.getStr("peopleId"));
}
}

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/AlarmRecordService.java
View File

@@ -29,5 +29,5 @@ public interface AlarmRecordService extends IService<AlarmRecord> {
* @param operatorMap 操作记录映射，键为报警记录ID，值为对应操作记录列表
* @return 成功保存的记录数
*/
int saveNewRecords(List<AlarmRecord> records, Map<Long, List<Map<String, Object>>> operatorMap);
// int saveNewRecords(List<AlarmRecord> records, Map<Long, List<Map<String, Object>>> operatorMap);
}

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventAttachmentsService.java
View File

@@ -2,6 +2,7 @@ package org.dromara.sis.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.SisAlarmEventAttachments;
import org.dromara.sis.domain.bo.SisAlarmEventAttachmentsBo;
import org.dromara.sis.domain.vo.SisAlarmEventAttachmentsVo;
@@ -65,4 +66,13 @@ public interface ISisAlarmEventAttachmentsService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 批量写入事件附件表
*
* @param ls 附件数据
* @return 返回写入数量
*/
Boolean batchInsert(List<SisAlarmEventAttachments> ls);
}

1
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java
View File

@@ -76,6 +76,7 @@ public interface ISisDeviceManageService {
*/
SisDeviceManageVo queryVoByDeviceIp(String deviceIp);
SisDeviceManage queryByDeviceIp(String deviceId);
/**
* 查询设备数
*

8
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorFloorRefService.java
View File

@@ -1,5 +1,6 @@
package org.dromara.sis.service;
import org.dromara.sis.domain.SisElevatorFloorChannelRef;
import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
import org.dromara.sis.domain.bo.SisElevatorFloorRefBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -72,4 +73,11 @@ public interface ISisElevatorFloorRefService {
* @param authGroupId 电梯id
*/
List<SisElevatorFloorRefVo> queryByAuthGroupId(Long authGroupId);
/**
* 批量更新电梯⇄楼层通道关联信息
*
* @param info 通道信息
*/
Boolean batchUpdateChannel(Collection<SisElevatorFloorChannelRef> info);
}

68
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/AlarmRecordServiceImpl.java
View File

@@ -27,6 +27,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
@Autowired
private AlarmTaskOperatorService taskOperatorService;
@Transactional(rollbackFor = Exception.class)
@Override
public int saveOrUpdateRecords(List<AlarmRecord> records, Map<Long, List<Map<String, Object>>> operatorMap) {
@@ -58,6 +59,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
} else {
// 新记录
newRecords.add(record);
}
}
@@ -68,10 +70,8 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
if (this.saveBatch(newRecords)) {
result += newRecords.size();
// 保存关联的操作记录
saveRelatedOperators(newRecords, operatorMap);
}
}
// 批量更新修改过的记录
if (!updateRecords.isEmpty()) {
if (this.updateBatchById(updateRecords)) {
@@ -125,38 +125,38 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
}
@Override
@Transactional(rollbackFor = Exception.class)
public int saveNewRecords(List<AlarmRecord> records, Map<Long, List<Map<String, Object>>> operatorMap) {
if (records == null || records.isEmpty()) return 0;
// 提取待插入记录的ID列表
List<Long> ids = records.stream().map(AlarmRecord::getId).collect(Collectors.toList());
// 查询数据库中已存在的记录
LambdaQueryWrapper<AlarmRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(AlarmRecord::getId, ids);
List<AlarmRecord> existingRecords = this.list(queryWrapper);
List<Long> existingIds = existingRecords.stream().map(AlarmRecord::getId).collect(Collectors.toList());
// 过滤出新增记录
List<AlarmRecord> newRecords = records.stream()
.filter(record -> !existingIds.contains(record.getId()))
.collect(Collectors.toList());
// 批量插入新记录
int savedCount = 0;
if (!newRecords.isEmpty()) {
if (this.saveBatch(newRecords)) {
savedCount = newRecords.size();
// 保存关联的操作记录
saveRelatedOperators(newRecords, operatorMap);
}
}
return savedCount;
}
//
// @Override
// @Transactional(rollbackFor = Exception.class)
// public int saveNewRecords(List<AlarmRecord> records, Map<Long, List<Map<String, Object>>> operatorMap) {
// if (records == null || records.isEmpty()) return 0;
//
// // 提取待插入记录的ID列表
// List<Long> ids = records.stream().map(AlarmRecord::getId).collect(Collectors.toList());
//
// // 查询数据库中已存在的记录
// LambdaQueryWrapper<AlarmRecord> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.in(AlarmRecord::getId, ids);
// List<AlarmRecord> existingRecords = this.list(queryWrapper);
// List<Long> existingIds = existingRecords.stream().map(AlarmRecord::getId).collect(Collectors.toList());
//
// // 过滤出新增记录
// List<AlarmRecord> newRecords = records.stream()
// .filter(record -> !existingIds.contains(record.getId()))
// .collect(Collectors.toList());
//
// // 批量插入新记录
// int savedCount = 0;
// if (!newRecords.isEmpty()) {
// if (this.saveBatch(newRecords)) {
// savedCount = newRecords.size();
//
// // 保存关联的操作记录
// saveRelatedOperators(newRecords, operatorMap);
// }
// }
// return savedCount;
// }
private void saveRelatedOperators(List<AlarmRecord> newRecords, Map<Long, List<Map<String, Object>>> operatorMap) {
if (operatorMap == null || operatorMap.isEmpty()) return;

8
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventAttachmentsServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.SisAlarmEventAttachments;
@@ -75,7 +74,7 @@ public class SisAlarmEventAttachmentsServiceImpl implements ISisAlarmEventAttach
LambdaQueryWrapper<SisAlarmEventAttachments> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisAlarmEventAttachments::getId);
lqw.eq(bo.getEventId() != null, SisAlarmEventAttachments::getEventId, bo.getEventId());
lqw.eq(StringUtils.isNotBlank(bo.getOssId()), SisAlarmEventAttachments::getOssId, bo.getOssId());
lqw.eq(bo.getOssId() != null, SisAlarmEventAttachments::getOssId, bo.getOssId());
lqw.eq(bo.getType() != null, SisAlarmEventAttachments::getType, bo.getType());
return lqw;
}
@@ -131,4 +130,9 @@ public class SisAlarmEventAttachmentsServiceImpl implements ISisAlarmEventAttach
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public Boolean batchInsert(List<SisAlarmEventAttachments> ls) {
return baseMapper.insertBatch(ls);
}
}

52
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
View File

@@ -12,19 +12,20 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.resource.api.domain.RemoteFile;
import org.dromara.sis.domain.SisAlarmEventAttachments;
import org.dromara.sis.domain.SisAlarmEvents;
import org.dromara.sis.domain.SisDeviceManage;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.vo.SisAlarmEventsVo;
import org.dromara.sis.domain.vo.SisDeviceManageVo;
import org.dromara.sis.mapper.SisAlarmEventsMapper;
import org.dromara.sis.service.ISisAlarmEventAttachmentsService;
import org.dromara.sis.service.ISisAlarmEventsService;
import org.dromara.sis.service.ISisDeviceManageService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 告警Service业务层处理
@@ -39,6 +40,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
private final SisAlarmEventsMapper baseMapper;
private final ISisDeviceManageService deviceManageService;
private final ISisAlarmEventAttachmentsService alarmEventAttachmentsService;
@DubboReference
private RemoteFileService remoteFileService;
@@ -148,17 +150,49 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
@Async
@Override
@Transactional(rollbackFor = Exception.class)
public void createAlarmRecord(String deviceIp, Integer level, Integer type, byte[] smallImg, byte[] bigImg) {
// 校验设备信息
SisDeviceManageVo sisDeviceManageVo = deviceManageService.queryVoByDeviceIp(deviceIp);
if (sisDeviceManageVo == null) {
SisDeviceManage sisDeviceManage = deviceManageService.queryByDeviceIp(deviceIp);
if (sisDeviceManage == null) {
log.error("设备信息不存在，放弃此条告警记录。");
return;
}
// 生成时间信息
SisAlarmEvents alarmEvents = new SisAlarmEvents();
alarmEvents.setType(1L);
alarmEvents.setLevel(Long.valueOf(level));
alarmEvents.setDeviceIp(deviceIp);
alarmEvents.setDeviceName(sisDeviceManage.getDeviceName());
alarmEvents.setDeviceGroupId(sisDeviceManage.getId());
alarmEvents.setReportTime(new Date());
alarmEvents.setState(1);
alarmEvents.setTenantId(sisDeviceManage.getTenantId());
alarmEvents.setCreateDept(sisDeviceManage.getCreateDept());
int insert = this.baseMapper.insert(alarmEvents);
log.info("写入报警事件表完成，num={}", insert);
// 写入附件表
// 上传图片
RemoteFile small = remoteFileService.uploadImg(smallImg);
RemoteFile big = remoteFileService.uploadImg(bigImg);
List<SisAlarmEventAttachments> ls = new ArrayList<>();
if (smallImg != null && smallImg.length > 0) {
ls.add(createEventAttachments(smallImg, alarmEvents, sisDeviceManage));
}
if (bigImg != null && bigImg.length > 0) {
ls.add(createEventAttachments(bigImg, alarmEvents, sisDeviceManage));
}
Boolean flag = alarmEventAttachmentsService.batchInsert(ls);
log.info("写入告警事件附件表完成, reslut={}, size={}", flag, ls.size());
}
public SisAlarmEventAttachments createEventAttachments(byte[] img, SisAlarmEvents alarmEvents, SisDeviceManage sisDeviceManage) {
RemoteFile result = remoteFileService.uploadImg(img);
SisAlarmEventAttachments attachments = new SisAlarmEventAttachments();
attachments.setEventId(alarmEvents.getId());
attachments.setOssId(result.getOssId());
attachments.setType(1L);
attachments.setTenantId(sisDeviceManage.getTenantId());
attachments.setCreateDept(sisDeviceManage.getCreateDept());
return attachments;
}
}

9
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java
View File

@@ -178,7 +178,14 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
public SisDeviceManageVo queryVoByDeviceIp(String deviceIp) {
LambdaQueryWrapper<SisDeviceManage> lqw = Wrappers.lambdaQuery();
lqw.eq(SisDeviceManage::getDeviceIp, deviceIp);
return baseMapper.selectVoById(lqw);
return baseMapper.selectVoOne(lqw);
}
@Override
public SisDeviceManage queryByDeviceIp(String deviceId) {
LambdaQueryWrapper<SisDeviceManage> lqw = Wrappers.lambdaQuery();
lqw.eq(SisDeviceManage::getDeviceIp, deviceId);
return baseMapper.selectOne(lqw);
}
@Override

1
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorChannelRefServiceImpl.java
View File

@@ -150,6 +150,7 @@ public class SisElevatorFloorChannelRefServiceImpl implements ISisElevatorFloorC
lqw.eq(SisElevatorFloorChannelRef::getElevatorId, elevatorId);
baseMapper.delete(lqw);
// 写入通道关系
boolean flag = baseMapper.insertBatch(bo);
Assert.isTrue(flag, "批量增加电梯⇄楼层⇄通道关联信息失败");
return flag;

21
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
View File

@@ -9,6 +9,7 @@ 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.sis.domain.SisElevatorFloorChannelRef;
import org.springframework.stereotype.Service;
import org.dromara.sis.domain.bo.SisElevatorFloorRefBo;
import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
@@ -151,4 +152,24 @@ public class SisElevatorFloorRefServiceImpl implements ISisElevatorFloorRefServi
lqw.eq(SisElevatorFloorRef::getElevatorId, authGroupId);
return baseMapper.selectVoList(lqw);
}
/**
* 批量更新电梯⇄楼层通道关联信息
*
* @param info 通道信息
*/
@Override
public Boolean batchUpdateChannel(Collection<SisElevatorFloorChannelRef> info){
LambdaQueryWrapper<SisElevatorFloorRef> lqw = Wrappers.lambdaQuery();
lqw.in(SisElevatorFloorRef::getFloorId, info.stream().map(SisElevatorFloorChannelRef::getFloorId).toList());
List<SisElevatorFloorRef> list = baseMapper.selectList(lqw);
for (SisElevatorFloorRef item : list){
item.setInChannel(info.stream().filter(x -> x.getFloorId().equals(item.getFloorId())).findFirst().get().getInChannel());
}
return false;
}
}

82
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java
View File

@@ -24,6 +24,7 @@ import org.dromara.sis.domain.vo.SisElevatorInfoVo;
import org.dromara.sis.mapper.SisElevatorInfoMapper;
import org.dromara.sis.service.ISisDeviceBindRefService;
import org.dromara.sis.service.ISisElevatorFloorChannelRefService;
import org.dromara.sis.service.ISisElevatorFloorRefService;
import org.dromara.sis.service.ISisElevatorInfoService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +46,7 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService {
private final SisElevatorInfoMapper baseMapper;
private final ISisDeviceBindRefService deviceBindRefService;
private final ISisElevatorFloorRefService elevatorFloorRefService;
private final ISisElevatorFloorChannelRefService elevatorFloorChannelRefService;
@DubboReference
@@ -159,53 +161,13 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService {
if (flag) {
bo.setElevatorId(add.getElevatorId());
List<SisDeviceBindRef> ls = new ArrayList<>();
// 梯控
if (bo.getElevatorControlDeviceId() != null) {
SisDeviceBindRef ref = new SisDeviceBindRef();
ref.setDeviceId(bo.getElevatorControlDeviceId().getDeviceId());
ref.setDeviceIp(bo.getElevatorControlDeviceId().getDeviceIp());
ref.setBindId(bo.getElevatorId());
ref.setControlType(ControlTypeEnum.ELEVATOR_CONTROL.getCode());
ls.add(ref);
}
// 远程呼叫
if (bo.getRemoteCallElevatorDeviceId() != null && !bo.getRemoteCallElevatorDeviceId().isEmpty()) {
for (SisElevatorInfoBo.DeviceInfo deviceInfo : bo.getRemoteCallElevatorDeviceId()) {
SisDeviceBindRef ref = new SisDeviceBindRef();
ref.setDeviceId(deviceInfo.getDeviceId());
ref.setDeviceIp(deviceInfo.getDeviceIp());
ref.setBindId(bo.getElevatorId());
ref.setControlType(ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode());
ls.add(ref);
}
}
// 写入绑定设备表
if (!ls.isEmpty()) {
Boolean b = deviceBindRefService.batchInsert(ls);
Assert.isTrue(b, "设备绑定关联关系写入失败！");
}
// 写入设备绑定关系
this.insertSisDeviceBindRefs(bo);
// 写入电梯⇄楼层⇄通道关联表
if (!bo.getChannels().isEmpty()) {
Collection<SisElevatorFloorChannelRef> channelRefs = new ArrayList<>();
for (SisElevatorInfoBo.ChannelInfo channelInfo : bo.getChannels()) {
SisElevatorFloorChannelRef ref = new SisElevatorFloorChannelRef();
ref.setElevatorId(add.getElevatorId());
ref.setFloorId(channelInfo.getFloorId());
ref.setInChannel(channelInfo.getInChannel());
ref.setOutChannel(channelInfo.getOutChannel());
channelRefs.add(ref);
this.insertSisElevatorFloorChannelRefs(bo);
}
Boolean b = elevatorFloorChannelRefService.batchInsert(add.getElevatorId(), channelRefs);
Assert.isTrue(b, "电梯楼层通道关联关系写入失败！");
}
// hik sdk 登录
// short port = bo.getControlPort().shortValue();
// Boolean isLogin = HikApiService.getInstance().login(bo.getControlIp(), port, bo.getControlAccount(), bo.getControlPwd());
// Assert.isTrue(isLogin, "电梯添加失败, 发起梯控设备连接失败.");
// todo 发起电梯楼层信息同步
}
return flag;
}
@@ -223,6 +185,19 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService {
// 删除设备绑定关系
deviceBindRefService.deleteByBindId(bo.getElevatorId());
// 重新写入关联关系
this.insertSisDeviceBindRefs(bo);
// 写入电梯⇄楼层⇄通道关联表
if (!bo.getChannels().isEmpty()) {
this.insertSisElevatorFloorChannelRefs(bo);
}
return baseMapper.updateById(update) > 0;
}
/**
* 抽取公共方法，写入绑定关系
*/
private void insertSisDeviceBindRefs(SisElevatorInfoBo bo) {
List<SisDeviceBindRef> ls = new ArrayList<>();
// 梯控
if (bo.getElevatorControlDeviceId() != null) {
@@ -244,27 +219,34 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService {
ls.add(ref);
}
}
// 写入绑定设备表
if (!ls.isEmpty()) {
Boolean b = deviceBindRefService.batchInsert(ls);
Assert.isTrue(b, "设备绑定关联关系写入失败！");
}
}
// 写入电梯⇄楼层⇄通道关联表
if(!bo.getChannels().isEmpty()){
/**
* 抽取公共方法，写入电梯⇄楼层⇄通道关联
*/
private void insertSisElevatorFloorChannelRefs(SisElevatorInfoBo bo) {
Collection<SisElevatorFloorChannelRef> channelRefs = new ArrayList<>();
for (SisElevatorInfoBo.ChannelInfo channelInfo : bo.getChannels()) {
SisElevatorFloorChannelRef ref = new SisElevatorFloorChannelRef();
ref.setElevatorId(update.getElevatorId());
ref.setElevatorId(bo.getElevatorId());
ref.setFloorId(channelInfo.getFloorId());
ref.setInChannel(channelInfo.getInChannel());
ref.setOutChannel(channelInfo.getOutChannel());
channelRefs.add(ref);
}
Boolean b = elevatorFloorChannelRefService.batchInsert(update.getElevatorId(), channelRefs);
Assert.isTrue(b, "电梯楼层通道关联关系写入失败！");
}
return baseMapper.updateById(update) > 0;
// 写入电梯⇄楼层⇄通道关联表
Boolean insert = elevatorFloorChannelRefService.batchInsert(bo.getElevatorId(), channelRefs);
Assert.isTrue(insert, "电梯⇄楼层⇄通道关联关系写入失败！");
// 冗余数据到电梯⇄楼层关联表
Boolean update = elevatorFloorRefService.batchUpdateChannel(channelRefs);
}
/**

9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java
View File

@@ -26,4 +26,13 @@ public class RemoteConfigServiceImpl implements RemoteConfigService {
return configService.selectRegisterEnabled(tenantId);
}
/**
* 获取访客机二维码有效期
*/
@Override
public String selectQrTimeOut() {
return configService.selectConfigByKey("sys.fkqr.timeout");
}
}

13
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
View File

@@ -25,6 +25,7 @@ import org.dromara.system.api.model.PostDTO;
import org.dromara.system.api.model.RoleDTO;
import org.dromara.system.api.model.XcxLoginUser;
import org.dromara.system.domain.*;
import org.dromara.system.domain.bo.SysDeptBo;
import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysPostVo;
@@ -478,4 +479,16 @@ public class RemoteUserServiceImpl implements RemoteUserService {
.collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
}
@Override
public Map<String, Integer> seelectOrgcount() {
List<SysDeptVo> sysDeptVos = deptService.selectDeptList(new SysDeptBo());
HashMap<String , Integer> hashMap = new HashMap<>();
for (SysDeptVo sysDeptVo : sysDeptVos) {
Long l = userMapper.selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getDeptId, sysDeptVo.getDeptId()));
hashMap.put(sysDeptVo.getDeptName(), l.intValue());
}
return hashMap;
}
}