From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 1 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 7f03484..c9aae7c 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
@@ -16,6 +16,9 @@
  */
 package org.sxkj.fw.area.service.impl;
 
+import org.springblade.core.secure.utils.AuthUtil;
+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.vo.FwPoliceStationVO;
 import org.sxkj.fw.area.excel.FwPoliceStationExcel;
@@ -26,12 +29,13 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Date;
 
 /**
  * 派出所信息表 服务实现类
  *
  * @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 @Service
 public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService {
@@ -39,6 +43,11 @@
 	@Override
 	public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation) {
 		return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
+	}
+
+	@Override
+	public List<FwPoliceStationVO> selectFwPoliceStationList() {
+		return baseMapper.selectFwPoliceStationList();
 	}
 
 
@@ -51,4 +60,62 @@
 		return fwPoliceStationList;
 	}
 
+	@Override
+	public boolean save(FwPoliceStationEntity fwPoliceStation) {
+		fillCreateFields(fwPoliceStation);
+		return super.save(fwPoliceStation);
+	}
+
+	@Override
+	public boolean updateById(FwPoliceStationEntity fwPoliceStation) {
+		fillUpdateFields(fwPoliceStation);
+		return super.updateById(fwPoliceStation);
+	}
+
+	@Override
+	public boolean saveOrUpdate(FwPoliceStationEntity fwPoliceStation) {
+		if (fwPoliceStation.getId() == null) {
+			fillCreateFields(fwPoliceStation);
+		} else {
+			fillUpdateFields(fwPoliceStation);
+		}
+		return super.saveOrUpdate(fwPoliceStation);
+	}
+
+	private void fillCreateFields(FwPoliceStationEntity fwPoliceStation) {
+		Long userId = AuthUtil.getUserId();
+		String deptIdStr = AuthUtil.getDeptId();
+		Long deptId = null;
+		if (StringUtil.isNotBlank(deptIdStr)) {
+			try {
+				deptId = Long.valueOf(deptIdStr);
+			} catch (NumberFormatException ignored) {
+				deptId = null;
+			}
+		}
+//		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);
+//		}
+		fwPoliceStation.setCreateTime(now);
+		fwPoliceStation.setUpdateTime(now);
+	}
+
+	private void fillUpdateFields(FwPoliceStationEntity fwPoliceStation) {
+		Long userId = AuthUtil.getUserId();
+		if (userId != null) {
+			fwPoliceStation.setUpdateUser(userId);
+		}
+		fwPoliceStation.setUpdateTime(new Date());
+	}
+
 }

--
Gitblit v1.9.3