From c2b44c03a28775af841963fe3396ac25f07cc837 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 17 Mar 2023 10:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 +- .../SarBussionessStandController.java | 4 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 58 +++---------------- 4 files changed, 11 insertions(+), 55 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 1fb38073..5256f0be 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -151,6 +151,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); + addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); addInterceptor.excludePathPatterns("/api/sarLawsDetailedList/sar-laws-detailed-list/importData"); //doc文檔重新轉換 @@ -164,7 +165,6 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenterForExits"); - //// //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index eedecd3f..87803b0a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -416,9 +416,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ + public ResponseMessage importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - return sarBussionessStandEOService.importSarBussionessStandFile(file); + return sarBussionessStandEOService.importSarBussionessStandFile(file); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 86255b38..c77bac43 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage emptyFileAnewStorage(String type); - ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; + ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; ResponseMessage repetitionFile(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 40652294..8cc65480 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2017,7 +2017,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file)throws Exception { + public ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception { //给出头部信息 String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; @@ -2072,7 +2072,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = new ArrayList<>(); list.add(sarBussStandAttrInfo); - //进行转义 - attrInfoShowImport(list); - com.alibaba.fastjson.JSONArray json = com.alibaba.fastjson.JSONArray.parseArray(JSON.toJSONString(list)); com.alibaba.fastjson.JSONObject jsonObjects = null; for (int j = 0; j < json.size(); j++) { @@ -2296,7 +2293,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ - throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); + //return Result.error("当前企标标准号和企标名称已存在"); + throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); } String standCode = ""; @@ -2412,52 +2410,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); - if(responseMessage.isOk()){ - SarBussionessStand bussionessStand = responseMessage.getData(); - bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); - } - } - List evaluationHis = new ArrayList<>(); - Map> listMap = new TreeMap<>(); - - List evaluations = new ArrayList<>(); - if(!listMap.isEmpty()){ - SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); - listMap.forEach((key, value) -> { - if(!value.isEmpty()){ - evaluationHis.add(value.get(0)); - } - }); - String finalBussId = bussId; - Date date = new Date(); - evaluationHis.forEach(busProcessEvaluationHis -> { - List valueArr = com.alibaba.fastjson.JSONArray.parseArray(busProcessEvaluationHis.getMesg(), com.alibaba.fastjson.JSONObject.class); - if(!valueArr.isEmpty()){ - valueArr.forEach(object -> { - QualityEvaluation evaluation = new QualityEvaluation(); - evaluation.setId(UUIDUtils.randomUUID20()); - evaluation.setLawId(finalBussId); - evaluation.setUserId(object.getString("userId")); - evaluation.setScore(object.getString("score")); - evaluation.setReason(object.getString("reason")); - evaluation.setEvaluationIndex(object.getString("code")); - evaluation.setProcessNode(object.getString("processNode")); - evaluation.setEvaluationType(object.getString("indexType")); - evaluation.setCreateTime(date); - evaluation.setModifyTime(date); - evaluations.add(evaluation); - - }); - } - }); - qualityEvaluationService.saveBatch(evaluations); + iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); } } - return bussId; + return null; } /**