区域管理模块

rain

2026-01-09 3ae46f2a59f9d4e751f78d8dc1a896ceba5ca495

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java

@@ -17,6 +17,7 @@
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.FwDefenseZoneEntity;
import org.sxkj.fw.area.vo.FwDefenseZoneVO;
@@ -57,40 +58,59 @@
   @Override
   public boolean save(FwDefenseZoneEntity fwDefenseZone) {
      fillCreateFields(fwDefenseZone);
      return super.save(fwDefenseZone);
      return baseMapper.insertWithGeom(fwDefenseZone) > 0;
   }

   @Override
   public boolean updateById(FwDefenseZoneEntity fwDefenseZone) {
      fillUpdateFields(fwDefenseZone);
      return super.updateById(fwDefenseZone);
      return baseMapper.updateWithGeomById(fwDefenseZone) > 0;
   }

   @Override
   public boolean saveOrUpdate(FwDefenseZoneEntity fwDefenseZone) {
      if (fwDefenseZone.getId() == null) {
         fillCreateFields(fwDefenseZone);
         return baseMapper.insertWithGeom(fwDefenseZone) > 0;
      } else {
         fillUpdateFields(fwDefenseZone);
         return baseMapper.updateWithGeomById(fwDefenseZone) > 0;
      }
      return super.saveOrUpdate(fwDefenseZone);
   }

   private void fillCreateFields(FwDefenseZoneEntity fwDefenseZone) {
      Long userId = AuthUtil.getUserId();
      Long deptId = Long.valueOf(AuthUtil.getDeptId());
      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 = fwDefenseZone.getAreaCode();
      }
      Date now = new Date();
      fwDefenseZone.setCreateUser(userId);
      fwDefenseZone.setUpdateUser(userId);
      fwDefenseZone.setCreateDept(deptId);
      fwDefenseZone.setAreaCode(areaCode);
      if (deptId != null) {
         fwDefenseZone.setCreateDept(deptId);
      }
      if (StringUtil.isNotBlank(areaCode)) {
         fwDefenseZone.setAreaCode(areaCode);
      }
      fwDefenseZone.setCreateTime(now);
      fwDefenseZone.setUpdateTime(now);
   }

   private void fillUpdateFields(FwDefenseZoneEntity fwDefenseZone) {
      fwDefenseZone.setUpdateUser(AuthUtil.getUserId());
      Long userId = AuthUtil.getUserId();
      if (userId != null) {
         fwDefenseZone.setUpdateUser(userId);
      }
      fwDefenseZone.setUpdateTime(new Date());
   }