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
This commit is contained in:
dy
2025-08-18 20:21:24 +08:00
parent c8179e164d 38e75e6b6b
commit 23cab413c2
68 changed files with 2098 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlController.java
View File

@@ -139,4 +139,5 @@ public class SisAccessControlController extends BaseController {
}
}

12
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventAttachmentsController.java
View File

@@ -47,6 +47,16 @@ public class SisAlarmEventAttachmentsController extends BaseController {
return sisAlarmEventAttachmentsService.queryPageList(bo, pageQuery);
}
/**
* 查询【请填写功能名称】列表
*/
@SaCheckPermission("system:alarmEventAttachments:list")
@GetMapping("/query/{alarmId}")
public R<List<SisAlarmEventAttachmentsVo>> queryListByAlarmId(@PathVariable("alarmId") String alarmId) {
return R.ok(sisAlarmEventAttachmentsService.queryListByAlarmId(alarmId));
}
/**
* 导出【请填写功能名称】列表
*/
@@ -66,7 +76,7 @@ public class SisAlarmEventAttachmentsController extends BaseController {
@SaCheckPermission("system:alarmEventAttachments:query")
@GetMapping("/{id}")
public R<SisAlarmEventAttachmentsVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@PathVariable("id") Long id) {
return R.ok(sisAlarmEventAttachmentsService.queryById(id));
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventProcessController.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.SisAlarmEventProcessVo;
import org.dromara.sis.domain.bo.SisAlarmEventProcessBo;
import org.dromara.sis.service.ISisAlarmEventProcessService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 告警信息处理流程记录
* 前端访问路由地址为:/sis/alarmEventProcess
*
* @author lxj
* @date 2025-08-17
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/alarmEventProcess")
public class SisAlarmEventProcessController extends BaseController {
private final ISisAlarmEventProcessService sisAlarmEventProcessService;
/**
* 查询告警信息处理流程记录列表
*/
@SaCheckPermission("sis:alarmEventProcess:list")
@GetMapping("/list")
public TableDataInfo<SisAlarmEventProcessVo> list(SisAlarmEventProcessBo bo, PageQuery pageQuery) {
return sisAlarmEventProcessService.queryPageList(bo, pageQuery);
}
/**
* 导出告警信息处理流程记录列表
*/
@SaCheckPermission("sis:alarmEventProcess:export")
@Log(title = "告警信息处理流程记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisAlarmEventProcessBo bo, HttpServletResponse response) {
List<SisAlarmEventProcessVo> list = sisAlarmEventProcessService.queryList(bo);
ExcelUtil.exportExcel(list, "告警信息处理流程记录", SisAlarmEventProcessVo.class, response);
}
/**
* 获取告警信息处理流程记录详细信息
*
* @param id 主键
*/
@SaCheckPermission("sis:alarmEventProcess:query")
@GetMapping("/{id}")
public R<SisAlarmEventProcessVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(sisAlarmEventProcessService.queryById(id));
}
/**
* 新增告警信息处理流程记录
*/
@SaCheckPermission("sis:alarmEventProcess:add")
@Log(title = "告警信息处理流程记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisAlarmEventProcessBo bo) {
return toAjax(sisAlarmEventProcessService.insertByBo(bo));
}
/**
* 修改告警信息处理流程记录
*/
@SaCheckPermission("sis:alarmEventProcess:edit")
@Log(title = "告警信息处理流程记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisAlarmEventProcessBo bo) {
return toAjax(sisAlarmEventProcessService.updateByBo(bo));
}
/**
* 删除告警信息处理流程记录
*
* @param ids 主键串
*/
@SaCheckPermission("sis:alarmEventProcess:remove")
@Log(title = "告警信息处理流程记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(sisAlarmEventProcessService.deleteWithValidByIds(List.of(ids), true));
}
}

91
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventsController.java
View File

