From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
index 8fb7c3f..f2abfe6 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -20,6 +20,7 @@
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.entity.FwPoliceStationEntity;
+import org.sxkj.fw.area.param.FwPoliceStationQueryParam;
import org.sxkj.fw.area.vo.FwPoliceStationVO;
import org.sxkj.fw.area.excel.FwPoliceStationExcel;
import org.sxkj.fw.area.mapper.FwPoliceStationMapper;
@@ -38,25 +39,27 @@
* @since 2026-01-08
*/
@Service
-public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService {
+public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity>
+ implements IFwPoliceStationService {
@Override
- public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation) {
- return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
+ public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page,
+ FwPoliceStationQueryParam param) {
+ return page.setRecords(baseMapper.selectFwPoliceStationPage(page, param));
}
@Override
- public List<FwPoliceStationVO> selectFwPoliceStationList() {
- return baseMapper.selectFwPoliceStationList();
+ public List<FwPoliceStationVO> selectFwPoliceStationList(String stationName) {
+ return baseMapper.selectFwPoliceStationList(stationName);
}
-
@Override
public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) {
List<FwPoliceStationExcel> fwPoliceStationList = baseMapper.exportFwPoliceStation(queryWrapper);
- //fwPoliceStationList.forEach(fwPoliceStation -> {
- // fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwPoliceStation.getType()));
- //});
+ // fwPoliceStationList.forEach(fwPoliceStation -> {
+ // fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO,
+ // FwPoliceStation.getType()));
+ // });
return fwPoliceStationList;
}
@@ -100,19 +103,19 @@
deptId = null;
}
}
-// String areaCode = HeaderUtils.getAreaCode();
-// if (StringUtil.isBlank(areaCode)) {
-// areaCode = fwPoliceStation.getAreaCode();
-// }
+ // String areaCode = HeaderUtils.getAreaCode();
+ // if (StringUtil.isBlank(areaCode)) {
+ // areaCode = fwPoliceStation.getAreaCode();
+ // }
Date now = new Date();
fwPoliceStation.setCreateUser(userId);
fwPoliceStation.setUpdateUser(userId);
if (deptId != null) {
fwPoliceStation.setCreateDept(deptId);
}
-// if (StringUtil.isNotBlank(areaCode)) {
-// fwPoliceStation.setAreaCode(areaCode);
-// }
+ // if (StringUtil.isNotBlank(areaCode)) {
+ // fwPoliceStation.setAreaCode(areaCode);
+ // }
fwPoliceStation.setCreateTime(now);
fwPoliceStation.setUpdateTime(now);
}
--
Gitblit v1.9.3