更新接口

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.joda.time.LocalDateTime;
+import org.springframework.beans.BeanUtils;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +36,7 @@ import java.io.*;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvServiceImpl;
 import org.springframework.web.multipart.MultipartFile;
@@ -193,10 +204,10 @@ public class HouseholdPvController extends BaseController {
     @GetMapping(value = "/importData")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "模板下载", notes = "模板下载")
-    public ResponseModel<Object> importData(MultipartFile file) {
+    public ResponseModel<Object> importData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
         try {
-            ExcelReader reader = EasyExcelFactory.read(file.getInputStream()).build();
-            List<HouseholdPvImport> list = ExcelUtil.readExcel(reader, HouseholdPvImport.class, 0);
+//            ExcelReader reader = EasyExcelFactory.read(multipartFile.getInputStream()).build();
+            List<HouseholdPvImport> list = ExcelUtil.readFirstSheetExcel(multipartFile, HouseholdPvImport.class, 2);
             iHouseholdPvService.importData(list);
         } catch (IOException e) {
             e.printStackTrace();
@@ -229,7 +240,8 @@ public class HouseholdPvController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
-    public ResponseModel<Object> deleteBatch(@RequestBody List<Long> ids) {
+    public ResponseModel<Object> deleteBatch(@RequestBody JSONObject object) {
+        List<Long> ids =(List<Long>)object.get("ids");
         iHouseholdPvService.deleteBatch(ids);
         return ResponseHelper.buildResponse("ok");
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java

@@ -59,6 +59,7 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 	 */
 	public IPage<HouseholdPv> queryForHouseholdPvPage(Page<HouseholdPv> page, HouseholdPvDto dto) {
 		LambdaQueryWrapper<HouseholdPv> lambda = new QueryWrapper<HouseholdPv>().lambda();
+		lambda.eq(HouseholdPv::getIsDelete, false);
 		if (!ObjectUtils.isEmpty(dto.getName())) {
 			lambda.like(HouseholdPv::getName, dto.getName());
 		}