@@ -1,26 +1,31 @@
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.sis.domain.vo.SisAlarmEventsVo;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.service.ISisAlarmEventsService;
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.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
import org.dromara.sis.domain.vo.SisAlarmEventsVo;
import org.dromara.sis.service.ISisAlarmEventsService;
import org.dromara.system.api.model.LoginUser;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 告警
@@ -46,6 +51,18 @@ public class SisAlarmEventsController extends BaseController {
return sisAlarmEventsService.queryPageList(bo, pageQuery);
}
/**
* 查询告警列表
*/
@SaCheckPermission("sis:alarmEvents:list")
@GetMapping("/list/curr")
public TableDataInfo<SisAlarmEventsVo> listCurr(SisAlarmEventsBo bo, PageQuery pageQuery) {
LoginUser loginUser = LoginHelper.getLoginUser();
bo.setSolveId(loginUser.getUserId());
return sisAlarmEventsService.queryPageListCurr(bo, pageQuery);
}
/**
* 导出告警列表
*/
@@ -65,7 +82,7 @@ public class SisAlarmEventsController extends BaseController {
@SaCheckPermission("sis:alarmEvents:query")
@GetMapping("/{id}")
public R<SisAlarmEventsVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@PathVariable("id") Long id) {
return R.ok(sisAlarmEventsService.queryById(id));
}
@@ -103,4 +120,46 @@ public class SisAlarmEventsController extends BaseController {
@PathVariable("ids") Long[] ids) {
return toAjax(sisAlarmEventsService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 告警任务指派
*
* @param bo 指派参数
*/
@SaCheckPermission("sis:alarmEvents:edit")
@Log(title = "告警任务指派", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/assignment")
public R<Void> taskAssignment(@Validated @RequestBody AlarmAssignmentBo bo) {
return toAjax(sisAlarmEventsService.taskAssignment(bo));
}
/**
* 告警处理完成
*
* @param bo 完成参数
*/
@SaCheckPermission("sis:alarmEvents:edit")
@Log(title = "告警处理完成", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/complete")
public R<Void> complete(@Validated @RequestBody AlarmCompleteBo bo) {
return toAjax(sisAlarmEventsService.complete(bo));
}
/**
* 分页查询当前用的告警处理任务
*
* @param bo 查询参数
* @return 返回当前用户要处理的告警任务
*/
@RepeatSubmit()
@PutMapping("/query/curr/assignment")
public TableDataInfo<SisAlarmEventsVo> queryCurrAssignment(@Validated @RequestBody SisAlarmEventsBo bo, PageQuery pageQuery) {
return sisAlarmEventsService.queryCurrAssignment(bo, pageQuery);
}
}

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

@@ -0,0 +1,68 @@
package org.dromara.sis.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.util.Date;
/**
* 告警信息处理流程记录对象 sis_alarm_event_process
*
* @author lxj
* @date 2025-08-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sis_alarm_event_process")
public class SisAlarmEventProcess extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 告警记录主键id
*/
private Long alarmId;
/**
* 指派人员id
*/
private Long solveId;
/**
* 指派人员名称
*/
private String solveName;
/**
* 此次处理的状态码
*/
private Integer state;
/**
* 工单问题回复内容
*/
private String workReply;
/**
* 处理时间
*/
private Date workReplyTime;
/**
* 是否已接受任务 0:未接收;1:已接收
*/
private Long receiveTaskTag;
}

42
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java
View File

@@ -72,12 +72,12 @@ public class SisAlarmEvents extends TenantEntity {
/**
* 开始处理时间
*/
private Date processSt;
private Date servBeginTime;
/**
* 结束处理时间
*/
private Date processEt;
private Date servEndTime;
/**
* 事件状态
@@ -89,4 +89,42 @@ public class SisAlarmEvents extends TenantEntity {
*/
private Long workOrderId;
/**
* 当前处理人id
*/
private Long solveId;
/**
* 当前处理人名称
*/
private String solveName;
/**
* 处理人电话
*/
private String solvePhone;
/**
* 处理人邮箱
*/
private String solveEmail;
/**
* 任务接受时间
*/
private Date acceptTime;
/**
* 任务处理时间
*/
private Date solveTime;
/**
* 任务完成时间
*/
private Date finishTime;
private String description;
}

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

@@ -71,7 +71,7 @@ public class SisPersonLibImg extends TenantEntity {
/**
* 远程库图像ID
*/
private Long remoteHWId;
private Long remoteHwId;
/**
* 入驻员工id

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

@@ -0,0 +1,70 @@
package org.dromara.sis.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
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.sis.domain.SisAlarmEventProcess;
import java.util.Date;
/**
* 告警信息处理流程记录业务对象 sis_alarm_event_process
*
* @author lxj
* @date 2025-08-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SisAlarmEventProcess.class, reverseConvertGenerate = false)
public class SisAlarmEventProcessBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = {EditGroup.class})
private Long id;
/**
* 告警记录主键id
*/
@NotNull(message = "告警记录主键id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long alarmId;
/**
* 指派人员id
*/
@NotNull(message = "指派人员id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long solveId;
/**
* 指派人员名称
*/
private String solveName;
/**
* 工单问题回复内容
*/
private String workReply;
/**
* 处理时间
*/
private Date workReplyTime;
/**
* 是否已接受任务 0:未接收;1:已接收
*/
@NotNull(message = "是否已接受任务 0:未接收;1:已接收不能为空", groups = {AddGroup.class, EditGroup.class})
private Long receiveTaskTag;
/**
* 此次处理的状态码
*/
private Integer state;
}

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

@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.SisAlarmEvents;
import java.util.Date;
import java.util.List;
/**
* 告警业务对象 sis_alarm_events
@@ -73,12 +74,12 @@ public class SisAlarmEventsBo extends BaseEntity {
/**
* 开始处理时间
*/
private Date processSt;
private Date servBeginTime;
/**
* 结束处理时间
*/
private Date processEt;
private Date servEndTime;
/**
@@ -86,9 +87,40 @@ public class SisAlarmEventsBo extends BaseEntity {
*/
private Integer state;
/**
* 状态列表
*/
private List<Integer> states;
/**
* 工单id
*/
private Long workOrderId;
/**
* 当前处理人id
*/
private Long solveId;
/**
* 当前处理人名称
*/
private String solveName;
/**
* 任务接受时间
*/
private Date acceptTime;
/**
* 任务处理时间
*/
private Date solveTime;
/**
* 任务完成时间
*/
private Date finishTime;
private String description;
}

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

@@ -9,8 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Collection;
/**
* 人像信息业务对象 tb_person_lib_img
*
@@ -79,7 +77,7 @@ public class SisPersonLibImgBo extends BaseEntity {
/**
* 远程库图像ID
*/
private Long remoteHWId;
private Long remoteHwId;
/**
* 入驻员工id

60
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/alarm/AlarmAssignmentBo.java Normal file
View File

@@ -0,0 +1,60 @@
package org.dromara.sis.domain.bo.alarm;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* 任务指派参数
*
* @author lxj
*/
@Data
public class AlarmAssignmentBo {
/**
* 告警任务id
*/
@NotNull
private Long alarmId;
/**
* 处理人id
*/
@NotNull
private Long solveId;
/**
* 指派人员信息
*/
private String solveName;
/**
* 处理人电话
*/
private String solvePhone;
/**
* 处理人邮箱
*/
private String solveEmail;
/**
* 指派备注
*/
private String remark;
/**
* 任务指派操作人员id
*/
private Long modifyUserId;
/**
* 任务指派操作人员姓名
*/
private String modifyUserName;
/**
* 任务指派操作人员部门id
*/
private Long modifyDeptId;
}

29
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/alarm/AlarmCompleteBo.java Normal file
View File

@@ -0,0 +1,29 @@
package org.dromara.sis.domain.bo.alarm;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
@Data
public class AlarmCompleteBo {
/**
* 告警任务id
*/
@NotNull
private Long alarmId;
/**
* 任务备注信息
*/
private String remark;
/**
* 附件信息(任务完成上传的图片或者文件)
*/
private List<String> attachments;
}

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

@@ -4,6 +4,8 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.sis.domain.SisAlarmEventAttachments;
import java.io.Serial;
@@ -42,6 +44,10 @@ public class SisAlarmEventAttachmentsVo implements Serializable {
@ExcelProperty(value = "时间图片id")
private Long ossId;
@Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "ossId")
private String imagePath;
/**
* 1：图片，2：文件；3视频
*/

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

@@ -0,0 +1,80 @@
package org.dromara.sis.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.sis.domain.SisAlarmEventProcess;
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_alarm_event_process
*
* @author lxj
* @date 2025-08-17
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SisAlarmEventProcess.class)
public class SisAlarmEventProcessVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 告警记录主键id
*/
@ExcelProperty(value = "告警记录主键id")
private Long alarmId;
/**
* 指派人员id
*/
@ExcelProperty(value = "指派人员id")
private Long solveId;
/**
* 指派人员名称
*/
@ExcelProperty(value = "指派人员名称")
private String solveName;
/**
* 工单问题回复内容
*/
@ExcelProperty(value = "工单问题回复内容")
private String workReply;
/**
* 处理时间
*/
@ExcelProperty(value = "处理时间")
private Date workReplyTime;
/**
* 是否已接受任务 0:未接收;1:已接收
*/
@ExcelProperty(value = "是否已接受任务 0:未接收;1:已接收")
private Long receiveTaskTag;
/**
* 此次处理的状态码
*/
private Integer state;
}

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

@@ -1,23 +1,18 @@
package org.dromara.sis.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.sis.domain.SisAlarmEvents;
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_alarm_events
*
@@ -92,12 +87,12 @@ public class SisAlarmEventsVo implements Serializable {
/**
* 开始处理时间
*/
private Date processSt;
private Date servBeginTime;
/**
* 结束处理时间
*/
private Date processEt;
private Date servEndTime;
/**
* 事件状态
@@ -111,4 +106,43 @@ public class SisAlarmEventsVo implements Serializable {
* 工单id
*/
private Long workOrderId;
/**
* 当前处理人id
*/
private Long solveId;
/**
* 当前处理人名称
*/
private String solveName;
/**
* 处理人电话
*/
private String solvePhone;
/**
* 处理人邮箱
*/
private String solveEmail;
/**
* 任务接受时间
*/
private Date acceptTime;
/**
* 任务处理时间
*/
private Date solveTime;
private Date createTime;
/**
* 任务完成时间
*/
private Date finishTime;
private String description;
}

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

@@ -8,7 +8,6 @@ import org.dromara.sis.domain.SisPersonLibImg;
import java.io.Serial;
import java.io.Serializable;
import java.util.Collection;
/**
@@ -83,7 +82,7 @@ public class SisPersonLibImgVo implements Serializable {
* 远程库图像ID
*/
@ExcelProperty(value = "远程库图像ID")
private Long remoteHWId;
private Long remoteHwId;
/**
* 入驻员工id

3
ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSisAuthServiceImpl.java
View File

@@ -70,7 +70,6 @@ public class RemoteSisAuthServiceImpl implements RemoteSisAuthService {
return sisAuthRecordService.deleteByPersonIds(ids, e8Ids);
}
/**
* 查询人员授权信息
*
@@ -93,7 +92,7 @@ public class RemoteSisAuthServiceImpl implements RemoteSisAuthService {
@Override
public Long queryHuaweiBoxIdByImgMd5(String imgMd5) {
SisPersonLibImgVo vo = sisPersonLibImgService.queryByImgMd5(imgMd5);
return vo != null ? vo.getRemoteHWId() : null;
return vo != null ? vo.getRemoteHwId() : null;
}
/**

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

@@ -0,0 +1,60 @@
package org.dromara.sis.dubbo;
import cn.hutool.core.lang.Assert;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.sis.api.RemoteVisitorService;
import org.dromara.sis.api.domain.RemoteVisitor;
import org.dromara.sis.sdk.e8.E8PlatformApi;
import org.dromara.sis.sdk.e8.domain.visitors.req.VisitorAddReq;
import org.dromara.sis.sdk.e8.domain.visitors.res.VisitorAddRes;
/**
* @author lsm
* @apiNote RemoteVisitorServiceImpl
* @since 2025/8/18
*/
@Slf4j
@DubboService
@RequiredArgsConstructor
public class RemoteVisitorServiceImpl implements RemoteVisitorService {
private final E8PlatformApi e8PlatformApi;
@DubboReference
private RemoteFileService fileService;
/**
* 访客信息写入E8平台
*
* @param visitor 访客信息
* @return 访客ID
*/
@Override
public Long syncE8PlatVisitor(RemoteVisitor visitor) {
try {
byte[] imgByte = fileService.downloadToByteArray(Long.parseLong(visitor.getVisitorFaceImg()));
Assert.notNull(imgByte,"下载访客照片失败");
String imgUrl = e8PlatformApi.uploadFace(imgByte);
Assert.notNull(imgUrl, "e8平台上传访客照片失败");
VisitorAddReq req = new VisitorAddReq();
req.setVisitorName(visitor.getVisitorName());
req.setMobilePhone(visitor.getMobilePhone());
req.setIntervieweeMobile(visitor.getIntervieweeMobile());
req.setVisitorStartTime(visitor.getVisitorStartTime());
req.setVistorEndTime(visitor.getVistorEndTime());
req.setVisitorFaceImg(imgUrl);
VisitorAddRes res = e8PlatformApi.addVisitor(req);
Assert.notNull(res, "e8平台新增访客登记失败");
return res.getId();
} catch (Exception e) {
log.info(e.getMessage());
return null;
}
}
}

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

@@ -0,0 +1,15 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.SisAlarmEventProcess;
import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 告警信息处理流程记录Mapper接口
*
* @author lxj
* @date 2025-08-17
*/
public interface SisAlarmEventProcessMapper extends BaseMapperPlus<SisAlarmEventProcess, SisAlarmEventProcessVo> {
}

5
ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/ElevatorTcpRunner.java
View File

@@ -14,10 +14,7 @@ import java.io.IOException;
* @since 2025/8/8
*/
@Slf4j
@Component
public class ElevatorTcpRunner implements ApplicationRunner {
@Override
public class ElevatorTcpRunner{
public void run(ApplicationArguments args) {
// 获取单例实例
ElevatorControlTcpUtil elevatorHelper = ElevatorControlTcpUtil.getInstance();

5
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/visitors/req/VisitorAddReq.java
View File

@@ -35,6 +35,11 @@ public class VisitorAddReq {
*/
private String vistorEndTime;
/**
* 访客人脸照
*/
private String visitorFaceImg;
/**
* 访客登记类型 0:登记 1:邀请 2:预约
*/

8
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
View File

@@ -280,11 +280,8 @@ public class HikAlarmCallBack implements HCNetSDK.FMSGCallBack_V31 {
buffers1.get(bigImg);
//设备ip
String sAlarmInfo = new String(pAlarmer.sDeviceIP).trim();
SisDeviceManage device = sisDeviceManageService.queryByDeviceIp(sAlarmInfo);
if (!device.getIsComparison()) {
log.info("海康设备告警信息上传,设备={}, 人脸图片大小={}， 背景图片大小={}", sAlarmInfo, smallImg.length, bigImg.length);
zeroSensationPassageService.pass(sAlarmInfo, smallImg, bigImg);
}
log.info("海康设备告警信息上传,设备={}, 人脸图片大小={}， 背景图片大小={}", sAlarmInfo, smallImg.length, bigImg.length);
zeroSensationPassageService.pass(sAlarmInfo, smallImg, bigImg);
}
/**
@@ -320,7 +317,6 @@ public class HikAlarmCallBack implements HCNetSDK.FMSGCallBack_V31 {
log.info("比对结果：{}，相似度：{}，人员：{}，id:{}", compareResults, similarity, name, pid);
log.info("处理前置人脸比对结果，耗时：{}", interval.interval());
zeroSensationPassageService.handleEleOut(new String(pAlarmer.sDeviceIP).trim());
}

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

@@ -75,4 +75,11 @@ public interface ISisAlarmEventAttachmentsService {
*/
Boolean batchInsert(List<SisAlarmEventAttachments> ls);
/**
* 通过告警id 查询告警附件信息
* @param alarmId 告警id
* @return 返回附件列表
*/
List<SisAlarmEventAttachmentsVo> queryListByAlarmId(String alarmId);
}

77
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventProcessService.java Normal file
View File

@@ -0,0 +1,77 @@
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.SisAlarmEventProcess;
import org.dromara.sis.domain.bo.SisAlarmEventProcessBo;
import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
import java.util.Collection;
import java.util.List;
/**
* 告警信息处理流程记录Service接口
*
* @author lxj
* @date 2025-08-17
*/
public interface ISisAlarmEventProcessService {
/**
* 查询告警信息处理流程记录
*
* @param id 主键
* @return 告警信息处理流程记录
*/
SisAlarmEventProcessVo queryById(Long id);
/**
* 分页查询告警信息处理流程记录列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 告警信息处理流程记录分页列表
*/
TableDataInfo<SisAlarmEventProcessVo> queryPageList(SisAlarmEventProcessBo bo, PageQuery pageQuery);
/**
* 查询符合条件的告警信息处理流程记录列表
*
* @param bo 查询条件
* @return 告警信息处理流程记录列表
*/
List<SisAlarmEventProcessVo> queryList(SisAlarmEventProcessBo bo);
/**
* 新增告警信息处理流程记录
*
* @param bo 告警信息处理流程记录
* @return 是否新增成功
*/
Boolean insertByBo(SisAlarmEventProcessBo bo);
/**
* 修改告警信息处理流程记录
*
* @param bo 告警信息处理流程记录
* @return 是否修改成功
*/
Boolean updateByBo(SisAlarmEventProcessBo bo);
/**
* 校验并批量删除告警信息处理流程记录信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 新增处理信息
*
* @param process 处理信息
* @return 返回是否写入成功
*/
Boolean insert(SisAlarmEventProcess process);
}

32
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java
View File

@@ -3,6 +3,8 @@ 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.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
import org.dromara.sis.domain.vo.SisAlarmEventsVo;
import java.util.Collection;
@@ -33,6 +35,13 @@ public interface ISisAlarmEventsService {
*/
TableDataInfo<SisAlarmEventsVo> queryPageList(SisAlarmEventsBo bo, PageQuery pageQuery);
/**
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 告警分页列表
*/
TableDataInfo<SisAlarmEventsVo> queryPageListCurr(SisAlarmEventsBo bo, PageQuery pageQuery);
/**
* 查询符合条件的告警列表
*
@@ -71,4 +80,27 @@ public interface ISisAlarmEventsService {
*/
void createAlarmRecord(String deviceIp, Integer level, Integer type, String msg, byte[] smallImg, byte[] bigImg);
/**
* 任务分配操作
* @param bo 分配参数
* @return 返回是否分配成功
*/
Boolean taskAssignment(AlarmAssignmentBo bo);
/**
* 查询当前用户的告警处理任务
* @param bo 查询参数
* @param pageQuery 分页参数
* @return 返回任务列表
*/
TableDataInfo<SisAlarmEventsVo> queryCurrAssignment(SisAlarmEventsBo bo, PageQuery pageQuery);
/**
* 任务完成
* @param bo 任务完成参数
* @return 返回是否成功
*/
Boolean complete(AlarmCompleteBo bo);
}

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

@@ -135,4 +135,12 @@ public class SisAlarmEventAttachmentsServiceImpl implements ISisAlarmEventAttach
public Boolean batchInsert(List<SisAlarmEventAttachments> ls) {
return baseMapper.insertBatch(ls);
}
@Override
public List<SisAlarmEventAttachmentsVo> queryListByAlarmId(String alarmId) {
LambdaQueryWrapper<SisAlarmEventAttachments> lqw = Wrappers.lambdaQuery();
lqw.eq(SisAlarmEventAttachments::getEventId, alarmId);
return baseMapper.selectVoList(lqw);
}
}

142
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java Normal file
View File

@@ -0,0 +1,142 @@
package org.dromara.sis.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.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.SisAlarmEventProcess;
import org.dromara.sis.domain.bo.SisAlarmEventProcessBo;
import org.dromara.sis.domain.vo.SisAlarmEventProcessVo;
import org.dromara.sis.mapper.SisAlarmEventProcessMapper;
import org.dromara.sis.service.ISisAlarmEventProcessService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 告警信息处理流程记录Service业务层处理
*
* @author lxj
* @date 2025-08-17
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class SisAlarmEventProcessServiceImpl implements ISisAlarmEventProcessService {
private final SisAlarmEventProcessMapper baseMapper;
/**
* 查询告警信息处理流程记录
*
* @param id 主键
* @return 告警信息处理流程记录
*/
@Override
public SisAlarmEventProcessVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
/**
* 分页查询告警信息处理流程记录列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 告警信息处理流程记录分页列表
*/
@Override
public TableDataInfo<SisAlarmEventProcessVo> queryPageList(SisAlarmEventProcessBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SisAlarmEventProcess> lqw = buildQueryWrapper(bo);
Page<SisAlarmEventProcessVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的告警信息处理流程记录列表
*
* @param bo 查询条件
* @return 告警信息处理流程记录列表
*/
@Override
public List<SisAlarmEventProcessVo> queryList(SisAlarmEventProcessBo bo) {
LambdaQueryWrapper<SisAlarmEventProcess> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SisAlarmEventProcess> buildQueryWrapper(SisAlarmEventProcessBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SisAlarmEventProcess> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisAlarmEventProcess::getId);
lqw.eq(bo.getAlarmId() != null, SisAlarmEventProcess::getAlarmId, bo.getAlarmId());
lqw.eq(bo.getSolveId() != null, SisAlarmEventProcess::getSolveId, bo.getSolveId());
lqw.like(StringUtils.isNotBlank(bo.getSolveName()), SisAlarmEventProcess::getSolveName, bo.getSolveName());
lqw.eq(StringUtils.isNotBlank(bo.getWorkReply()), SisAlarmEventProcess::getWorkReply, bo.getWorkReply());
lqw.eq(bo.getWorkReplyTime() != null, SisAlarmEventProcess::getWorkReplyTime, bo.getWorkReplyTime());
lqw.eq(bo.getReceiveTaskTag() != null, SisAlarmEventProcess::getReceiveTaskTag, bo.getReceiveTaskTag());
return lqw;
}
/**
* 新增告警信息处理流程记录
*
* @param bo 告警信息处理流程记录
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(SisAlarmEventProcessBo bo) {
SisAlarmEventProcess add = MapstructUtils.convert(bo, SisAlarmEventProcess.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改告警信息处理流程记录
*
* @param bo 告警信息处理流程记录
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(SisAlarmEventProcessBo bo) {
SisAlarmEventProcess update = MapstructUtils.convert(bo, SisAlarmEventProcess.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SisAlarmEventProcess entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除告警信息处理流程记录信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public Boolean insert(SisAlarmEventProcess process) {
return baseMapper.insert(process) > 0;
}
}

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

@@ -1,6 +1,10 @@
package org.dromara.sis.service.impl;
import cn.dev33.satoken.context.mock.SaTokenContextMockUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,25 +15,36 @@ 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.common.satoken.utils.LoginHelper;
import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.resource.api.domain.RemoteFile;
import org.dromara.sis.domain.SisAlarmEventAttachments;
import org.dromara.sis.domain.SisAlarmEventProcess;
import org.dromara.sis.domain.SisAlarmEvents;
import org.dromara.sis.domain.SisDeviceManage;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
import org.dromara.sis.domain.enums.AlarmStatus;
import org.dromara.sis.domain.enums.EventBigTypeEnum;
import org.dromara.sis.domain.enums.EventSmallTypeEnum;
import org.dromara.sis.domain.vo.SisAlarmEventsVo;
import org.dromara.sis.mapper.SisAlarmEventsMapper;
import org.dromara.sis.service.ISisAlarmEventAttachmentsService;
import org.dromara.sis.service.ISisAlarmEventProcessService;
import org.dromara.sis.service.ISisAlarmEventsService;
import org.dromara.sis.service.ISisDeviceManageService;
import org.dromara.system.api.model.LoginUser;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* 告警Service业务层处理
@@ -45,9 +60,12 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
private final SisAlarmEventsMapper baseMapper;
private final ISisDeviceManageService deviceManageService;
private final ISisAlarmEventAttachmentsService alarmEventAttachmentsService;
private final ISisAlarmEventProcessService alarmEventProcessService;
@DubboReference
private RemoteFileService remoteFileService;
@DubboReference
private RemoteAttendanceService remoteAttendanceService;
/**
* 查询告警
@@ -70,6 +88,15 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
@Override
public TableDataInfo<SisAlarmEventsVo> queryPageList(SisAlarmEventsBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SisAlarmEvents> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SisAlarmEvents::getId);
Page<SisAlarmEventsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<SisAlarmEventsVo> queryPageListCurr(SisAlarmEventsBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SisAlarmEvents> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SisAlarmEvents::getSolveTime);
Page<SisAlarmEventsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -87,10 +114,11 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
}
private LambdaQueryWrapper<SisAlarmEvents> buildQueryWrapper(SisAlarmEventsBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SisAlarmEvents> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisAlarmEvents::getId);
lqw.eq(bo.getLevel() != null, SisAlarmEvents::getLevel, bo.getLevel());
lqw.eq(bo.getSolveId() != null, SisAlarmEvents::getSolveId, bo.getSolveId());
lqw.eq(bo.getState() != null, SisAlarmEvents::getState, bo.getState());
lqw.in(CollectionUtil.isNotEmpty(bo.getStates()), SisAlarmEvents::getState, bo.getStates());
lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SisAlarmEvents::getDeviceIp, bo.getDeviceIp());
lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), SisAlarmEvents::getDeviceName, bo.getDeviceName());
lqw.eq(bo.getDeviceGroupId() != null, SisAlarmEvents::getDeviceGroupId, bo.getDeviceGroupId());
@@ -162,18 +190,24 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
return;
}
// 生成时间信息
Date now = new Date();
SisAlarmEvents alarmEvents = new SisAlarmEvents();
alarmEvents.setBigType(EventBigTypeEnum.EQUIPMENT_UP.getCode());
//TODO 处理上报小类型
alarmEvents.setSmallType(EventSmallTypeEnum.EQP_REPORT_SBSB.getCode());
alarmEvents.setLevel(Long.valueOf(level));
alarmEvents.setDeviceIp(deviceIp);
alarmEvents.setDeviceName(sisDeviceManage.getDeviceName());
alarmEvents.setDeviceGroupId(sisDeviceManage.getId());
alarmEvents.setReportTime(new Date());
alarmEvents.setReportTime(now);
alarmEvents.setState(AlarmStatus.REPORTED.getCode());
alarmEvents.setTenantId(sisDeviceManage.getTenantId());
alarmEvents.setCreateDept(sisDeviceManage.getCreateDept());
// 默认服务时间为2个小时
alarmEvents.setServBeginTime(now);
alarmEvents.setServEndTime(DateUtil.offset(now, DateField.HOUR, 2));
int insert = this.baseMapper.insert(alarmEvents);
log.info("写入报警事件表完成，num={}", insert);
// 写入附件表
@@ -200,4 +234,103 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
attachments.setCreateDept(sisDeviceManage.getCreateDept());
return attachments;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean taskAssignment(AlarmAssignmentBo bo) {
// 验证工单状态
SisAlarmEventsVo sisAlarmEventsVo = this.baseMapper.selectVoById(bo.getAlarmId());
if (sisAlarmEventsVo == null) {
throw new RuntimeException("工单信息不存在!");
}
if (!sisAlarmEventsVo.getState().equals(AlarmStatus.REPORTED.getCode())) {
throw new RuntimeException("当前工单已指派，请刷新后重新指派!");
}
Date now = new Date();
List<RemoteAttendanceUserGroupVo> remoteAttendanceUserGroupVos = remoteAttendanceService.queryAttendPersonInfo(now);
if (CollUtil.isEmpty(remoteAttendanceUserGroupVos)) {
throw new RuntimeException("当前排无排班人员.");
}
// 验证当前人员是否为排班人员
RemoteAttendanceUserGroupVo attendInfo = null;
for (RemoteAttendanceUserGroupVo item : remoteAttendanceUserGroupVos) {
if (bo.getSolveId().equals(item.getEmployeeId())) {
attendInfo = item;
break;
}
}
if (attendInfo == null) {
throw new RuntimeException("当前人员不在今天排班计划内.");
}
SisAlarmEvents events = new SisAlarmEvents();
events.setId(sisAlarmEventsVo.getId());
events.setSolveId(bo.getSolveId());
events.setSolveName(bo.getSolveName());
events.setSolvePhone(bo.getSolvePhone());
events.setSolveEmail(bo.getSolveEmail());
events.setSolveName(bo.getSolveName());
events.setSolveTime(now);
events.setState(AlarmStatus.CONFIRMED.getCode());
this.baseMapper.updateById(events);
// 写入处理流程
SisAlarmEventProcess process = new SisAlarmEventProcess();
process.setAlarmId(sisAlarmEventsVo.getId());
process.setSolveId(attendInfo.getEmployeeId());
process.setSolveName(attendInfo.getEmployeeName());
process.setWorkReply(bo.getRemark());
process.setState(events.getState());
process.setWorkReplyTime(now);
process.setReceiveTaskTag(0L);
Boolean insert = alarmEventProcessService.insert(process);
log.info("事件处理信息写入完成,result= {}", insert);
//TODO 推送到执行客户端
return true;
}
@Override
public TableDataInfo<SisAlarmEventsVo> queryCurrAssignment(SisAlarmEventsBo bo, PageQuery pageQuery) {
LoginUser loginUser = LoginHelper.getLoginUser();
bo.setSolveId(loginUser.getUserId());
LambdaQueryWrapper<SisAlarmEvents> lqw = buildQueryWrapper(bo);
Page<SisAlarmEventsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean complete(AlarmCompleteBo bo) {
LoginUser loginUser = LoginHelper.getLoginUser();
// 验证工单状态
SisAlarmEventsVo sisAlarmEventsVo = this.baseMapper.selectVoById(bo.getAlarmId());
if (sisAlarmEventsVo == null) {
throw new RuntimeException("工单信息不存在!");
}
if (sisAlarmEventsVo.getState().equals(AlarmStatus.REPORTED.getCode())) {
throw new RuntimeException("当前工单已指派，请刷新后重新指派!");
}
Date now = new Date();
SisAlarmEvents events = new SisAlarmEvents();
events.setId(sisAlarmEventsVo.getId());
events.setSolveId(bo.getAlarmId());
events.setFinishTime(now);
events.setSolveId(loginUser.getUserId());
events.setSolveName(loginUser.getUsername());
events.setState(AlarmStatus.RESOLVED.getCode());
this.baseMapper.updateById(events);
// 写入处理流程
SisAlarmEventProcess process = new SisAlarmEventProcess();
process.setAlarmId(sisAlarmEventsVo.getId());
process.setSolveId(loginUser.getUserId());
process.setSolveName(loginUser.getUsername());
process.setWorkReply(bo.getRemark());
process.setState(events.getState());
process.setWorkReplyTime(now);
process.setReceiveTaskTag(0L);
Boolean insert = alarmEventProcessService.insert(process);
log.info("事件处理信息写入完成,result= {}", insert);
return true;
}
}

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

@@ -143,7 +143,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
List<SisPersonLibImgVo> list = this.queryListByIds(ids);
Collection<Long> remoteIds = list.stream().map(SisPersonLibImgVo::getRemoteHWId).toList();
Collection<Long> remoteIds = list.stream().map(SisPersonLibImgVo::getRemoteHwId).toList();
if (!remoteIds.isEmpty()) {
Boolean flag = huaWeiBoxApi.deletePerson(remoteIds);
@@ -180,7 +180,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
LambdaQueryWrapper<SisPersonLibImg> lqw = new LambdaQueryWrapper<>();
lqw.eq(SisPersonLibImg::getResidentPersonId, personId);
SisPersonLibImg update = new SisPersonLibImg();
update.setRemoteHWId(huaweiBoxId);
update.setRemoteHwId(huaweiBoxId);
update.setImgMd5Value(imgMd5);
return baseMapper.update(update, lqw) > 0;
}

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

@@ -65,7 +65,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
if (result.getCode() != 200) {
log.info("华为盒子比对失败,msg={}", result.getMessage());
// 产生告警数据
alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
// alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
return;
}
log.info("人脸比对执行完成,耗时：{}ms", interval.intervalMs());
@@ -81,14 +81,14 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
} else {
if (Objects.equals(authRecord.getRosterType(), RosterTypeEnum.BLACK_LIST.getCode())) {
log.info("人员[{}]在黑名单中，暂不处理。", person);
alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg);
// alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg);
return;
}
}
Date now = new Date();
if (DateUtil.compare(now, authRecord.getEndDate()) > 0) {
alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "人员授权信息已过期", smallImg, bigImg);
// alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "人员授权信息已过期", smallImg, bigImg);
log.info("当前人脸已过期，暂不处理。");
return;
}
@@ -119,9 +119,9 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
if (Objects.equals(item.getControlType(), ControlTypeEnum.ACCESS_CONTROL.getCode())) { // 门禁
handleAc(item.getBindId());
} else if (item.getControlType().equals(ControlTypeEnum.ELEVATOR_OUT_CONTROL.getCode())) { // 电梯外面面板权限
handleEle(item.getBindId(), r.getAuthGroupId(), ControlTypeEnum.ELEVATOR_OUT_CONTROL.getCode(), item.getDeviceFloorId());
// handleEle(item.getBindId(), r.getAuthGroupId(), ControlTypeEnum.ELEVATOR_OUT_CONTROL.getCode(), item.getDeviceFloorId());
} else if (item.getControlType().equals(ControlTypeEnum.ELEVATOR_IN_CONTROL.getCode())) { // 电梯里面的面板
handleEle(item.getBindId(), r.getAuthGroupId(), ControlTypeEnum.ELEVATOR_IN_CONTROL.getCode(), 0L);
// handleEle(item.getBindId(), r.getAuthGroupId(), ControlTypeEnum.ELEVATOR_IN_CONTROL.getCode(), 0L);
} else {
log.info("设备绑定了未知的控制类型[{}],不处理", item.getControlType());
}
@@ -166,7 +166,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
* 生成告警事件
*/
public void createAlarmRecord(String deviceIp, Integer level, Integer type, String msg, byte[] smallImg, byte[] bigImg) {
alarmEventsService.createAlarmRecord(deviceIp, level, type, msg, smallImg, bigImg);
// alarmEventsService.createAlarmRecord(deviceIp, level, type, msg, smallImg, bigImg);
}
/**

7
ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventProcessMapper.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.sis.mapper.SisAlarmEventProcessMapper">
</mapper>