diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java index 1db837948..e94d0a881 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java @@ -17,6 +17,7 @@ public enum SupervisionResponseEnum { */ SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"), IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"), + IMPORT_SENSITIVE_REPORT_ERROR("A00550","导入干扰源用户失败"), SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失，清查看类路径配置"), DATA_NOT_EXISTS("A00550","数据不存在"), NO_POWER("A00550","不能操作非自己创建的任务！") diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java index ae505a556..9aee174c9 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java @@ -115,7 +115,7 @@ public class SensitiveReportExcel implements Serializable { @Data @EqualsAndHashCode(callSuper = true) public static class SensitiveReportExcelMsg extends SensitiveReportExcel implements Serializable { - @Excel(name = "错误信息描述") + @Excel(name = "错误信息描述", width = 30) private String msg; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java index 3c1521b97..4a046be27 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java @@ -37,6 +37,8 @@ public class SensitiveUserSExcel implements Serializable { @Excel(name = "*变电站", width = 30) @NotBlank(message = "变电站不能为空") private String substation; + + @Excel(name = "*负荷级别", width = 30) @NotBlank(message = "*负荷级别不能为空") private String loadLevel; @@ -151,9 +153,8 @@ public class SensitiveUserSExcel implements Serializable { @Data @EqualsAndHashCode(callSuper = true) public static class SensitiveUserExcelMsg extends SensitiveUserSExcel implements Serializable { - @Excel(name = "错误信息描述") + @Excel(name = "错误信息描述", width = 30) private String msg; - } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index 2f55dc50f..f10231097 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -116,6 +116,9 @@ public class UserReportParam { private String saveOrCheckflag; + @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入") + private Integer dataType; + private UserReportProjectPO userReportProjectPO; private UserReportSensitivePO userReportSensitivePO; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 7b35271e3..68038526f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -6,12 +6,8 @@ import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.poi.util.PoiUtil; -import com.njcn.supervision.enums.SupervisionResponseEnum; -import com.njcn.supervision.pojo.dto.SensitiveUserExcel; import com.njcn.supervision.pojo.param.user.UserReportParam; import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.supervision.service.user.UserReportPOService; @@ -30,7 +26,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Objects; /** * 干扰源用户管理 @@ -187,14 +182,12 @@ public class UserReportManageController extends BaseController { } - @PostMapping(value = "/importSensitiveReportData", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + @PostMapping(value = "/importSensitiveReportData") @ApiOperation("批量导入干扰源用户") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) - public HttpResult importSensitiveReportData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { + public HttpResult importSensitiveReportData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { String methodDescribe = getMethodDescribe("importSensitiveReportData"); - if (Objects.isNull(userReportPOService.importSensitiveReportData(file, response))) { - return null; - } + userReportPOService.importSensitiveReportData(file, response); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -211,10 +204,7 @@ public class UserReportManageController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) public HttpResult importSensitiveUserData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { String methodDescribe = getMethodDescribe("importSensitiveUserData"); - //批量录入暂降数据 - if (Objects.isNull(userReportPOService.importSensitiveUserData(file, response))) { - return null; - } + userReportPOService.importSensitiveUserData(file, response); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java index 176956dd9..3ab945404 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java @@ -49,9 +49,9 @@ public interface UserReportPOService extends IBpmService { void downloadSensitiveUserTemplate(); - String importSensitiveUserData(MultipartFile file, HttpServletResponse response); + void importSensitiveUserData(MultipartFile file, HttpServletResponse response); void downloadSensitiveReportTemplate(); - String importSensitiveReportData(MultipartFile file, HttpServletResponse response); + void importSensitiveReportData(MultipartFile file, HttpServletResponse response); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 523a78cf3..706edcd63 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -67,6 +67,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.beans.PropertyDescriptor; import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -119,8 +120,14 @@ public class UserReportPOServiceImpl extends ServiceImpl()); - } @Override @Transactional(rollbackFor = Exception.class) - public String importSensitiveUserData(MultipartFile file, HttpServletResponse response) { + public void importSensitiveUserData(MultipartFile file, HttpServletResponse response) { ImportParams params = new ImportParams(); params.setHeadRows(1);//表头 params.setTitleRows(1);//标题 params.setNeedVerify(true); params.setStartSheetIndex(0); params.setSheetNum(1); - List sensitiveUserExcels; + List sensitiveUserExcels=new ArrayList<>(); try { ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserSExcel.class, params); //如果存在非法数据，将不合格的数据导出 if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response); - return null; } else { sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList(); } @@ -748,9 +753,7 @@ public class UserReportPOServiceImpl extends ServiceImpl sensitiveUserExcels; + List sensitiveUserExcels=new ArrayList<>(); try { ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveReportExcel.class, params); //如果存在非法数据，将不合格的数据导出 if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response); - return null; } else { sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList(); } } catch (Exception e) { - throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_USER_ERROR); + throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_REPORT_ERROR); } //主要非线性设备类型-冀北 List treeVOS = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.Major_Nonlinear_Device.getCode()).getData(); @@ -954,10 +956,8 @@ public class UserReportPOServiceImpl extends ServiceImpl getTreeString(String name, List treeVOS) { @@ -983,10 +983,10 @@ public class UserReportPOServiceImpl extends ServiceImpl emptyNames = new HashSet<>(); - for (java.beans.PropertyDescriptor pd : pds) { + for (PropertyDescriptor pd : pds) { Object srcValue = src.getPropertyValue(pd.getName()); if (srcValue == null) { emptyNames.add(pd.getName());