drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java
@@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.sxkj.fw.detection.dto.FwEffectEvalDTO; import org.sxkj.fw.detection.entity.FwEffectEvalEntity; import org.sxkj.fw.detection.param.FwEffectEvalParam; import org.sxkj.fw.detection.vo.FwEffectEvalVO; import org.sxkj.fw.detection.excel.FwEffectEvalExcel; import org.sxkj.fw.detection.wrapper.FwEffectEvalWrapper; @@ -81,7 +82,7 @@ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入fwEffectEval") public R<IPage<FwEffectEvalVO>> page(FwEffectEvalVO fwEffectEval, Query query) { public R<IPage<FwEffectEvalVO>> page(FwEffectEvalParam fwEffectEval, Query query) { IPage<FwEffectEvalVO> pages = fwEffectEvalService.selectFwEffectEvalPage(Condition.getPage(query), fwEffectEval); return R.data(pages); } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.java
@@ -17,6 +17,7 @@ package org.sxkj.fw.detection.mapper; import org.sxkj.fw.detection.entity.FwEffectEvalEntity; import org.sxkj.fw.detection.param.FwEffectEvalParam; import org.sxkj.fw.detection.vo.FwEffectEvalVO; import org.sxkj.fw.detection.excel.FwEffectEvalExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -40,7 +41,7 @@ * @param fwEffectEval * @return */ List<FwEffectEvalVO> selectFwEffectEvalPage(IPage page, FwEffectEvalVO fwEffectEval); List<FwEffectEvalVO> selectFwEffectEvalPage(IPage page, FwEffectEvalParam fwEffectEval); /** drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -34,77 +34,14 @@ select * from ja_fw_effect_eval <where> is_deleted = 0 <if test="param2.id != null and param2.id != ''"> and id = #{param2.id} </if> <if test="param2.alarmRecordId != null and param2.alarmRecordId != ''"> and alarm_record_id = #{param2.alarmRecordId} </if> <if test="param2.deviceId != null and param2.deviceId != ''"> and device_id = #{param2.deviceId} </if> <if test="param2.deviceSn != null and param2.deviceSn != ''"> and device_sn = #{param2.deviceSn} </if> <if test="param2.deviceName != null and param2.deviceName != ''"> and device_name = #{param2.deviceName} </if> <if test="param2.deviceModel != null and param2.deviceModel != ''"> and device_model = #{param2.deviceModel} and device_name like concat('%', #{param2.deviceName}, '%') </if> <if test="param2.deviceType != null and param2.deviceType != ''"> and device_type = #{param2.deviceType} </if> <if test="param2.droneName != null and param2.droneName != ''"> and drone_name = #{param2.droneName} </if> <if test="param2.droneType != null and param2.droneType != ''"> and drone_type = #{param2.droneType} </if> <if test="param2.droneDeviceCode != null and param2.droneDeviceCode != ''"> and drone_device_code = #{param2.droneDeviceCode} </if> <if test="param2.findTime != null and param2.findTime != ''"> and find_time = #{param2.findTime} </if> <if test="param2.counterEffect != null and param2.counterEffect != ''"> and counter_effect = #{param2.counterEffect} </if> <if test="param2.deployLongitude != null and param2.deployLongitude != ''"> and deploy_longitude = #{param2.deployLongitude} </if> <if test="param2.deployLatitude != null and param2.deployLatitude != ''"> and deploy_latitude = #{param2.deployLatitude} </if> <if test="param2.coverRadiusM != null and param2.coverRadiusM != ''"> and cover_radius_m = #{param2.coverRadiusM} </if> <if test="param2.workMode != null and param2.workMode != ''"> and work_mode = #{param2.workMode} </if> <if test="param2.areaCode != null and param2.areaCode != ''"> and area_code = #{param2.areaCode} </if> <if test="param2.createUser != null and param2.createUser != ''"> and create_user = #{param2.createUser} </if> <if test="param2.createDept != null and param2.createDept != ''"> and create_dept = #{param2.createDept} </if> <if test="param2.createTime != null and param2.createTime != ''"> and create_time = #{param2.createTime} </if> <if test="param2.updateUser != null and param2.updateUser != ''"> and update_user = #{param2.updateUser} </if> <if test="param2.updateTime != null and param2.updateTime != ''"> and update_time = #{param2.updateTime} </if> <if test="param2.status != null and param2.status != ''"> and status = #{param2.status} </if> <if test="param2.isDeleted != null and param2.isDeleted != ''"> and is_deleted = #{param2.isDeleted} </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
@@ -1,4 +1,3 @@ package org.sxkj.fw.detection.param; import io.swagger.annotations.ApiModelProperty; @@ -18,21 +17,21 @@ private static final long serialVersionUID = 1L; /** * 告警记录ID（ja_fw_drone_alarm_record.id） * 反制设备名称（快照） */ @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）") private Long alarmRecordId; @ApiModelProperty(value = "反制设备名称（快照）") private String deviceName; @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无") private String counterWay; /** * 反制设备类型（快照） */ @ApiModelProperty(value = "反制设备类型（快照）") private String deviceType; // @ApiModelProperty(value = "反制效果（1.success/2.fail）") // private String counterEffect; // // @ApiModelProperty(value = "覆盖范围（米）") // private Integer coverRadiusM; // // @ApiModelProperty(value = "工作模式（1.机动/2.固定）") // private String workMode; /** * 反制效果（success/fail） */ @ApiModelProperty(value = "反制效果（success/fail）") private String counterEffect; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/IFwEffectEvalService.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.fw.detection.entity.FwEffectEvalEntity; import org.sxkj.fw.detection.param.FwEffectEvalParam; import org.sxkj.fw.detection.vo.FwEffectEvalVO; import org.sxkj.fw.detection.excel.FwEffectEvalExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,7 +39,7 @@ * @param fwEffectEval * @return */ IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalVO fwEffectEval); IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval); /** drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
@@ -17,6 +17,7 @@ package org.sxkj.fw.detection.service.impl; import org.sxkj.fw.detection.entity.FwEffectEvalEntity; import org.sxkj.fw.detection.param.FwEffectEvalParam; import org.sxkj.fw.detection.vo.FwEffectEvalVO; import org.sxkj.fw.detection.excel.FwEffectEvalExcel; import org.sxkj.fw.detection.mapper.FwEffectEvalMapper; @@ -37,7 +38,7 @@ public class FwEffectEvalServiceImpl extends BaseServiceImpl<FwEffectEvalMapper, FwEffectEvalEntity> implements IFwEffectEvalService { @Override public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalVO fwEffectEval) { public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval) { return page.setRecords(baseMapper.selectFwEffectEvalPage(page, fwEffectEval)); }
