修改bug

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

@@ -29,13 +29,14 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
@@ -176,66 +177,66 @@ public class HouseholdPvController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    private String checkData(List<HouseholdPvImport> list){
+    private String checkData(List<HouseholdPvImport> list) {
         int line = 3;
         Map<String, Object> map = householdPvServiceImpl.companyNameList();
         for (HouseholdPvImport dto : list) {
-            if (ObjectUtils.isEmpty(dto.getPlatformCompanyId())){
-                return "第 "+line+" 行所属厂站不能为空！";
+            if (ObjectUtils.isEmpty(dto.getPlatformCompanyId())) {
+                return "第 " + line + " 行所属厂站不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getDistrictId())){
-                return "第 "+line+" 行乡镇不能为空！";
+            if (ObjectUtils.isEmpty(dto.getDistrictId())) {
+                return "第 " + line + " 行乡镇不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getNumber())){
-                return "第 "+line+" 行户号不能为空！";
+            if (ObjectUtils.isEmpty(dto.getNumber())) {
+                return "第 " + line + " 行户号不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getName())){
-                return "第 "+line+" 行户主名称不能为空！";
+            if (ObjectUtils.isEmpty(dto.getName())) {
+                return "第 " + line + " 行户主名称不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getSex())){
-                return "第 "+line+" 行性别不能为空！";
+            if (ObjectUtils.isEmpty(dto.getSex())) {
+                return "第 " + line + " 行性别不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getIdNumber())){
-                return "第 "+line+" 行身份证号不能为空！";
+            if (ObjectUtils.isEmpty(dto.getIdNumber())) {
+                return "第 " + line + " 行身份证号不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getExpiryTime())){
-                return "第 "+line+" 行证件过期时间不能为空！";
+            if (ObjectUtils.isEmpty(dto.getExpiryTime())) {
+                return "第 " + line + " 行证件过期时间不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getIssuingAuthority())){
-                return "第 "+line+" 行签发机关不能为空！";
+            if (ObjectUtils.isEmpty(dto.getIssuingAuthority())) {
+                return "第 " + line + " 行签发机关不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getResidenceAddress())){
-                return "第 "+line+" 行户籍地址不能为空！";
+            if (ObjectUtils.isEmpty(dto.getResidenceAddress())) {
+                return "第 " + line + " 行户籍地址不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getPhone())){
-                return "第 "+line+" 行行手机号码不能为空！";
+            if (ObjectUtils.isEmpty(dto.getPhone())) {
+                return "第 " + line + " 行行手机号码不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getAddress())){
-                return "第 "+line+" 行居住地不能为空！";
+            if (ObjectUtils.isEmpty(dto.getAddress())) {
+                return "第 " + line + " 行居住地不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getPostcode())){
-                return "第 "+line+" 行居住地邮编不能为空！";
+            if (ObjectUtils.isEmpty(dto.getPostcode())) {
+                return "第 " + line + " 行居住地邮编不能为空！";
             }
-            if (ObjectUtils.isEmpty(dto.getServiceAddress())){
-                return "第 "+line+" 行送达地址不能为空！";
+            if (ObjectUtils.isEmpty(dto.getServiceAddress())) {
+                return "第 " + line + " 行送达地址不能为空！";
             }
             // 导入文件中数据校验
             List<HouseholdPvImport> collect = list.stream().filter(item -> dto.getNumber().equals(item.getNumber())).collect(Collectors.toList());
-            if (!ObjectUtils.isEmpty(collect) && collect.size() >= 2){
-                return "第"+line+" 行户号重复！";
+            if (!ObjectUtils.isEmpty(collect) && collect.size() >= 2) {
+                return "第" + line + " 行户号重复！";
             }
             // 户号已存在
             LambdaQueryWrapper<HouseholdPv> lambda = new QueryWrapper<HouseholdPv>().lambda();
             lambda.eq(HouseholdPv::getNumber, dto.getNumber());
             Integer integer = householdPvServiceImpl.getBaseMapper().selectCount(lambda);
-            if (integer > 0){
-                return "第"+line+" 行户号已存在！";
+            if (integer > 0) {
+                return "第" + line + " 行户号已存在！";
             }
-            if (!map.containsKey(dto.getPlatformCompanyId())){
-                return "第"+line+" 行厂站不存在！";
+            if (!map.containsKey(dto.getPlatformCompanyId())) {
+                return "第" + line + " 行厂站不存在！";
             }
-            if (!map.containsKey(dto.getDistrictId())){
-                return "第"+line+" 行乡镇不存在！";
+            if (!map.containsKey(dto.getDistrictId())) {
+                return "第" + line + " 行乡镇不存在！";
             }
             line = line + 1;
         }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.EquipType;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDeviceDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDeviceImport;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDevice;
 import com.yeejoin.amos.boot.module.jxiop.api.util.CommonResponse;
 import com.yeejoin.amos.boot.module.jxiop.api.util.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvDeviceServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDeviceDto;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDeviceImport;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvDeviceServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 户用光伏设备表

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.CompanyTreeDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDistrictDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDistrict;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvDistrictService;
@@ -18,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
-import java.text.ParseException;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.LevelType;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvDistrictMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvContactService;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvInstallService;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvLeaseService;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.joda.time.LocalDateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,16 +31,8 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvContactService;
-import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvInstallService;
-import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvLeaseService;
-import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvService;
+import java.text.ParseException;
+import java.util.*;
 
 /**
  * 户用光伏表服务实现类