From 15cb65ffdb2e1334feae60ae79768fcead85be1d Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 10:46:01 +0800 Subject: [PATCH 01/54] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=20?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=88=A4=E6=96=AD=E5=90=8D=E7=A7=B0+?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BA=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 13 +++++++++++++ .../controller/SarStandardsInfoController.java | 15 +++++++++++++++ 2 files changed, 28 insertions(+) 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 7f93d5b5..a42e4eec 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 @@ -365,7 +365,20 @@ public class SarBussionessStandController extends BaseController wrapper=new QueryWrapper<>(); + wrapper.eq(null!=sarBussionessStand.getStandName(),"STAND_NAME",sarBussionessStand.getStandName()) + .eq(null!=sarBussionessStand.getStandNumber(),"STAND_NUMBER",sarBussionessStand.getStandNumber()); + Integer s=sarBussionessStandEOService.count(wrapper); + if (s>0){ + return Result.error("当前标准编号和中文名称已存在"); + }else { + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 7bf2ac8b..07c22118 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -925,4 +925,19 @@ public class SarStandardsInfoController extends BaseController return "1"; } + @ApiOperation(value = "|SarStandardsInfoEO|编号+名称组合为唯一标识（国内海外）") + @PostMapping("/selectOnlyInfo") + public ResponseMessage selectOnlyInfo (SarStandardsInfo sarStandardsInfo){ + + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq(null!=sarStandardsInfo.getStandName(),"STAND_NAME",sarStandardsInfo.getStandName()) + .eq(null!=sarStandardsInfo.getStandNumber(),"STAND_NUMBER",sarStandardsInfo.getStandNumber()); + Integer s=sarStandardsInfoEOService.count(wrapper); + if (s>0){ + return Result.error("当前标准编号和中文名称已存在"); + }else { + return Result.success(); + } + } + } From 719c98739bcd5d9fe8f0ade49afe524b90e40719 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 10:50:49 +0800 Subject: [PATCH 02/54] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=20=E5=80=92=E5=8F=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E5=92=8C=E4=B8=89=E5=A4=A9=E4=BB=A5?= =?UTF-8?q?=E5=86=85=E6=94=B6=E8=97=8F=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0?= =?UTF-8?q?=EF=BC=88new=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../person/service/impl/PersonCollectEOServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index b8685939..dd05be89 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -156,11 +156,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper); - //三天以内收藏的 标题名称后面加 new 一小时3600000 一天时间戳 为 86400000 - /*long newTime = 86400000; + //三天以内收藏的 标题名称后面加 new 一小时3600000 一天时间戳 为 86400000 三天259,200,000 + long newTime = 259200000; Date date = new Date(); long time = date.getTime(); for (TsPersonCollect data : page.getRecords()){ @@ -170,7 +168,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl"+"(new)"+"").append(data.getCollectTitle()); data.setCollectTitle(sb.toString()); } - }*/ + } return Result.success(page); } From 3fca3eed63c8eeb0c21f151cf3378218a145e0be Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 10:54:25 +0800 Subject: [PATCH 03/54] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0+=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=94=AF=E4=B8=80=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 2 +- .../service/Impl/SarPublicIdeaServiceImpl.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 a42e4eec..e332ab5a 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 @@ -374,7 +374,7 @@ public class SarBussionessStandController extends BaseController0){ - return Result.error("当前标准编号和中文名称已存在"); + return Result.error("当前企业编号和中文名称已存在"); }else { return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index d6213731..2900d02a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; @@ -96,6 +97,18 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); + //三天以内收藏的 标题名称后面加 new 一小时3600000 一天时间戳 为 86400000 三天259,200,000 + long newTime = 259200000; + Date date = new Date(); + long time = date.getTime(); + for (SarPublicIdea data : userIPage.getRecords()){ + long creationTime = data.getEndTime().getTime(); + if(creationTime + newTime == time || creationTime + newTime > time){ + StringBuffer sb = new StringBuffer(); + sb.append(""+"(new)"+"").append(data.getCid()); + data.setCid(sb.toString()); + } + } return userIPage; } From 3ffeefcfc8f7f29266e2c1b8681deac0a340881a Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 11:18:35 +0800 Subject: [PATCH 04/54] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0+=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=94=AF=E4=B8=80=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 2 +- .../service/Impl/SarPublicIdeaServiceImpl.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) 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 e332ab5a..08bc65c2 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 @@ -365,7 +365,7 @@ public class SarBussionessStandController extends BaseController userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); - //三天以内收藏的 标题名称后面加 new 一小时3600000 一天时间戳 为 86400000 三天259,200,000 - long newTime = 259200000; - Date date = new Date(); - long time = date.getTime(); - for (SarPublicIdea data : userIPage.getRecords()){ - long creationTime = data.getEndTime().getTime(); - if(creationTime + newTime == time || creationTime + newTime > time){ - StringBuffer sb = new StringBuffer(); - sb.append(""+"(new)"+"").append(data.getCid()); - data.setCid(sb.toString()); - } - } return userIPage; } From e2ed54e90e23a009b48aca0e50a1fe9fc27aab20 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 13:53:59 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0+=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=94=AF=E4=B8=80=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 4 ++-- .../controller/SarStandardsInfoController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 08bc65c2..0cdbb05f 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 @@ -365,9 +365,9 @@ public class SarBussionessStandController extends BaseController wrapper=new QueryWrapper<>(); wrapper.eq(null!=sarBussionessStand.getStandName(),"STAND_NAME",sarBussionessStand.getStandName()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 07c22118..ad0af98f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -927,7 +927,7 @@ public class SarStandardsInfoController extends BaseController @ApiOperation(value = "|SarStandardsInfoEO|编号+名称组合为唯一标识（国内海外）") @PostMapping("/selectOnlyInfo") - public ResponseMessage selectOnlyInfo (SarStandardsInfo sarStandardsInfo){ + public ResponseMessage selectOnlyInfo (@RequestBody SarStandardsInfo sarStandardsInfo){ QueryWrapper wrapper=new QueryWrapper<>(); wrapper.eq(null!=sarStandardsInfo.getStandName(),"STAND_NAME",sarStandardsInfo.getStandName()) From 6ac734d65fbb43473bfe9347c71f64a1b3e88625 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 20 Feb 2023 16:42:49 +0800 Subject: [PATCH 06/54] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 6ef0837a..888049f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -14,18 +14,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; -import oracle.ucp.proxy.annotation.Post; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Author: qk @@ -177,7 +170,10 @@ public class AskQuestionsController extends BaseController { //添加问题分配人员 askUserService.saveBatch(askUserList); if(askQuestionsService.save(askQuestions)){ - return Result.success("200","添加成功",null); + Map objectObjectHashMap = new HashMap<>(); + objectObjectHashMap.put("askUserList",askUserList); + objectObjectHashMap.put("askQuestions",askQuestions); + return Result.success("200","添加成功",objectObjectHashMap); }else { return Result.error("-1","添加失败",null); } From 1d00e1c8c37e824585768cb3ef7e060dfdff1617 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 22 Feb 2023 16:09:40 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/common/ActDefineStartMap.java | 2 ++ .../StandardQA/controller/AskQuestionsController.java | 8 +++++++- .../slrs/sarStandTranslate/entity/SarStandTranslate.java | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index f958b680..3ee1949d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -60,6 +60,8 @@ public class ActDefineStartMap { map.put("26","qbzxdlxjh"); + map.put("27","wdzxlc"); + return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 888049f7..9dd5b33f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; +import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -171,7 +172,12 @@ public class AskQuestionsController extends BaseController { askUserService.saveBatch(askUserList); if(askQuestionsService.save(askQuestions)){ Map objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("askUserList",askUserList); + List askUserListUser = new ArrayList<>(); + for (AskUser user: askUserList){ + askUserListUser.add(user.getUsid()); + } + JSONArray jsonArray = JSONArray.fromObject(askUserListUser); + objectObjectHashMap.put("questioner",jsonArray); objectObjectHashMap.put("askQuestions",askQuestions); return Result.success("200","添加成功",objectObjectHashMap); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java new file mode 100644 index 00000000..8f82841d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.sarStandTranslate.entity; + +public class SarStandTranslate { +} From 0eb34588fc11b06f2478f0f0661b1c42d3706849 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 23 Feb 2023 15:16:30 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BF=AE=E6=AD=A3=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E6=A0=A1=E9=AA=8C=E3=80=82=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=AD=A3=E7=9A=84=E6=A0=87=E5=87=86=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 184 +++++++++++++++++- .../dao/SarBussionessStandDao.java | 1 + .../service/ISarBussionessStandService.java | 4 + .../impl/SarBussionessStandServiceImpl.java | 38 ++++ .../SarStandardsInfoController.java | 17 ++ .../impl/SarStandardsInfoServiceImpl.java | 10 + .../adc/da/utils/util/FieldConvertUtil.java | 2 + .../SarBussionessStandMapper.xml | 49 +++++ 8 files changed, 302 insertions(+), 3 deletions(-) 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 0cdbb05f..4b32c8a7 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 @@ -3,10 +3,12 @@ package com.adc.da.slrs.sarBussionessStand.controller; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; +import com.adc.da.common.FileUnZip; import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; @@ -23,25 +25,33 @@ import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.IOUtils; import com.adc.da.util.utils.StringUtils; import com.adc.da.utils.util.BussStandExportUtil; +import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.commons.io.FileUtils; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.ss.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.Date; -import java.util.List; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; /** *

