Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/police/controller/PoliceAffairsGridController.java

@@ -23,11 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.police.excel.PoliceAffairsGridExcel;
import org.springblade.modules.police.excel.PoliceAffairsGridImporter;
import org.springblade.modules.police.excel.PoliceStationExcel;
import org.springblade.modules.police.excel.PoliceStationImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
@@ -35,6 +40,7 @@
import org.springblade.modules.police.wrapper.PoliceAffairsGridWrapper;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;

/**
 * 警务网格（辖区）表 控制器
@@ -122,5 +128,15 @@
      return R.status(policeAffairsGridService.removeByIds(Func.toLongList(ids)));
   }

   /**
    * 导入警务辖区数据
    */
   @PostMapping("/import-policeAffairsGrid")
   public R importPoliceAffairsGrid(MultipartFile file, Integer isCovered) {
      PoliceAffairsGridImporter policeAffairsGridImporter = new PoliceAffairsGridImporter(policeAffairsGridService, isCovered == 1);
      ExcelUtil.save(file, policeAffairsGridImporter, PoliceAffairsGridExcel.class);
      return R.success("操作成功");
   }


}