From 2e0b7e66be6b6f48cee02c009d08ff991326addd Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Sat, 17 Jan 2026 17:35:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java | 28 ++++++++++++++++++++++++++++
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml | 2 +-
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java | 4 ++--
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
index 0a74419..4572afa 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -63,7 +63,7 @@
// 从参数获取反制方式，否则使用告警记录中的值
fwEffectEvalEntity.setCounterWay(fwEffectEvalParam.getCounterWay());
-
+ alarmRecordEntity.setCounterWay(fwEffectEvalParam.getCounterWay());
// 设备相关字段
fwEffectEvalEntity.setDeviceId(alarmRecordEntity.getDeviceId());
fwEffectEvalEntity.setDeviceSn(device.getDeviceSn());
@@ -78,7 +78,7 @@
fwEffectEvalEntity.setCounterEffect( "1"); // 1.success/2.fail
fwEffectEvalEntity.setCoverRadiusM(2500); // 覆盖范围（米）
fwEffectEvalEntity.setWorkMode( "1"); // 1.机动/2.固定
-
+ fwDroneAlarmRecordService.updateById(alarmRecordEntity);
return fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity);
}
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
index b4ca89b..d4e0e17 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -130,7 +130,7 @@
* 反制方式：信号干扰/诱导驱离/无
*/
@TableField("counter_way")
- @ApiModelProperty(value = "反制方式：信号干扰/诱导驱离/无")
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
private String counterWay;
/**
* 区域id ja_fw_area_divide
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
index ce8967f..6b87fb6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.orderdata.mapper.GdDataEvaluationMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="gdDataEvaluationResultMap" type="org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity">
+ <resultMap id="gdDataEvaluationResultMap" type="org.sxkj.gd.orderdata.vo.GdDataEvaluationVO">
<result column="id" property="id"/>
<result column="title" property="title"/>
<result column="data_name" property="dataName"/>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
index 1c7cc2b..ad34315 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
@@ -16,8 +16,12 @@
*/
package org.sxkj.gd.orderdata.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
import org.springblade.core.tool.node.INode;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.system.cache.SysCache;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,4 +36,28 @@
public class GdDataEvaluationVO extends GdDataEvaluationEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "提出部门名称")
+ public String getProposeDeptName() {
+ if (StringUtil.isBlank(getProposeDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getProposeDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
+
+ @ApiModelProperty(value = "数据提供部门名称")
+ public String getDataProvideDeptName() {
+ if (StringUtil.isBlank(getDataProvideDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getDataProvideDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
+
}
--
Gitblit v1.9.3