@@ -74,6 +84,12 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { + //校验编号和名称是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) + .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); + List list = sarBussionessStandEOService.list(queryWrapper); + if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){ + return Result.error("当前标准编号和企标名称已存在"); + } sarBussionessStandEO.setModifyTime(new Date()); sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO); return Result.success("","修改成功",sarBussionessStandEO); @@ -381,6 +405,160 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false) MultipartFile file)throws Exception { + //截取后缀名 + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0, pos); + //判断上传文件必须是zip + if (!str.equals("zip")) { + return Result.error("fail", "请上传zip文件"); + } + String path = filePath + "/modal/" + filenameorg; + File saveDirectory = new File(path); + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + "/" + file.getOriginalFilename())); + try { + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path + "/" + file.getOriginalFilename(), path); + // 数据相关处理, + // 1.获取其中的Excel, + List excelfilelist = FileUnZip.readImpExcelFile(zipEntryName); + System.gc(); + if (excelfilelist.size() < 1) { + int i = 0; + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + i++; + } + } + if (i == 0) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内没有上传导入模板Excel"); + } + } else if (excelfilelist.size() > 1) { + int i = 0; + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + i++; + } + } + if (i > 1) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内有多个导入模板Excel"); + } + } + File excelfile = excelfilelist.get(0); + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + excelfile = file1; + } + } + // 导入参数设置，默认即可 + Workbook workbook = null; + try { + workbook = WorkbookFactory.create(excelfile); + List> dataList = new ArrayList<>(); + if (workbook != null) { + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null) { + StringBuilder headerSb = new StringBuilder(); + int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数 + for (int i = 0; i <= rowNos; i++) {// 遍历行 + Row row = sheet.getRow(i); + Row headerRow = sheet.getRow(0); + boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); + if (row != null && !isBlank) { + int columNos = headerRow.getLastCellNum();// 表头总共的列数 + Map rowList = new LinkedHashMap<>(); + for (int j = 0; j < columNos; j++) { + Cell cell = row.getCell(j); + Cell headerCell = headerRow.getCell(j); + if (cell != null) { + if (i == 0) { + cell.setCellType(CellType.STRING); + headerSb.append(cell.getStringCellValue() + ","); + } else { + if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { + Date d = cell.getDateCellValue(); + rowList.put(headerCell.getStringCellValue(), df.format(d)); + } else { + cell.setCellType(CellType.STRING); + rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); + } + } + } else { + if (i != 0) { + rowList.put(headerCell.getStringCellValue(), ""); + } + } + } + if (i != 0) { + dataList.add(rowList); + } + } + } + String fields = FieldConvertUtil.exportBaseFieldNamesBuss + "," + FieldConvertUtil.exportBaseFieldNamesBussCode + ","; + String excelHeader = headerSb.toString(); + if (!fields.equals(excelHeader)) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } + } + //导入 + if(dataList!=null &&!dataList.isEmpty()){ + try { + String unzipfilepath = zipEntryName; + ResponseMessage message = sarBussionessStandEOService.importSarBussionessStand(dataList,unzipfilepath); + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return message; + } catch (Exception e) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", e.getMessage()); + } + }else{ + if (workbook != null) { + workbook.close(); + } + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } + } catch (NoSuchElementException e){ + if (workbook != null) { + workbook.close(); + } + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } catch (Exception e) { + if (workbook != null) { + workbook.close(); + } + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 49cef6a8..0fe7c5cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -118,5 +118,6 @@ public interface SarBussionessStandDao extends BaseMapper { int insertSelective(SarBussionessStand sarBussionessStandEO); + void importSarBussionessStand(SarBussionessStand sarBussionessStands); } 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 57897616..3d145986 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 @@ -7,8 +7,10 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; /** *

@@ -54,5 +56,7 @@ public interface ISarBussionessStandService extends IService void checkFileByEncrypt(); + ResponseMessage importSarBussionessStand(List> dataList, String filepath)throws Exception; + } 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 6b67f662..50551181 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 @@ -64,6 +64,17 @@ import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,9 +82,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import java.sql.Clob; import java.text.DateFormat; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -173,6 +186,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStand(List> dataList, String filepath)throws Exception { + try { + //将导入数据循环新增至相应表 + List list = new ArrayList<>(); + int countSuccess = 0; + for (SarBussionessStand sarBussionessStand : list) { + sarBussionessStandEODao.importSarBussionessStand(sarBussionessStand); + countSuccess++; + } + String msg = "成功导入" + countSuccess + "条"; + return Result.success("0", msg, null); + } catch (Exception e) { + logger.error(e.getMessage(), e); + return Result.error("导入失败"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index ad0af98f..121a91c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -298,6 +298,14 @@ public class SarStandardsInfoController extends BaseController } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); } + //校验编号和名称是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) + .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); + Integer s1 = sarStandardsInfoEOService.count(queryWrapper); + if (s1>0){ + return Result.error("当前标准编号和中文名称已存在"); + } sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO); return Result.success("0", "添加成功", sarStandardsInfoEO); } @@ -307,6 +315,14 @@ public class SarStandardsInfoController extends BaseController //401问题2021-03-31暂时注释掉 liuhuiwen // @RequiresPermissions("lawss:sarStandardsInfo:updateSarStandardsInfo") public ResponseMessage updateSarStandardsInfo(@RequestBody SarStandardsInfo sarStandardsInfoEO) throws Exception { + //校验编号和名称是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) + .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); + List list = sarStandardsInfoEOService.list(queryWrapper); + if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ + return Result.error("当前标准编号和中文名称已存在"); + } int result = sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); if (result > 0) { return Result.success("", "修改成功", sarStandardsInfoEO); @@ -940,4 +956,5 @@ public class SarStandardsInfoController extends BaseController } } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index d3cad04c..2a7faa7b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -18,6 +18,7 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandFile.service.ISarStandFileService; import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl; +import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; @@ -259,6 +260,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl list = (List) map.get("resultList"); int countSuccess = 0; for (SarStandardsInfo sarStandardsInfoEO : list) { + //校验编号和名称是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) + .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); + Integer s1 = count(queryWrapper); + if (s1>0){ + return Result.error("当前标准编号和中文名称已存在"); + } sarStandardsInfoEO.setStandType(standType); sarStandardsInfoEO.setMenuId(menuId); createSarStandardsInfo(sarStandardsInfoEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 1e8f3a1b..1d3cf766 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -56,6 +56,8 @@ public class FieldConvertUtil { public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态"; + public static String exportBaseFieldNamesBussCode = "起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称"; + public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," + "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本"; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index b43f68ff..870c8a9f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1176,4 +1176,53 @@ select usid from SAR_BUSSIONESS_PERSON where QBID=#{qbid} + + insert into SAR_BUSSIONESS_STAND + + modify_time, + creation_time, + valid_flag, + stand_status, + replaced_stand_num, + replace_stand_num, + put_time, + issue_time, + stand_en_name, + stand_name, + stand_code, + id, + + apply_country, + stand_Nature, + stand_sort, + stand_year, + stand_number, + REVISE_STATUS, + REVISION_STATUS, + STAND_SN, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{standStatus, jdbcType=VARCHAR}, + #{replacedStandNum, jdbcType=VARCHAR}, + #{replaceStandNum, jdbcType=VARCHAR}, + #{putTime, jdbcType=TIMESTAMP}, + #{issueTime, jdbcType=TIMESTAMP}, + #{standEnName, jdbcType=VARCHAR}, + #{standName, jdbcType=VARCHAR}, + #{standCode, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + #{applyCountry, jdbcType=VARCHAR}, + #{standNature, jdbcType=VARCHAR}, + #{standSort, jdbcType=VARCHAR}, + #{standYear, jdbcType=VARCHAR}, + #{standNumber, jdbcType=VARCHAR}, + #{reviseStatus, jdbcType=VARCHAR}, + #{revisionStatus, jdbcType=VARCHAR}, + #{standSn, jdbcType=VARCHAR}, + + From 4358a62274ba8ff850617fb45cd8d87a9367ffd0 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 23 Feb 2023 15:59:47 +0800 Subject: [PATCH 09/54] =?UTF-8?q?=E5=AF=B9=E4=BC=81=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BC=81=E6=A0=87=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E5=92=8C=E4=BC=81=E6=A0=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4b32c8a7..a263e611 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 @@ -161,11 +161,11 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) + queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); List list = sarBussionessStandEOService.list(queryWrapper); if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){ - return Result.error("当前标准编号和企标名称已存在"); + return Result.error("当前企标标准号和企标名称已存在"); } sarBussionessStandEO.setModifyTime(new Date()); sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO); From 07520b2108e70829dc18c578449c4461ae883957 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 23 Feb 2023 15:59:47 +0800 Subject: [PATCH 10/54] =?UTF-8?q?=E5=AF=B9=E4=BC=81=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BC=81=E6=A0=87=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E5=92=8C=E4=BC=81=E6=A0=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 184 +++++++++++++++++- 1 file changed, 181 insertions(+), 3 deletions(-) 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 0cdbb05f..a263e611 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 @@ -3,10 +3,12 @@ package com.adc.da.slrs.sarBussionessStand.controller; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; +import com.adc.da.common.FileUnZip; import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; @@ -23,25 +25,33 @@ import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.IOUtils; import com.adc.da.util.utils.StringUtils; import com.adc.da.utils.util.BussStandExportUtil; +import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.commons.io.FileUtils; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.ss.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.Date; -import java.util.List; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; /** *

@@ -74,6 +84,12 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { + //校验编号和名称是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) + .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); + List list = sarBussionessStandEOService.list(queryWrapper); + if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){ + return Result.error("当前企标标准号和企标名称已存在"); + } sarBussionessStandEO.setModifyTime(new Date()); sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO); return Result.success("","修改成功",sarBussionessStandEO); @@ -381,6 +405,160 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false) MultipartFile file)throws Exception { + //截取后缀名 + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0, pos); + //判断上传文件必须是zip + if (!str.equals("zip")) { + return Result.error("fail", "请上传zip文件"); + } + String path = filePath + "/modal/" + filenameorg; + File saveDirectory = new File(path); + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + "/" + file.getOriginalFilename())); + try { + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path + "/" + file.getOriginalFilename(), path); + // 数据相关处理, + // 1.获取其中的Excel, + List excelfilelist = FileUnZip.readImpExcelFile(zipEntryName); + System.gc(); + if (excelfilelist.size() < 1) { + int i = 0; + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + i++; + } + } + if (i == 0) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内没有上传导入模板Excel"); + } + } else if (excelfilelist.size() > 1) { + int i = 0; + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + i++; + } + } + if (i > 1) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内有多个导入模板Excel"); + } + } + File excelfile = excelfilelist.get(0); + for (File file1 : excelfilelist) { + if (file1.getName().indexOf("导入模板") > -1) { + excelfile = file1; + } + } + // 导入参数设置，默认即可 + Workbook workbook = null; + try { + workbook = WorkbookFactory.create(excelfile); + List> dataList = new ArrayList<>(); + if (workbook != null) { + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null) { + StringBuilder headerSb = new StringBuilder(); + int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数 + for (int i = 0; i <= rowNos; i++) {// 遍历行 + Row row = sheet.getRow(i); + Row headerRow = sheet.getRow(0); + boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); + if (row != null && !isBlank) { + int columNos = headerRow.getLastCellNum();// 表头总共的列数 + Map rowList = new LinkedHashMap<>(); + for (int j = 0; j < columNos; j++) { + Cell cell = row.getCell(j); + Cell headerCell = headerRow.getCell(j); + if (cell != null) { + if (i == 0) { + cell.setCellType(CellType.STRING); + headerSb.append(cell.getStringCellValue() + ","); + } else { + if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { + Date d = cell.getDateCellValue(); + rowList.put(headerCell.getStringCellValue(), df.format(d)); + } else { + cell.setCellType(CellType.STRING); + rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); + } + } + } else { + if (i != 0) { + rowList.put(headerCell.getStringCellValue(), ""); + } + } + } + if (i != 0) { + dataList.add(rowList); + } + } + } + String fields = FieldConvertUtil.exportBaseFieldNamesBuss + "," + FieldConvertUtil.exportBaseFieldNamesBussCode + ","; + String excelHeader = headerSb.toString(); + if (!fields.equals(excelHeader)) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } + } + //导入 + if(dataList!=null &&!dataList.isEmpty()){ + try { + String unzipfilepath = zipEntryName; + ResponseMessage message = sarBussionessStandEOService.importSarBussionessStand(dataList,unzipfilepath); + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return message; + } catch (Exception e) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", e.getMessage()); + } + }else{ + if (workbook != null) { + workbook.close(); + } + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } + } catch (NoSuchElementException e){ + if (workbook != null) { + workbook.close(); + } + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } catch (Exception e) { + if (workbook != null) { + workbook.close(); + } + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } + } From 98d454739e217fb23a0bab379c01f69a49fd1d4e Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 24 Feb 2023 13:50:41 +0800 Subject: [PATCH 11/54] =?UTF-8?q?=E5=AF=B9=E8=BF=87=E5=86=85=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/workFlow/service/ActSarItemsBussEOService.java | 8 ++++++++ .../adc/da/workFlow/service/ActSarItemsEOService.java | 11 +++++++++++ .../controller/SarStandardsInfoController.java | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index c1a52764..63dc0acd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -5,6 +5,7 @@ import com.adc.da.common.BussEnum; import com.adc.da.common.SarConformStateEnum; import com.adc.da.common.SarStateColorEnum; import com.adc.da.common.SarTypeEnum; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; @@ -387,6 +388,13 @@ public class ActSarItemsBussEOService { sarBussionessStand.setSarStandAttrEOStr(resData); // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId + QueryWrapperqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) + .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); + Integer count = iSarBussionessStandService.count(queryWrapper); + if (count > 0){ + throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); + } String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 4b2c708d..05ae71e6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -4,6 +4,8 @@ import com.adc.da.common.PropertyTypeEnum; import com.adc.da.common.SarConformStateEnum; import com.adc.da.common.SarStateColorEnum; import com.adc.da.common.SarTypeEnum; +import com.adc.da.exception.AdcDaBaseException; +import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; @@ -34,6 +36,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,6 +192,14 @@ public class ActSarItemsEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); + + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()) + .eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()); + Integer s=sarStandardsInfoEOService.count(wrapper); + if (s>0){ + throw new AdcDaBaseException("当前标准编号和中文名称已存在"); + } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId String standnumber = ""; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 121a91c8..60d0855c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -902,7 +902,7 @@ public class SarStandardsInfoController extends BaseController .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0); Integer s=sarStandardsInfoEOService.count(wrapper); if (s>0){ - return Result.error(); + return Result.error("当前标准编号已存在"); }else { return Result.success(); } From ddf2a828a8370026c8159a149a569b1333bedfd4 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 24 Feb 2023 14:57:06 +0800 Subject: [PATCH 12/54] =?UTF-8?q?=E5=AF=B9=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=AD=A3=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a263e611..c5577125 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 @@ -161,7 +161,7 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) + queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); List list = sarBussionessStandEOService.list(queryWrapper); if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){ From 7d3e8707a5e4cf88d042fd2db7920e72d582662f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 27 Feb 2023 16:34:01 +0800 Subject: [PATCH 13/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 10 +- .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 154 +++++++++++++++++- 3 files changed, 157 insertions(+), 9 deletions(-) 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 c5577125..dae1cfef 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 @@ -557,7 +557,15 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile2(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ + sarBussionessStandEOService.importSarBussionessStandFile2(file); + return Result.success(); + } } 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 3d145986..5a6ce13e 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,5 +58,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage importSarBussionessStand(List> dataList, String filepath)throws Exception; + //导入 + ResponseMessage importSarBussionessStandFile2(MultipartFile file) throws Exception; } 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 50551181..4c0d58c0 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 @@ -3,10 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; import cn.hutool.core.bean.BeanUtil; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; -import com.adc.da.common.ConvertMqEO; -import com.adc.da.common.SarTypeEnum; -import com.adc.da.common.SelectionTypeEnum; -import com.adc.da.common.UseModuleEnum; +import com.adc.da.common.*; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.mq.CreateMQService; @@ -37,6 +34,7 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.entity.TsResource; @@ -63,6 +61,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; @@ -70,10 +69,7 @@ import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.json.JSONTokener; import org.slf4j.Logger; @@ -84,6 +80,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.sql.Clob; import java.text.DateFormat; import java.text.DecimalFormat; @@ -185,6 +182,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile2(MultipartFile file) throws Exception { + //获取文件全称 + String fileNameStr = file.getOriginalFilename(); + //获取最后.的位置 + int pos = fileNameStr.lastIndexOf("."); + //获取压缩文件名称并以小写显示 + String fileStr = fileNameStr.substring(pos + 1).toLowerCase(); + //校验是否是zip文件 + if (!fileStr.equals("zip")){ + return Result.error("请上传zip格式的文件"); + } + //进行拼接获取文件名称 + String fileName = fileNameStr.substring(0,pos); + //获取路径和文件名称 + String path = filePath + "/" + fileName; + + File saveDirectory = new File(path); + //判断saveDirectory中是否是文件夹 + if (!saveDirectory.isDirectory()){ + saveDirectory.mkdir(); + } + //将文件写入到指定路径中 + FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr)); + try { + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path); + //获取文件信息 + List fileList = readImpExcelFile(zipEntryName); + //判断获取到的文件数量 + if (fileList.size() < 1){ + return Result.error("上传的文件是空文件"); + } + File excelfile = fileList.get(0); + if (excelfile.getName().contains(".xls") || excelfile.getName().contains("xlsx")) { + for (File file1 : fileList){ + excelfile = file1; + } + Workbook workbook = null; + try { + workbook = WorkbookFactory.create(excelfile); + List> dataList = new ArrayList<>(); + if (workbook != null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null){ + StringBuilder sb = new StringBuilder(); + //获取总条数 + int rowNum = sheet.getLastRowNum(); + //循环遍历 + for (int i = 0;i < rowNum;i++){ + Row row = sheet.getRow(i); + Row headerRow = sheet.getRow(0); + boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); + if (row != null && !isBlank) { + int columNos = headerRow.getLastCellNum();// 表头总共的列数 + Map rowList = new LinkedHashMap<>(); + for (int j = 0; j < columNos; j++) { + Cell cell = row.getCell(j); + Cell headerCell = headerRow.getCell(j); + if (cell != null) { + if (i == 0) { + cell.setCellType(CellType.STRING); + sb.append(cell.getStringCellValue() + ","); + } else { + if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { + Date d = cell.getDateCellValue(); + rowList.put(headerCell.getStringCellValue(), sdf.format(d)); + } else { + cell.setCellType(CellType.STRING); + rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); + } + } + } else { + if (i != 0) { + rowList.put(headerCell.getStringCellValue(), ""); + } + } + } + if (i != 0) { + dataList.add(rowList); + } + } + } + String fields = FieldConvertUtil.exportBaseFieldNamesBuss + "," + FieldConvertUtil.exportBaseFieldNamesBussCode + ","; + String excelHeader = sb.toString(); + if (!fields.equals(excelHeader)) { + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } + } + //判断解析后的数据是否为空 + if (dataList != null && !dataList.isEmpty() ){ + + } + }catch (Exception e){ + FileUnZip.deleteDir(saveDirectory); + return Result.error("导入失败"); + } + + }else { + Result.error("您上传的文件中没有Excel文件"); + } + }catch (Exception e){ + FileUnZip.deleteDir(saveDirectory); + Result.error("导入失败,没有可导入的数据,请检查!"); + } + + return null; + } + + private static List readImpExcelFile(String path) { + File file = new File(path); + List resultlist = new ArrayList<>(); + if (file.isDirectory()) { + File[] files = file.listFiles(); + for (File fi : files) { + // 对文件进行过滤，读取所有文件 + String name = fi.getName(); + //文件不为空 添加 + if (name != null){ + resultlist.add(fi); + } + } + } + return resultlist; + } + + } From 3adaeddbf1661573b20101657907f19d7f8b9c06 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 28 Feb 2023 10:44:12 +0800 Subject: [PATCH 14/54] =?UTF-8?q?=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/ActDefineStartMap.java | 4 +++- .../StandardQA/controller/ReplyController.java | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 3ee1949d..9a11b8e6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -59,8 +59,10 @@ public class ActDefineStartMap { map.put("25","enterpriseStandardSystemRevisionPlan"); map.put("26","qbzxdlxjh"); - + // 问答流程 map.put("27","wdzxlc"); + // 标准需求（翻译）申请流程 + map.put("28","bzxqfy"); return map.get(type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java index 2a5421d1..9da0099c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java @@ -58,7 +58,7 @@ public class ReplyController extends BaseController { return Result.error("-1","添加失败"); } } - @PostMapping("/updateReply") + //@PostMapping("/updateReply") public ResponseMessage updateReply(String id){ if(StringUtils.isEmpty(id)){ return Result.error("-1","请选择要归档的回答"); @@ -78,4 +78,16 @@ public class ReplyController extends BaseController { public ResponseMessage updateReply(@RequestBody ReplyPage reply){ return Result.success(replyService.listByPage(reply)); } + + @PostMapping("/updateReply") + public ResponseMessage updateReplyInfo(@RequestBody List replyList){ + if (replyList.isEmpty()){ + return Result.error("-1","编辑失败",null); + } + for(Reply reply: replyList){ + reply.setState("yes"); + } + replyService.updateBatchById(replyList); + return Result.success("200","编辑成功",null); + } } From 9ab7605f79f13636147f53950d14d7b8584de27b Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 28 Feb 2023 14:59:13 +0800 Subject: [PATCH 15/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 5 ++- .../impl/SarBussionessStandServiceImpl.java | 43 +++++++++++++++---- 2 files changed, 38 insertions(+), 10 deletions(-) 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 dae1cfef..f1506d6b 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 @@ -563,8 +563,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile2(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - sarBussionessStandEOService.importSarBussionessStandFile2(file); - return Result.success(); + + sarBussionessStandEOService.importSarBussionessStandFile2(file); + return Result.success(); } 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 4c0d58c0..1cd98add 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 @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; import cn.hutool.core.bean.BeanUtil; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; import com.adc.da.common.*; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -1986,6 +1987,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile2(MultipartFile file) throws Exception { + //给出头部信息 + String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,"}; + //获取文件全称 String fileNameStr = file.getOriginalFilename(); //获取最后.的位置 @@ -2017,14 +2021,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 1){ + return Result.error("导入了多个Excel文件"); + } Workbook workbook = null; try { - workbook = WorkbookFactory.create(excelfile); + workbook = WorkbookFactory.create(fileInfo); List> dataList = new ArrayList<>(); if (workbook != null){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -2038,7 +2045,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl rowList = new LinkedHashMap<>(); for (int j = 0; j < columNos; j++) { @@ -2068,7 +2094,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Wed, 1 Mar 2023 09:45:33 +0800 Subject: [PATCH 16/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 93 +++++++++++++++++++ .../impl/SarBussionessStandServiceImpl.java | 12 ++- 2 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java new file mode 100644 index 00000000..85374607 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -0,0 +1,93 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author + * @since 2023-02-28 + */ +@Data +public class SarBussStandAttrInfoExecl extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + @ApiModelProperty(value = "标准基础表主键") + private String standId; + + private String creationUser; + + @ApiModelProperty(value = "是否有效") + private String validFlag; + + @ApiModelProperty(value = "创建时间") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + private Date modifyTime; + + @ApiModelProperty(value = "体系类别") + private String txlbbuss; + + private String bdtqbbhbuss; + + private String dtqbbhbuss; + + private String glwj; + + private String svpps; + + private String gfxyywj; + + private String zrbm; + + private Date fzrq; + + private Date fsrq; + + private String qbmj; + + private String qbsq; + + private String qbwb; + + private String gcwb; + + private String zyqcr; + + private String qcfbw; + + private String xglc; + + private String xgbm; + + private String xhqbm; + + private String zqcbm; + + private String qtqcr; + + private String wfspjs; + + private String xgjh; + + //附件 + private String fbgBuss; + + + +} 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 1cd98add..28f9da8c 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 @@ -22,6 +22,7 @@ import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoExecl; import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao; @@ -2048,22 +2049,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl rowList = new LinkedHashMap<>(); From 296194b9be06a4c11df11b1307dbf154330ab51e Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 1 Mar 2023 10:44:00 +0800 Subject: [PATCH 17/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 1 + .../service/impl/SarBussionessStandServiceImpl.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 85374607..b5c60ebf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -90,4 +90,5 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { + } 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 28f9da8c..054b2e7b 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 @@ -2050,11 +2050,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Thu, 2 Mar 2023 17:12:41 +0800 Subject: [PATCH 18/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BusProcessEvaluationHis.java | 84 +++ .../entity/SarBussStandAttrInfoExecl.java | 67 +- .../SarBussionessStandController.java | 168 +---- .../service/ISarBussionessStandService.java | 4 +- .../impl/SarBussionessStandServiceImpl.java | 665 ++++++++++++++++-- 5 files changed, 764 insertions(+), 224 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java new file mode 100644 index 00000000..20135145 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java @@ -0,0 +1,84 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表") +public class BusProcessEvaluationHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; + + @ApiModelProperty(value = "处理人姓名") + @TableField(exist = false) + private String userName; +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index b5c60ebf..581a256c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -8,8 +8,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.scheduling.support.SimpleTriggerContext; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; /** *

@@ -43,10 +46,6 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { @ApiModelProperty(value = "体系类别") private String txlbbuss; - private String bdtqbbhbuss; - - private String dtqbbhbuss; - private String glwj; private String svpps; @@ -88,7 +87,67 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { //附件 private String fbgBuss; + //标准中文名称 + private String standName; + //企标类型 + private String standSort; + //标准年份 + private String standYear; + + //文本状态 + private String textStatusBuss; + + //起草部门 + private String qcdw; + + //起草人 + private String qcrbuss; + + //发布日期 + private Date issueTime; + + //标准编号 + private String standCode; + + //标准英文名称 + private String standEnName; + + //实施日期 + private Date putTime; + + //企标制修订状态 + private String revisionStatus; + + //废止日期 + private String fzrqbuss; + + //代替企标编号 + private String dtqbbhbuss; + + //复审日期 + private String fsrqbuss; + + //被代替企标编号 + private String bdtqbbhbuss; + + //文件上传人员 + private String wjscrybuss; + + //适用车型 + private String sycxclass; + + //能源类型 + private String nylxclass; + + //适用产品线 + private String sycpxclass; + + //上传时间 + private String xcsjbuss; + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); } 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 f1506d6b..06d18273 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 @@ -404,168 +404,16 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - @ApiOperation(value = "|SarBussionessStand|导入") - @PostMapping("/importSarBussionessStand") - public ResponseMessage importSarBussionessStandFile(@RequestParam(value = "file",required = false) MultipartFile file)throws Exception { - //截取后缀名 - int pos = file.getOriginalFilename().lastIndexOf("."); - String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); - String filenameorg = file.getOriginalFilename().substring(0, pos); - //判断上传文件必须是zip - if (!str.equals("zip")) { - return Result.error("fail", "请上传zip文件"); - } - String path = filePath + "/modal/" + filenameorg; - File saveDirectory = new File(path); - if (!saveDirectory.isDirectory()) { - saveDirectory.mkdir(); - } - FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + "/" + file.getOriginalFilename())); - try { - //解压缩 - String zipEntryName = FileUnZip.unZipFiles(path + "/" + file.getOriginalFilename(), path); - // 数据相关处理, - // 1.获取其中的Excel, - List excelfilelist = FileUnZip.readImpExcelFile(zipEntryName); - System.gc(); - if (excelfilelist.size() < 1) { - int i = 0; - for (File file1 : excelfilelist) { - if (file1.getName().indexOf("导入模板") > -1) { - i++; - } - } - if (i == 0) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "压缩包内没有上传导入模板Excel"); - } - } else if (excelfilelist.size() > 1) { - int i = 0; - for (File file1 : excelfilelist) { - if (file1.getName().indexOf("导入模板") > -1) { - i++; - } - } - if (i > 1) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "压缩包内有多个导入模板Excel"); - } + ResponseMessage message = sarBussionessStandEOService.importSarBussionessStandFile(file); + if (message != null && ! message.equals("")){ + return Result.success(); + }else { + return Result.error("导入失败,导入的文件为空"); } - File excelfile = excelfilelist.get(0); - for (File file1 : excelfilelist) { - if (file1.getName().indexOf("导入模板") > -1) { - excelfile = file1; - } - } - // 导入参数设置，默认即可 - Workbook workbook = null; - try { - workbook = WorkbookFactory.create(excelfile); - List> dataList = new ArrayList<>(); - if (workbook != null) { - DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Sheet sheet = workbook.getSheetAt(0); - if (sheet != null) { - StringBuilder headerSb = new StringBuilder(); - int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数 - for (int i = 0; i <= rowNos; i++) {// 遍历行 - Row row = sheet.getRow(i); - Row headerRow = sheet.getRow(0); - boolean isBlank = sarLawsInfoEOService.isRowEmpty(row); - if (row != null && !isBlank) { - int columNos = headerRow.getLastCellNum();// 表头总共的列数 - Map rowList = new LinkedHashMap<>(); - for (int j = 0; j < columNos; j++) { - Cell cell = row.getCell(j); - Cell headerCell = headerRow.getCell(j); - if (cell != null) { - if (i == 0) { - cell.setCellType(CellType.STRING); - headerSb.append(cell.getStringCellValue() + ","); - } else { - if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { - Date d = cell.getDateCellValue(); - rowList.put(headerCell.getStringCellValue(), df.format(d)); - } else { - cell.setCellType(CellType.STRING); - rowList.put(headerCell.getStringCellValue(), cell.getStringCellValue()); - } - } - } else { - if (i != 0) { - rowList.put(headerCell.getStringCellValue(), ""); - } - } - } - if (i != 0) { - dataList.add(rowList); - } - } - } - String fields = FieldConvertUtil.exportBaseFieldNamesBuss + "," + FieldConvertUtil.exportBaseFieldNamesBussCode + ","; - String excelHeader = headerSb.toString(); - if (!fields.equals(excelHeader)) { - workbook.close(); - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); - } - } - } - //导入 - if(dataList!=null &&!dataList.isEmpty()){ - try { - String unzipfilepath = zipEntryName; - ResponseMessage message = sarBussionessStandEOService.importSarBussionessStand(dataList,unzipfilepath); - workbook.close(); - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return message; - } catch (Exception e) { - workbook.close(); - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", e.getMessage()); - } - }else{ - if (workbook != null) { - workbook.close(); - } - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "没有可导入的数据,请检查!"); - } - } catch (NoSuchElementException e){ - if (workbook != null) { - workbook.close(); - } - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "没有可导入的数据,请检查!"); - } catch (Exception e) { - if (workbook != null) { - workbook.close(); - } - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); - } - } catch (Exception e) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); - } - } - - - @ApiOperation(value = "导入功能 测试") - @PostMapping("/importSarBussionessStandFile2") - public ResponseMessage importSarBussionessStandFile2(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - - sarBussionessStandEOService.importSarBussionessStandFile2(file); - return Result.success(); } 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 5a6ce13e..6882f179 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 @@ -56,9 +56,7 @@ public interface ISarBussionessStandService extends IService void checkFileByEncrypt(); - ResponseMessage importSarBussionessStand(List> dataList, String filepath)throws Exception; - //导入 - ResponseMessage importSarBussionessStandFile2(MultipartFile file) throws Exception; + ResponseMessage importSarBussionessStandFile(MultipartFile file) throws Exception; } 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 054b2e7b..afb729bc 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 @@ -5,8 +5,10 @@ import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; import com.adc.da.common.*; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.login.util.UserUtils; import com.adc.da.mq.CreateMQService; import com.adc.da.mq.CreateStandMQService; import com.adc.da.person.dao.PersonCollectEODao; @@ -18,11 +20,18 @@ import com.adc.da.search.entity.StandLawsEO; import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.NewsFeed.entity.NewsFeed; import com.adc.da.slrs.NewsFeed.service.INewsFeedService; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.BusProcessEvaluationHis; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoExecl; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao; @@ -36,6 +45,10 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; @@ -43,6 +56,7 @@ import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandFile.entity.SarStandFile; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; @@ -58,13 +72,18 @@ import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.*; +import com.adc.da.utils.util.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mysql.cj.x.protobuf.MysqlxDatatypes; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFDateUtil; @@ -73,6 +92,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.json.JSONArray; import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -188,6 +208,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStand(List> dataList, String filepath)throws Exception { - try { - //将导入数据循环新增至相应表 - List list = new ArrayList<>(); - int countSuccess = 0; - for (SarBussionessStand sarBussionessStand : list) { - sarBussionessStandEODao.importSarBussionessStand(sarBussionessStand); - countSuccess++; - } - String msg = "成功导入" + countSuccess + "条"; - return Result.success("0", msg, null); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return Result.error("导入失败"); - } - } - - - /** - * 导入 测试 * @param file * @throws Exception */ @Override - public ResponseMessage importSarBussionessStandFile2(MultipartFile file) throws Exception { + public ResponseMessage importSarBussionessStandFile(MultipartFile file) throws Exception { //给出头部信息 - String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,"}; + String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; //获取文件全称 String fileNameStr = file.getOriginalFilename(); @@ -2033,7 +2049,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl> dataList = new ArrayList<>(); if (workbook != null){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Sheet sheet = workbook.getSheetAt(0); @@ -2046,28 +2061,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl rowList = new LinkedHashMap<>(); for (int j = 0; j < columNos; j++) { @@ -2092,8 +2086,188 @@ public class SarBussionessStandServiceImpl extends ServiceImpl100){ + return Result.error("输入的标准名称过长"); + } + sarBussStandAttrInfo.setStandName(standName); + }else { + return Result.error("标准名称不能为空"); + } + + String standEnName = rowList.get("英文名称"); + sarBussStandAttrInfo.setStandEnName(standEnName); + + String textStatusBuss = rowList.get("文本状态"); + if (StringUtils.isNotBlank(textStatusBuss)){ + if (textStatusBuss.length() > 200){ + return Result.error("输入的文本状态过长"); + } + sarBussStandAttrInfo.setTextStatusBuss(textStatusBuss); + }else { + return Result.error("文本状态不能为空"); + } + + SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd"); + + Date issueTime = sdfs.parse( rowList.get("发布日期")); + String issueTimeStr = sdfs.format(issueTime); + if (StringUtils.isNotBlank(issueTimeStr)){ + sarBussStandAttrInfo.setIssueTime(issueTime); + }else { + return Result.error("发布日期不能为空"); + } + + + Date putTime = sdfs.parse(rowList.get("企标实施日期")); + String putTimeStr = sdfs.format(putTime); + if (StringUtils.isNotBlank(putTimeStr)){ + sarBussStandAttrInfo.setPutTime(putTime); + }else { + return Result.error("企标实施日期不能为空"); + } + + + String revisionStatus = rowList.get("企标制修订状态"); + sarBussStandAttrInfo.setRevisionStatus(revisionStatus); + + String qcdw = rowList.get("起草部门"); + if (StringUtils.isNotBlank(qcdw)){ + if (qcdw.length() > 100){ + return Result.error("输入的起草部门过长"); + } + sarBussStandAttrInfo.setQcdw(qcdw); + }else { + return Result.error("起草部门不能为空"); + } + + String fzrqbuss = rowList.get("废止日期"); + if (StringUtils.isNotBlank(fzrqbuss)){ + sarBussStandAttrInfo.setFzrqbuss(fzrqbuss); + }else { + return Result.error("废止日期不能为空"); + } + + + String dtqbbhbuss = rowList.get("代替企标编号"); + sarBussStandAttrInfo.setDtqbbhbuss(dtqbbhbuss); + + String fsrqbuss = rowList.get("复审日期"); + if (StringUtils.isNotBlank(fsrqbuss)){ + sarBussStandAttrInfo.setFsrqbuss(fsrqbuss); + }else { + return Result.error("复审日期不能为空"); + } + + + String qcrbuss = rowList.get("起草人"); + if (StringUtils.isNotBlank(qcrbuss)){ + if (qcrbuss.length() > 100){ + return Result.error("输入的起草人过长"); + } + sarBussStandAttrInfo.setQcrbuss(qcrbuss); + }else { + return Result.error("起草人不能为空"); + } + + String bdtqbbhbuss = rowList.get("被代替企标编号"); + sarBussStandAttrInfo.setBdtqbbhbuss(bdtqbbhbuss); + +//// //采用标准 13 + + String wjscrybuss = rowList.get("文件上传人员"); + sarBussStandAttrInfo.setWjscrybuss(wjscrybuss); + +//// //采标程度 15 +//// //引用标准 16 + + String sycxclass = rowList.get("适用车型"); + sarBussStandAttrInfo.setSycxclass(sycxclass); + + String nylxclass = rowList.get("能源类型"); + sarBussStandAttrInfo.setNylxclass(nylxclass); + + String sycpxclass = rowList.get("适用产品线"); + sarBussStandAttrInfo.setSycpxclass(sycpxclass); + + String xcsjbuss = rowList.get("上传时间"); + if (StringUtils.isNotBlank(xcsjbuss)){ + sarBussStandAttrInfo.setXcsjbuss(xcsjbuss); + }else { + return Result.error("上传时间不能为空"); + } + + + String txlbbuss = rowList.get("体系类别"); + sarBussStandAttrInfo.setTxlbbuss(txlbbuss); + +//// //备案日期 22 +//// //关联模块-乘用车VPPS编码 23 +//// //关联模块--乘用车vpps中文名称 24 +//// //关联模块--卡车VPPS编码 25 +//// //关联模块--卡车vpps中文名称 26 + + String fbgBuss = rowList.get("附件"); + String[] split = fbgBuss.split(","); + String s = ""; + if (split.length != 0){ + for (int j = 0;j < split.length;j++){ + String name = fileInfo.getName(); + String[] split1 = fileInfo.toString().split(name); + File files = new File(split1[0]+split[j]); + AttFileVo attFileVo = attFileEOService.saveFileInfo(files); + if (StringUtils.isNotBlank(attFileVo.getId())){ + s = "," + attFileVo.getAttId(); + }else { + s = attFileVo.getAttId(); + } + sarBussStandAttrInfo.setFbgBuss(s); + } + }else { + sarBussStandAttrInfo.setFbgBuss(StringUtils.join(split)); + } + + String standSort = rowList.get("企标类型"); + if (StringUtils.isNotBlank(standSort)){ + if (standSort.length() > 100){ + return Result.error("企标类型输入过长"); + } + sarBussStandAttrInfo.setStandSort(standSort); + }else { + return Result.error("企标类型不能为空"); + } + + String standYear = rowList.get("标准年份"); + if (StringUtils.isNotBlank(standYear)){ + if (standYear.length() > 100){ + return Result.error("标准年份输入过长"); + } + sarBussStandAttrInfo.setStandYear(standYear); + }else { + return Result.error("标准年份不能为空"); + } + + List 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++) { + jsonObjects = json.getJSONObject(j); + } + String infoJson = String.valueOf(jsonObjects); + //入库 + processCreateBuss(infoJson); } } } @@ -2107,22 +2281,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl standMap = new HashMap(); + standMap = com.alibaba.fastjson.JSONObject.parseObject(standJson); + String bussId = ""; + if (standMap != null && !standMap.isEmpty()) { + String prcNum = String.valueOf(standMap.get("prcNum")); + String pid = String.valueOf(standMap.get("topId")); + String prcName = String.valueOf(standMap.get("prcName")); + String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); + String standType = String.valueOf(standMap.get("standType")); +// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 + SarBussionessStand sarBussionessStand = new SarBussionessStand(); +// if(standMap.containsKey("standId")) { +// if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) { +// String resId = standMap.get("standId").toString(); +// //此处说明是带入的形式 +// sarStandardsInfoEO.setId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); +// if (assessInfoByResId != null) { +// assessInfoByResId.setProcessState("2"); +// sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); +// } +// } +// } + + Map attInfoMap = new HashMap<>(); + List jsonArray = new ArrayList<>(); + Object breakVal = null; + Object itemList = null; + for (Map.Entry entry : standMap.entrySet()) { + String field = entry.getKey().toUpperCase(); + Object value = entry.getValue(); + if (InitStandAttrUtil.queryFieldListBuss.contains(field)) { + if (value instanceof com.alibaba.fastjson.JSONArray) { + String valStr = String.valueOf(value); + List valueArr = com.alibaba.fastjson.JSONArray.parseArray(valStr,String.class); + if (valueArr != null && !valueArr.isEmpty()) { + String newValue = ""; + for (String val : valueArr) { + newValue += val + ","; + } + newValue = newValue.substring(0,newValue.length()-1); + value = newValue; + }else { + value = ""; + } + } + attInfoMap.put(field,value); + } else { + createStandBaseField(sarBussionessStand,entry.getKey(),value); + } + } + //处理文件 + //此处需要处理之前的文件信息，防止文件丢失 +// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); + String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + // 根据标准号判断数据是否已存在 + //2021年4月9日 此处检查当前是否存在standId + QueryWrapperqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) + .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); + Integer count = iSarBussionessStandService.count(queryWrapper); + if (count > 0){ + throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); + } + String standCode = ""; + if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ + standCode = sarBussionessStand.getStandCode(); + } + List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); +// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { +// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); +// sarStandardsInfoEO.setCountry("CN"); +// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { +// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); +// } + //此处判断是否是带入的标准 + if(StringUtils.isNotBlank(sarBussionessStand.getId())) { + bussId = sarBussionessStand.getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(sarBussionessStand.getId()); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ +// updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,prcCreateUser); + }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 + String standId = lawsList.get(0).getId(); + bussId = lawsList.get(0).getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(standId); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ +// updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + sarBussionessStand.setId(standId); + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser); + } else {//标准号、ID都不存在的情况 + // 新增方法 + sarBussionessStand.setPrcCreateUser(prcCreateUser); + ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); + if(responseMessage.isOk()){ + SarBussionessStand bussionessStand = responseMessage.getData(); + bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); + } + + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",prcNum); + } + List allItems = new ArrayList<>(); + //开始处理条款数据，从去重后的结果中直接处理即可 +// if(itemData!=null && !itemData.isEmpty()){ +// // allItems = +// saveStandItemsData(itemData, sarStandardsInfoEO); +// } + //技术评估结果入库 重构技术评估结果入库内容 +// if ("0".equals(isJudge)) { +// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); +// } + +// List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 +// listMap = evaluationHisFilter.stream().collect( +// Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId()))); + + 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); + } + } + return bussId; + } + + /** + * 处理标准基础库字段 + * @param sarBussionessStand + * @param field + * @param value + * @throws Exception + */ + public void createStandBaseField (SarBussionessStand sarBussionessStand,String field,Object value) throws Exception{ + String valueStr = ""; + if (value != null) { + valueStr = String.valueOf(value); + } + switch (field) { + case "id": sarBussionessStand.setId(valueStr); break; + case "standSort": sarBussionessStand.setStandSort(valueStr); break; + case "standNumber": sarBussionessStand.setStandNumber(valueStr); break; + case "standYear": sarBussionessStand.setStandYear(valueStr); break; + case "standCode": sarBussionessStand.setStandCode(valueStr); break; + case "standName": sarBussionessStand.setStandName(valueStr); break; + case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; + case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "reviseStatus": sarBussionessStand.setReviseStatus(valueStr); break; + case "standSn": sarBussionessStand.setStandSn(valueStr); break; + case "issueTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setIssueTime(tTo(valueStr)); + } + break; + case "putTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setPutTime(tTo(valueStr)); + } + break; + case "prcNum": sarBussionessStand.setProcessNum(valueStr); break; + case "menuId": sarBussionessStand.setMenuId(valueStr); break; + case "fileWord": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); break; + case "filePdf": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); + break; + default: break; + } + } + + private String tTo(String dateStr){ + return dateStr.contains("T") ? dateStr.split("T")[0] : dateStr; + } + + public void attrInfoShowImport(List sarlist) throws Exception { + + //查询字典表,形成Hash映射提升速度 + List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + + for(SarBussStandAttrInfoExecl row : sarlist){ + attrInfoDetailsImport(row); + Map getAttrMap = row.getAttrInfoMap(); + Map getNewMap = new LinkedHashMap<>(); + if (getAttrMap != null && getAttrMap.size() > 0) { + String svppsTip = ""; + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if ("SVPPS".equals(name)) { + Object svpps = entry.getValue(); + if (svpps != null && StringUtils.isNotBlank(svpps.toString())) { + svppsTip = svpps.toString(); + } + if (StringUtils.isNotBlank(svppsTip)) { + svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip); + } + value = String.valueOf(getAttrMap.get("SVPPSName")); + entry.setValue(value); + } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { +// value = entry.getValue().toString(); +// if (StringUtils.isNotBlank(value)) { +// List fileObj = attFileEOService.getMultiFileInfos(value); +// entry.setValue(fileObj); +// } + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + if("ZYQCR".equals(name)||"QTQCR".equals(name)){ + + if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + }else{ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + } else { + List valArr = Arrays.asList(value.split(",")); + if(entry.getValue()!=null) { + StringBuilder builder = new StringBuilder(""); + for (String s : valArr) { + if (dicMap.containsKey(s) && !"ZRBM".equals(name)){ + builder.append(dicMap.get(s)+","); + } + + } + + if (builder.toString().isEmpty()){ + value = entry.getValue().toString(); + }else { + value = builder.toString(); + } + } + } + entry.setValue(value); + } + } + getAttrMap.put("SVPPSTips",svppsTip); + } + } + } + + public void attrInfoDetailsImport (SarBussStandAttrInfoExecl row) throws Exception { + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + // 查询属性表数据 + if (StringUtils.isNotBlank(fieldInfo)) { + List list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format(s.trim())).collect(Collectors.toList()); + + Map getAttrMap = BeanUtils.describe(row); + + if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldListBuss) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField,fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if(getAttrMap != null){ + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + List filterList = list.stream().filter(a -> name.equals(a)).collect(Collectors.toList()); + if(filterList.isEmpty()){ + newMap.remove(name); + continue; + } + Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ + entry.setValue(""); + } + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + String value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name",value); + } + } + } + getAttrMap.putAll(newMap); + } + row.setAttrInfoMap(getAttrMap); + } + } + } From faa7fdd02e93631d5b1a47c6ba0e5d81f371a472 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 2 Mar 2023 17:21:02 +0800 Subject: [PATCH 19/54] Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts. --- .../main/resources/application-dev.properties | 12 +- .../src/main/resources/application.properties | 298 ++++++++++++++---- .../SarBussionessStandController.java | 6 +- .../service/ISarBussionessStandService.java | 4 +- .../impl/SarBussionessStandServiceImpl.java | 53 ++++ .../SarStandTranslateController.java | 81 +++++ .../dao/SarStandTranslateDao.java | 15 + .../entity/SarStandTranslate.java | 102 +++++- .../service/SarStandTranslateService.java | 7 + .../impl/SarStandTranslateServiceImpl.java | 19 ++ 10 files changed, 519 insertions(+), 78 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/controller/SarStandTranslateController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/dao/SarStandTranslateDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/SarStandTranslateService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/impl/SarStandTranslateServiceImpl.java diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index a4aa4373..7e91731a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,9 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -spring.datasource.username = tempuser -spring.datasource.password = Fting&8g35g#geg2 +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.username = root +spring.datasource.password = hzwlsoft.com @@ -18,7 +18,7 @@ application.center=1 #Eureka eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ +eureka.client.service-url.defaultZone=http://127.0.0.1:8123/eureka/ #============================================== # 邮箱配置1 @@ -37,10 +37,10 @@ spring.mail.port=587 #============================================== # MQ配置 #============================================== -spring.rabbitmq.host=10.100.5.119 +spring.rabbitmq.host=121.36.69.172 spring.rabbitmq.port=5672 spring.rabbitmq.username=admin -spring.rabbitmq.password=foton@admin +spring.rabbitmq.password=hzwlsoft.com spring.rabbitmq.listener.simple.acknowledge-mode= manual # 生产者 默认关闭 发版 需改为 true spring.rabbitmq.listener.direct.auto-startup=true diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 76632190..7ea71fac 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -1,161 +1,323 @@ ############################################## -# 项目启动模式 + +# \u9879\u76EE\u542F\u52A8\u6A21\u5F0F + ############################################## + spring.profiles.active=dev + + ############################################## -#公共配置信息 + +#\u516C\u5171\u914D\u7F6E\u4FE1\u606F + ############################################## + server.compression.enabled=true + server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript -# 端口号设置 -server.port=4202 -#主服务session超时 + +# \u7AEF\u53E3\u53F7\u8BBE\u7F6E + +server.port=10086 + +#\u4E3B\u670D\u52A1session\u8D85\u65F6 + server.servlet.session.timeout =600 -#tomcat /resource/local/version-manager 创建tomcat指定临时目录 + + +#tomcat /resource/local/version-manager \u521B\u5EFAtomcat\u6307\u5B9A\u4E34\u65F6\u76EE\u5F55 + server.tomcat.basedir=/data/slrs/temp + + # http-only + server.session.cookie.http-only=true + spring.mvc.async.request-timeout=20000 -# file模块上传文件大小限制 + + +# file\u6A21\u5757\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 + spring.http.multipart.max-request-size=100MB + spring.http.multipart.max-file-size=100MB -#显示sql + + +#\u663E\u793Asql + logging.level.com.adc=DEBUG + logging.level.org.springframework=info -# 请求前缀 + + +# \u8BF7\u6C42\u524D\u7F00 + restPath=/api -#是否将自己注册到Eureka Server上，默认为true + + +#\u662F\u5426\u5C06\u81EA\u5DF1\u6CE8\u518C\u5230Eureka Server\u4E0A\uFF0C\u9ED8\u8BA4\u4E3Atrue + eureka.client.register-with-eureka=true -##是否从Eureka Server上获取注册信息，默认为true + +##\u662F\u5426\u4ECEEureka Server\u4E0A\u83B7\u53D6\u6CE8\u518C\u4FE1\u606F\uFF0C\u9ED8\u8BA4\u4E3Atrue + eureka.client.fetch-registry=true + eureka.instance.prefer-ip-address=true + + + eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ -# 请求连接的超时时间 默认的时间为 1 秒 + + +# \u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA4\u7684\u65F6\u95F4\u4E3A 1 \u79D2 + ribbon.ConnectTimeout=500000 -# 请求处理的超时时间 + +# \u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 + ribbon.ReadTimeout=500000 -# =============================== -# = DATA SOURCE -# =============================== -spring.datasource.type = com.alibaba.druid.pool.DruidDataSource -# 下面为连接池的补充设置，应用到上面所有数据源中 -# 初始化大小，最小，最大 -spring.datasource.druid.initial-size= 5 -spring.datasource.druid.min-idle= 5 -spring.datasource.druid.max-active= 50 -# 配置获取连接等待超时的时间 -spring.datasource.druid.max-wait= 60000 -# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -spring.datasource.druid.time-between-eviction-runs-millis= 60000 -# 配置一个连接在池中最小生存的时间，单位是毫秒 -spring.datasource.druid.min-evictable-idle-time-millis= 300000 -spring.datasource.druid.validation-query= SELECT 1 FROM DUAL -# 空闲时间监测连接是否优秀奥 -spring.datasource.druid.test-while-idle= true -# 数据库连接心跳监测 -spring.datasource.druid.keep-alive= true -# 获取链接前检查链接是否有效 -spring.datasource.druid.test-on-borrow= true -# 返回连接池时检查链接是否可用 -spring.datasource.druid.test-on-return= false -# 打开PSCache，并且指定每个连接上PSCache的大小 -spring.datasource.druid.pool-prepared-statements= true -spring.datasource.druid.max-pool-prepared-statement-per-connection-size= 20 -# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 -spring.datasource.druid.filters=stat,wall -#合并多个DruidDataSource的监控数据 -spring.datasource.druid.use-global-data-source-stat=true -# druid web管理页面开启 -spring.datasource.druid.stat-view-servlet.enabled=true -# druid web管理页面白名单 -#spring.datasource.druid.stat-view-servlet.allow=127.0.0.1 -# druid web管理页面账号 -spring.datasource.druid.stat-view-servlet.login-username=druid -# druid web管理页面密码 -spring.datasource.druid.stat-view-servlet.login-password=laws1q2w3e4r -# druid web管理页面URL访问前缀地址 -spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* + + # =============================== +# = DATA SOURCE + +# =============================== + +spring.datasource.type = com.alibaba.druid.pool.DruidDataSource + +# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D + +# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927 + +spring.datasource.druid.initial-size= 5 + +spring.datasource.druid.min-idle= 5 + +spring.datasource.druid.max-active= 50 + +# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4 + +spring.datasource.druid.max-wait= 60000 + +# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 + +spring.datasource.druid.time-between-eviction-runs-millis= 60000 + +# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 + +spring.datasource.druid.min-evictable-idle-time-millis= 300000 + +spring.datasource.druid.validation-query= SELECT 1 FROM DUAL + +# \u7A7A\u95F2\u65F6\u95F4\u76D1\u6D4B\u8FDE\u63A5\u662F\u5426\u4F18\u79C0\u5965 + +spring.datasource.druid.test-while-idle= true + +# \u6570\u636E\u5E93\u8FDE\u63A5\u5FC3\u8DF3\u76D1\u6D4B + +spring.datasource.druid.keep-alive= true + +# \u83B7\u53D6\u94FE\u63A5\u524D\u68C0\u67E5\u94FE\u63A5\u662F\u5426\u6709\u6548 + +spring.datasource.druid.test-on-borrow= true + +# \u8FD4\u56DE\u8FDE\u63A5\u6C60\u65F6\u68C0\u67E5\u94FE\u63A5\u662F\u5426\u53EF\u7528 + +spring.datasource.druid.test-on-return= false + +# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F + +spring.datasource.druid.pool-prepared-statements= true + +spring.datasource.druid.max-pool-prepared-statement-per-connection-size= 20 + +# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899 + +spring.datasource.druid.filters=stat,wall + +#\u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E + +spring.datasource.druid.use-global-data-source-stat=true + +# druid web\u7BA1\u7406\u9875\u9762\u5F00\u542F + +spring.datasource.druid.stat-view-servlet.enabled=true + +# druid web\u7BA1\u7406\u9875\u9762\u767D\u540D\u5355 + +#spring.datasource.druid.stat-view-servlet.allow=127.0.0.1 + +# druid web\u7BA1\u7406\u9875\u9762\u8D26\u53F7 + +spring.datasource.druid.stat-view-servlet.login-username=druid + +# druid web\u7BA1\u7406\u9875\u9762\u5BC6\u7801 + +spring.datasource.druid.stat-view-servlet.login-password=laws1q2w3e4r + +# druid web\u7BA1\u7406\u9875\u9762URL\u8BBF\u95EE\u524D\u7F00\u5730\u5740 + +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* + +# =============================== + + + # ======================================= + # Mybatis Plus config + # ======================================= + mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml + mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml + + # ======================================== -# activiti 配置信息 + +# activiti \u914D\u7F6E\u4FE1\u606F + # ======================================== + #spring.activiti.database-schema=ACT + spring.activiti.database-schema-update=false + spring.activiti.check-process-definitions=false + spring.activiti.job-executor-activate=false + spring.activiti.process-definition-location-prefix=classpath:/mybatis/mapper/activiti/ + + # ============================================================================= -# 邮箱配置 + +# \u90AE\u7BB1\u914D\u7F6E + # ============================================================================= + mail.valid=false + spring.mail.host=smtp.163.com + spring.mail.protocol=smtp + spring.mail.username=xxx@163.com + spring.mail.password=xxx + spring.mail.properties.smtp.auth=true + spring.mail.properties.smtp.starttls.enable=true + spring.mail.properties.smtp.starttls.required=true + spring.mail.properties.mail.smtp.ssl.enable=true + spring.mail.port=465 -#全球标准法规管理系统 十六进制码 + +#\u5168\u7403\u6807\u51C6\u6CD5\u89C4\u7BA1\u7406\u7CFB\u7EDF \u5341\u516D\u8FDB\u5236\u7801 + mail.personName=E585A8E79083E6A087E58786E6B395E8A784E7AEA1E79086E7B3BBE7BB9F -#邮箱内容中嵌入的系统地址 + +#\u90AE\u7BB1\u5185\u5BB9\u4E2D\u5D4C\u5165\u7684\u7CFB\u7EDF\u5730\u5740 + Lawss.address =http://standard.gacrnd.com:60090 + + + # ========================================= + # login value + # ========================================= + maxLoginErrorCount=3 + verifyCodeMode=1 + + # ============================================================================= -# 文件上传管控及配置 + +# \u6587\u4EF6\u4E0A\u4F20\u7BA1\u63A7\u53CA\u914D\u7F6E + # ============================================================================= -# file模块上传文件的服务器地址 + +# file\u6A21\u5757\u4E0A\u4F20\u6587\u4EF6\u7684\u670D\u52A1\u5668\u5730\u5740 + file.path=/data/slrs/file + + stand.edit.file.path = /data/slrs/file/ -# onlyoffice 预览地址 + +# onlyoffice \u9884\u89C8\u5730\u5740 + file.downloadUrl=https://srms.foton.com.cn/file/ -#上传文件白名单-以,分隔 + + +#\u4E0A\u4F20\u6587\u4EF6\u767D\u540D\u5355-\u4EE5,\u5206\u9694 + upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip,dot + + # ============================================================================= -# elasticsearch 配置 + +# elasticsearch \u914D\u7F6E + # ============================================================================= + elasticsearch.clustername=elasticsearch -elasticsearch.ip=10.100.5.122 -elasticsearch.port=9300 + +elasticsearch.ip=127.0.0.1 + +elasticsearch.port=9306 + elasticsearch.poolSize=5 + elas.flag=true -elasticsearch.img=https://srms.foton.com.cn -# 文档转换TCP通讯地址 + +# 拆分的图片调用 （修改ip时此处也应该被修改） + +elasticsearch.img=http://localhost:9090 + + + +# \u6587\u6863\u8F6C\u6362TCP\u901A\u8BAF\u5730\u5740 + convert.host=127.0.0.1 + + # ============================================================================= -# scheduled 配置 + +# scheduled \u914D\u7F6E + # ============================================================================= + isNotScheduled=true 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 06d18273..b10abc55 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,6 +416,10 @@ public class SarBussionessStandController extends BaseController void checkFileByEncrypt(); - //导入 - ResponseMessage importSarBussionessStandFile(MultipartFile file) throws Exception; + ResponseMessage importSarBussionessStand(List> dataList, String filepath)throws Exception; + } 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 afb729bc..bfb656a9 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 @@ -2695,6 +2695,59 @@ public class SarBussionessStandServiceImpl extends ServiceImpl + * 前端控制器 + *

+ * + * @author gjb + * @since 2023/2/23 + */ +@RestController +@Api(tags = "流程中心-标准需求（翻译）申请流程") +@RequestMapping("/${restPath}/sarStandTranslate") +@Slf4j +public class SarStandTranslateController extends BaseController { + + @Autowired + private SarStandTranslateService sarStandTranslateService; + + /** + * 流程中心，标准需求翻译申请 发起 + * @param + * @return + */ + @PostMapping("/addSarStandTranslate") + public ResponseMessage addSarStandTranslate(@RequestBody SarStandTranslate sarStandTranslate){ + sarStandTranslate.setId(UUIDUtils.randomUUID20()); + if(sarStandTranslateService.save(sarStandTranslate)){ + return Result.success("200","添加成功",sarStandTranslate); + }else { + return Result.error("-1","添加失败",null); + } + } + + /** + * 流程中心，标准需求翻译审核 回填 + * @param + * @return + */ + @PostMapping("/selectSarStandTranslate") + public ResponseMessage selectSarStandTranslate(String id){ + SarStandTranslate byId = sarStandTranslateService.getById(id); + if(byId!=null){ + return Result.success("200",null,byId); + }else { + return Result.error("-1","失败",null); + } + } + + /** + * 流程中心，标准需求翻译申请 审核 + * @param + * @return + */ + @PostMapping("/updateSarStandTranslate") + public ResponseMessage updateSarStandTranslate(@RequestBody SarStandTranslate sarStandTranslate){ + if(sarStandTranslateService.updateById(sarStandTranslate)){ + return Result.success("200","成功",sarStandTranslate); + }else { + return Result.error("-1","失败",null); + } + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/dao/SarStandTranslateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/dao/SarStandTranslateDao.java new file mode 100644 index 00000000..7cb78902 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/dao/SarStandTranslateDao.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarStandTranslate.dao; + +import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author gjb + * @since 2023-02-23 + */ +public interface SarStandTranslateDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java index 8f82841d..9df54259 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java @@ -1,4 +1,104 @@ package com.adc.da.slrs.sarStandTranslate.entity; -public class SarStandTranslate { +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * 标准需求翻译申请表 + * @author gjb + * @since 2023-02-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarStandTranslate对象", description="") +public class SarStandTranslate extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "申请人") + @TableField("PRORPSER_NAME") + private String proposerName; + + @ApiModelProperty(value = "申请单位") + @TableField("PRORPSER_UNIT") + private String proposerUnit; + +// @ApiModelProperty(value = "联系电话") +// @TableField("PHONE") +// private String phone; +// +// @ApiModelProperty(value = "邮箱") +// @TableField("MAIL") +// private String mail; + + @ApiModelProperty(value = "类型") + @TableField("TYPE") + private String type; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "需求时间") + @TableField("NEED_TIME") + private String needTime; + + @ApiModelProperty(value = "页数/字数") + @TableField("NUMBER_WORDS") + private String numberWords; + + @ApiModelProperty(value = "原语言") + @TableField("INITIAL_LANGUAGE") + private String initialLanguage; + + @ApiModelProperty(value = "目标语言") + @TableField("GOAL_LANGUAGE") + private String goalLanguage; + + @ApiModelProperty(value = "费用出资项目目的项目名称") + @TableField("COST_GOAL_PROECT_NAME") + private String costGoalProectName; + + @ApiModelProperty(value = "费用出资项目目的项目编号科目") + @TableField("COST_GOAL_PROECT_NUMBER") + private String costGoalProectNumber; + + @ApiModelProperty(value = "是否批准") + @TableField("RATIFY") + private String ratify; + + @ApiModelProperty(value = "申请理由") + @TableField("REASON") + private String reason; + + @ApiModelProperty(value = "驳回理由") + @TableField("NOT_REASON") + private String notReason; + + @ApiModelProperty(value = "费用") + @TableField("COST") + private String cost; + + @ApiModelProperty(value = "审核人") + @TableField("AUDIT") + private String audit; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/SarStandTranslateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/SarStandTranslateService.java new file mode 100644 index 00000000..44c7ede1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/SarStandTranslateService.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarStandTranslate.service; + +import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface SarStandTranslateService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/impl/SarStandTranslateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/impl/SarStandTranslateServiceImpl.java new file mode 100644 index 00000000..af7230c7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/impl/SarStandTranslateServiceImpl.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.sarStandTranslate.service.impl; + +import com.adc.da.slrs.sarStandTranslate.dao.SarStandTranslateDao; +import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate; +import com.adc.da.slrs.sarStandTranslate.service.SarStandTranslateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarStandTranslateServiceImpl extends ServiceImpl implements SarStandTranslateService { + + @Autowired + private SarStandTranslateDao sarStandTranslateDao; + +} From 17ec638303db5ed21697557388b7a36f469e3072 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 3 Mar 2023 13:57:29 +0800 Subject: [PATCH 20/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 95 +++++++++++-------- 1 file changed, 57 insertions(+), 38 deletions(-) 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 afb729bc..19ac146d 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 @@ -2318,12 +2318,30 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); } + String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); @@ -2403,24 +2422,24 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } +// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// //processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// }// else { +// relatePro = prcNum; +// } // 编辑标准 iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); // 编辑相关流程 - sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,prcCreateUser); + // sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); + // String content = "新增一条相关流程:" +standName; + // sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,standName); }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 String standId = lawsList.get(0).getId(); bussId = lawsList.get(0).getId(); @@ -2434,28 +2453,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } +// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// //processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// }// else { +// relatePro = prcNum; +// } // 编辑标准 sarBussionessStand.setId(standId); iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); // 编辑相关流程 - sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser); +// sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); +// String content = "新增一条相关流程:" +standName; +// sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,standName); } else {//标准号、ID都不存在的情况 // 新增方法 - sarBussionessStand.setPrcCreateUser(prcCreateUser); + sarBussionessStand.setStandCode(standCode); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); @@ -2463,7 +2482,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl allItems = new ArrayList<>(); //开始处理条款数据，从去重后的结果中直接处理即可 From 59e89c9c987716bf170c0b66fc6efd8781682fce Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 7 Mar 2023 10:09:53 +0800 Subject: [PATCH 21/54] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=82=E9=9D=A0=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfo.java | 8 + .../dao/SarBussionessStandDao.java | 3 + .../sarBussionessStand/entity/OldSystem.java | 33 +++ .../service/ISarBussionessStandService.java | 5 +- .../impl/SarBussionessStandServiceImpl.java | 208 +++++++++++++++--- .../entity/SarStandAttrInfo.java | 4 + .../dao/SarStandardsInfoDao.java | 6 + .../SarBussionessStandMapper.xml | 8 + .../SarStandardsInfoMapper.xml | 33 +++ 9 files changed, 280 insertions(+), 28 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java index abe68add..a8be5802 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -67,6 +67,14 @@ public class SarBussStandAttrInfo extends BaseEntity { @TableField(exist = false) private String glwj; + + @ApiModelProperty(value = "译文件") + @TableField("TRANSLATION") + private String translation; + + @ApiModelProperty(value = "原文件") + @TableField("FBGBUSS") + private String fbgbuss; // // @TableField("SVPPS") // private String svpps; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0fe7c5cb..9da70f84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussionessStand.dao; +import com.adc.da.slrs.sarBussionessStand.entity.OldSystem; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; @@ -119,5 +120,7 @@ public interface SarBussionessStandDao extends BaseMapper { void importSarBussionessStand(SarBussionessStand sarBussionessStands); + + List selectListInfo(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java new file mode 100644 index 00000000..b4505ed9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java @@ -0,0 +1,33 @@ +package com.adc.da.slrs.sarBussionessStand.entity; + +import lombok.Data; + +@Data +public class OldSystem { + + //kmpro_addon34 与 buss_id 对应 + private String loreDocId; + //lore_depot_sort + private String sortId; + //lore_attache + private String fileSign; + //lore_attache + private String fileSrc; + //lore_depot_sort + private String sortSign; + + //新系统返回数据所需要的 + private String attfid; + + private String standId; + + private String buildId; + + + // 需要组合的数据 + private String attFileId; + + private String original; + + private String Translation; +} 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 3d145986..09f243aa 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 @@ -55,8 +55,9 @@ public interface ISarBussionessStandService extends IService void convertDocAllQB(List list); void checkFileByEncrypt(); + + ResponseMessage emptyFileAnewStorage(); - ResponseMessage importSarBussionessStand(List> dataList, String filepath)throws Exception; - + ResponseMessage importSarBussionessStandFile(MultipartFile file); } 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 bfb656a9..2ba13653 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 @@ -41,6 +41,7 @@ import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn; import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService; import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao; import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal; +import com.adc.da.slrs.sarBussionessStand.entity.OldSystem; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; @@ -55,6 +56,7 @@ import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.slrs.sarStandFile.entity.SarStandFile; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; @@ -229,6 +231,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file) throws Exception { + public ResponseMessage importSarBussionessStandFile(MultipartFile file) { //给出头部信息 String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; @@ -2028,7 +2033,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + // 获取 kmpro_addon34 表的 lore_doc_id + List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); + //组合数据 + List oldArr = new ArrayList(); + List oldInfoArr = new ArrayList(); + //文件id + List fileIdList = new ArrayList<>(); + //文件路径 + List fileSrcList = new ArrayList<>(); + //国内海外 + for (OldSystem oldSystem: oldSystemInfoList){ + for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + //lore_doc_id 与 DUILD_Id + if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ + if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())){ + //查询文件是否是多个 是否存在 + List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); + if(!fileList.isEmpty()){ + if(fileList.size()==1){ + //判断文件是否存在 重新存入文件 获取id 存入att 表 + OldSystem old = new OldSystem(); + File file = new File(fileList.get(0).getFileSrc()); + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + //文件id 和数据id + if(attFileVo != null) { + fileIdList.add(attFileVo.getId()); + fileSrcList.add(fileList.get(0).getFileSrc()); + old.setStandId(SarStandardsInfo.getStandId()); + old.setSortSign(SarStandardsInfo.getSortSign()); + //判断存入原本版本 还是译文版本 + if (SarStandardsInfo.getSortSign().contains("译")) { + old.setTranslation(attFileVo.getId()); + } else { + old.setOriginal(attFileVo.getId()); + } + oldArr.add(old); + } + }else { + String yuan = ""; + String yi = ""; + OldSystem old = new OldSystem(); + //每一个文件 都是一个英文版 或者译文版 + // 如果每一个文件是 那我必然不能 这样子拼接 + // 应该是先判断他是 英文版 还是译文版 然后再 去拼接 + for (OldSystem src:fileList){ + File file = new File(src.getFileSrc()); + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + if(attFileVo != null) { + if (SarStandardsInfo.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + attFileVo.getId(); + } else { + yi = attFileVo.getId(); + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + attFileVo.getId(); + } else { + yuan = attFileVo.getId(); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + } + fileSrcList.add(src.getFileSrc()); + fileIdList.add(attFileVo.getId()); + } + } + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } + } + } + } + } + // 企业 + for (OldSystem oldSystem: oldSystemInfoList){ + for (OldSystem sarBussionessStand: SarBussionessStandList){ + //lore_doc_id 与 DUILD_Id + if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ + if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())){ + //查询文件是否是多个 是否存在 + List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); + if(!fileList.isEmpty()){ + if(fileList.size()==1){ + //判断文件是否存在 重新存入文件 获取id 存入att 表 + OldSystem old = new OldSystem(); + File file = new File(fileList.get(0).getFileSrc()); + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + //文件id 和数据id + if(attFileVo != null) { + fileIdList.add(attFileVo.getId()); + fileSrcList.add(fileList.get(0).getFileSrc()); + old.setStandId(sarBussionessStand.getStandId()); + old.setSortSign(sarBussionessStand.getSortSign()); + //判断存入原本版本 还是译文版本 + if (sarBussionessStand.getSortSign().contains("译")) { + old.setTranslation(attFileVo.getId()); + } else { + old.setOriginal(attFileVo.getId()); + } + oldInfoArr.add(old); + } + }else { + String yuan = ""; + String yi = ""; + OldSystem old = new OldSystem(); + for (OldSystem src:fileList) { + File file = new File(src.getFileSrc()); + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + if (attFileVo != null) { + if (sarBussionessStand.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + attFileVo.getId(); + } else { + yi = attFileVo.getId(); + } + old.setTranslation(yi); + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + attFileVo.getId(); + } else { + yuan = attFileVo.getId(); + } + old.setOriginal(yuan); + } + fileSrcList.add(src.getFileSrc()); + fileIdList.add(attFileVo.getId()); + } + } + old.setStandId(sarBussionessStand.getStandId()); + oldInfoArr.add(old); + } + } + } + } + } + } - 三： 进行数据关联 - 1：先跟 海外和国内的数据 进行对比 找到 kmpro_addon34表的lore_doc_id字段 与 新系统中数据表sar_standards_info表的BUILD_ID字段， - 2：对应老系统中数据表kmpro_addon34表的lore_doc_id字段 相同则进入 - 四：关联数据的文件存储 - 1： 判断能不能找到 - 2： 如果能找到 则重新存入， - 3： 鉴定是否是原文 还是 译文 进行分类存储 或者进行标识存储 - 4： 数据库增加字段，与老系统进行对应 - - 数据存储的时候，建立一种表 这张表存储的数据是 需要转码的文件 - 五： 数据对应上 以后 要进行换换 线上进行预览 （待） - 六： es数据进行同步 - */ - return null; + // 获取完整数据以后 数据库 增加字段， 然后区分是否是译文 原文 然后 进行保存 通过 id 可以找到对应的数据 + // 企业 + for(OldSystem data : oldInfoArr) { + SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); + String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarBussStandAttrInfo.setId(id); + sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); + sarBussStandAttrInfo.setTranslation(data.getTranslation()); + } + sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); + } + //海外 国内 + for(OldSystem data : oldInfoArr) { + SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); + String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarStandAttrInfo.setId(id); + sarStandAttrInfo.setFbgbjbd(data.getOriginal()); + sarStandAttrInfo.setTranslation(data.getTranslation()); + } + sarStandAttrInfoEODao.updateById(sarStandAttrInfo); + } + //文件删除 +// for (String s : fileSrcList){ +// File file = new File(s); +// file.delete(); +// } + return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 146b2b83..6ba76937 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -238,5 +238,9 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("BDTBZH") private String bdtbzh; + @ApiModelProperty(value = "译文件") + @TableField("TRANSLATION") + private String translation; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index dfc26280..9cd6472b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandardsInfo.dao; +import com.adc.da.slrs.sarBussionessStand.entity.OldSystem; import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO; import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; @@ -99,4 +100,9 @@ public interface SarStandardsInfoDao extends BaseMapper { List dealWithDS(@Param("type") String standType, @Param("status")List strings); + List selectOldSystemInfo(); + + List selectListInfo(); + + List OldSystemFile(@Param("loreDocId") String loreDocId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 870c8a9f..b4bb66ee 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1225,4 +1225,12 @@ #{standSn, jdbcType=VARCHAR}, + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 620dbeb5..a5344aa3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1888,4 +1888,37 @@ + + + + + + From 9f8adf60cdfb7752f92fe4e57f3502a659b21a45 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 8 Mar 2023 16:00:09 +0800 Subject: [PATCH 22/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=AF=B9=E6=A0=87=E5=87=86=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsBussEOService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 63dc0acd..cb18e184 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -386,15 +386,7 @@ public class ActSarItemsBussEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); - // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId - QueryWrapperqueryWrapper = new QueryWrapper<>(); - queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) - .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); - Integer count = iSarBussionessStandService.count(queryWrapper); - if (count > 0){ - throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); - } String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); @@ -472,6 +464,14 @@ public class ActSarItemsBussEOService { } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setPrcCreateUser(prcCreateUser); + // 根据标准号判断数据是否已存在 + QueryWrapperqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) + .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); + Integer count = iSarBussionessStandService.count(queryWrapper); + if (count > 0){ + throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); + } ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); From 70171a5e790767d5f1d0d5457e033bd0e08af0df Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 9 Mar 2023 14:19:25 +0800 Subject: [PATCH 23/54] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=20+?= =?UTF-8?q?=20=E6=B5=81=E7=A8=8B=E7=9A=84=E5=8E=86=E5=8F=B2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 16 ++++++++ .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 40 +++++++++++++++++++ .../dao/SarStandardsInfoDao.java | 2 + .../SarStandardsInfoMapper.xml | 7 ++++ 5 files changed, 67 insertions(+) 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 b10abc55..529cd72e 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 @@ -245,6 +245,16 @@ public class SarBussionessStandController extends BaseController ResponseMessage emptyFileAnewStorage(); ResponseMessage importSarBussionessStandFile(MultipartFile file); + + ResponseMessage downloadFile(); } 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 86571d60..2070c751 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 @@ -105,6 +105,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; import java.sql.Clob; import java.text.DateFormat; import java.text.DecimalFormat; @@ -2923,6 +2926,43 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystems = sarStandardsInfoDao.selectOldSystemFile(); + //for (OldSystem src : oldSystems){ + String i = saveFile(""); + if(i.equals("-1")){ + return Result.error(); + } + //} + return Result.success(); + } + public String saveFile(String src) { + //主服务 G:\kmpro_futian\htdocs\UploadFile + // 测试服务 E:\kmpro_futian\htdocs\UploadFile + // 本地服务 + String filePath = "https:10.0.3.21/E://srcul"; + //String filePath = "https:10.0.11.1//E://kmpro_futian/htdocs/"; + src = "全球标准法规系统需求(1)(1).docx"; + try { + URL url = new URL(filePath); + File file = new File(filePath,src); + try { + FileUtils.copyURLToFile(url,file); + } catch (IOException e) { + e.printStackTrace(); + logger.info("文件下载错误"); + return "-1"; + } + } catch (MalformedURLException e) { + e.printStackTrace(); + logger.info("文件下载错误"); + return "-1"; + } + + return "1"; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 9cd6472b..d997aeb7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -105,4 +105,6 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectListInfo(); List OldSystemFile(@Param("loreDocId") String loreDocId); + + List selectOldSystemFile(); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index a5344aa3..3e0092c5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1921,4 +1921,11 @@ + + From acc164f16da5de5c98be1f31f65337f74507ed05 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 10 Mar 2023 10:31:28 +0800 Subject: [PATCH 24/54] =?UTF-8?q?=E8=8B=B1=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 7 +- .../sarBussionessStand/entity/OldSystem.java | 2 + .../service/ISarBussionessStandService.java | 1 - .../impl/SarBussionessStandServiceImpl.java | 459 +++++++++++------- .../sarBussionessStand/utils/SslUtils.java | 69 +++ .../SarBussionessStandMapper.xml | 3 +- .../SarStandardsInfoMapper.xml | 12 +- 7 files changed, 376 insertions(+), 177 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/utils/SslUtils.java 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 529cd72e..a00ab75c 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 @@ -426,16 +426,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage importSarBussionessStandFile(MultipartFile file); - ResponseMessage downloadFile(); } 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 2070c751..99ddb075 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 @@ -80,6 +80,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mysql.cj.x.protobuf.MysqlxDatatypes; +import lombok.SneakyThrows; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; @@ -104,10 +105,16 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.net.ssl.*; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; import java.sql.Clob; import java.text.DateFormat; import java.text.DecimalFormat; @@ -2746,149 +2753,299 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); +// List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); +// // 获取 kmpro_addon34 表的 lore_doc_id +// List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); +// //组合数据 +// List oldArr = new ArrayList(); +// List oldInfoArr = new ArrayList(); +// //文件id +// List fileIdList = new ArrayList<>(); +// //文件路径 +// List fileSrcList = new ArrayList<>(); +// //国内海外 +// for (OldSystem oldSystem: oldSystemInfoList){ +// for (OldSystem SarStandardsInfo: SarStandardsInfoList){ +// //lore_doc_id 与 DUILD_Id +// if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ +// if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())){ +// //查询文件是否是多个 是否存在 +// List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); +// if(!fileList.isEmpty()){ +// if(fileList.size()==1){ +// //判断文件是否存在 重新存入文件 获取id 存入att 表 +// OldSystem old = new OldSystem(); +// File file = new File(fileList.get(0).getFileSrc()); +// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); +// //文件id 和数据id +// if(attFileVo != null) { +// fileIdList.add(attFileVo.getId()); +// fileSrcList.add(fileList.get(0).getFileSrc()); +// old.setStandId(SarStandardsInfo.getStandId()); +// old.setSortSign(SarStandardsInfo.getSortSign()); +// //判断存入原本版本 还是译文版本 +// if (SarStandardsInfo.getSortSign().contains("译")) { +// old.setTranslation(attFileVo.getId()); +// } else { +// old.setOriginal(attFileVo.getId()); +// } +// oldArr.add(old); +// } +// }else { +// String yuan = ""; +// String yi = ""; +// OldSystem old = new OldSystem(); +// //每一个文件 都是一个英文版 或者译文版 +// // 如果每一个文件是 那我必然不能 这样子拼接 +// // 应该是先判断他是 英文版 还是译文版 然后再 去拼接 +// for (OldSystem src:fileList){ +// File file = new File(src.getFileSrc()); +// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); +// if(attFileVo != null) { +// if (SarStandardsInfo.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = "," + attFileVo.getId(); +// } else { +// yi = attFileVo.getId(); +// } +// if (StringUtils.isNotBlank(yi)) { +// old.setTranslation(yi); +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = "," + attFileVo.getId(); +// } else { +// yuan = attFileVo.getId(); +// } +// if (StringUtils.isNotBlank(yuan)) { +// old.setOriginal(yuan); +// } +// } +// fileSrcList.add(src.getFileSrc()); +// fileIdList.add(attFileVo.getId()); +// } +// } +// old.setStandId(SarStandardsInfo.getStandId()); +// oldArr.add(old); +// } +// } +// } +// } +// } +// } +// // 企业 +// for (OldSystem oldSystem: oldSystemInfoList){ +// for (OldSystem sarBussionessStand: SarBussionessStandList){ +// //lore_doc_id 与 DUILD_Id +// if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ +// if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())){ +// //查询文件是否是多个 是否存在 +// List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); +// if(!fileList.isEmpty()){ +// if(fileList.size()==1){ +// //判断文件是否存在 重新存入文件 获取id 存入att 表 +// OldSystem old = new OldSystem(); +// File file = new File(fileList.get(0).getFileSrc()); +// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); +// //文件id 和数据id +// if(attFileVo != null) { +// fileIdList.add(attFileVo.getId()); +// fileSrcList.add(fileList.get(0).getFileSrc()); +// old.setStandId(sarBussionessStand.getStandId()); +// old.setSortSign(sarBussionessStand.getSortSign()); +// //判断存入原本版本 还是译文版本 +// if (sarBussionessStand.getSortSign().contains("译")) { +// old.setTranslation(attFileVo.getId()); +// } else { +// old.setOriginal(attFileVo.getId()); +// } +// oldInfoArr.add(old); +// } +// }else { +// String yuan = ""; +// String yi = ""; +// OldSystem old = new OldSystem(); +// for (OldSystem src:fileList) { +// File file = new File(src.getFileSrc()); +// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); +// if (attFileVo != null) { +// if (sarBussionessStand.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = "," + attFileVo.getId(); +// } else { +// yi = attFileVo.getId(); +// } +// old.setTranslation(yi); +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = "," + attFileVo.getId(); +// } else { +// yuan = attFileVo.getId(); +// } +// old.setOriginal(yuan); +// } +// fileSrcList.add(src.getFileSrc()); +// fileIdList.add(attFileVo.getId()); +// } +// } +// old.setStandId(sarBussionessStand.getStandId()); +// oldInfoArr.add(old); +// } +// } +// } +// } +// } +// } +// +// // 获取完整数据以后 数据库 增加字段， 然后区分是否是译文 原文 然后 进行保存 通过 id 可以找到对应的数据 +// // 企业 +// for(OldSystem data : oldInfoArr) { +// SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); +// String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); +// if(StringUtils.isNotBlank(id)) { +// sarBussStandAttrInfo.setId(id); +// sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); +// sarBussStandAttrInfo.setTranslation(data.getTranslation()); +// } +// sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); +// } +// //海外 国内 +// for(OldSystem data : oldInfoArr) { +// SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); +// String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); +// if(StringUtils.isNotBlank(id)) { +// sarStandAttrInfo.setId(id); +// sarStandAttrInfo.setFbgbjbd(data.getOriginal()); +// sarStandAttrInfo.setTranslation(data.getTranslation()); +// } +// sarStandAttrInfoEODao.updateById(sarStandAttrInfo); +// } +// return Result.success(); +// } + @Override public ResponseMessage emptyFileAnewStorage() { - //1 查询 新系统的所有数据 其中包含为 国内 海外 获取到 DUILD_Id 字段用来对比 - List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); - // 获取 kmpro_addon34 表的 lore_doc_id - List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - //组合数据 - List oldArr = new ArrayList(); - List oldInfoArr = new ArrayList(); - //文件id - List fileIdList = new ArrayList<>(); - //文件路径 - List fileSrcList = new ArrayList<>(); - //国内海外 - for (OldSystem oldSystem: oldSystemInfoList){ - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ - //lore_doc_id 与 DUILD_Id - if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ - if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())){ - //查询文件是否是多个 是否存在 - List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); - if(!fileList.isEmpty()){ - if(fileList.size()==1){ - //判断文件是否存在 重新存入文件 获取id 存入att 表 - OldSystem old = new OldSystem(); - File file = new File(fileList.get(0).getFileSrc()); - AttFileVo attFileVo = attFileEOService.saveFileInfo(file); - //文件id 和数据id - if(attFileVo != null) { - fileIdList.add(attFileVo.getId()); - fileSrcList.add(fileList.get(0).getFileSrc()); - old.setStandId(SarStandardsInfo.getStandId()); - old.setSortSign(SarStandardsInfo.getSortSign()); - //判断存入原本版本 还是译文版本 - if (SarStandardsInfo.getSortSign().contains("译")) { - old.setTranslation(attFileVo.getId()); - } else { - old.setOriginal(attFileVo.getId()); - } - oldArr.add(old); - } - }else { - String yuan = ""; - String yi = ""; - OldSystem old = new OldSystem(); - //每一个文件 都是一个英文版 或者译文版 - // 如果每一个文件是 那我必然不能 这样子拼接 - // 应该是先判断他是 英文版 还是译文版 然后再 去拼接 - for (OldSystem src:fileList){ - File file = new File(src.getFileSrc()); - AttFileVo attFileVo = attFileEOService.saveFileInfo(file); - if(attFileVo != null) { - if (SarStandardsInfo.getSortSign().contains("译")) { + List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + // 获取 kmpro_addon34 表的 lore_doc_id + List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); + + //获取所有的文件表信息 + List loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); + + //数据组合 + List oldArr = new ArrayList(); + List oldArr1 = new ArrayList(); + + //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 + for (OldSystem oldSystem : oldSystemInfoList) { + for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ + if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if(StringUtils.isNotBlank(SarStandardsInfo.getFileId())){ + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), loreAttacheList); + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + //获取到 lode 表 id + //原文译文 进行判断 + if (oldSystem.getSortSign().contains("译")) { if (StringUtils.isNotBlank(yi)) { - yi = "," + attFileVo.getId(); + yi = "," + fileId; } else { - yi = attFileVo.getId(); - } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); + yi = fileId; } } else { if (StringUtils.isNotBlank(yuan)) { - yuan = "," + attFileVo.getId(); + yuan = "," + fileId; } else { - yuan = attFileVo.getId(); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); + yuan = fileId; } + } - fileSrcList.add(src.getFileSrc()); - fileIdList.add(attFileVo.getId()); } - } - old.setStandId(SarStandardsInfo.getStandId()); - oldArr.add(old); - } - } - } - } - } - } - // 企业 - for (OldSystem oldSystem: oldSystemInfoList){ - for (OldSystem sarBussionessStand: SarBussionessStandList){ - //lore_doc_id 与 DUILD_Id - if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ - if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())){ - //查询文件是否是多个 是否存在 - List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); - if(!fileList.isEmpty()){ - if(fileList.size()==1){ - //判断文件是否存在 重新存入文件 获取id 存入att 表 - OldSystem old = new OldSystem(); - File file = new File(fileList.get(0).getFileSrc()); - AttFileVo attFileVo = attFileEOService.saveFileInfo(file); - //文件id 和数据id - if(attFileVo != null) { - fileIdList.add(attFileVo.getId()); - fileSrcList.add(fileList.get(0).getFileSrc()); - old.setStandId(sarBussionessStand.getStandId()); - old.setSortSign(sarBussionessStand.getSortSign()); - //判断存入原本版本 还是译文版本 - if (sarBussionessStand.getSortSign().contains("译")) { - old.setTranslation(attFileVo.getId()); - } else { - old.setOriginal(attFileVo.getId()); - } - oldInfoArr.add(old); } - }else { - String yuan = ""; + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } + } + } + } + } + } + + //企业的文件数据处理 + for (OldSystem oldSystem : oldSystemInfoList) { + for (OldSystem sarBussionessStand : SarBussionessStandList){ + if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ + if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { String yi = ""; + String yuan = ""; OldSystem old = new OldSystem(); - for (OldSystem src:fileList) { - File file = new File(src.getFileSrc()); - AttFileVo attFileVo = attFileEOService.saveFileInfo(file); - if (attFileVo != null) { - if (sarBussionessStand.getSortSign().contains("译")) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), loreAttacheList); + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + //原文译文 进行判断 + if (oldSystem.getSortSign().contains("译")) { if (StringUtils.isNotBlank(yi)) { - yi = "," + attFileVo.getId(); + yi = "," + fileId; } else { - yi = attFileVo.getId(); + yi = fileId; } - old.setTranslation(yi); } else { if (StringUtils.isNotBlank(yuan)) { - yuan = "," + attFileVo.getId(); + yuan = "," + fileId; } else { - yuan = attFileVo.getId(); + yuan = fileId; } - old.setOriginal(yuan); + } - fileSrcList.add(src.getFileSrc()); - fileIdList.add(attFileVo.getId()); } } - old.setStandId(sarBussionessStand.getStandId()); - oldInfoArr.add(old); + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(sarBussionessStand.getStandId()); + oldArr.add(old); + } } } } @@ -2896,9 +3053,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystems = sarStandardsInfoDao.selectOldSystemFile(); - //for (OldSystem src : oldSystems){ - String i = saveFile(""); - if(i.equals("-1")){ - return Result.error(); - } - //} return Result.success(); } - public String saveFile(String src) { - //主服务 G:\kmpro_futian\htdocs\UploadFile - // 测试服务 E:\kmpro_futian\htdocs\UploadFile - // 本地服务 - String filePath = "https:10.0.3.21/E://srcul"; - //String filePath = "https:10.0.11.1//E://kmpro_futian/htdocs/"; - src = "全球标准法规系统需求(1)(1).docx"; - try { - URL url = new URL(filePath); - File file = new File(filePath,src); - try { - FileUtils.copyURLToFile(url,file); - } catch (IOException e) { - e.printStackTrace(); - logger.info("文件下载错误"); - return "-1"; - } - } catch (MalformedURLException e) { - e.printStackTrace(); - logger.info("文件下载错误"); - return "-1"; + public String isTheSame (String oldFileName,List loreAttacheList){ + if(loreAttacheList.size()>0){ + for (OldSystem src : loreAttacheList) { + if(StringUtils.isNotBlank(src.getFileSrc())){ + // 通过 / 去分割 / 的最后一位 + String[] split = src.getFileSrc().split("/"); + List asList = Arrays.asList(split); + //集合的最后一个就是名称 + int size = asList.size(); + String s = asList.get(size-1); + if (s.equals(oldFileName)){ + return "1"; + } + } + } } - - return "1"; + return "-1"; } - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/utils/SslUtils.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/utils/SslUtils.java new file mode 100644 index 00000000..1b41bb8b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/utils/SslUtils.java @@ -0,0 +1,69 @@ +package com.keepsoft.devbase.core.util; + +import lombok.SneakyThrows; +import org.apache.commons.io.IOUtils; + +import javax.net.ssl.*; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +/** + * 此工具类用来解决，请求https时，ssl证书的问题 + */ +public class SslUtils { + + private static void trustAllHttpsCertificates() throws Exception { + TrustManager[] trustAllCerts = new TrustManager[1]; + TrustManager tm = new miTM(); + trustAllCerts[0] = tm; + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, trustAllCerts, null); + HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); + } + + /** + * 忽略HTTPS请求的SSL证书，必须在openConnection之前调用 + * @throws Exception + */ + @SneakyThrows + public static void ignoreSsl() { + HostnameVerifier hv = new HostnameVerifier() { + public boolean verify(String urlHostName, SSLSession session) { + System.out.println("Warning: URL Host: " + urlHostName + " vs. " + session.getPeerHost()); + return true; + } + }; + trustAllHttpsCertificates(); + HttpsURLConnection.setDefaultHostnameVerifier(hv); + } + + static class miTM implements TrustManager, X509TrustManager { + public X509Certificate[] getAcceptedIssuers() { + return null; + } + public boolean isServerTrusted(X509Certificate[] certs) { + return true; + } + public boolean isClientTrusted(X509Certificate[] certs) { + return true; + } + public void checkServerTrusted(X509Certificate[] certs, String authType) + throws CertificateException { + return; + } + public void checkClientTrusted(X509Certificate[] certs, String authType) + throws CertificateException { + return; + } + } + + + + + + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index b4bb66ee..c3717d55 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1229,7 +1229,8 @@ SELECT std.id as 'standId', std.BUILD_ID as 'buildId', - att.id as 'attfid' + att.id as 'attfid', + att.FBGBUSS as 'fileId' from sar_bussioness_stand std left JOIN sar_buss_stand_attr_info att on std.id = att.STAND_ID diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 3e0092c5..38607da4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1891,20 +1891,20 @@ From 8165d529461851b17e30e052e8822ad0e9b8932b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 10 Mar 2023 17:21:28 +0800 Subject: [PATCH 25/54] =?UTF-8?q?=E8=8B=B1=E8=AF=91=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20+=20=E8=80=81=E7=B3=BB=E7=BB=9F=E9=99=84=E4=BB=B6=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 6 ++ .../service/ISarBussionessStandService.java | 1 + .../impl/SarBussionessStandServiceImpl.java | 65 ++++++++++++++----- .../dao/SarStandardsInfoDao.java | 4 ++ .../SarStandardsInfoMapper.xml | 26 ++++++-- 5 files changed, 81 insertions(+), 21 deletions(-) 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 a00ab75c..8f2f6dfb 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 @@ -432,5 +432,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage importSarBussionessStandFile(MultipartFile file); + 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 99ddb075..b01995e9 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 @@ -2937,16 +2937,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - //获取所有的文件表信息 - List loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); - //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - for (OldSystem oldSystem : oldSystemInfoList) { - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + for (OldSystem oldSystem : oldSystemInfoList) { if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件，通过id去查询文件 获取文件名称 @@ -2961,12 +2958,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList){ + public String isTheSame (String oldFileName,String buildId){ + List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); if(loreAttacheList.size()>0){ for (OldSystem src : loreAttacheList) { if(StringUtils.isNotBlank(src.getFileSrc())){ @@ -3098,4 +3097,38 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); + for (OldSystem src : loreAttacheList) { + if(StringUtils.isNotBlank(src.getFileSrc())){ + // 通过 / 去分割 / 的最后一位 + String[] split = src.getFileSrc().split("/"); + List asList = Arrays.asList(split); + //集合的最后一个就是名称 + int size = asList.size(); + String s = asList.get(size-1); + for (OldSystem data: loreAttacheList){ + //相等证明是数据本身 + if(!src.getFileId().equals(data.getFileId())) { + if (StringUtils.isNotBlank(data.getFileSrc())) { + // 通过 / 去分割 / 的最后一位 + String[] split1 = data.getFileSrc().split("/"); + List asList1 = Arrays.asList(split1); + //集合的最后一个就是名称 + int size1 = asList1.size(); + String s1 = asList1.get(size1 - 1); + if (s.equals(s1)) { + set.add(src.getFileId()); + } + } + } + } + } + } + return Result.success(null,"数量="+set.size()+"====",set); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index d997aeb7..786e3629 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -107,4 +107,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List OldSystemFile(@Param("loreDocId") String loreDocId); List selectOldSystemFile(); + + List selectOldSystemFileBuildId(@Param("buildId") String buildId); + + OldSystem loreDepotSort(@Param("sortId") String sortId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 38607da4..1b0f4d38 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1891,12 +1891,8 @@ + + + + From e13d97769d476c8f80e124088c047b17ade42d37 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 10 Mar 2023 17:25:04 +0800 Subject: [PATCH 26/54] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 180 +----------------- 1 file changed, 1 insertion(+), 179 deletions(-) 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 b01995e9..46e518e2 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 @@ -2729,7 +2729,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); -// List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); -// // 获取 kmpro_addon34 表的 lore_doc_id -// List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); -// //组合数据 -// List oldArr = new ArrayList(); -// List oldInfoArr = new ArrayList(); -// //文件id -// List fileIdList = new ArrayList<>(); -// //文件路径 -// List fileSrcList = new ArrayList<>(); -// //国内海外 -// for (OldSystem oldSystem: oldSystemInfoList){ -// for (OldSystem SarStandardsInfo: SarStandardsInfoList){ -// //lore_doc_id 与 DUILD_Id -// if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ -// if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())){ -// //查询文件是否是多个 是否存在 -// List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); -// if(!fileList.isEmpty()){ -// if(fileList.size()==1){ -// //判断文件是否存在 重新存入文件 获取id 存入att 表 -// OldSystem old = new OldSystem(); -// File file = new File(fileList.get(0).getFileSrc()); -// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); -// //文件id 和数据id -// if(attFileVo != null) { -// fileIdList.add(attFileVo.getId()); -// fileSrcList.add(fileList.get(0).getFileSrc()); -// old.setStandId(SarStandardsInfo.getStandId()); -// old.setSortSign(SarStandardsInfo.getSortSign()); -// //判断存入原本版本 还是译文版本 -// if (SarStandardsInfo.getSortSign().contains("译")) { -// old.setTranslation(attFileVo.getId()); -// } else { -// old.setOriginal(attFileVo.getId()); -// } -// oldArr.add(old); -// } -// }else { -// String yuan = ""; -// String yi = ""; -// OldSystem old = new OldSystem(); -// //每一个文件 都是一个英文版 或者译文版 -// // 如果每一个文件是 那我必然不能 这样子拼接 -// // 应该是先判断他是 英文版 还是译文版 然后再 去拼接 -// for (OldSystem src:fileList){ -// File file = new File(src.getFileSrc()); -// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); -// if(attFileVo != null) { -// if (SarStandardsInfo.getSortSign().contains("译")) { -// if (StringUtils.isNotBlank(yi)) { -// yi = "," + attFileVo.getId(); -// } else { -// yi = attFileVo.getId(); -// } -// if (StringUtils.isNotBlank(yi)) { -// old.setTranslation(yi); -// } -// } else { -// if (StringUtils.isNotBlank(yuan)) { -// yuan = "," + attFileVo.getId(); -// } else { -// yuan = attFileVo.getId(); -// } -// if (StringUtils.isNotBlank(yuan)) { -// old.setOriginal(yuan); -// } -// } -// fileSrcList.add(src.getFileSrc()); -// fileIdList.add(attFileVo.getId()); -// } -// } -// old.setStandId(SarStandardsInfo.getStandId()); -// oldArr.add(old); -// } -// } -// } -// } -// } -// } -// // 企业 -// for (OldSystem oldSystem: oldSystemInfoList){ -// for (OldSystem sarBussionessStand: SarBussionessStandList){ -// //lore_doc_id 与 DUILD_Id -// if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ -// if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())){ -// //查询文件是否是多个 是否存在 -// List fileList = sarStandardsInfoDao.OldSystemFile(oldSystem.getLoreDocId()); -// if(!fileList.isEmpty()){ -// if(fileList.size()==1){ -// //判断文件是否存在 重新存入文件 获取id 存入att 表 -// OldSystem old = new OldSystem(); -// File file = new File(fileList.get(0).getFileSrc()); -// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); -// //文件id 和数据id -// if(attFileVo != null) { -// fileIdList.add(attFileVo.getId()); -// fileSrcList.add(fileList.get(0).getFileSrc()); -// old.setStandId(sarBussionessStand.getStandId()); -// old.setSortSign(sarBussionessStand.getSortSign()); -// //判断存入原本版本 还是译文版本 -// if (sarBussionessStand.getSortSign().contains("译")) { -// old.setTranslation(attFileVo.getId()); -// } else { -// old.setOriginal(attFileVo.getId()); -// } -// oldInfoArr.add(old); -// } -// }else { -// String yuan = ""; -// String yi = ""; -// OldSystem old = new OldSystem(); -// for (OldSystem src:fileList) { -// File file = new File(src.getFileSrc()); -// AttFileVo attFileVo = attFileEOService.saveFileInfo(file); -// if (attFileVo != null) { -// if (sarBussionessStand.getSortSign().contains("译")) { -// if (StringUtils.isNotBlank(yi)) { -// yi = "," + attFileVo.getId(); -// } else { -// yi = attFileVo.getId(); -// } -// old.setTranslation(yi); -// } else { -// if (StringUtils.isNotBlank(yuan)) { -// yuan = "," + attFileVo.getId(); -// } else { -// yuan = attFileVo.getId(); -// } -// old.setOriginal(yuan); -// } -// fileSrcList.add(src.getFileSrc()); -// fileIdList.add(attFileVo.getId()); -// } -// } -// old.setStandId(sarBussionessStand.getStandId()); -// oldInfoArr.add(old); -// } -// } -// } -// } -// } -// } -// -// // 获取完整数据以后 数据库 增加字段， 然后区分是否是译文 原文 然后 进行保存 通过 id 可以找到对应的数据 -// // 企业 -// for(OldSystem data : oldInfoArr) { -// SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); -// String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); -// if(StringUtils.isNotBlank(id)) { -// sarBussStandAttrInfo.setId(id); -// sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); -// sarBussStandAttrInfo.setTranslation(data.getTranslation()); -// } -// sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); -// } -// //海外 国内 -// for(OldSystem data : oldInfoArr) { -// SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); -// String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); -// if(StringUtils.isNotBlank(id)) { -// sarStandAttrInfo.setId(id); -// sarStandAttrInfo.setFbgbjbd(data.getOriginal()); -// sarStandAttrInfo.setTranslation(data.getTranslation()); -// } -// sarStandAttrInfoEODao.updateById(sarStandAttrInfo); -// } -// return Result.success(); -// } - @Override public ResponseMessage emptyFileAnewStorage() { List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); From 99eb785b9d0e6cae4067b0793eb81425b5df45ad Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 13 Mar 2023 10:52:18 +0800 Subject: [PATCH 27/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 184 +++++++++++------- 1 file changed, 113 insertions(+), 71 deletions(-) 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 46e518e2..1277e504 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 @@ -2762,9 +2762,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldArr = new ArrayList(); List oldArr1 = new ArrayList(); + //记录同一数据下文件名重复的 + List fileEOArrayList= new ArrayList<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + for (OldSystem SarStandardsInfo: SarStandardsInfoList){ for (OldSystem oldSystem : oldSystemInfoList) { if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { @@ -2773,43 +2775,53 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if(asList.size()>0) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(),SarStandardsInfo.getBuildId()); - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if(attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } - } - } - } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(SarStandardsInfo.getStandId()); - oldArr.add(old); + } + } + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + fileEO.setResId("h-"+SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); + } } } } @@ -2828,44 +2840,56 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if(asList.size()>0) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(),sarBussionessStand.getBuildId()); - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if(attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + } } } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(sarBussionessStand.getStandId()); + oldArr1.add(old); + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-"+sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(sarBussionessStand.getStandId()); - oldArr1.add(old); - } + } } } @@ -2897,7 +2921,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl newFileNameRepetition(List asList){ + List attFileEOS = new ArrayList<>(); + List attFileEOArrayList = new ArrayList<>(); + for (String fileId : asList){ + AttFileEO byId = attFileEOService.getFileInfo(fileId); + attFileEOS.add(byId); + } + for (AttFileEO data:attFileEOS) { + for (AttFileEO file:attFileEOS){ + if(!data.getId().equals(file.getId())){ + if(data.getOldFileName().equals(file.getOldFileName())){ + attFileEOArrayList.add(data); + } + } + } + } + return attFileEOArrayList; + } } From 4872a5a24aba08ae6dba440eb155aab394bc4aa3 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 13 Mar 2023 14:49:40 +0800 Subject: [PATCH 28/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D,=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 4 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 291 +++++++++--------- .../SarBussionessStandMapper.xml | 2 + .../SarStandardsInfoMapper.xml | 2 + 5 files changed, 154 insertions(+), 147 deletions(-) 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 8f2f6dfb..cad4f1b5 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 @@ -428,8 +428,8 @@ public class SarBussionessStandController extends BaseController void checkFileByEncrypt(); - ResponseMessage emptyFileAnewStorage(); + ResponseMessage emptyFileAnewStorage(String type); ResponseMessage importSarBussionessStandFile(MultipartFile file); 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 1277e504..2225ecaf 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 @@ -2753,173 +2753,176 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + public ResponseMessage emptyFileAnewStorage(String type) { + //List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + // List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); // 获取 kmpro_addon34 表的 lore_doc_id List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //记录同一数据下文件名重复的 List fileEOArrayList= new ArrayList<>(); - //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ - for (OldSystem oldSystem : oldSystemInfoList) { - if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ - if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(SarStandardsInfo.getFileId())){ - String[] fileIdArr = SarStandardsInfo.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(type.equals("海外")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + for (OldSystem oldSystem : oldSystemInfoList) { + if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + } } } - } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(SarStandardsInfo.getStandId()); - oldArr.add(old); - } - }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - fileEO.setResId("h-"+SarStandardsInfo.getStandId()); - fileEOArrayList.add(fileEO); - } - } - } - } - } - } - } - } - - //企业的文件数据处理 - for (OldSystem sarBussionessStand : SarBussionessStandList){ - for (OldSystem oldSystem : oldSystemInfoList) { - if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ - if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } - - } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + fileEO.setResId("h-" + SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); } } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(sarBussionessStand.getStandId()); - oldArr1.add(old); - } - }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId("q-"+sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } } - } } } } } - } + //海外 国内 + for(OldSystem data : oldArr) { + SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); + String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarStandAttrInfo.setId(id); + sarStandAttrInfo.setFbgbjbd(data.getOriginal()); + sarStandAttrInfo.setTranslation(data.getTranslation()); + } + sarStandAttrInfoEODao.updateById(sarStandAttrInfo); + logger.info("海外国内修改成功"); + } - // 企业 - for(OldSystem data : oldArr1) { - SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); - String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); - if(StringUtils.isNotBlank(id)) { - sarBussStandAttrInfo.setId(id); - sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); - sarBussStandAttrInfo.setTranslation(data.getTranslation()); - } - sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); - logger.info("企业修改成功"); } - //海外 国内 - for(OldSystem data : oldArr) { - SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); - String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); - if(StringUtils.isNotBlank(id)) { - sarStandAttrInfo.setId(id); - sarStandAttrInfo.setFbgbjbd(data.getOriginal()); - sarStandAttrInfo.setTranslation(data.getTranslation()); + if(type.equals("企业")){ + List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + //企业的文件数据处理 + for (OldSystem sarBussionessStand : SarBussionessStandList){ + for (OldSystem oldSystem : oldSystemInfoList) { + if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ + if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if(attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(sarBussionessStand.getStandId()); + oldArr1.add(old); + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-"+sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } + } + + } + } + } + } + } + } + // 企业 + for(OldSystem data : oldArr1) { + SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); + String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarBussStandAttrInfo.setId(id); + sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); + sarBussStandAttrInfo.setTranslation(data.getTranslation()); + } + sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); + logger.info("企业修改成功"); } - sarStandAttrInfoEODao.updateById(sarStandAttrInfo); - logger.info("海外国内修改成功"); } return Result.success(fileEOArrayList); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index c3717d55..c165c4a2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1233,5 +1233,7 @@ att.FBGBUSS as 'fileId' from sar_bussioness_stand std left JOIN sar_buss_stand_attr_info att on std.id = att.STAND_ID + where std.BUILD_ID is not null + and att.FBGBUSS is not null diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 1b0f4d38..9900c0cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1903,6 +1903,8 @@ att.FBGBJBD as 'fileId' from sar_standards_info std left JOIN sar_stand_attr_info att on std.id = att.STAND_ID + where std.BUILD_ID is not null + and att.FBGBJBD is not null - - + + + + From 690373af7d08c2d043bcdef84064dc0b18702cc7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 13 Mar 2023 17:03:08 +0800 Subject: [PATCH 30/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D,=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 264 ++++++++++++------ 1 file changed, 172 insertions(+), 92 deletions(-) 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 f5776d63..6207ce0d 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 @@ -2758,7 +2758,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //记录同一数据下文件名重复的 - List fileEOArrayList= new ArrayList<>(); + Set fileEOArrayList= new HashSet<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 if(type.equals("海外")) { List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); @@ -2768,57 +2768,97 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + } } } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + fileEO.setResId("h-" + SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); + } } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { - old.setStandId(SarStandardsInfo.getStandId()); - oldArr.add(old); - } - } else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO : attFileEOS) { - fileEO.setResId("h-" + SarStandardsInfo.getStandId()); - fileEOArrayList.add(fileEO); + } + }else { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + //循环调用每一个 文件 获取文件名称 + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + } } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } } } } @@ -2848,59 +2888,99 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(sarBussionessStand.getFileId().contains(",")){ + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if(attFileEOS.isEmpty()) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + } } } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(sarBussionessStand.getStandId()); + oldArr1.add(old); + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-"+sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(sarBussionessStand.getStandId()); - oldArr1.add(old); - } - }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId("q-"+sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } - } + } + }else { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + //循环调用每一个 文件 获取文件名称 + String id = sarBussionessStand.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } + + } + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ + old.setStandId(sarBussionessStand.getStandId()); + oldArr1.add(old); + } } } } From f398caa0eb02955cfc96d1a0bb920e8dfe8b5079 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 13 Mar 2023 18:06:40 +0800 Subject: [PATCH 31/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D,=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 6 ++++-- .../da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 6207ce0d..006ed72e 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 @@ -2764,7 +2764,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); for (OldSystem SarStandardsInfo : SarStandardsInfoList) { if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { - OldSystem oldSystem = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件，通过id去查询文件 获取文件名称 if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { @@ -2884,7 +2885,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); + OldSystem oldSystem =oldSystem1.get(0); if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { //通过,号分割文件，通过id去查询文件 获取文件名称 if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 6e66bd87..75abf5e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -110,5 +110,5 @@ public interface SarStandardsInfoDao extends BaseMapper { OldSystem loreDepotSort(@Param("sortId") String sortId); - OldSystem selectOldSystemInfoByBuidId(@Param("buildId") String buildId); + List selectOldSystemInfoByBuidId(@Param("buildId") String buildId); } From cf570dbe6ca9fec41f4c51c308a5c23d6a966593 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 14 Mar 2023 11:34:20 +0800 Subject: [PATCH 32/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D,=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarBussStandAttrInfoDao.java | 3 + .../impl/SarBussionessStandServiceImpl.java | 504 ++++++++++++++---- .../dao/SarStandAttrInfoDao.java | 4 + .../dao/SarStandardsInfoDao.java | 2 +- .../SarStandAttrInfoMapper.xml | 11 + .../SarBussStandAttrInfoMapper.xml | 10 + .../SarStandardsInfoMapper.xml | 3 + 7 files changed, 446 insertions(+), 91 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java index 9afeac88..b0970f41 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -47,4 +47,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper fileEOArrayList= new HashSet<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 if(type.equals("海外")) { - List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN"); for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if(SarStandardsInfo.getBuildId().contains(",")){ + String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + fileEO.setResId("h-" + SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); + } + } + } + }else { + //循环调用每一个 文件 获取文件名称 + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + + } + } + } + } + } + } + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + fileEO.setResId("h-" + SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); + } + } + } + }else { + //循环调用每一个 文件 获取文件名称 + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + } + } + } + } + } + } + + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } + //海外 + for(OldSystem data : oldArr) { + SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); + String id = sarStandAttrInfoEODao.selectInfoStandId(data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarStandAttrInfo.setId(id); + sarStandAttrInfo.setFbgbjbd(data.getOriginal()); + sarStandAttrInfo.setTranslation(data.getTranslation()); + } + sarStandAttrInfoEODao.updateByIdInfo(id,sarStandAttrInfo.getFbgbjbd(),sarStandAttrInfo.getTranslation()); + logger.info("海外修改成功"); + } + + } + + if(type.equals("国内")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); + for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if(SarStandardsInfo.getBuildId().contains(",")){ + String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + fileEO.setResId("h-" + SarStandardsInfo.getStandId()); + fileEOArrayList.add(fileEO); + } + } + } + }else { + //循环调用每一个 文件 获取文件名称 + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + + } + } + } + } + } + } + } + }else { List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { @@ -2776,9 +3046,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS = newFileNameRepetition(asList); if (attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); for (String fileId : asList) { //循环调用每一个 文件 获取文件名称 String id = fileId; @@ -2804,16 +3071,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); //企业的文件数据处理 for (OldSystem sarBussionessStand: SarBussionessStandList){ + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); // 通过 关联id 去查询这条数据 查询到 即当前数据 if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ - List oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); - OldSystem oldSystem =oldSystem1.get(0); - if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ - if(sarBussionessStand.getFileId().contains(",")){ - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { + if(sarBussionessStand.getBuildId().contains(",")){ + String[] buildIdArr = sarBussionessStand.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bId: buildIdList){ + List oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bId); + OldSystem oldSystem =oldSystem1.get(0); + if(oldSystem.getLoreDocId().equals(bId)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ + if(sarBussionessStand.getFileId().contains(",")){ + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if(attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bId); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-"+sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } + } + + } + }else { //循环调用每一个 文件 获取文件名称 - String id = fileId; + String id = sarBussionessStand.getFileId(); AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + String theSame = isTheSame(byId.getOldFileName(), bId); if (theSame.equals("1")) { //证明找到文件名称一致的了 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //原文译文 进行判断 if (sortSign.getSortSign().contains("译")) { if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + yi = "," + sarBussionessStand.getFileId(); } else { - yi = fileId; + yi = sarBussionessStand.getFileId(); } } else { if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; + yuan = "," + sarBussionessStand.getFileId(); } else { - yuan = fileId; + yuan = sarBussionessStand.getFileId(); } } } } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ - old.setStandId(sarBussionessStand.getStandId()); - oldArr1.add(old); - } - }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId("q-"+sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } } - } - }else { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - //循环调用每一个 文件 获取文件名称 + } + } + }else { + List oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); + OldSystem oldSystem = oldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { + if (sarBussionessStand.getFileId().contains(",")) { + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO : attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-" + sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } + } + + } + } else { String id = sarBussionessStand.getFileId(); AttFileEO byId = attFileEOService.getFileInfo(id); String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); @@ -2973,31 +3295,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId); List selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List standIds); + + void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("translation") String translation); + + String selectInfoStandId(@Param("standId")String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 75abf5e9..009c9ee9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -100,7 +100,7 @@ public interface SarStandardsInfoDao extends BaseMapper { List dealWithDS(@Param("type") String standType, @Param("status")List strings); - List selectListInfo(); + List selectListInfo(@Param("type") String type); List OldSystemFile(@Param("loreDocId") String loreDocId); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml index 17105f6a..de2d245a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml @@ -241,4 +241,15 @@ + + update SAR_STAND_ATTR_INFO set FBGBJBD = #{fbgbjbd}, TRANSLATION = #{translation} + where stand_id = #{standId} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml index a7b74a5c..a68ae897 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml @@ -167,5 +167,15 @@ where id = #{id} + + update SAR_BUSS_STAND_ATTR_INFO set FBGBUSS = #{fbgbuss}, TRANSLATION = #{translation} + where ID = #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 59ffed22..3d969e24 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1898,6 +1898,9 @@ left JOIN sar_stand_attr_info att on std.id = att.STAND_ID where std.BUILD_ID is not null and att.FBGBJBD is not null + + and std.STAND_TYPE = #{type} + - update SAR_STAND_ATTR_INFO set FBGBJBD = #{fbgbjbd}, TRANSLATION = #{translation} - where stand_id = #{standId} + update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation} + where id = #{id} SELECT - lo.Src as 'fileSrc' + lo.Src as 'fileSrc', + lo.Sign as 'fileSign', + lo.Ext as 'ext' from lore_attache lo where 1=1 From d481985603689ed47b42fad5a365b699f49e724a Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 14 Mar 2023 17:18:28 +0800 Subject: [PATCH 34/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E6=A0=A1=E9=AA=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 296 ++++++++++-------- 1 file changed, 159 insertions(+), 137 deletions(-) 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 f527f945..d1e9d797 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 @@ -2793,32 +2793,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Tue, 14 Mar 2023 17:55:34 +0800 Subject: [PATCH 35/54] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 4 +- .../SarBussionessStandController.java | 6 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 118 +++--------------- .../adc/da/slrs/sarRole/dao/TsRoleDao.java | 5 + .../service/impl/TsRoleServiceImpl.java | 6 + .../tsRoleMeunData/dao/TsRoleMenuDataDao.java | 4 + .../zlTree/controller/ZlTreeController.java | 2 + .../com/adc/da/slrs/zlTree/dao/ZlTreeDao.java | 5 + .../slrs/zlTree/service/IZlTreeService.java | 3 + .../service/impl/ZlTreeServiceImpl.java | 27 ++++ 11 files changed, 70 insertions(+), 112 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 581a256c..5484e59d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -106,7 +106,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String qcrbuss; //发布日期 - private Date issueTime; + private String issueTime; //标准编号 private String standCode; @@ -115,7 +115,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standEnName; //实施日期 - private Date putTime; + private String putTime; //企标制修订状态 private String revisionStatus; 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 8f2f6dfb..85b4a416 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 @@ -418,12 +418,8 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - ResponseMessage message = sarBussionessStandEOService.importSarBussionessStandFile(file); - if (message != null && ! message.equals("")){ + sarBussionessStandEOService.importSarBussionessStandFile(file); return Result.success(); - }else { - return Result.error("导入失败,导入的文件为空"); - } } @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 a436dbfc..7b885edf 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(); - ResponseMessage importSarBussionessStandFile(MultipartFile file); + 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 1277e504..a998a415 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 @@ -2018,7 +2018,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file) { + public ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception { //给出头部信息 String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; @@ -2043,7 +2043,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attInfoMap = new HashMap<>(); List jsonArray = new ArrayList<>(); @@ -2398,9 +2363,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); -// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); -// sarStandardsInfoEO.setCountry("CN"); -// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); -// } + //此处判断是否是带入的标准 if(StringUtils.isNotBlank(sarBussionessStand.getId())) { bussId = sarBussionessStand.getId(); @@ -2432,29 +2389,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ -// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } - // 查询原相关流程 -// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); -// if (StringUtils.isNotBlank(relatePro)) { -// String[] processSplit = relatePro.split(","); -// Set processSet = new HashSet<>(); -// for(String sData:processSplit){ -// processSet.add(sData); -// } -// //processSet.add(prcNum); -// relatePro = StringUtils.join(processSet.toArray(), ","); -// }// else { -// relatePro = prcNum; -// } + // 编辑标准 iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - // 编辑相关流程 - // sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); - // String content = "新增一条相关流程:" +standName; - // sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,standName); + }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 String standId = lawsList.get(0).getId(); bussId = lawsList.get(0).getId(); @@ -2467,57 +2408,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); -// for(String sData:processSplit){ -// processSet.add(sData); -// } -// //processSet.add(prcNum); -// relatePro = StringUtils.join(processSet.toArray(), ","); -// }// else { -// relatePro = prcNum; -// } + // 编辑标准 sarBussionessStand.setId(standId); iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - // 编辑相关流程 -// sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); -// String content = "新增一条相关流程:" +standName; -// sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,standName); + } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setStandCode(standCode); +// sarBussionessStand.setStandNumber(""); +// sarBussionessStand.setStandSn(""); +// sarBussionessStand.setReviseStatus(""); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); } - - // 编辑相关流程 - //sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",standName); } - List allItems = new ArrayList<>(); - //开始处理条款数据，从去重后的结果中直接处理即可 -// if(itemData!=null && !itemData.isEmpty()){ -// // allItems = -// saveStandItemsData(itemData, sarStandardsInfoEO); -// } - //技术评估结果入库 重构技术评估结果入库内容 -// if ("0".equals(isJudge)) { -// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); -// } - -// List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); List evaluationHis = new ArrayList<>(); Map> listMap = new TreeMap<>(); - // 按 相同数据分组 -// listMap = evaluationHisFilter.stream().collect( -// Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId()))); - List evaluations = new ArrayList<>(); if(!listMap.isEmpty()){ SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); @@ -2613,8 +2523,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); Map dicMap = dicInfo.stream() - .filter(item-> !item.getDicTypeCode().isEmpty()) - .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + .filter(item-> !item.getDicTypeName().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeName,DicTypeEO::getDicTypeCode,(value1, value2 )->value2)); for(SarBussStandAttrInfoExecl row : sarlist){ attrInfoDetailsImport(row); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index 1e10c1ac..c0cf74e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarRole.dao; import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; @@ -105,4 +106,8 @@ public interface TsRoleDao extends BaseMapper { @Select("select ROLE_ID from ts_user_role where USER_ID = #{userId}") List getRoleByUserId(@Param("userId") String userId); + + @Select("select role_id from ts_role_resource where resource_id =#{oldResourceIds}") + List getResourceId(String oldResourceIds); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 93586a44..fc70a78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -14,6 +14,8 @@ import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.enums.MenuEnum; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.zlTree.dao.ZlTreeDao; +import com.adc.da.slrs.zlTree.entity.ZlTree; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,6 +26,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,6 +49,9 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Lazy private ISarUserPersonalMenuService sarUserPersonalMenuService; + @Autowired + private ZlTreeDao zlTreeDao; + @Autowired private ITsResourceService tsResourceService; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java index c1331443..b7ee9949 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.tsRoleMeunData.dao; import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsRoleMenuDataDao extends BaseMapper { + @Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})") + void save(@Param("roleId") String roleId,@Param("id") String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java index b5eca3ec..af8f2dda 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -46,6 +46,8 @@ public class ZlTreeController extends BaseController { public ResponseMessage addFileMaterial(@RequestBody ZlTree material){ material.setId(String.valueOf(UUID.randomUUID())); boolean save = iZlTreeService.save(material); + //新增后给所有角色配置权限 + iZlTreeService.setResource(material); return Result.success(save); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java index e7527d15..91971be7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java @@ -2,7 +2,11 @@ package com.adc.da.slrs.zlTree.dao; import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** *

@@ -16,4 +20,5 @@ public interface ZlTreeDao extends BaseMapper { int topping(@Param("id") String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index e37b374c..6e9ef9f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.zlTree.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.zlTree.entity.TreeData; import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -54,4 +55,6 @@ public interface IZlTreeService extends IService { ZlTree queryTree(String treeId); void subordinateTreeNodes(List treeIds,String parentTreeId); + + void setResource(ZlTree material); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 4d9a6e88..6784de4f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -1,9 +1,15 @@ package com.adc.da.slrs.zlTree.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.dao.TsRoleDao; +import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao; +import com.adc.da.slrs.tsRoleMeunData.service.impl.TsRoleMenuDataServiceImpl; import com.adc.da.slrs.zlTree.dao.ZlTreeDao; import com.adc.da.slrs.zlTree.entity.TreeData; import com.adc.da.slrs.zlTree.entity.ZlTree; @@ -40,6 +46,12 @@ public class ZlTreeServiceImpl extends ServiceImpl implements @Autowired private ITsUserService tsUserService; + @Autowired + private TsRoleDao tsRoleDao; + + @Autowired + TsRoleMenuDataDao tsRoleMenuDataDao; + @Override public List getLeftTree() { // 获取当前登录人 @@ -173,4 +185,19 @@ public class ZlTreeServiceImpl extends ServiceImpl implements } } } + + /** + * 新增后给所有角色配置权限 + * @param material + */ + @Override + public void setResource(ZlTree material) { + //获取pid + String pId = material.getParentId(); + List roleIds = tsRoleDao.getResourceId(pId); + for (String roleId : roleIds){ + tsRoleDao.addResource(roleId,material.getId()); + tsRoleMenuDataDao.save(roleId,material.getId()); + } + } } From 57e01dff1024371aa0045384b416728262a48c23 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 15 Mar 2023 12:08:47 +0800 Subject: [PATCH 36/54] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/person/controller/PersonCollectEOController.java | 4 ++-- .../com/adc/da/person/service/IPersonCollectEOService.java | 2 +- .../da/person/service/impl/PersonCollectEOServiceImpl.java | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 2e91e397..1601197f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -43,10 +43,10 @@ public class PersonCollectEOController extends BaseController { **/ @ApiOperation(value = "|PersonCollectEO|分页查询") @GetMapping("/page") - public ResponseMessage> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) throws Exception { + public ResponseMessage> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) throws Exception { - return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId); + return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId,validFlag); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index a68eefaf..ae505a87 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -28,7 +28,7 @@ public interface IPersonCollectEOService extends IService { int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception; - public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId); + public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId,Integer validFlag); /** * 通过标准号和用户id查询是否收藏此标准 diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index dd05be89..5b021183 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -133,7 +133,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) { + public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) { BasePage basePage = new BasePage(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("user_id",userId); @@ -144,6 +144,11 @@ public class PersonCollectEOServiceImpl extends ServiceImpl ids = new ArrayList<>(Arrays.asList(modeType.split(","))); wrapper.in("collect_type",ids); } + if (validFlag != null && !validFlag.equals("") && validFlag == 0){ + wrapper.eq("valid_flag",validFlag); + }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){ + wrapper.eq("valid_flag",validFlag); + } wrapper.orderByDesc("creation_Time"); if (pageNo != null) { From 5f466027b1edcf80af1dc60ec5d5257823da66c3 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 16 Mar 2023 09:02:32 +0800 Subject: [PATCH 37/54] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 911 ++++++++++++++---- .../SarStandardsInfoMapper.xml | 10 - 2 files changed, 700 insertions(+), 221 deletions(-) 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 d1e9d797..b0a446c6 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 @@ -244,7 +244,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldArr = new ArrayList(); - List oldArr1 = new ArrayList(); - //记录同一数据下文件名重复的 - Set fileEOArrayList= new HashSet<>(); + // 记录无法处理的id + Set fileEOArrayList= new HashSet<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 if(type.equals("海外")) { List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN"); @@ -2782,7 +2780,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if (asList.size() > 0) { // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); + Set attFileEOS = newFileNameRepetition(asList); if (attFileEOS.isEmpty()) { for (String fileId : asList) { //循环调用每一个 文件 获取文件名称 @@ -2796,13 +2794,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + } } }else { @@ -2830,13 +2909,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if (asList.size() > 0) { // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); + Set attFileEOS = newFileNameRepetition(asList); if (attFileEOS.isEmpty()) { for (String fileId : asList) { //循环调用每一个 文件 获取文件名称 @@ -2873,13 +2952,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + } } }else { @@ -2908,13 +3068,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); for (OldSystem SarStandardsInfo : SarStandardsInfoList) { @@ -2975,7 +3134,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if (asList.size() > 0) { // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); + Set attFileEOS = newFileNameRepetition(asList); if (attFileEOS.isEmpty()) { for (String fileId : asList) { //循环调用每一个 文件 获取文件名称 @@ -2989,31 +3148,111 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + } } }else { - //循环调用每一个 文件 获取文件名称 String id = SarStandardsInfo.getFileId(); AttFileEO byId = attFileEOService.getFileInfo(id); String theSame = isTheSame(byId.getOldFileName(), bid); @@ -3024,17 +3263,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(fileIdArr); if (asList.size() > 0) { // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); + Set attFileEOS = newFileNameRepetition(asList); if (attFileEOS.isEmpty()) { for (String fileId : asList) { //循环调用每一个 文件 获取文件名称 @@ -3068,13 +3306,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + } } }else { @@ -3103,13 +3422,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - //企业的文件数据处理 - for (OldSystem sarBussionessStand: SarBussionessStandList){ + for (OldSystem sarBussionessStand : SarBussionessStandList) { String yi = ""; String yuan = ""; OldSystem old = new OldSystem(); - // 通过 关联id 去查询这条数据 查询到 即当前数据 - if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ - if(sarBussionessStand.getBuildId().contains(",")){ - String[] buildIdArr = sarBussionessStand.getBuildId().split(","); - List buildIdList = Arrays.asList(buildIdArr); - if(!buildIdList.isEmpty()){ - for (String bId: buildIdList){ - List oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bId); - OldSystem oldSystem =oldSystem1.get(0); - if(oldSystem.getLoreDocId().equals(bId)) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ - if(sarBussionessStand.getFileId().contains(",")){ - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(),bId); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; - } else { - yi = fileId; - } + if (StringUtils.isNotBlank(sarBussionessStand.getBuildId())) { + if(sarBussionessStand.getBuildId().contains(",")){ + String[] buildIdArr = sarBussionessStand.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { + if(sarBussionessStand.getFileId().contains(",")) { + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } + } + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); } } } } }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId(sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } + fileEOArrayList.add(sarBussionessStand.getStandId()); } } - }else { - //循环调用每一个 文件 获取文件名称 - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), bId); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + sarBussionessStand.getFileId(); - } else { - yi = sarBussionessStand.getFileId(); - } + } + }else { + String id = sarBussionessStand.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + sarBussionessStand.getFileId(); } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); - } - + yi = sarBussionessStand.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); } } } @@ -3242,78 +3634,157 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); - OldSystem oldSystem = oldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { - if (sarBussionessStand.getFileId().contains(",")) { - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; - } else { - yi = fileId; - } + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { + if(sarBussionessStand.getFileId().contains(",")) { + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } + } + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); } } } } - } else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO : attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId(sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } + }else { + fileEOArrayList.add(sarBussionessStand.getStandId()); } } - } else { - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + sarBussionessStand.getFileId(); - } else { - yi = sarBussionessStand.getFileId(); - } + } + }else { + //循环调用每一个 文件 获取文件名称 + String id = sarBussionessStand.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + sarBussionessStand.getFileId(); } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); - } - + yi = sarBussionessStand.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); } } } @@ -3322,7 +3793,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); - if(loreAttacheList.size()>0){ - for (OldSystem src : loreAttacheList) { - if(StringUtils.isNotBlank(src.getFileSrc())){ - // 通过 / 去分割 / 的最后一位 - String[] split = src.getFileSrc().split("/"); - List asList = Arrays.asList(split); - //集合的最后一个就是名称 - int size = asList.size(); - String s = asList.get(size-1); - if (s.equals(oldFileName)){ - return "1"; - } - } - } - } - return "-1";*/ List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); if(loreAttacheList.size()>0){ for (OldSystem src : loreAttacheList) { @@ -3415,18 +3870,52 @@ public class SarBussionessStandServiceImpl extends ServiceImpl newFileNameRepetition(List asList){ + public Set newFileNameRepetition(List asList){ List attFileEOS = new ArrayList<>(); - List attFileEOArrayList = new ArrayList<>(); - for (String fileId : asList){ - AttFileEO byId = attFileEOService.getFileInfo(fileId); - attFileEOS.add(byId); + Set attFileEOArrayList = new HashSet<>(); + if(asList.size()>0) { + for (String fileId : asList) { + AttFileEO byId = attFileEOService.getFileInfo(fileId); + attFileEOS.add(byId); + } } - for (AttFileEO data:attFileEOS) { - for (AttFileEO file:attFileEOS){ - if(!data.getId().equals(file.getId())){ - if(data.getOldFileName().equals(file.getOldFileName())){ - attFileEOArrayList.add(data); + if(attFileEOS.size()>0) { + for (AttFileEO data : attFileEOS) { + for (AttFileEO file : attFileEOS) { + if (!data.getId().equals(file.getId())) { + if (data.getOldFileName().equals(file.getOldFileName())) { + attFileEOArrayList.add(data); + } + } + } + } + } + return attFileEOArrayList; + } + + public List newFileNameRepetitionInfo(List asList){ + List attFileEOS = new ArrayList<>(); + if(asList.size()>0) { + for (String fileId : asList) { + AttFileEO byId = attFileEOService.getFileInfo(fileId); + attFileEOS.add(byId); + } + } + return attFileEOS; + } + + public List duplicateFiles(List attFileEOList,Set chongfu){ + //非重复的文件处理 + List attFileEOArrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOList){ + attFileEOArrayList.add(data); + } + + for (AttFileEO data : attFileEOList){ + for (AttFileEO file : chongfu){ + if(data.getId().equals(file.getId())){ + if(!attFileEOArrayList.isEmpty()) { + attFileEOArrayList.remove(data); } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 5f96b8b2..c40ce3d5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1944,16 +1944,6 @@ - - SELECT lo.ID as 'fileId', - lo.Src as 'fileSrc' + lo.Sign as 'fileSign' from lore_attache lo From 71f86a9635d2576bf547f8d2f72b988d4224d29d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 16 Mar 2023 16:56:59 +0800 Subject: [PATCH 39/54] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 26 ++++++- .../SarBussionessStandController.java | 3 +- .../impl/SarBussionessStandServiceImpl.java | 69 +++++++++---------- .../impl/PersonCollectEOServiceImpl.java | 4 +- 4 files changed, 61 insertions(+), 41 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 5484e59d..321d8870 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -85,7 +85,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String xgjh; //附件 - private String fbgBuss; + private String qtwjbuss; //标准中文名称 private String standName; @@ -147,6 +147,30 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { //上传时间 private String xcsjbuss; + //关联模块-乘用车VPPS编码 + private String cycvppsbmbuss; + + //关联模块--乘用车vpps中文名称 + private String cycvppscnbuss; + + //关联模块--卡车VPPS编码 + private String kcvppsbmbuss; + + //关联模块--卡车vpps中文名称 + private String kcvppscnbuss; + + //采用标准 + private String cybz; + + //采标程度 + private String cycd; + + //引用标准 + private String yybz; + + //备案日期 + private String barq; + @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); 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 366a63c2..eedecd3f 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 @@ -418,8 +418,7 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - sarBussionessStandEOService.importSarBussionessStandFile(file); - return Result.success(); + return sarBussionessStandEOService.importSarBussionessStandFile(file); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") 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 5228dee2..40652294 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 @@ -2055,6 +2055,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 1){ @@ -2112,8 +2113,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = new ArrayList<>(); @@ -2279,7 +2277,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl readImpExcelFile(String path) { diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index 5b021183..99d16a6f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -144,9 +144,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl ids = new ArrayList<>(Arrays.asList(modeType.split(","))); wrapper.in("collect_type",ids); } - if (validFlag != null && !validFlag.equals("") && validFlag == 0){ + if (validFlag != null && !validFlag.equals("") && validFlag == 0){//有效 wrapper.eq("valid_flag",validFlag); - }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){ + }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){//无效 wrapper.eq("valid_flag",validFlag); } wrapper.orderByDesc("creation_Time"); From c2b44c03a28775af841963fe3396ac25f07cc837 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 17 Mar 2023 10:48:35 +0800 Subject: [PATCH 40/54] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=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; } /** From cd61f6a2fba29cf0c451683090fdb7b3285697d5 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 17 Mar 2023 13:51:32 +0800 Subject: [PATCH 41/54] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=92=8CResult=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-base/src/main/java/com/adc/da/http/Result.java | 4 ++++ .../controller/SarBussionessStandController.java | 2 +- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adc-da-base/src/main/java/com/adc/da/http/Result.java b/adc-da-base/src/main/java/com/adc/da/http/Result.java index 77ffe02d..5e468ced 100644 --- a/adc-da-base/src/main/java/com/adc/da/http/Result.java +++ b/adc-da-base/src/main/java/com/adc/da/http/Result.java @@ -20,6 +20,10 @@ public class Result { return new ResponseMessage(code, message, true, t); } + public static ResponseMessage success(String code, String message,Boolean t) { + return new ResponseMessage(code, message, true); + } + public static ResponseMessage success(T t) { return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true, t); } 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 87803b0a..6acb0c22 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 @@ -419,7 +419,7 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ return sarBussionessStandEOService.importSarBussionessStandFile(file); - } + } @ApiOperation(value = "|SarBussionessStand|判断原文译文") @GetMapping("/emptyFileAnewStorage") 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 8cc65480..401f7163 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 @@ -2301,7 +2301,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl readImpExcelFile(String path) { From aa4451f0aaf1da24042b968b4a23f35f7f587b6c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Mar 2023 18:03:27 +0800 Subject: [PATCH 42/54] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 1392 +++++++++-------- 1 file changed, 703 insertions(+), 689 deletions(-) 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 5228dee2..2bc50570 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 @@ -2681,6 +2681,366 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + if(!OldSystem1.isEmpty()){ + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } + } + + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + + } + } + }else { + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + } + } + } + } + } + } + } + } + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + if(!OldSystem1.isEmpty()){ + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + + } + } + }else { + //循环调用每一个 文件 获取文件名称 + String id = SarStandardsInfo.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + } + } + } + } + } + } + } + + } + + } + if (StringUtils.isNotBlank(yi)) { + old.setTranslation(yi); + } + if (StringUtils.isNotBlank(yuan)) { + old.setOriginal(yuan); + } + if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) { + old.setStandId(SarStandardsInfo.getStandId()); + oldArr.add(old); + } + } + //海外 + for(OldSystem data : oldArr) { + SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo(); + String id = sarStandAttrInfoEODao.selectInfoStandId(data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarStandAttrInfo.setId(id); + sarStandAttrInfo.setFbgbjbd(data.getOriginal()); + sarStandAttrInfo.setTranslation(data.getTranslation()); + } + sarStandAttrInfoEODao.updateByIdInfo(id,sarStandAttrInfo.getFbgbjbd(),sarStandAttrInfo.getTranslation()); + logger.info("海外修改成功===================================================================================="); + } + + } + if(type.equals("国内")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); + for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if(SarStandardsInfo.getBuildId().contains(",")){ + String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + if(!OldSystem1.isEmpty()){ OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(bid)) { //通过,号分割文件，通过id去查询文件 获取文件名称 @@ -2721,90 +3081,90 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } } } @@ -2837,8 +3197,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + if(!OldSystem1.isEmpty()){ OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件，通过id去查询文件 获取文件名称 @@ -2883,8 +3245,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); - for (OldSystem SarStandardsInfo : SarStandardsInfoList) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { - if(SarStandardsInfo.getBuildId().contains(",")){ - String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); - List buildIdList = Arrays.asList(buildIdArr); - if(!buildIdList.isEmpty()){ - for (String bid: buildIdList){ - List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(bid)) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { - if(SarStandardsInfo.getFileId().contains(",")) { - String[] fileIdArr = SarStandardsInfo.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(),bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - } - } - - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } - - } - } - }else { - String id = SarStandardsInfo.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + SarStandardsInfo.getFileId(); - } else { - yi = SarStandardsInfo.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + SarStandardsInfo.getFileId(); - } else { - yuan = SarStandardsInfo.getFileId(); - } - } - } - } - } - } - } - } - } - }else { - List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { - if(SarStandardsInfo.getFileId().contains(",")) { - String[] fileIdArr = SarStandardsInfo.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - - } - } - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - }else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } - - } - } - }else { - //循环调用每一个 文件 获取文件名称 - String id = SarStandardsInfo.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + SarStandardsInfo.getFileId(); - } else { - yi = SarStandardsInfo.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + SarStandardsInfo.getFileId(); - } else { - yuan = SarStandardsInfo.getFileId(); - } - } - } - } - } - } - } - } } if (StringUtils.isNotBlank(yi)) { @@ -3389,153 +3399,155 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(bid)) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { - if(sarBussionessStand.getFileId().contains(",")) { - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(),bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; + if(OldSystem1.isEmpty()){ + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { + if(sarBussionessStand.getFileId().contains(",")) { + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(),bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } } } - } - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; } } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } } } } } - } - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } } } } + }else { + fileEOArrayList.add(sarBussionessStand.getStandId()); } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); + } - } - } - }else { - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + sarBussionessStand.getFileId(); + }else { + String id = sarBussionessStand.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), bid); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } } } } @@ -3547,154 +3559,156 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { - if(sarBussionessStand.getFileId().contains(",")) { - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; + if(!OldSystem1.isEmpty()){ + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { + if(sarBussionessStand.getFileId().contains(",")) { + String[] fileIdArr = sarBussionessStand.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set attFileEOS = newFileNameRepetition(asList); + if (attFileEOS.isEmpty()) { + for (String fileId : asList) { + //循环调用每一个 文件 获取文件名称 + String id = fileId; + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } } } } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } } } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } } } } } - } + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } }else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } + fileEOArrayList.add(sarBussionessStand.getStandId()); } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); - } + } } - } - }else { - //循环调用每一个 文件 获取文件名称 - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + sarBussionessStand.getFileId(); + }else { + //循环调用每一个 文件 获取文件名称 + String id = sarBussionessStand.getFileId(); + AttFileEO byId = attFileEOService.getFileInfo(id); + String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } } } } From 59e8462d2338a89bc7da235d4e1fa3a33d8c7c14 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 20 Mar 2023 09:19:21 +0800 Subject: [PATCH 43/54] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2bc50570..e95373a6 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 @@ -3023,7 +3023,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Mon, 20 Mar 2023 15:59:02 +0800 Subject: [PATCH 44/54] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f89d68a7..bf8ea9c6 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 @@ -2961,7 +2961,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Mon, 20 Mar 2023 16:10:40 +0800 Subject: [PATCH 45/54] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 bf8ea9c6..2a199b25 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 @@ -3738,15 +3738,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl0) { for (String fileId : asList) { AttFileEO byId = attFileEOService.getFileInfo(fileId); - attFileEOS.add(byId); + if(byId!=null){ + attFileEOS.add(byId); + } } } - if(attFileEOS.size()>0) { + if(attFileEOS.size()>0 && !attFileEOS.isEmpty()) { for (AttFileEO data : attFileEOS) { for (AttFileEO file : attFileEOS) { - if (!data.getId().equals(file.getId())) { - if (data.getOldFileName().equals(file.getOldFileName())) { - attFileEOArrayList.add(data); + if(data !=null && file !=null) { + if (!data.getId().equals(file.getId())) { + if (data.getOldFileName().equals(file.getOldFileName())) { + attFileEOArrayList.add(data); + } } } } From b4946c9ecce3fbbc63e8a16cc47dd432ec421268 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 20 Mar 2023 16:27:55 +0800 Subject: [PATCH 46/54] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 422 ++++++++++-------- 1 file changed, 224 insertions(+), 198 deletions(-) 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 2a199b25..304ad227 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 @@ -2650,27 +2650,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Tue, 21 Mar 2023 17:11:18 +0800 Subject: [PATCH 47/54] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarBussStandAttrInfoDao.java | 3 - .../impl/SarBussionessStandServiceImpl.java | 746 +++++++++--------- .../dao/SarStandAttrInfoDao.java | 2 +- .../entity/SarStandAttrInfo.java | 5 - .../SarStandAttrInfoMapper.xml | 2 +- .../SarBussStandAttrInfoMapper.xml | 4 - 6 files changed, 370 insertions(+), 392 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java index b0970f41..ebc32d5e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -44,10 +44,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); - void updateFSQR(@Param("id") String id,@Param("time") String time); - void updateByIdInfo(@Param("id")String id,@Param("fbgbuss") String fbgbuss,@Param("translation") String translation); - String selectInfoStandId(@Param("standId") String standId); } 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 304ad227..6242ec88 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 @@ -2976,15 +2976,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - for (OldSystem sarBussionessStand : SarBussionessStandList) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - if (StringUtils.isNotBlank(sarBussionessStand.getBuildId())) { - if(sarBussionessStand.getBuildId().contains(",")){ - String[] buildIdArr = sarBussionessStand.getBuildId().split(","); - List buildIdList = Arrays.asList(buildIdArr); - if(!buildIdList.isEmpty()){ - for (String bid: buildIdList){ - List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); - if(OldSystem1.isEmpty()){ - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(bid)) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { - if(sarBussionessStand.getFileId().contains(",")) { - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - String theSame = isTheSame(byId.getOldFileName(),bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - } - } - - } - } - - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); - } - - } - } - }else { - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - String theSame = isTheSame(byId.getOldFileName(), bid); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + sarBussionessStand.getFileId(); - } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); - } - } - } - } - } - } - } - } - } - } - } - }else { - List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); - if(!OldSystem1.isEmpty()){ - OldSystem oldSystem =OldSystem1.get(0); - if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { - if(sarBussionessStand.getFileId().contains(",")) { - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if (asList.size() > 0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set attFileEOS = newFileNameRepetition(asList); - if (attFileEOS.isEmpty()) { - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - - } - } - } - } - - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - }else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); - } - - } - } - }else { - //循环调用每一个 文件 获取文件名称 - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + sarBussionessStand.getFileId(); - } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); - } - } - } - } - } - } - } - } - } - } - - } - if (StringUtils.isNotBlank(yi)) { - old.setTranslation(yi); - } - if (StringUtils.isNotBlank(yuan)) { - old.setOriginal(yuan); - } - if (StringUtils.isNotBlank(yi)) { - old.setStandId(sarBussionessStand.getStandId()); - oldArr.add(old); - } - } - // 企业 - for(OldSystem data : oldArr) { - SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); - String id = sarBussStandAttrInfoEODao.selectInfoStandId(data.getStandId()); - if(StringUtils.isNotBlank(id)) { - sarBussStandAttrInfo.setId(id); - sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); - sarBussStandAttrInfo.setTranslation(data.getTranslation()); - } - sarBussStandAttrInfoEODao.updateByIdInfo(id,sarBussStandAttrInfo.getFbgbuss(),sarBussStandAttrInfo.getTranslation()); - logger.info("企业修改成功===================================================================================="); - } +// List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); +// for (OldSystem sarBussionessStand : SarBussionessStandList) { +// String yi = ""; +// String yuan = ""; +// OldSystem old = new OldSystem(); +// if (StringUtils.isNotBlank(sarBussionessStand.getBuildId())) { +// if(sarBussionessStand.getBuildId().contains(",")){ +// String[] buildIdArr = sarBussionessStand.getBuildId().split(","); +// List buildIdList = Arrays.asList(buildIdArr); +// if(!buildIdList.isEmpty()){ +// for (String bid: buildIdList){ +// List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); +// if(OldSystem1.isEmpty()){ +// OldSystem oldSystem =OldSystem1.get(0); +// if (oldSystem.getLoreDocId().equals(bid)) { +// //通过,号分割文件，通过id去查询文件 获取文件名称 +// if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { +// if(sarBussionessStand.getFileId().contains(",")) { +// String[] fileIdArr = sarBussionessStand.getFileId().split(","); +// List asList = Arrays.asList(fileIdArr); +// if (asList.size() > 0) { +// // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 +// Set attFileEOS = newFileNameRepetition(asList); +// if (attFileEOS.isEmpty()) { +// for (String fileId : asList) { +// //循环调用每一个 文件 获取文件名称 +// String id = fileId; +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// String theSame = isTheSame(byId.getOldFileName(),bid); +// if (theSame.equals("1")) { +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + fileId; +// } else { +// yi = fileId; +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + fileId; +// } else { +// yuan = fileId; +// } +// } +// } +// +// } +// } +// +// } +// } else { +// int numberCount = 0; +// //只允许2个文件名称相同 +// for (AttFileEO data : attFileEOS) { +// numberCount = 0; +// for (AttFileEO file : attFileEOS) { +// if (data.getOldFileName().equals(file.getOldFileName())) { +// numberCount = numberCount+1; +// } +// } +// } +// if(numberCount==2){ +// //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 +// List attFileEOS1 = newFileNameRepetitionInfo(asList); +// // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS +// List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); +// if(!notRepeatedFile.isEmpty()){ +// //不重复数据在老库中是否存在 selectOldSystemFileBuildId +// for (AttFileEO file: notRepeatedFile){ +// String theSame = isTheSame(file.getOldFileName(), bid); +// //1 有相同 -1 无相同 +// if(theSame.equals("1")){ +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + file.getId(); +// } else { +// yi = file.getId(); +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + file.getId(); +// } else { +// yuan = file.getId(); +// } +// } +// } +// } +// } +// +// } else { +// //相同文件处理 +// List arrayList = new ArrayList<>(); +// for (AttFileEO data : attFileEOS) { +// arrayList.add(data); +// } +// String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); +// if (theSame.equals("1")) { +// File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); +// File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); +// //判断两个文件大小 //相等 则不做处理 +// long length1 = file1.length(); +// long length2 = file2.length(); +// if (length1 > length2) { +// //1 中文 2英文 +// if (StringUtils.isNotBlank(yi)) { +// yi = yi + "," + arrayList.get(1).getId(); +// } else { +// yi = arrayList.get(1).getId(); +// } +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan + "," + arrayList.get(0).getId(); +// } else { +// yuan = arrayList.get(0).getId(); +// } +// } +// if (length1 < length2) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi + "," + arrayList.get(0).getId(); +// } else { +// yi = arrayList.get(0).getId(); +// } +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan + "," + arrayList.get(1).getId(); +// } else { +// yuan = arrayList.get(1).getId(); +// } +// } +// } +// } +// }else { +// fileEOArrayList.add(sarBussionessStand.getStandId()); +// } +// +// } +// } +// }else { +// String id = sarBussionessStand.getFileId(); +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// String theSame = isTheSame(byId.getOldFileName(), bid); +// if (theSame.equals("1")) { +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + sarBussionessStand.getFileId(); +// } else { +// yi = sarBussionessStand.getFileId(); +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + sarBussionessStand.getFileId(); +// } else { +// yuan = sarBussionessStand.getFileId(); +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// }else { +// List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); +// if(!OldSystem1.isEmpty()){ +// OldSystem oldSystem =OldSystem1.get(0); +// if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { +// //通过,号分割文件，通过id去查询文件 获取文件名称 +// if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) { +// if(sarBussionessStand.getFileId().contains(",")) { +// String[] fileIdArr = sarBussionessStand.getFileId().split(","); +// List asList = Arrays.asList(fileIdArr); +// if (asList.size() > 0) { +// // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 +// Set attFileEOS = newFileNameRepetition(asList); +// if (attFileEOS.isEmpty()) { +// for (String fileId : asList) { +// //循环调用每一个 文件 获取文件名称 +// String id = fileId; +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); +// if (theSame.equals("1")) { +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + fileId; +// } else { +// yi = fileId; +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + fileId; +// } else { +// yuan = fileId; +// } +// +// } +// } +// } +// } +// +// } +// } else { +// int numberCount = 0; +// //只允许2个文件名称相同 +// for (AttFileEO data : attFileEOS) { +// numberCount = 0; +// for (AttFileEO file : attFileEOS) { +// if (data.getOldFileName().equals(file.getOldFileName())) { +// numberCount = numberCount+1; +// } +// } +// } +// if(numberCount==2){ +// //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 +// List attFileEOS1 = newFileNameRepetitionInfo(asList); +// // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS +// List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); +// if(!notRepeatedFile.isEmpty()){ +// //不重复数据在老库中是否存在 selectOldSystemFileBuildId +// for (AttFileEO file: notRepeatedFile){ +// String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); +// //1 有相同 -1 无相同 +// if(theSame.equals("1")){ +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + file.getId(); +// } else { +// yi = file.getId(); +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + file.getId(); +// } else { +// yuan = file.getId(); +// } +// } +// } +// } +// } +// +// }else { +// //相同文件处理 +// List arrayList = new ArrayList<>(); +// for (AttFileEO data : attFileEOS) { +// arrayList.add(data); +// } +// String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); +// if (theSame.equals("1")) { +// File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); +// File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); +// //判断两个文件大小 //相等 则不做处理 +// long length1 = file1.length(); +// long length2 = file2.length(); +// if (length1 > length2) { +// //1 中文 2英文 +// if (StringUtils.isNotBlank(yi)) { +// yi = yi + "," + arrayList.get(1).getId(); +// } else { +// yi = arrayList.get(1).getId(); +// } +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan + "," + arrayList.get(0).getId(); +// } else { +// yuan = arrayList.get(0).getId(); +// } +// } +// if (length1 < length2) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi + "," + arrayList.get(0).getId(); +// } else { +// yi = arrayList.get(0).getId(); +// } +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan + "," + arrayList.get(1).getId(); +// } else { +// yuan = arrayList.get(1).getId(); +// } +// } +// } +// } +// }else { +// fileEOArrayList.add(sarBussionessStand.getStandId()); +// } +// +// } +// } +// }else { +// //循环调用每一个 文件 获取文件名称 +// String id = sarBussionessStand.getFileId(); +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); +// if (theSame.equals("1")) { +// //证明找到文件名称一致的了 +// OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); +// //原文译文 进行判断 +// if(sortSign != null) { +// if (sortSign.getSortSign().contains("译")) { +// if (StringUtils.isNotBlank(yi)) { +// yi = yi+"," + sarBussionessStand.getFileId(); +// } else { +// yi = sarBussionessStand.getFileId(); +// } +// } else { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + sarBussionessStand.getFileId(); +// } else { +// yuan = sarBussionessStand.getFileId(); +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// +// } +// if (StringUtils.isNotBlank(yi)) { +// old.setTranslation(yi); +// } +// if (StringUtils.isNotBlank(yuan)) { +// old.setOriginal(yuan); +// } +// if (StringUtils.isNotBlank(yi)) { +// old.setStandId(sarBussionessStand.getStandId()); +// oldArr.add(old); +// } +// } +// // 企业 +// for(OldSystem data : oldArr) { +// String id = sarBussStandAttrInfoEODao.selectInfoStandId(data.getStandId()); +// if(StringUtils.isNotBlank(id)) { +// //sarBussStandAttrInfoEODao.updateByIdInfo(id,sarBussStandAttrInfo.getFbgbuss(),sarBussStandAttrInfo.getTranslation()); +// logger.info("企业修改成功===================================================================================="); +// } +// +// } + logger.info("企业没有译文件"); } return Result.success(fileEOArrayList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java index 13266ef0..353743a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java @@ -42,7 +42,7 @@ public interface SarStandAttrInfoDao extends BaseMapper { List selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List standIds); - void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("translation") String translation); + void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("fbgywbd") String fbgywbd); String selectInfoStandId(@Param("standId")String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 6ba76937..107a7cef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -238,9 +238,4 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("BDTBZH") private String bdtbzh; - @ApiModelProperty(value = "译文件") - @TableField("TRANSLATION") - private String translation; - - } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml index 6994a345..dc335c84 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml @@ -242,7 +242,7 @@ - update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation} + update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.FBGYWBD = #{fbgywbd} where id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml index 9f5e4db4..5cd9c06a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml @@ -167,10 +167,6 @@ where id = #{id} - - update SAR_BUSS_STAND_ATTR_INFO sb set sb.FBGBUSS = #{fbgbuss}, sb.TRANSLATION = #{translation} - where ID = #{id} - + SELECT + std.id as 'standId', + att.id as 'attfid', + att.FBGBUSS as 'fileId' + from sar_bussioness_stand std + left JOIN sar_buss_stand_attr_info att on std.id = att.STAND_ID + left join SAR_BUSS_STAND_MENU smenu ON std.id = smenu.buss_stand_id + where 1=1 + and att.FBGBUSS is not null + and smenu.MENU_ID = '44' + + + + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} + where id = #{attfId} + diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java index b51ade10..7218e09e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -24,4 +24,5 @@ public interface AttFileEODao extends BaseMapper { public int insertData(AttFileEO attFileEO); + void deleteByIdInfo(String str, String id); } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index ad3edad4..d7ef8220 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -32,4 +32,6 @@ public interface IAttFileEOService extends IService { public AttFileVo insertFileInfo(File file,String fileName); void downLoadFileList(List multiFileInfos, String fileNowPath) throws IOException; + + void deleteById(String id); } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 7d759ce5..9b178b8b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -23,10 +23,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.List; +import java.util.*; @Service("attFileEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -438,6 +435,17 @@ public class AttFileEOServiceImpl extends ServiceImpl i } } } + + @Override + public void deleteById(String id) { + if(StringUtils.isNotBlank(id)){ + String[] s = id.split("_"); + List asList = Arrays.asList(s); + String str = "att_file_"+asList.get(2); + baseMapper.deleteByIdInfo(str,id); + } + } + public static void copyFile1(String srcPath, String destPath) throws IOException { // 打开输入流 FileInputStream fis = new FileInputStream(srcPath); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index 565a95df..1349ee8e 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -100,4 +100,8 @@ update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id} + + delete from ${str} where id = #{id} + + From 02a4b8a6d7fa9e4ea9766bf9384ddbd25c65def2 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 26 Mar 2023 10:16:30 +0800 Subject: [PATCH 52/54] =?UTF-8?q?OA=E4=B8=89=E5=A4=A9=E5=90=8E=E6=92=A4?= =?UTF-8?q?=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 7 +++++++ .../adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 10 ++++++++++ .../esRevisePlan/service/IEsRevisePlanService.java | 3 +++ .../service/impl/EsRevisePlanServiceImpl.java | 10 ++++++++++ 5 files changed, 32 insertions(+) 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 5256f0be..3f94431f 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 @@ -61,6 +61,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); // 提供企标计划数据 addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk"); + // 修改企业计划数据 + addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/oaUpdatePlans"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index a8058830..0c4cb4f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -182,4 +183,10 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.delPlans(ids)); } + @ApiOperation(value = "OA时间添加") + @GetMapping("/oaUpdatePlans") + public ResponseMessage oaUpdatePlans(@RequestParam("esId")String esId, @RequestParam("date") Date date, @RequestParam("s") String s){ + return Result.success(iEsRevisePlanService.oaUpdatePlans(esId,date,s)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 06ae6697..663f5efc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -159,4 +159,14 @@ public class EsRevisePlan extends BasePage { @TableField(exist = false) private String logType; + + @ApiModelProperty(value = "OA发送时间记录") + @TableField("OA_DATETIME") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date oaDateIime; + + @ApiModelProperty(value = "OA是否已经发送") + @TableField("OA_IS_SEND") + private String oaIsSend; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 6d727bd3..562ac4b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; import java.util.List; /** @@ -28,4 +29,6 @@ public interface IEsRevisePlanService extends IService { List getDataByName(EsRevisePlan esRevisePlan); List getAllPlansByWk(String esName); + + Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 79bc10ed..b51ef3f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -229,4 +229,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Sun, 26 Mar 2023 12:59:43 +0800 Subject: [PATCH 53/54] =?UTF-8?q?OA=E4=B8=89=E5=A4=A9=E5=90=8E=E6=92=A4?= =?UTF-8?q?=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6964430b..6ad0614e 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 @@ -3953,10 +3953,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Sun, 26 Mar 2023 13:06:24 +0800 Subject: [PATCH 54/54] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 ++ .../controller/SarStandardsInfoController.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 6ad0614e..34201c5e 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 @@ -3756,6 +3756,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl QueryWrapper wrapper=new QueryWrapper<>(); wrapper .eq("STAND_TYPE",page.getStandType()) .eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort()) + .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName()) .eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber()) .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0); Integer s=sarStandardsInfoEOService.count(wrapper); if (s>0){ - return Result.error("当前标准编号已存在"); + return Result.error("当前标准编号或中文名称已存在"); }else { return Result.success(); }