[26110201] 事件查询页面条件"是否确认"改为"处理状态"(下拉选项 已处理/未处理): 前后端查询参数 confirmed 更名为 processStatus, 过滤语义不变(true=process_flag=2, false=process_flag!=2)

forecast-backend-server/src/main/java/com/ufo/project/alarm/controller/AlarmEventRecordController.java

@@ -43,7 +43,7 @@ public class AlarmEventRecordController extends BaseController
     /**
      * 查询事件列表
      *
-     * 参数: alarmCategory 告警类别, alarmLevel 告警等级, confirmed 是否确认(true=已确认, false=未确认),
+     * 参数: alarmCategory 告警类别, alarmLevel 告警等级, processStatus 处理状态(true=已处理, false=未处理),
      * alarmDate 告警时间(yyyy-MM-dd), pageNum, pageSize
      */
     @PreAuthorize("@ss.hasPermi('alarm:eventRecord:list')")
@@ -83,7 +83,7 @@ public class AlarmEventRecordController extends BaseController
     /**
      * 导出事件列表
      *
-     * 参数: alarmCategory 告警类别, alarmLevel 告警等级, confirmed 是否确认, alarmDate 告警时间
+     * 参数: alarmCategory 告警类别, alarmLevel 告警等级, processStatus 处理状态, alarmDate 告警时间
      */
     @PreAuthorize("@ss.hasPermi('alarm:eventRecord:export')")
     @Log(title = "事件查询", businessType = BusinessType.EXPORT)
@@ -157,7 +157,7 @@ public class AlarmEventRecordController extends BaseController
         AlarmEventRecord query = new AlarmEventRecord();
         query.setAlarmCategory(params.getString("alarmCategory"));
         query.setAlarmLevel(params.getLong("alarmLevel"));
-        query.setConfirmed(params.getBoolean("confirmed"));
+        query.setProcessStatus(params.getBoolean("processStatus"));
         query.setAlarmDate(params.getString("alarmDate"));
         return query;
     }

forecast-backend-server/src/main/java/com/ufo/project/alarm/domain/AlarmEventRecord.java

@@ -67,8 +67,8 @@ public class AlarmEventRecord extends BaseEntity
     @Excel(name = "处理人ids")
     private String processPersonId;
 
-    /** 是否确认(查询条件: true=已确认即已处理, false=未确认) */
-    private Boolean confirmed;
+    /** 处理状态(查询条件: true=已处理即process_flag=2, false=未处理即process_flag!=2) */
+    private Boolean processStatus;
 
     /** 告警日期(查询条件: yyyy-MM-dd, 按当天 00:00:00~23:59:59 过滤) */
     private String alarmDate;
@@ -196,14 +196,14 @@ public class AlarmEventRecord extends BaseEntity
     {
         return processPersonId;
     }
-    public void setConfirmed(Boolean confirmed)
+    public void setProcessStatus(Boolean processStatus)
     {
-        this.confirmed = confirmed;
+        this.processStatus = processStatus;
     }
 
-    public Boolean getConfirmed()
+    public Boolean getProcessStatus()
     {
-        return confirmed;
+        return processStatus;
     }
     public void setAlarmDate(String alarmDate)
     {

forecast-backend-server/src/main/resources/mybatis/alarm/AlarmEventRecordMapper.xml

@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmCategory != null  and alarmCategory != ''"> and alarm_category = #{alarmCategory}</if>
             <if test="alarmLevel != null "> and alarm_level = #{alarmLevel}</if>
             <if test="alarmCreateTime != null  and alarmCreateTime != ''"> and alarm_create_time = #{alarmCreateTime}</if>
-            <if test="confirmed != null and confirmed"> and process_flag = 2</if>
-            <if test="confirmed != null and !confirmed"> and process_flag != 2</if>
+            <if test="processStatus != null and processStatus"> and process_flag = 2</if>
+            <if test="processStatus != null and !processStatus"> and process_flag != 2</if>
             <if test="alarmDateBegin != null and alarmDateEnd != null"> and alarm_create_time &gt;= #{alarmDateBegin} and alarm_create_time &lt;= #{alarmDateEnd}</if>
             <if test="processFlag != null "> and process_flag = #{processFlag}</if>
             <if test="processPerson != null  and processPerson != ''"> and process_person = #{processPerson}</if>

forecast-backend-vue/src/views/ufo/electricity/statanalysis/eventQuery.vue

@@ -22,9 +22,9 @@
         </a-col>
         <a-col :xs="24" :md="4">
           <a-select
-            v-model:value="query.confirmed"
-            :options="confirmedOptions"
-            placeholder="是否确认"
+            v-model:value="query.processStatus"
+            :options="processStatusOptions"
+            placeholder="处理状态"
             allow-clear
             class="full-control"
           />
@@ -107,9 +107,9 @@ const categoryLabelMap = computed(() =>
 const levelLabel = (val) => (val == null ? '' : levelLabelMap.value[String(val)] ?? val);
 const categoryLabel = (val) => (val == null ? '' : categoryLabelMap.value[String(val)] ?? val);
 
-const confirmedOptions = [
-  {label: '已确认', value: true},
-  {label: '未确认', value: false}
+const processStatusOptions = [
+  {label: '已处理', value: true},
+  {label: '未处理', value: false}
 ];
 
 const processLabelMap = {
@@ -161,14 +161,14 @@ const pagination = reactive({
 const query = reactive({
   alarmCategory: undefined,
   alarmLevel: undefined,
-  confirmed: undefined,
+  processStatus: undefined,
   alarmDate: dayjs().format('YYYY-MM-DD')
 });
 
 const buildParams = () => ({
   alarmCategory: query.alarmCategory,
   alarmLevel: query.alarmLevel,
-  confirmed: query.confirmed,
+  processStatus: query.processStatus,
   alarmDate: query.alarmDate
 });