From ef3c144fe69c1052042a04b4214bb694f0542912 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Thu, 14 Aug 2025 09:33:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sis/domain/SisAlarmEvents.java | 11 +++-- .../sis/domain/bo/SisAlarmEventsBo.java | 12 +++-- .../sis/domain/enums/EventBigTypeEnum.java | 44 +++++++++++++++++++ .../sis/domain/enums/EventSmallTypeEnum.java | 40 +++++++++++++++++ .../sis/domain/vo/SisAlarmEventsVo.java | 12 +++-- .../impl/SisAlarmEventsServiceImpl.java | 5 ++- 6 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventBigTypeEnum.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java index 8db8ed8a..fd8b4d23 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAlarmEvents.java @@ -30,12 +30,17 @@ public class SisAlarmEvents extends TenantEntity { private Long id; /** - * 报警事件类型 + * 事件大类 */ - private Long type; + private Long bigType; /** - * 报警记录级别(1：一般，2：中级，3：紧急) + * 事件小类 + */ + private Long smallType; + + /** + * 报警记录级别(0:特急;1:紧急;2:普通) */ private Long level; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java index 9f2f7427..047cb45e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java @@ -29,15 +29,19 @@ public class SisAlarmEventsBo extends BaseEntity { private Long id; /** - * 报警事件类型 + * 事件大类 */ - @NotNull(message = "报警事件类型不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long type; + private Long bigType; + + /** + * 事件小类 + */ + private Long smallType; /** * 报警记录级别(1：一般，2：中级，3：紧急) */ - @NotNull(message = "报警记录级别(1：一般，2：中级，3：紧急)不能为空", groups = {AddGroup.class, EditGroup.class}) + @NotNull(message = "报警记录级别(0:特急;1:紧急;2:普通)不能为空", groups = {AddGroup.class, EditGroup.class}) private Long level; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventBigTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventBigTypeEnum.java new file mode 100644 index 00000000..3444b91b --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventBigTypeEnum.java @@ -0,0 +1,44 @@ +package org.dromara.sis.domain.enums; + +import lombok.Getter; + +/** + * 事件大类枚举 + * + * @author lxj + */ +@Getter +public enum EventBigTypeEnum { + /** + * 10：设备上报 + */ + EQUIPMENT_UP(10, "设备上报"), + /** + * 20:系统报警 + */ + SYSTEM_ALERM(20, "系统报警"), + + /** + * 30:移动端上报 + */ + MOBILE_REPORT(30, "移动端上报"), + + /** + * 40:客户求助 + */ + CUST_NEED_HELP(40, "客户求助"), + + /** + * 50:客户投诉 + */ + CUST_COMPLAINT(50, "客户投诉"); + + private final Integer code; + + private final String desc; + + EventBigTypeEnum(Integer code, String desc) { + this.code = code; + this.desc = desc; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java new file mode 100644 index 00000000..b3d94499 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java @@ -0,0 +1,40 @@ +package org.dromara.sis.domain.enums; + +import lombok.Getter; + +/** + * 事件小类 + * + * @author lxj + */ +@Getter +public enum EventSmallTypeEnum { + + EQP_REPORT_RYLG(1001, "人员离岗"), + EQP_REPORT_RYSG(1002, "人员睡岗"), + EQP_REPORT_RYDD(1003, "人员倒地"), + EQP_REPORT_CY(1004, "抽烟"), + EQP_REPORT_DDH(1005, "打电话"), + EQP_REPORT_WSJ(1006, "玩手机"), + EQP_REPORT_RYJJ(1007, "人员聚集"), + EQP_REPORT_ZJCR(1008, "周界闯入"), + EQP_REPORT_RYPH(1009, "人员徘徊"), + + + ; + + /** + * 事件编码 + */ + private final Integer code; + + /** + * 事件描述 + */ + private final String desc; + + EventSmallTypeEnum(Integer code, String desc) { + this.code = code; + this.desc = desc; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java index ee9fdc34..19812ef9 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventsVo.java @@ -31,21 +31,19 @@ public class SisAlarmEventsVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 报警记录ID + * 事件大类 */ - @ExcelProperty(value = "报警记录ID") - private Long id; + private Long bigType; /** - * 报警事件类型 + * 事件小类 */ - @ExcelProperty(value = "报警事件类型") - private Long type; + private Long smallType; /** * 报警记录级别(1：一般，2：中级，3：紧急) */ - @ExcelProperty(value = "报警记录级别(1：一般，2：中级，3：紧急)") + @ExcelProperty(value = "报警记录级别(0:特急;1:紧急;2:普通)") private Long level; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java index 9bd6cf42..b3c486b3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java @@ -87,7 +87,6 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SisAlarmEvents::getId); - lqw.eq(bo.getType() != null, SisAlarmEvents::getType, bo.getType()); lqw.eq(bo.getLevel() != null, SisAlarmEvents::getLevel, bo.getLevel()); lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SisAlarmEvents::getDeviceIp, bo.getDeviceIp()); lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), SisAlarmEvents::getDeviceName, bo.getDeviceName()); @@ -161,7 +160,9 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { } // 生成时间信息 SisAlarmEvents alarmEvents = new SisAlarmEvents(); - alarmEvents.setType(1L); + // + alarmEvents.setBigType(10L); + alarmEvents.setSmallType(1008L); alarmEvents.setLevel(Long.valueOf(level)); alarmEvents.setDeviceIp(deviceIp); alarmEvents.setDeviceName(sisDeviceManage.getDeviceName()); From de44deae2e14f71a73f8a53e31c22c33e21afbc6 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 14 Aug 2025 11:35:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 13c24388..cebfe314 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -39,14 +39,14 @@ jobs: cat > ~/.m2/settings.xml << EOF - $HOME/.m2/repository + /root/.m2/repository multi-repo local-repo - file://$HOME/.m2/repository + file:///root/.m2/repository aliyun-public @@ -101,9 +101,9 @@ jobs: COMMON_MODULES=( "ruoyi-common" "ruoyi-api" - "ruoyi-common-bom" + # "ruoyi-common-bom" "ruoyi-common-alibaba-bom" - "ruoyi-api-bom" + # "ruoyi-api-bom" ) for module in "${COMMON_MODULES[@]}"; do @@ -115,7 +115,7 @@ jobs: retries=3 count=0 - until "$MAVEN_HOME/bin/mvn" clean install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do + until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do count=$((count + 1)) if [ $count -ge $retries ]; then echo "错误：模块 $module 构建失败" From 8c32e29571e3555a12c3659cb2984f217f03a369 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 14 Aug 2025 11:55:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index cebfe314..2409dfa1 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -101,9 +101,9 @@ jobs: COMMON_MODULES=( "ruoyi-common" "ruoyi-api" - # "ruoyi-common-bom" + "ruoyi-common-bom" "ruoyi-common-alibaba-bom" - # "ruoyi-api-bom" + "ruoyi-api-bom" ) for module in "${COMMON_MODULES[@]}"; do From f807f37395684c6f11cab662abc07d1c52f2dbee Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 14 Aug 2025 12:04:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 2409dfa1..84b2fe73 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -80,50 +80,50 @@ jobs: sleep 10 done - build-common-modules: - needs: build-parent-pom - runs-on: ubuntu - steps: - - name: 拉取代码仓库 - uses: http://git.missmoc.top/mocheng/checkout@v4 + # build-common-modules: + # needs: build-parent-pom + # runs-on: ubuntu + # steps: + # - name: 拉取代码仓库 + # uses: http://git.missmoc.top/mocheng/checkout@v4 - - name: 配置环境变量 - run: | - export JAVA_HOME="/java17/java17" - export MAVEN_HOME="/maven/apache-maven-3.9.11" - echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV - echo "$JAVA_HOME/bin" >> $GITHUB_PATH - echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV - echo "$MAVEN_HOME/bin" >> $GITHUB_PATH + # - name: 配置环境变量 + # run: | + # export JAVA_HOME="/java17/java17" + # export MAVEN_HOME="/maven/apache-maven-3.9.11" + # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV + # echo "$JAVA_HOME/bin" >> $GITHUB_PATH + # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV + # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH - - name: 构建通用模块（仅本地使用，不上传） - run: | - COMMON_MODULES=( - "ruoyi-common" - "ruoyi-api" - "ruoyi-common-bom" - "ruoyi-common-alibaba-bom" - "ruoyi-api-bom" - ) + # - name: 构建通用模块（仅本地使用，不上传） + # run: | + # COMMON_MODULES=( + # "ruoyi-common" + # "ruoyi-api" + # "ruoyi-common-bom" + # "ruoyi-common-alibaba-bom" + # "ruoyi-api-bom" + # ) - for module in "${COMMON_MODULES[@]}"; do - MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml" - if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then - echo "警告：模块 $module 不存在，跳过" - continue - fi + # for module in "${COMMON_MODULES[@]}"; do + # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml" + # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then + # echo "警告：模块 $module 不存在，跳过" + # continue + # fi - retries=3 - count=0 - until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do - count=$((count + 1)) - if [ $count -ge $retries ]; then - echo "错误：模块 $module 构建失败" - exit 1 - fi - sleep 10 - done - done + # retries=3 + # count=0 + # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do + # count=$((count + 1)) + # if [ $count -ge $retries ]; then + # echo "错误：模块 $module 构建失败" + # exit 1 + # fi + # sleep 10 + # done + # done build-and-push-services: needs: build-common-modules From b9b0a040995f26d87de6a8f8198d79e706ebc114 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 14 Aug 2025 12:14:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 84b2fe73..6680ef88 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -71,7 +71,7 @@ jobs: retries=3 count=0 - until "$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$MAIN_POM_ABSOLUTE_PATH"; do + until "$MAVEN_HOME/bin/mvn" clean install -U -DskipTests -f "$MAIN_POM_ABSOLUTE_PATH"; do count=$((count + 1)) if [ $count -ge $retries ]; then echo "错误：主POM构建失败"