From e98d76d9e7b4699ef819d262da70ffa18c137b3f Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 22 Jan 2026 11:23:17 +0800
Subject: [PATCH] page入参替换param
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java | 7 ++
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java | 5 +
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java | 3
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java | 5 +
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 57 +------------------
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java | 5 +
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwTaskSchedulePageParam.java | 42 ++++++++++++++
7 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java
index 384a439..ec8620e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwTaskScheduleController.java
@@ -36,6 +36,7 @@
import org.sxkj.fw.detection.dto.FwTaskScheduleDTO;
import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
+import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
import org.sxkj.fw.detection.wrapper.FwTaskScheduleWrapper;
@@ -82,7 +83,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwTaskSchedule")
- public R<IPage<FwTaskScheduleVO>> page(FwTaskScheduleVO fwTaskSchedule, Query query) {
+ public R<IPage<FwTaskScheduleVO>> page(FwTaskSchedulePageParam fwTaskSchedule, Query query) {
IPage<FwTaskScheduleVO> pages = fwTaskScheduleService.selectFwTaskSchedulePage(Condition.getPage(query), fwTaskSchedule);
return R.data(pages);
}
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java
index 4d185b0..64eb233 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.java
@@ -17,8 +17,9 @@
package org.sxkj.fw.detection.mapper;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
-import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
+import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
+import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,7 +41,7 @@
* @param fwTaskSchedule
* @return
*/
- List<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage page, FwTaskScheduleVO fwTaskSchedule);
+ List<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage page, FwTaskSchedulePageParam fwTaskSchedule);
/**
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index ea87b58..814e30e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -72,66 +72,15 @@
and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
<where>
ts.is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and ts.id = #{param2.id}
- </if>
- <if test="param2.deviceId != null and param2.deviceId != ''">
- and ts.device_id = #{param2.deviceId}
- </if>
- <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and ts.area_divide_id = #{param2.areaDivideId}
- </if>
- <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and ts.defense_scene_id = #{param2.defenseSceneId}
- </if>
- <if test="param2.longitude != null and param2.longitude != ''">
- and ts.longitude = #{param2.longitude}
- </if>
- <if test="param2.latitude != null and param2.latitude != ''">
- and ts.latitude = #{param2.latitude}
- </if>
- <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
- and ts.dispatch_user = #{param2.dispatchUser}
- </if>
- <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
- and ts.dispatch_start_time = #{param2.dispatchStartTime}
- </if>
- <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
- and ts.dispatch_end_time = #{param2.dispatchEndTime}
- </if>
- <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
- and ts.dispatch_content = #{param2.dispatchContent}
- </if>
- <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
- and ts.dispatch_result = #{param2.dispatchResult}
- </if>
- <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
- and ts.dispose_measure = #{param2.disposeMeasure}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and ts.area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and ts.create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and ts.create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and ts.create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and ts.update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and ts.update_time = #{param2.updateTime}
- </if>
<if test="param2.deviceName != null and param2.deviceName != ''">
and d.device_name like concat('%', #{param2.deviceName}, '%')
</if>
<if test="param2.deviceSn != null and param2.deviceSn != ''">
and d.device_sn like concat('%', #{param2.deviceSn}, '%')
</if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
+ </if>
<if test="param2.status != null and param2.status != ''">
and d.status = #{param2.status}
</if>
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
index 468d3a0..23640fc 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
@@ -33,5 +33,12 @@
*/
@ApiModelProperty(value = "反制效果（success/fail）")
private String counterEffect;
+ /**
+ * 告警记录ID（ja_fw_drone_alarm_record.id）
+ */
+ @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）")
+ private Long alarmRecordId;
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+ private String counterWay;
}
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwTaskSchedulePageParam.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwTaskSchedulePageParam.java
new file mode 100644
index 0000000..8bb27ca
--- /dev/null
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwTaskSchedulePageParam.java
@@ -0,0 +1,42 @@
+package org.sxkj.fw.detection.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 任务调度记录表 分页参数
+ *
+ * @author lw
+ * @since 2026-01-08
+ */
+@Data
+public class FwTaskSchedulePageParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
+
+ /**
+ * 设备编号
+ */
+ @ApiModelProperty(value = "设备编号")
+ private String deviceSn;
+
+ /**
+ * 设备类型
+ */
+ @ApiModelProperty(value = "设备类型")
+ private String deviceType;
+
+ /**
+ * 设备状态
+ */
+ @ApiModelProperty(value = "设备状态")
+ private Integer status;
+}
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java
index ae65ca8..4f84122 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwTaskScheduleService.java
@@ -18,8 +18,9 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
-import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
+import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
+import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
@@ -38,7 +39,7 @@
* @param fwTaskSchedule
* @return
*/
- IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskScheduleVO fwTaskSchedule);
+ IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskSchedulePageParam fwTaskSchedule);
/**
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
index 3a8de36..62d4efa 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
@@ -17,8 +17,9 @@
package org.sxkj.fw.detection.service.impl;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
-import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
+import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
+import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.mapper.FwTaskScheduleMapper;
import org.sxkj.fw.detection.service.IFwTaskScheduleService;
import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@
public class FwTaskScheduleServiceImpl extends BaseServiceImpl<FwTaskScheduleMapper, FwTaskScheduleEntity> implements IFwTaskScheduleService {
@Override
- public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskScheduleVO fwTaskSchedule) {
+ public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskSchedulePageParam fwTaskSchedule) {
return page.setRecords(baseMapper.selectFwTaskSchedulePage(page, fwTaskSchedule));
}
--
Gitblit v1.9.3