diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ccd200f7..5c8cf3cd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -17,6 +17,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) + long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); + @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) Wrapper activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId); @@ -374,7 +377,7 @@ public interface workFlowFeignClient { Wrapper findPrcNumByPid(@RequestParam("pId") String pId); @RequestMapping(value = "/bat-wkflow/findPrcNameByPrcNum",method = RequestMethod.GET) - Wrapper findPrcNameByPrcNum(@RequestParam("prcNum") String prcNum); + Wrapper findPrcNameByPrcNum(@RequestParam("prcNum") String prcNum); @RequestMapping(value = "/bat-wkflow/getStandCode",method = RequestMethod.GET) Set getStandCode(); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 2b40fb5e..aa8221bc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -25,6 +25,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + long stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); + return stringWrapper; + } + public ResponseMessage activiti_define_start(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId){ Wrapper stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId); return Result.success(stringWrapper.getResult()); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 34216ab8..523b81e8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -51,6 +51,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "流程实例明细验证是否完成") + @GetMapping("/get_verify_by_instance") + public long activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + return workFlowFeignClient.get_verify_by_instance(taskId,pId); + } + @ApiOperation(value = "导出excel") @PostMapping("/export_excel") public void exportExcel(@RequestBody ExportExcelEO exportExcelEO, HttpServletResponse response, HttpServletRequest request) throws IOException { diff --git a/adc-da-convert/pom.xml b/adc-da-convert/pom.xml index 49b7dbb2..3394f4a2 100644 --- a/adc-da-convert/pom.xml +++ b/adc-da-convert/pom.xml @@ -23,20 +23,28 @@ 3.0.0 + + + com.artofsolving + jodconverter + system + 2.2.2 + ${basedir}/src/main/lib/jodconverter-2.2.2.jar + org.jodconverter jodconverter-core - 4.2.2 + 4.3.0 org.jodconverter jodconverter-spring-boot-starter - 4.2.2 + 4.3.0 org.jodconverter jodconverter-local - 4.2.2 + 4.3.0 diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java index 5fd73037..503973d9 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java @@ -1,16 +1,20 @@ package com.adc.da.convert.common; +import com.artofsolving.jodconverter.openoffice.connection.SocketOpenOfficeConnection; +import com.artofsolving.jodconverter.openoffice.converter.StreamOpenOfficeDocumentConverter; import org.apache.commons.lang.StringUtils; -import org.jodconverter.DocumentConverter; -import org.jodconverter.JodConverter; -import org.jodconverter.OfficeDocumentConverter; -import org.jodconverter.document.DefaultDocumentFormatRegistry; -import org.jodconverter.office.*; +import org.jodconverter.core.DocumentConverter; +import org.jodconverter.core.office.OfficeException; +import org.jodconverter.core.office.OfficeManager; +import org.jodconverter.core.office.OfficeUtils; +import org.jodconverter.local.JodConverter; +import org.jodconverter.local.office.LocalOfficeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import java.io.*; +import java.net.ConnectException; public class DocConverterPdf { @@ -75,6 +79,35 @@ public class DocConverterPdf { */ private static final int openOfficePort = 8100; + /** + * + * @param input 初始文件的路径，例：C:\Users\...\Desktop\test\1.doc + * @param output 转换后的存储路径，例：C:\Users\...\Desktop\test\ + */ + public void convert(File input , File output){ + + if (!input.exists()){ + System.out.println("源文件不存在"); + return; + } + SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("0.0.0.0", 8100); +// SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("10.10.66.176", 8100); + try { + connection.connect(); + System.out.println("获取连接成功！"); + } catch (ConnectException e) { + System.out.println("获取连接失败！"); + e.printStackTrace(); + } +// OpenOfficeDocumentConverter converter = new OpenOfficeDocumentConverter(connection); + StreamOpenOfficeDocumentConverter converter = new StreamOpenOfficeDocumentConverter(connection); + System.out.println("开始转换！"); + converter.convert(input, output); + System.out.println("转换成功！"); + System.out.println("关闭连接！"); + connection.disconnect(); + } + /** * 转化文档 * @param input @@ -113,7 +146,7 @@ public class DocConverterPdf { try { // in = new FileInputStream(docFile); // out = new FileOutputStream(convertPdfFile); - convertFile(docFile,convertPdfFile); + convert(docFile,convertPdfFile); // converter.convert(in).as(DefaultDocumentFormatRegistry.getFormatByMediaType(filesType)). // to(out).as(DefaultDocumentFormatRegistry.PDF); // close the connection diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index fb4b5ca4..6fa51b04 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -84,13 +84,9 @@ public class SearchCenterController extends BaseController> if (StringUtils.isAlphanumericSpace(searchInfoEO.getSelectIndex())) { if(elasticsearchService.isIndexExist(searchInfoEO.getSelectIndex())){ if("fulltextserch".equals(searchInfoEO.getSelectIndex()) || "fulltextserch"== searchInfoEO.getSelectIndex()){ - Pattern pattern = Pattern.compile("^[a-zA-Z]+\\s[0-9a-zA-Z\\.\\(\\（\\）\\)\\-\\s]+$"); + Pattern pattern = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-]+$"); if (null != searchInfoEO.getSelectValue() && StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { - if (pattern.matcher(searchInfoEO.getSelectValue()).matches()) { - result = searchCenterService.searchSarBykeyAndHighLightNumber(searchInfoEO); - }else { - result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); - } + result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); } else { result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index d172428e..fc907922 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -156,7 +156,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { @@ -178,6 +178,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } + if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); + } boolQueryBuilder.must(boolQueryShould); }else { boolQueryBuilder.must(boolQueryShould); @@ -245,7 +251,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ - List fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + List fieldList = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); collectAttrMap.put("CYSD",array); } @@ -287,15 +293,60 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } if(!fields.isEmpty()){ - for (String str : fields) { - boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+str+"*")); + if(fields.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + fields.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery(keyWordField, "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+fields.get(0)+"*")); } + } } } } if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())) { boolQueryBuilder.should(boolQueryBuilderMust); + if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){ + List list = Arrays.asList(searchInfoEO.getQCDW().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+searchInfoEO.getQCDW()+"*")); + } + } + + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ + List list = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+searchInfoEO.getCYSD()+"*")); + } + } + + if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + List list = Arrays.asList(searchInfoEO.getCLLX().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+searchInfoEO.getCLLX()+"*")); + } + } }else { boolQueryBuilder.must(boolQueryBuilderMust); } @@ -312,7 +363,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*")); + List list = Arrays.asList(searchInfoEO.getStandSort().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } } if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*")); @@ -571,20 +631,29 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standCode.keyword", "*"+searchInfoEO.getStandCode()+"*")); + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandName())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*")); + boolQueryBuilder.must(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getStandName()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + List list = Arrays.asList(searchInfoEO.getTextStatusBuss().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + } } if (searchInfoEO.getIssueTime() != null) { @@ -644,7 +713,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 循环统计各种类型数据 String[] seniortype; if("stand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD"}; + String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"}; seniortype = seniortypeStand.clone(); } else if("laws".equals(searchInfoEO.getSelectIndex())){ String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"}; @@ -943,12 +1012,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); // 记录搜索记录到数据库中 if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ - QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); - multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "title","textContent","textItems" - ).minimumShouldMatch("100%").field("title",10f); - boolQueryBuilder.must(multiQueryBuilder); -// boolQueryBuilder.should() + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + "title" + ).minimumShouldMatch("100%").field("title",10f)); + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + "textItems" + ).minimumShouldMatch("100%").field("title",10f)); + boolQueryBuilder.should(QueryBuilders.wildcardQuery("title.keyword","*"+searchInfoEO.getSelectValue()+"*")); } //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword())) { @@ -1060,16 +1133,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); QueryBuilder multiQueryBuilder; multiQueryBuilder = QueryBuilders.multiMatchQuery(value, - "title","textContent").minimumShouldMatch("100%").field("title",1f); + "title.keyword","textContent.keyword").minimumShouldMatch("100%").field("title.keyword",1f); boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) - .should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*")) + boolQueryShould.should(QueryBuilders.wildcardQuery("title.keyword", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) + .should(QueryBuilders.wildcardQuery("textContent.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(multiQueryBuilder); boolQueryBuilder.should(boolQueryShould); //在结果中检索 // boolQueryBuilder.must(multiQueryBuilder); HighlightBuilder hiBuilder=new HighlightBuilder(); - HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title"); + HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title.keyword"); hiBuilder.field(highlightTitle); HighlightBuilder.Field highlightUser = new HighlightBuilder.Field("textContent"); hiBuilder.field(highlightUser); @@ -1091,7 +1164,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { Map sourceAsMap = searchHit.getSourceAsMap(); //解析高亮字段 Map highlightFields = searchHit.getHighlightFields(); - HighlightField field= highlightFields.get("title"); + HighlightField field= highlightFields.get("title.keyword"); if(field!= null){ Text[] fragments = field.fragments(); String n_field = ""; @@ -1099,11 +1172,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { n_field += fragment; } //高亮标题覆盖原标题 - sourceAsMap.put("title",n_field); + sourceAsMap.put("title.keyword",n_field); } Map highlightFieldsnameshowStr = searchHit.getHighlightFields(); - HighlightField fieldnameshowStr= highlightFieldsnameshowStr.get("textContent"); + HighlightField fieldnameshowStr= highlightFieldsnameshowStr.get("textContent.keyword"); if(fieldnameshowStr!= null){ Text[] fragments = fieldnameshowStr.fragments(); String n_field = ""; @@ -1111,7 +1184,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { n_field += fragment; } //高亮标题覆盖原标题 - sourceAsMap.put("textContent",n_field); + sourceAsMap.put("textContent.keyword",n_field); } result.add(sourceAsMap); } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index b45fe99e..21240490 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -302,9 +302,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); - contentBuilder.append("企标英文名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); + contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 0c0cf95d..f8b1108c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -171,17 +171,18 @@ public class SendBussMQService { saveMap.put("validFlag","0"); saveMap.put("content",infoEO.getFileIds()); - String fieldInfo = InitStandAttrUtil.queryField; + String fieldInfo = InitStandAttrUtil.queryFieldBuss; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); // 动态存储属性字段 for (String field : fieldInfoList) { saveMap.put(field,attrInfoMap.getOrDefault(field,"")); String fieldValue = ""; - if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){ - Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); + String fieldFilter = field.toLowerCase(); + if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ + Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); if(!json.toString().equals("null")){ - fieldValue = infoMap.get(field).toString(); + fieldValue = infoMap.get(fieldFilter).toString(); } } saveMap.put(field+"Name",fieldValue); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 6664c6bb..beb4b269 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -12,7 +12,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.sun.corba.se.spi.ior.iiop.IIOPFactories; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -21,9 +23,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.time.LocalDate; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.regex.Pattern; + @EnableScheduling @Component @@ -127,10 +129,15 @@ public class ScheduledJob { .setMark("3") .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - //实施日期达到预警时间,但新车型实施日期不在时间内 - if (term.isTerm(warningEO.getXCXSSRQ())){ - warningEO.setPutTime(warningEO.getXCXSSRQ()); - } + + //实施日期达到预警时间,但在产车实施日期不在时间内 + /** + * 2021/9/9取消限制 + */ +// if (term.isTerm(warningEO.getXCXSSRQ())){ +// warningEO.setPutTime(warningEO.getXCXSSRQ()); +// } + warningEO.setPutTime(warningEO.getXCXSSRQ()); } warningList.addAll(standInfoXCXSSRQ); @@ -148,9 +155,13 @@ public class ScheduledJob { .setMark("4") .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); //实施日期达到预警时间,但在产车实施日期不在时间内 - if (term.isTerm(warningEO.getZCCSSRQ())){ - warningEO.setPutTime(warningEO.getZCCSSRQ()); - } + /** + * 2021/9/9取消限制 + */ +// if (term.isTerm(warningEO.getZCCSSRQ())){ +// warningEO.setPutTime(warningEO.getZCCSSRQ()); +// } + warningEO.setPutTime(warningEO.getZCCSSRQ()); } warningList.addAll(standInfoZCCSSRQ); @@ -205,37 +216,87 @@ public class ScheduledJob { /** - * 被多个标准代替的标准变为“被代替”，只有一个被代替的自动变为“废止” + * 被多个标准代替的标准变为“被代替”，只被一个标准代替的自动变为“废止” */ - QueryWrapper columns = new QueryWrapper<>(); - columns.select("DTBJH","STAND_ID"); - List> mapsDTBZH = sarStandAttrInfoDao.selectMaps(columns); + QueryWrapper columnForDTBJH = new QueryWrapper<>(); - mapsDTBZH.forEach(item->{ - if (item.get("DTBJH")!=null && !item.get("DTBJH").toString().equals("")){ - String dtbzh = item.get("DTBJH").toString(); - String[] split = dtbzh.split(","); - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); - sarStandardsInfo.setId(item.get("STAND_ID").toString()); + columnForDTBJH.select("DTBJH"); + //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 + List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); + HashMap replaceIdCountMap = new HashMap<>(); +// 格式为 T/CSAE 175-2021 + Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); + replaceStandIdMaps.forEach(item->{ + if (item!=null){ + //此标准代替的标准的标准号的数组 + String DTBJHStr = item.get("DTBJH").toString(); - //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态 - switch (split.length){ - case 0 : - break; - case 1 : - sarStandardsInfo.setTextStatus("chblaarg77");//废止状态 - break; - default: - sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态 - } - try { - sarStandardsInfoDao.updateById(sarStandardsInfo); - }catch (Exception e){ - System.out.println("代替标准状态更新:id为"+item.get("STAND_ID").toString()+"文本状态更新失败"); + //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021) + if (!DTBJHStr.equals("")) { + String[] DTBJHArray = DTBJHStr.split(","); + for (String DTBJH : DTBJHArray) { + + if (!pattern.matcher(DTBJH).matches()){ + continue; + } + + String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 + String sort = split[0]; + String number = split[1]; + String year = split[2]; + + QueryWrapper infoWrapper = new QueryWrapper<>(); + infoWrapper.select("ID") + .eq("STAND_SORT", sort) + .eq("STAND_NUMBER", number) + .eq("STAND_YEAR", year); + + + List> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); + if (idMaps.size() > 0) { + String standId = idMaps.get(0).get("ID").toString(); + //如果代替标准id已存在则映射为2不存在则添加并映射为1 + if (replaceIdCountMap.containsKey(standId)) { + replaceIdCountMap.replace(standId, 2); + } else { + replaceIdCountMap.put(standId, 1); + } + } + + + } + + + } } + + }); + + + + + //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态 + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + for (String key : replaceIdCountMap.keySet()) { + switch (replaceIdCountMap.get(key)){ + case 1 : + sarStandardsInfo.setTextStatus("chblaarg77");//废止状态 + sarStandardsInfo.setId(key); + break; + default : + sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态 + sarStandardsInfo.setId(key); + break; } - }); + + try { + sarStandardsInfoDao.updateById(sarStandardsInfo); + }catch (Exception e){ + System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); + } + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java new file mode 100644 index 00000000..24bed50b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -0,0 +1,150 @@ +package com.adc.da.slrs.DataSync; + +import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; +import com.adc.da.slrs.sarInstitution.service.impl.TsInstitutionServiceImpl; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarPosition.service.impl.TsPositionServiceImpl; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.sarUser.service.impl.TsUserServiceImpl; +import com.adc.da.sync.service.SyncUserService; +import com.adc.da.sys.dao.OrgEODao; +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.impl.OrgEOServiceImpl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.sql.Timestamp; +import java.util.*; + +@RestController +@Api(description = "|SarStandPutTime|") +@RequestMapping("/DataSync") +public class DataSyncController { + + @Autowired + ITsPositionService tsPositionService; + @Autowired + ITsUserService tsUserService; + @Autowired + ITsInstitutionService tsInstitutionService; + + + @ApiOperation("同步用户数据") + @PostMapping("/importUserData") + public String importUserData() throws Exception { + SyncUserService syncUserService = new SyncUserService(); + List res = syncUserService.syncFotonUser(); + //存放岗位信息 + Map positionMap = new HashMap<>(); + Map useDistinct = new HashMap<>(); + TsPosition position = new TsPosition(); + position.setCurrent(1); + position.setPageSize(100000); + IPage iPage = tsPositionService.getPosition(position); + List positions=iPage.getRecords(); + if (!positions.isEmpty()) { + positions.forEach(tsPosition -> { + positionMap.put(tsPosition.getName(), tsPosition.getId()); + }); + } + for (String s : res) { + //获取到所有用户数据 + List tsUsers = new ArrayList<>(); + + JSONArray jsonArray = JSONArray.parseArray(JSONObject.parseObject(s.toString()).getString("results")); + jsonArray.forEach(object -> { + JSONObject jsonObject = JSONObject.parseObject(object.toString()); + //先获取岗位以及岗位id + TsUser tsUser = new TsUser(); + UserOrgEO userOrgEO = new UserOrgEO(); + //设置岗位 + if (null != jsonObject.getString("title")) { + if (null == positionMap.get(jsonObject.getString("title"))) { + TsPosition tsPosition = new TsPosition(); + tsPosition.setId(String.valueOf(UUID.randomUUID())); + tsPosition.setName(jsonObject.getString("title")); + tsPositionService.addPosition(tsPosition); + //放入岗位的map集合中 + positionMap.put(tsPosition.getName(), tsPosition.getId()); + //放入类中 + tsUser.setPositionName(tsPosition.getName()); + tsUser.setPositionId(tsPosition.getId()); + } else { + tsUser.setPositionName(jsonObject.getString("title").trim()); + tsUser.setPositionId(positionMap.get(jsonObject.getString("title").trim())); + } + } + //设置其他数据 + Timestamp createTime = new Timestamp(new Date().getTime()); + tsUser.setState(jsonObject.getString("userStatus")); + tsUser.setUname(null!=jsonObject.getString("name")?jsonObject.getString("name"):""); + tsUser.setValidFlag("0"); + tsUser.setDisableFlag("0"); + tsUser.setCreationTime(createTime); + tsUser.setUserId(jsonObject.getString("userid")); + tsUser.setAccount(jsonObject.getString("userid")); + tsUser.setInstitutionId(null!=jsonObject.getString("orgNumber")?jsonObject.getString("orgNumber"):"" ); + tsUser.setInstitutionName(null!=jsonObject.getString("orgName")?jsonObject.getString("orgName"):"" ); + if (null == useDistinct.get(jsonObject.getString("userid"))) { + tsUsers.add(tsUser); + + } + useDistinct.put(tsUser.getUserId(),tsUser.getUserId()); + }); + tsUserService.saveBatch(tsUsers); + } + + return "1"; + } + + @ApiOperation("同步组织机构") + @PostMapping("/importOrgData") + public String importOrgData() throws Exception { + SyncUserService syncUserService = new SyncUserService(); + List res = syncUserService.syncFotonOrg(); + + //获取到所有用户数据 + List strings=new ArrayList<>(); + + tsInstitutionService.clearData(); + for (String s : res) { + JSONArray jsonArray = JSONArray.parseArray(JSONObject.parseObject(s.toString()).getString("results")); + jsonArray.forEach(object -> { + JSONObject jsonObject = JSONObject.parseObject(object.toString()); + strings.add(jsonObject.getString("parentOrgNumber")); + }); + } + for (String s : res) { + List tsInstitutions = new ArrayList<>(); + JSONArray jsonArray = JSONArray.parseArray(JSONObject.parseObject(s.toString()).getString("results")); + jsonArray.forEach(object -> { + JSONObject jsonObject = JSONObject.parseObject(object.toString()); + TsInstitution tsInstitution=new TsInstitution(); + tsInstitution.setId(jsonObject.getString("orgNumber")); + tsInstitution.setName(jsonObject.getString("orgName")); + tsInstitution.setHasChild(strings.contains(jsonObject.getString("orgNumber"))?"1":"0"); + tsInstitution.setParentId(jsonObject.getString("parentOrgNumber")); + //部门为"null"的数据不保存 + if (!"null".equals(jsonObject.getString("orgName"))){ + tsInstitutions.add(tsInstitution); + } + }); + tsInstitutionService.saveBatch(tsInstitutions); + } + return "1"; + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java new file mode 100644 index 00000000..1efb078a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java @@ -0,0 +1,80 @@ +package com.adc.da.slrs.ImportExcelDatas.comment; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.adc.da.utils.util.BussStandExportUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.lang.reflect.Field; +import java.util.List; + + +@Component +public class ExclErrorOut { + private static final Logger logger = LoggerFactory.getLogger(BussStandExportUtil.class); + + public static Workbook exportDatas (List datas,String header) { + Workbook workbook = new XSSFWorkbook(); + try { + + + //创建工作表对象 + Sheet sheet = workbook.createSheet(); + // 创建头部 + createHeader(workbook,sheet,header); + // 创建数据 + createDatas(workbook,sheet,datas); + } catch (Exception e) { + logger.error(e.getMessage(), e); + } + return workbook; + } + + + public static void createHeader(Workbook workbook, Sheet sheet, String header){ + CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + Row rowHeader = sheet.createRow(0);//开始创建标题行 + if (StringUtils.isNotBlank(header)) { + String[] headerArr = header.split(","); + for (int i=0;i < headerArr.length; i++) { + rowHeader.createCell(i).setCellValue(headerArr[i]); +// rowHeader.createCell(i).setCellStyle(cellStyle); + } + } + } + + + + public static void createDatas(Workbook workbook,Sheet sheet,List datas) throws Exception{ + CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + if (datas != null && !datas.isEmpty()) { + for (int i=0;i < datas.size(); i++) { + ImportDto importDto = datas.get(i); + Row row = sheet.createRow(i+1); + + int sheetNum = 0; + + Class cls = importDto.getClass(); + Field[] fields = cls.getDeclaredFields(); + for (Field field : fields) { + field.setAccessible(true); + if (field.get(importDto)!=null){ + String value = field.get(importDto).toString(); + row.createCell(sheetNum).setCellValue(value); + }else { + row.createCell(sheetNum).setCellValue(""); + } + sheetNum++; + } + } + } + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java new file mode 100644 index 00000000..1a36d323 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -0,0 +1,82 @@ +package com.adc.da.slrs.ImportExcelDatas.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.common.ReadExcel; +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut; +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; +import com.adc.da.slrs.ImportExcelDatas.service.impl.ImportExcelServiceImpl; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar; +import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO; +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.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.factory.annotation.Autowired; +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.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; +import java.util.Map; + +@RestController +@Api(description = "|SarStandPutTime|") +@RequestMapping("/ImportExcel") +public class ImportExcelController extends BaseController { + + @Autowired + private ImportExcelService importExcelService; + + @Autowired + private ExclErrorOut exclErrorOut; + + @ApiOperation("批量删除用户收藏") + @PostMapping("/import") + public void deleteList(MultipartFile file, MultipartFile file2, HttpServletResponse response, HttpServletRequest request) throws IOException { + Map> mapMap=importExcelService.getExcelData(file,file2); + List errorList = importExcelService.storageExclData(mapMap); +// List guonei= mapMap.get("GNBZ"); +// List haiwai = mapMap.get("HWBZ"); +// List qibiao = mapMap.get("QYBZ"); + OutputStream os = null; + Workbook workbook = null; + try { + + String exportName="错误表格"; + response.setHeader("Content-Disposition", + "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request)); + response.setContentType("application/force-download"); + //导出数据 + String headStr="标准号,标准名称,英文名称,发布时间,实施时间,标准状态,代替标准号,附件路径,错误原因"; + workbook = exclErrorOut.exportDatas(errorList,headStr); + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + throw new AdcDaBaseException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + if (workbook != null) { + workbook.close(); + } + } + + + +// return responseMessage; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/dao/ImportExcelDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/dao/ImportExcelDao.java new file mode 100644 index 00000000..29293c7e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/dao/ImportExcelDao.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.ImportExcelDatas.dao; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +public interface ImportExcelDao extends BaseMapper { + + Map>> getExcelData(MultipartFile file); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java new file mode 100644 index 00000000..849680e3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.ImportExcelDatas.entity; + +import com.adc.da.base.entity.BaseEntity; +import lombok.Data; + +@Data +public class ImportDto extends BaseEntity { + +// 标准号 + private String standId; +// 标准名称 + private String standName; +// 英文名称 + private String standNameEN; +// 发布时间 + private String publishTime; +// 实施时间 + private String implementedTime; +// 标准状态 + private String standStatus; +// 代替标准号 + private String replaceId; +// 附件路径 + private String path; + +// 错误原因 + private String errorStr; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java new file mode 100644 index 00000000..61851025 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.ImportExcelDatas.service; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +public interface ImportExcelService extends IService { + + Map> getExcelData(MultipartFile file,MultipartFile file2); + + + public List storageExclData(Map> importListMap); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java new file mode 100644 index 00000000..5175ea6c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -0,0 +1,705 @@ +package com.adc.da.slrs.ImportExcelDatas.service.impl; + +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.http.Result; +import com.adc.da.slrs.ImportExcelDatas.dao.ImportExcelDao; +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.entity.DictionaryEO; +import com.adc.da.sys.service.impl.DicTypeEOServiceImpl; +import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.Gson; +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.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.InputStream; +import java.util.*; +import java.util.regex.Pattern; + +@Service +public class ImportExcelServiceImpl extends ServiceImpl implements ImportExcelService { + + + @Autowired + private IAttFileEOService attFileEOService; + +// @Autowired +// private CreateStandMQService createStandMQService; +// +// @Autowired +// private SarStandardsInfoServiceImpl sarStandardsInfoService; +// +// +// +// @Autowired +// private SarBussionessStandServiceImpl sarBussionessStandService; + + + + private final static String GN = "GB,GB/T,QC/T,GJB,JB,JT,HG,YV,SY,SH,GA,HJ,QB,JG,NB,JC,YS/T,FZ/T,TB/T,JJG,SJ/T,T/TBPS" + + ",NB/T,CJ/T,YS/T,SJ/T,BB/T,SN/T,SB/T,MH/T,DB11,SZDB/Z,HKG,T/ZSA,CSAE,T/CAS,T/CADA,T/CHTS,T/ITS,T/BJQC"; + private final static String QB = "Q/QCBFC,Q/FT,Q/FL,Q/QCFLC,Q/BQB,Q/SGT," + + "Q-AMSN,QB-NE,Q-IOUM,Q房/AYJ,KNT"; + + // file 为主 file2 为附件 + @Override + public Map> getExcelData(MultipartFile file, MultipartFile file2) { + + List dates = new ArrayList<>(); + for (int i = 1669; i < 2023; i++) { + dates.add("-" + i); + dates.add("—" + i); + dates.add("- " + i); + dates.add("— " + i); + } + + if (file == null || file.getSize() == 0) { + log.error("文件上传错误，重新上传"); + } + String filename = file.getOriginalFilename(); + if (!(filename.endsWith(".xls") || filename.endsWith(".xlsx"))) { + log.error("文件上传格式错误，请重新上传"); + } + + if (file2 == null || file2.getSize() == 0) { + log.error("文件上传错误，重新上传"); + } + String filename2 = file2.getOriginalFilename(); + if (!(filename2.endsWith(".xls") || filename2.endsWith(".xlsx"))) { + log.error("文件上传格式错误，请重新上传"); + } + + List datas = new ArrayList<>(); + List fujian = new ArrayList<>(); + try { + if (filename.endsWith(".xls")) { + datas = isXls(file); + } else { + datas = isXlsx(file); + } + + if (filename2.endsWith(".xls")) { + fujian = isXls(file2); + } else { + fujian = isXlsx(file2); + } + } catch (Exception e) { + log.error(e.getMessage()); + } + Map> res = new HashMap<>(); +// 国内标准 + List GNS = new ArrayList<>(Arrays.asList(GN.split(","))); +// 企业标准 + List QBS = new ArrayList<>(Arrays.asList(QB.split(","))); + //处理数据 + List InCountry = new ArrayList<>(); + List OutCountry = new ArrayList<>(); + List QiBiao = new ArrayList<>(); + List error = new ArrayList<>(); + //中间的Map 判断标准号属于哪种类型 + Map middle = new HashMap<>(); + datas.forEach(items -> { + //判断是否是正确的数据 + String[] as = items.split(","); + if (!inDate(as[0], dates)) { + ImportDto importDto = getImportDto(as); + error.add(importDto); + middle.put(as[0].trim(), "error-" + error.size()); + } else { + //数据二次拆解 针对标准进行拆解 + String[] step2 = as[0].trim().split(" "); +// 是否国内？ 企标 ？ 海外 + if (isCheck(GNS, step2[0].trim())) { + ImportDto importDto = getImportDto(as); + InCountry.add(importDto); + middle.put(as[0].trim(), "GNBZ-" + InCountry.size()); + } else if (isCheck(QBS, step2[0].trim())) { + ImportDto importDto = getImportDto(as); + QiBiao.add(importDto); + middle.put(as[0].trim(), "QYBZ-" + QiBiao.size()); + } else { + ImportDto importDto = getImportDto(as); + OutCountry.add(importDto); + middle.put(as[0].trim(), "HWBZ-" + OutCountry.size()); + } + } + }); + res.put("error", error); + res.put("GNBZ", InCountry); + res.put("QYBZ", QiBiao); + res.put("HWBZ", OutCountry); + + fujian.forEach(items2 -> { + String[] fj = items2.split(","); + if (fj.length > 2) { + if (null != middle.get(null != fj[2] ? fj[2].trim() : "")) { + //对应数据位置 + String[] location = middle.get(fj[2].trim()).split("-"); + res.get(location[0]).get(Integer.parseInt(location[1]) - 1).setPath(fj[3]); + } + } + }); + + + return res; + } + + private boolean inDate(String as, List dates) { + if (null != as && !"".equals(as)) { + for (String s : dates) { + if (s.equals(as.trim())) { + return true; + } else if (as.trim().contains(s)) { + return true; + } + } + } + return false; + } + + + private boolean isCheck(List QB, String item) { + for (String s : QB) { + if (s.equals(item)) { + return true; + } else if (item.contains(s) && item.startsWith(s)) { + return true; + } + } + return false; + } + + + //赋值方法 + private ImportDto getImportDto(String[] as) { + ImportDto importDto = new ImportDto(); + if (as.length == 7) { + importDto.setStandId(null != as[0] ? as[0].trim() : ""); + importDto.setStandName(null != as[1] ? as[1].trim() : ""); + importDto.setStandNameEN(null != as[2] ? as[2].trim() : ""); + importDto.setPublishTime(null != as[3] ? as[3].trim() : ""); + importDto.setImplementedTime(null != as[4] ? as[4].trim() : ""); + importDto.setStandStatus(null != as[5] ? as[5].trim() : ""); + importDto.setReplaceId(null != as[6] ? as[6].trim() : ""); + } else if (as.length == 6) { + importDto.setStandId(null != as[0] ? as[0].trim() : ""); + importDto.setStandName(null != as[1] ? as[1].trim() : ""); + importDto.setStandNameEN(null != as[2] ? as[2].trim() : ""); + importDto.setPublishTime(null != as[3] ? as[3].trim() : ""); + importDto.setImplementedTime(null != as[4] ? as[4].trim() : ""); + importDto.setStandStatus(null != as[5] ? as[5].trim() : ""); + importDto.setReplaceId(""); + } + return importDto; + } + + + private List isXls(MultipartFile multipartFile) { + List strings = new ArrayList<>(); + try { + InputStream inputStream = multipartFile.getInputStream(); + HSSFWorkbook workbook = new HSSFWorkbook(inputStream); +// 读取有多少页 + int sheetNum = workbook.getNumberOfSheets(); +// 遍历sheet页 + for (int i = 0; i < sheetNum; i++) { + HSSFSheet sheet = workbook.getSheetAt(i); +// 获取有多少行 + int lastNum = sheet.getLastRowNum(); + for (int j = 1; j <= lastNum; j++) { + HSSFRow row = sheet.getRow(j); + if (null != row) { + strings.add(row.getCell(0).getStringCellValue()); + } + } + } + } catch (Exception e) { + log.error(e.getMessage()); + } + return strings; + } + + private List isXlsx(MultipartFile multipartFile) { + List strings = new ArrayList<>(); + try { + InputStream inputStream = multipartFile.getInputStream(); + XSSFWorkbook workbook = new XSSFWorkbook(inputStream); +// 读取有多少页 + int sheetNum = workbook.getNumberOfSheets(); +// 遍历sheet页 + for (int i = 0; i <= sheetNum; i++) { + XSSFSheet sheet = workbook.getSheetAt(i); +// 获取有多少行 + int lastNum = sheet.getLastRowNum(); + for (int j = 1; j <= lastNum; j++) { + XSSFRow row = sheet.getRow(j); + if (null != row) { + strings.add(row.getCell(0).getStringCellValue()); + } + } + } + } catch (Exception e) { + log.error(e.getMessage()); + } + return strings; + } + + + + + private List error = new ArrayList<>(); + + private List fileError = new ArrayList<>(); + + @Autowired + private ISarStandardsInfoService sarStandardsInfoService; + + @Autowired + private DicTypeEOServiceImpl dicTypeEOService; + + @Autowired + private ISarBussionessStandService sarBussionessStandService; + @Override + public List storageExclData(Map> importListMap) { + + + + error = importListMap.get("error"); + /** + * 初始化国内外标准属性字段 + */ + List listStandField = InitStandAttrUtil.queryFieldList; + Map standAttrMap = new TreeMap<>(); + listStandField.forEach(item ->{ + standAttrMap.put(item,""); + }); + + /** + * 海外标准 + */ + importListMap.get("HWBZ").forEach(item -> { + + String standID = UUIDUtils.randomUUID20(); + + //使用初始化的属性字段映射 获得key值,value为"" + Map mapField = standAttrMap; + SarStandardsInfo ForeignEO = parseImportDtoToStandardsInfo(item,mapField, standID); + + if (ForeignEO != null) { + ForeignEO.setValidFlag("0"); + ForeignEO.setStandType("FOREIGN"); + QueryWrapper standSaveWrapper = new QueryWrapper<>(); + standSaveWrapper + .eq("STAND_SORT", ForeignEO.getStandSort()) + .eq("STAND_NUMBER", ForeignEO.getStandNumber()) + .eq("STAND_YEAR", ForeignEO.getStandYear()); + + SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); + + + + if (one != null) { + ForeignEO.setId(one.getId()); + + try { + sarStandardsInfoService.updateSarStandardsInfo(ForeignEO); + } catch (Exception e) { + item.setErrorStr("标准更新失败"); + error.add(item); + e.printStackTrace(); + } + + } else { + try { + sarStandardsInfoService.createSarStandardsInfo(ForeignEO); + } catch (Exception e) { + item.setErrorStr("标准新增失败"); + error.add(item); + e.printStackTrace(); + } + + } + + + } else { + item.setErrorStr("标准号无法解析"); + error.add(item); + } + + + }); + + + /** + * 国内标准 + */ + + importListMap.get("GNBZ").forEach(item -> { + String standID = UUIDUtils.randomUUID20(); + //使用初始化的属性字段映射 获得key值,value为"" + Map mapStandField = standAttrMap; + SarStandardsInfo InlandEO = parseImportDtoToStandardsInfo(item, mapStandField,standID); + + if (InlandEO != null) { + + + InlandEO.setValidFlag("0"); + InlandEO.setStandType("INLAND"); + + + QueryWrapper standSaveWrapper = new QueryWrapper<>(); + standSaveWrapper + .eq("STAND_SORT", InlandEO.getStandSort()) + .eq("STAND_NUMBER", InlandEO.getStandNumber()) + .eq("STAND_YEAR", InlandEO.getStandYear()); + + + SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); + if (one != null) { + + + InlandEO.setId(one.getId()); + try { + sarStandardsInfoService.updateSarStandardsInfo(InlandEO); + } catch (Exception e) { + item.setErrorStr("国内标准更新失败"); + error.add(item); + e.printStackTrace(); + } + + + } else { + + + try { + sarStandardsInfoService.createSarStandardsInfo(InlandEO); + } catch (Exception e) { + item.setErrorStr("国内标准新增失败"); + error.add(item); + e.printStackTrace(); + } + } + } else { + item.setErrorStr("标准号无法解析"); + error.add(item); + importListMap.replace("error", error); + } + + + }); + + + /** + * 企业标准 + */ + + /** + * 初始化企业标准属性字段 + */ + List listStandBussField = InitStandAttrUtil.queryFieldListBuss; + Map bussAttrMap = new TreeMap<>(); + listStandBussField.forEach(item->{ + bussAttrMap.put(item,""); + }); + importListMap.get("QYBZ").forEach(item -> { + String standId = UUIDUtils.randomUUID20(); + SarBussionessStand BussEO = parseImportDtoToSarBussionessStand(item, bussAttrMap,standId); + + if (BussEO != null) { + + try { + QueryWrapper saveWrapper = new QueryWrapper<>(); + saveWrapper.eq("STAND_CODE", item.getStandId()); + SarBussionessStand one = sarBussionessStandService.getOne(saveWrapper); + if (one != null) { + BussEO.setId(one.getId()); + sarBussionessStandService.updateSarBussionessStand(BussEO); + } else { + sarBussionessStandService.createSarBussionessStand(BussEO); + } + + + } catch (Exception e) { + item.setErrorStr("数据格式错误"); + error.add(item); + + e.printStackTrace(); + + } + + } + + }); + + + error.addAll(fileError); + return error; + } + + + /** + * 整理为标准信息实体 + * @param importDto + * @param fieldMap 属性字段 + * @param standId + * @return + */ + public SarStandardsInfo parseImportDtoToStandardsInfo(ImportDto importDto,Map fieldMap, String standId) { + + + HashMap analysis = analysisStandId(importDto); + if (analysis == null) { + return null; + } + + SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo(); + sarStandardsInfoEO.setId(standId); + + + sarStandardsInfoEO.setStandSort(analysis.get("sort")); + sarStandardsInfoEO.setStandNumber(analysis.get("number")); + sarStandardsInfoEO.setStandYear(analysis.get("year")); + + sarStandardsInfoEO.setStandName(importDto.getStandName()); + sarStandardsInfoEO.setStandEnName(importDto.getStandNameEN()); + + /** + * 截取发布日期 年月日 + */ + String issueDate = importDto.getPublishTime().substring(0, 19); + sarStandardsInfoEO.setIssueTime(issueDate);//标准发布日期 + + String standStatus = importDto.getStandStatus(); + if ("有效".equals(standStatus)) { + sarStandardsInfoEO.setTextStatus("vsaga7nwub");//现行有效 + } + + /** + * 标准属性字段 + */ + + fieldMap.put("DTBJH", importDto.getReplaceId()); + fieldMap.put("SSRQ", importDto.getImplementedTime().substring(0, 19)); + + + /** + * 文件 + */ + if (importDto.getPath() != null) { + String path[] = importDto.getPath().split("/"); + String realPath = ""; + for (int i = 4; i < path.length; i++) { + realPath = realPath + "/" + path[i]; + + } + + + try { +// File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath); +// File file = new File(importPath + realPath); + File file = new File("/home/file/2021/" + realPath); + if (file.exists()) { + AttFileVo fileInfo = attFileEOService.saveFileInfo(file); + + if (importDto.getImplementedTime() != null) { + fieldMap.put("FBGJBD", fileInfo.getAttId()); + } else { + fieldMap.put("GLWJ", fileInfo.getAttId()); + } + + } else { + importDto.setErrorStr("文件不存在"); + fileError.add(importDto); + } + + } catch (Exception e) { + importDto.setErrorStr("文件打开失败"); + fileError.add(importDto); + e.printStackTrace(); + } + + } +// attrInfoMap.put("") + Gson gson = new Gson(); + String attrInfoJson = gson.toJson(fieldMap); + sarStandardsInfoEO.setSarStandAttrEOStr(attrInfoJson);//新增修改时属性表信息 + + + return sarStandardsInfoEO; + + } + + + /** + * 整理为企业标准实体 + * @param importDto + * @param standId + * @return + */ + public SarBussionessStand parseImportDtoToSarBussionessStand(ImportDto importDto,Map fieldMap, String standId) { + + + HashMap analysis = analysisStandId(importDto); + if (analysis == null) { + return null; + } else { + SarBussionessStand sarBussionessStand = new SarBussionessStand(); + sarBussionessStand.setId(standId); + sarBussionessStand.setStandSort(analysis.get("sort")); + sarBussionessStand.setStandYear(analysis.get("year")); + sarBussionessStand.setStandCode(importDto.getStandId()); + sarBussionessStand.setStandName(importDto.getStandName()); + sarBussionessStand.setStandEnName(importDto.getStandNameEN()); + sarBussionessStand.setIssueTime(importDto.getPublishTime()); + sarBussionessStand.setPutTime(importDto.getImplementedTime()); + sarBussionessStand.setReplacedStandNum(importDto.getReplaceId()); + sarBussionessStand.setValidFlag(0); + if ("有效".equals(importDto.getStandStatus())) { + sarBussionessStand.setTextStatusBuss("vsaga7nwub"); + } + + /** + * 企业标准属性字段 + */ + + + if (importDto.getPath() != null) { + String path[] = importDto.getPath().split("/"); + String realPath = ""; + for (int i = 4; i < path.length; i++) { + realPath = realPath + "/" + path[i]; + + } + + + try { +// File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath); +// File file = new File(importPath + realPath); + File file = new File("/home/file/2021/" + realPath); + + if (file.exists()) { + AttFileVo fileInfo = attFileEOService.saveFileInfo(file); + + + if (importDto.getImplementedTime()!=null && importDto.getImplementedTime()!=""){ + fieldMap.put("FBGBUSS",fileInfo.getAttId()); + + }else { + fieldMap.put("GLWJBUSS",fileInfo.getAttId()); + } + + + + } else { + importDto.setErrorStr("文件不存在"); + fileError.add(importDto); + } + + } catch (Exception e) { + importDto.setErrorStr("路径错误!"); + fileError.add(importDto); + e.printStackTrace(); + } + + + } + + String attrInfoJson = new Gson().toJson(fieldMap); + sarBussionessStand.setSarStandAttrEOStr(attrInfoJson);//新增修改时属性表信息 + return sarBussionessStand; + } + + + } + + + /** + * 解析标准号,标准类别不存在则新增 + * @param importDto + * @return + */ + public HashMap analysisStandId(ImportDto importDto) { + HashMap result = new HashMap<>(); + if (importDto.getStandId() == null) { + importDto.setErrorStr("标准号为空"); + error.add(importDto); + return null; + } else { + String standId = importDto.getStandId(); + //格式 非空格字符+空格+非空格字符+‘-’或‘—’或空格+年份 如Q/FT F003—2001 + Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); + if (!pattern.matcher(standId).matches()) { + importDto.setErrorStr("标准号无法解析"); + error.add(importDto); + return null; + } + + String sort = ""; + String number = ""; + String year = ""; + String[] split = importDto.getStandId().split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 + + +// 多种格式(╯‵□′)╯︵┻━┻ Q-FL T015-2021 Q/ FL T015-2021 Q/FL T015-2021 + int length = split.length; + number = split[length - 2]; + year = split[length - 1]; + for (int i = 0; i < length - 2; i++) { + sort += split[i]; + } + + result.put("sort", sort); + result.put("number", number); + result.put("year", year); + //标准类别不存在,新增标准类别 + List isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, sort, null); + if (isExist == null || isExist.isEmpty() || isExist.size()==0){ + + DicTypeEO dicTypeVO = new DicTypeEO(); + dicTypeVO.setId(null); + dicTypeVO.setDicId("JKSADFH564S"); + dicTypeVO.setDicTypeCode(sort); + dicTypeVO.setDicTypeName(sort); + dicTypeVO.setShowIndex(1); + Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO); + if (dicTypeEO>0){ + importDto.setErrorStr("标准类别不存在,已新增"); + }else { + importDto.setErrorStr("标准类别不存在,新增失败"); + } + error.add(importDto); + } + + + + + + return result; + } + + + } + + + + +} 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 b0019e1d..8e18f63a 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 @@ -14,7 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author super_liu @@ -52,6 +52,9 @@ public class SarBussStandAttrInfo extends BaseEntity { @TableField("MODIFY_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modifyTime; + + @TableField(exist = false) + private String glwj; // // @TableField("SVPPS") // private String svpps; 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 3455a955..349a675c 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 @@ -24,6 +24,8 @@ public interface ISarBussionessStandService extends IService SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; + ResponseMessage createSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; + List selectStandardsByStandNumber(String replaceStandNum); SarBussionessStand selectStandardsInfoByKey(String id) 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 8e784e58..bc01354b 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 @@ -241,6 +241,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); @@ -250,24 +269,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getMenuIdList = new ArrayList<>(); - if(userId != null){ - getMenuIdList= tsUserService.getResourceUserId(userId); - } - // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); - if(getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } - List ids = sarMenuEOService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); - } } page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id"); if(userId != null){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index beaa8d70..7826e189 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -5,8 +5,10 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; +import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +35,8 @@ public class TsInstitutionController extends BaseController { private ITsInstitutionService tsInstitutionService; @Autowired private ITsUserService tsUserService; + @Autowired + private TsUserDao tsUserDao; /** * 查询所有机构 @@ -59,14 +63,14 @@ public class TsInstitutionController extends BaseController { /** * 查询机构人员 - * @param institutionId：机构ID * @return ResponseMessage> */ @ApiOperation("查询机构的人员") - @GetMapping("/user") - public ResponseMessage> getUserByInstitutionId(@RequestParam String institutionId){ - List tsUsers=tsUserService.getUserByInstitutionId(institutionId); - return Result.success(tsUsers); + @PostMapping("/user") + public ResponseMessage> getUserByInstitutionId(TsUser tsUser){ +// List tsUsers=tsUserService.getUserByInstitutionId(institutionId); + IPage tsUserIPage = tsUserService.getUserByInstitutionId(tsUser); + return Result.success(tsUserIPage); } @ApiOperation("导入机构数据") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 8b8d2ee3..0ea1a63b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -54,9 +54,12 @@ public interface TsInstitutionDao extends BaseMapper { * 查询根机构 * @return List */ - @Select("select * from ts_institution where parent_id not in (select id from ts_institution)") + @Select("select * from ts_institution where parent_id not in (select id from ts_institution) order by name") List selectRoot(); @Select("select * from ts_institution order by rand() limit 1") TsInstitution selectRand(); + + int clearData(); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 688cc318..8350d452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -42,4 +42,6 @@ public interface ITsInstitutionService extends IService { * @return */ public List getFirst(); + + int clearData(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 2e3c47cd..57e64d77 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -213,4 +213,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); - List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ - lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); - } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ - lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); - } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ - lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); - } + /** + *2021/9/13 摒弃使用清单实施日期,改用标准实施日期 + */ +// List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);/ +// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ +// lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); +// } +// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ +// lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); +// } +// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ +// lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); +// } if ("INLAND".equals(lawsDto.getStandType()))lawsDto.setStandType("INLAND_STAND"); if ("FOREIGN".equals(lawsDto.getStandType()))lawsDto.setStandType("FOREIGN_STAND"); } @@ -281,18 +284,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { - putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); - xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); - zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); - mapList.put("实施日期("+s.getCountry()+")",putTime); - mapList.put("新车型实施日期("+s.getCountry()+")",xcx); - mapList.put("在产车实施日期("+s.getCountry()+")",zcc); + private void dateTime(LinkedHashMap> mapList, StandRegionalTimeDto s) { + String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); + String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); + String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); +// putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); +// xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); +// zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); + mapList.put("实施日期("+s.getCountry()+")", Collections.singletonList(putTime)); + mapList.put("新车型实施日期("+s.getCountry()+")", Collections.singletonList(xcx)); + mapList.put("在产车实施日期("+s.getCountry()+")", Collections.singletonList(zcc)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index c5939bdb..15092f35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -599,6 +599,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl { */ @ApiOperation("查询岗位") @GetMapping - public ResponseMessage> getPosition(TsPosition tsPosition){ - List positions=tsPositionService.getPosition(tsPosition); + public ResponseMessage> getPosition(TsPosition tsPosition){ + IPage positions=tsPositionService.getPosition(tsPosition); return Result.success(positions); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java index d5989e46..df811c59 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java @@ -64,6 +64,8 @@ public interface TsPositionDao extends BaseMapper { */ List getRoleIdsByPositionIds(List positionIds); + long pageTotal(); + /** * 通过roleId查询岗位ID列表 * @param roleId：角色ID diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java index f6f7bab0..e408f1b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java @@ -76,5 +76,12 @@ public class TsPosition extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; + @TableField(exist = false) + private Integer current; + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private Integer total; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java index 79565b95..cf4a653c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -23,7 +24,7 @@ public interface ITsPositionService extends IService { * @param tsPosition：查询信息 * @return List */ - List getPosition(TsPosition tsPosition); + IPage getPosition(TsPosition tsPosition); /** * 配置角色 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 9e9be8c7..0c57e382 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -9,6 +9,8 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +42,16 @@ public class TsPositionServiceImpl extends ServiceImpl */ @Override - public List getPosition(TsPosition tsPosition) { + public IPage getPosition(TsPosition tsPosition) { + IPage page=new Page(); - return tsPositionDao.selectPositionAndRole(tsPosition); + page.setTotal(tsPositionDao.pageTotal()); + page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition)); + page.setCurrent(tsPosition.getCurrent()); + page.setSize(tsPosition.getPageSize()); + System.out.println(page.getTotal()); + + return page; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 45327104..d1e8776f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -291,6 +291,7 @@ public class TsResourceServiceImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.eq("PARENT_ID",parent.getId()); TsResourceQueryWrapper.in("ID",getMenuIdList); + TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); for(TsResource TsResource:children){ TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index 35f62d53..a56520f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -39,7 +39,7 @@ public class SarPublicIdeaController extends BaseController { @ApiOperation(value = "分页查询") @GetMapping("/SelectAllPage") public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, - String start, String end){ + String start, String end,String type){ Date startdate = null; Date enddate = null; SimpleDateFormat formater = new SimpleDateFormat(); @@ -54,7 +54,7 @@ public class SarPublicIdeaController extends BaseController { } catch (ParseException e) { e.printStackTrace(); } - IPage Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate); + IPage Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate,type); return Result.success(Publiclist); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 470fb13a..6c21bd31 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -66,5 +66,11 @@ public class SarPublicIdea extends BaseEntity { @TableField("uniques") private String uniques; + @TableField("files") + private String files; + + @TableField("files_name") + private String filesName; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java index 10e58c4a..886d4dc4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java @@ -20,6 +20,6 @@ import java.util.Date; public interface ISarPublicIdeaService extends IService { String add(SarPublicIdea sarPublicIdea); - IPage selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate); + IPage selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate, String type); IPage selectAllDynamic(SeByoDto seByoDto); } 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 9d5b3771..f5c6e163 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,7 +1,6 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; - import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; @@ -22,7 +21,7 @@ import java.util.Date; /** *

- * 服务实现类 + * 服务实现类 *

* * @author super_liu @@ -36,7 +35,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end) { + public IPage selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); - list.like(StringUtils.isNotEmpty(category),"category",category) - .like(StringUtils.isNotEmpty(cname),"cname",cname) - .ge(start!=null,"start_time",start) - .le(end!=null,"end_time",end) - .orderByAsc("end_time"); - Page page = new Page<>(p,size); + if ("1".equals(type)) { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cname", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + } else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cname", cname) + .ge("end_time", new Date()) + .orderByAsc("end_time"); + } + Page page = new Page<>(p, size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); return userIPage; } /** - * * @param seByoDto * @return */ @@ -72,33 +77,33 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - if (sar.getCategory()!=null&&sar.getCategory().length()!=0){ - wrapper.like("category",sar.getCategory()); + if (sar.getCategory() != null && sar.getCategory().length() != 0) { + wrapper.like("category", sar.getCategory()); } - if (sar.getCname()!=null&&sar.getCname().length()!=0){ - wrapper.like("cname",sar.getCname()); + if (sar.getCname() != null && sar.getCname().length() != 0) { + wrapper.like("cname", sar.getCname()); } - if (sar.getStartTime()!=null){ - wrapper.le("start_time",sar.getStartTime()); + if (sar.getStartTime() != null) { + wrapper.le("start_time", sar.getStartTime()); } - if (sar.getEndTime()!=null){ - wrapper.gt("end_time",sar.getEndTime()); + if (sar.getEndTime() != null) { + wrapper.gt("end_time", sar.getEndTime()); } Page page = new Page<>(seByoDto.getPage(), seByoDto.getSize()); IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); return userIPage; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 88bf5c29..75b56cc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -8,6 +8,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -55,7 +56,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") - public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + public ResponseMessage> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ List rows = ServiceImpl.querySarItemAndInterpretation(page); PageInfo pageInfo = getPageInfo(page.getPager(), rows); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..543cccc9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -13,9 +13,6 @@ import java.util.Date; public class FindSarItemsPageReqDTO extends BasePage { private static final long serialVersionUID = 1L; - private Integer page = 1; - private Integer pageSize = 20; - @ApiModelProperty(value = "标准id") private String standId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index c1268581..0d90b32d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -48,4 +48,8 @@ public class SarStandItemsDto { private String zccssrq; + private String technicalRequir; + + private String changePoint; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index cc48b8d5..4cc9288f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -19,8 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; /** *

@@ -162,7 +161,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl standId = new ArrayList<>(); for (SarStandardsInfo standardsInfo : pageInfo){ - if (standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ + if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ standId.add(standardsInfo.getId()); } } @@ -193,11 +192,56 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ - return dao.selectAllItemsByIds(type,ids); + List list=dao.selectAllItemsByIds(type,ids); + List res=new ArrayList<>(); + if (null == list || list.isEmpty()){ + return list; + }else { + List integerList=new ArrayList<>(); + Map> map=new HashMap<>(); + list.forEach(sarStandItemsDto -> { + int a= sarStandItemsDto.getItemsNum().indexOf("."); + String mark=sarStandItemsDto.getItemsNum(); + if (a>0){ + mark=mark.substring(0,a); + } + if (null != map.get(Integer.valueOf(mark))){ + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + }else { + integerList.add(Integer.valueOf(mark)); + List middle=new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark),middle); + } + }); + Collections.sort(integerList); + integerList.forEach(integer -> { + res.addAll(map.get(integer)); + }); + + return res; + } } public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + //排序 + if (page.getOrderBy()!=null && page.getOrder()!=null){ + + switch (page.getOrderBy()){ + case "itemsNum" : page.setOrderBy("ITEMS_NUM"); break; + default:page.setOrderBy("ITEMS_NUM"); page.setOrder("DESC"); + } + + switch (page.getOrder()){ + case "descending":page.setOrder("DESC");break; + default:page.setOrder("ASC"); + } + }else { + page.setOrderBy("ITEMS_NUM"); + page.setOrder("DESC"); + } + //分页查询的总数 Integer count=dao.sarItemCount(page); page.getPager().setRowCount(count); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index e098b0b8..26d1d7d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -227,72 +227,13 @@ public class SarStandProjectLibraryController extends BaseController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("project_number",sarStandProjectLibrary.getProjectNumber()); - - sarStandProjectLibraryService.saveOrUpdate(sarStandProjectLibrary,queryWrapper); - - } -// }catch (Exception e){ -// head.setERRORCODE("2"); -// head.setRESULT("业务失败需要重做"); -// return responseDto(head); -// } - head.setERRORCODE("0"); - head.setRESULT("成功"); - responseDto.setHEAD(head); + Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr); + ArrayList companies = new ArrayList<>(); + ResponseDto responseDto = new ResponseDto(head,companies); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); return responseDto; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java new file mode 100644 index 00000000..05e5c48a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +@Data +public class Company { + private String COMPANY_CODE; + + private String FISCAL_YEAR; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java index d8a99c92..074c12db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java @@ -17,8 +17,11 @@ public class ResponseDto { // } - public ResponseDto(Head head) { - this.HEAD = head; + List LIST; + + public ResponseDto(Head HEAD, List LIST) { + this.HEAD = HEAD; + this.LIST = LIST; } public ResponseDto() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index ac2a411e..06c6a716 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -5,15 +5,17 @@ import java.util.Date; 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 org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author ZhangJin @@ -49,10 +51,14 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目群") private String projectGroup; + @ApiModelProperty(value = "项目开始日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectStartDate; + @ApiModelProperty(value = "项目完成日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectEndDate; @ApiModelProperty(value = "当前节点") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index aaf079e1..d0dc5452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -19,5 +19,6 @@ public interface SarStandProjectLibraryService { void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); + public Head AnalysisJsonAndStorage(String jsonStr); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index ed2f5dd3..001a2d7f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -1,4 +1,5 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; +import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; @@ -9,19 +10,17 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.sys.service.IDicTypeEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.springframework.stereotype.Service; -import redis.clients.jedis.ScanResult; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -42,7 +41,87 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl updateCondition = new QueryWrapper(); + updateCondition.eq("project_number",projectInfo.getProjectNumber()); +// .eq("project_start_date",targetBeginOn); + + + this.saveOrUpdate(projectInfo,updateCondition); + + } + }catch (Exception e){ + head.setERRORCODE("2"); + head.setRESULT("业务失败需要重做"); + return head; + } + head.setERRORCODE("0"); + head.setRESULT("成功"); + + return head; + } @Override public IPage queryMaintenanceProject(int current, int pageSize, @@ -278,7 +357,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl @@ -37,8 +40,12 @@ public class SarStandProjectTeamController extends BaseController companies = new ArrayList<>(); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); + ResponseDto responseDto = new ResponseDto(head,companies); return responseDto; } 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 59218feb..9e07c26a 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 @@ -31,7 +31,7 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); - List queryStandInfoByList(@Param("limit") Integer limit); + List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); Integer selectStandColumn(@Param("columnName") String columnName); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index a2263387..d2fee840 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -12,6 +12,16 @@ import java.util.List; */ public class SarBussionessStandEOPage extends BasePage { + private String textStatusBuss; + + public String getTextStatusBuss() { + return textStatusBuss; + } + + public void setTextStatusBuss(String textStatusBuss) { + this.textStatusBuss = textStatusBuss; + } + private String modifyTime; private String modifyTime1; private String modifyTime2; @@ -111,6 +121,197 @@ public class SarBussionessStandEOPage extends BasePage { private String shunxu; private String sql; + // 新增字段 + private String FZRQBUSS; + private String FSRQBUSS; + private String FBGBUSS; + private String BZSMBUSS; + private String LSBBBUSS; + private String QTWJBUSS; + private String QCDW; + private String QCRBUSS; + private String WJSCRYBUSS; + private String SYCXCLASS; + private String NYLXCLASS; + private String SYCPXCLASS; + private String TXLBBUSS; + private String VPPSBMBUSS; + private String VPPSCNBUSS; + private String DTQBBHBUSS; + private String BDTQBBHBUSS; + private String XGJLBUSS; + private String XGLC; + private String GLWJBUSS; + private String XCSJBUSS; + + public String getFZRQBUSS() { + return FZRQBUSS; + } + + public void setFZRQBUSS(String FZRQBUSS) { + this.FZRQBUSS = FZRQBUSS; + } + + public String getFSRQBUSS() { + return FSRQBUSS; + } + + public void setFSRQBUSS(String FSRQBUSS) { + this.FSRQBUSS = FSRQBUSS; + } + + public String getFBGBUSS() { + return FBGBUSS; + } + + public void setFBGBUSS(String FBGBUSS) { + this.FBGBUSS = FBGBUSS; + } + + public String getBZSMBUSS() { + return BZSMBUSS; + } + + public void setBZSMBUSS(String BZSMBUSS) { + this.BZSMBUSS = BZSMBUSS; + } + + public String getLSBBBUSS() { + return LSBBBUSS; + } + + public void setLSBBBUSS(String LSBBBUSS) { + this.LSBBBUSS = LSBBBUSS; + } + + public String getQTWJBUSS() { + return QTWJBUSS; + } + + public void setQTWJBUSS(String QTWJBUSS) { + this.QTWJBUSS = QTWJBUSS; + } + + public String getQCDW() { + return QCDW; + } + + public void setQCDW(String QCDW) { + this.QCDW = QCDW; + } + + public String getQCRBUSS() { + return QCRBUSS; + } + + public void setQCRBUSS(String QCRBUSS) { + this.QCRBUSS = QCRBUSS; + } + + public String getWJSCRYBUSS() { + return WJSCRYBUSS; + } + + public void setWJSCRYBUSS(String WJSCRYBUSS) { + this.WJSCRYBUSS = WJSCRYBUSS; + } + + public String getSYCXCLASS() { + return SYCXCLASS; + } + + public void setSYCXCLASS(String SYCXCLASS) { + this.SYCXCLASS = SYCXCLASS; + } + + public String getNYLXCLASS() { + return NYLXCLASS; + } + + public void setNYLXCLASS(String NYLXCLASS) { + this.NYLXCLASS = NYLXCLASS; + } + + public String getSYCPXCLASS() { + return SYCPXCLASS; + } + + public void setSYCPXCLASS(String SYCPXCLASS) { + this.SYCPXCLASS = SYCPXCLASS; + } + + public String getTXLBBUSS() { + return TXLBBUSS; + } + + public void setTXLBBUSS(String TXLBBUSS) { + this.TXLBBUSS = TXLBBUSS; + } + + public String getVPPSBMBUSS() { + return VPPSBMBUSS; + } + + public void setVPPSBMBUSS(String VPPSBMBUSS) { + this.VPPSBMBUSS = VPPSBMBUSS; + } + + public String getVPPSCNBUSS() { + return VPPSCNBUSS; + } + + public void setVPPSCNBUSS(String VPPSCNBUSS) { + this.VPPSCNBUSS = VPPSCNBUSS; + } + + public String getDTQBBHBUSS() { + return DTQBBHBUSS; + } + + public void setDTQBBHBUSS(String DTQBBHBUSS) { + this.DTQBBHBUSS = DTQBBHBUSS; + } + + public String getBDTQBBHBUSS() { + return BDTQBBHBUSS; + } + + public void setBDTQBBHBUSS(String BDTQBBHBUSS) { + this.BDTQBBHBUSS = BDTQBBHBUSS; + } + + public String getXGJLBUSS() { + return XGJLBUSS; + } + + public void setXGJLBUSS(String XGJLBUSS) { + this.XGJLBUSS = XGJLBUSS; + } + + public String getXGLC() { + return XGLC; + } + + public void setXGLC(String XGLC) { + this.XGLC = XGLC; + } + + public String getGLWJBUSS() { + return GLWJBUSS; + } + + public void setGLWJBUSS(String GLWJBUSS) { + this.GLWJBUSS = GLWJBUSS; + } + + public String getXCSJBUSS() { + return XCSJBUSS; + } + + public void setXCSJBUSS(String XCSJBUSS) { + this.XCSJBUSS = XCSJBUSS; + } + public String getZqcrId() { return zqcrId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 291327f1..ec5291e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -155,6 +155,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standNatureShow; // 标准性质显示名称 @TableField(exist = false) + private String standTextStatusShow; // 标准文本状态显示名称 + @TableField(exist = false) private String sychronId; // 同步数据ID @TableField(exist = false) private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 @@ -607,5 +609,13 @@ public class SarStandardsInfo extends BaseEntity { public void setStandSystemName(String standSystemName) { this.standSystemName = standSystemName; } + + public String getStandTextStatusShow() { + return standTextStatusShow; + } + + public void setStandTextStatusShow(String standTextStatusShow) { + this.standTextStatusShow = standTextStatusShow; + } } 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 3528e41d..5b3dc546 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 @@ -49,6 +49,10 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; +import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; @@ -203,6 +207,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { + //存在的分解单文本名称列表 + LinkedList itemExistList = new LinkedList<>(); + getAttrMap.put("itemExistList",itemExistList); for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -452,6 +467,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); + //以标准id和文本类型查询分解单表 有数据设标记为为 1 + FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); + sarItemCount.setStandId(row.getId()); + sarItemCount.setFileType(name); + Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); + if (sarItemsCount>0){ + //存在分解单的文本名称存入列表 + itemExistList.add(name); + } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); @@ -2018,9 +2042,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ - return dao.queryStandInfoByList(Integer.valueOf(limit)); + + //查询文本状态为即将实施的 + QueryWrapper dictionaryWrapper = new QueryWrapper<>(); + dictionaryWrapper.select("ID") + .eq("DICTIONARY_NAME","文本状态"); + List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); + + + QueryWrapper dicTypeWrapper = new QueryWrapper<>(); + dicTypeWrapper.select("DIC_TYPE_CODE") + .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) + .eq("DIC_TYPE_NAME","即将实施"); + + List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); + + + List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); + return standInfoList; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index fbe98449..300b63ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -9,10 +9,12 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -80,5 +82,12 @@ public class TsUserController extends BaseController { } + @ApiOperation("查询人接口悬浮窗") + @GetMapping("/selectUp") + public ResponseMessage> selectUp(@Param("uname") String uname) throws Exception { + return Result.success(tsUserService.selectByName(uname)); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 260e3afd..d53fd821 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -1,9 +1,11 @@ package com.adc.da.slrs.sarUser.dao; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarUser.entity.TsUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -45,8 +47,9 @@ public interface TsUserDao extends BaseMapper { * @param institutionId：岗位ID * @return List */ - List getUserAndPosition(String institutionId); + List getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser); + Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index b3dd2824..40166850 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; /** *

- * + * *

* * @author zxy @@ -142,6 +142,14 @@ public class TsUser extends BaseEntity { @TableField(exist = false) private List positions; + @ApiModelProperty("当前页") + @TableField(exist = false) + private Integer current; + + @ApiModelProperty("每页条数") + @TableField(exist = false) + private Integer size; + public TsUser() { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java new file mode 100644 index 00000000..730b9910 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +@Data +public class UpDTO { + + + + private String value; + + private String id; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 2be89ea5..af98fb3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -4,7 +4,9 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -25,7 +27,7 @@ public interface ITsUserService extends IService { * @param institutionId：机构ID * @return List */ - List getUserByInstitutionId(String institutionId); + IPage getUserByInstitutionId(TsUser tsUser); /** * 封禁、解禁用户 @@ -73,4 +75,6 @@ public interface ITsUserService extends IService { void parseUser() throws Exception; List getSecondMenusByUserId(String userId); + + List selectByName(String name); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 12d7b452..06e78407 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.entity.SyncUser; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sync.service.SyncUserService; @@ -23,12 +24,15 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -60,12 +64,21 @@ public class TsUserServiceImpl extends ServiceImpl implements /** * 通过机构ID查询人员 - * @param institutionId：机构ID * @return List */ @Override - public List getUserByInstitutionId(String institutionId) { - return tsUserDao.getUserAndPosition(institutionId); + public IPage getUserByInstitutionId(TsUser tsUser) { +// return tsUserDao.getUserAndPosition(institutionId); + Page tsUserPage = new Page<>(); + System.out.println(tsUser.getCurrent()); + System.out.println(tsUser.getSize()); + List tsUserList = tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),1*tsUser.getSize(),tsUser); + Integer total = tsUserDao.getUserAndPositionCount(tsUser); + tsUserPage.setRecords(tsUserList); + tsUserPage.setCurrent(tsUser.getCurrent()); + tsUserPage.setSize(tsUser.getSize()); + tsUserPage.setTotal(total); + return tsUserPage; } /** @@ -262,4 +275,20 @@ public class TsUserServiceImpl extends ServiceImpl implements List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getSecondMenuByIds(menuIds); } + + @Override + public List selectByName(String name) { + QueryWrapper tsUserQueryWrapper=new QueryWrapper<>(); + tsUserQueryWrapper.like("ACCOUNT",name); + tsUserQueryWrapper.or().like("UNAME",name); + List res= tsUserDao.selectList(tsUserQueryWrapper); + List result=new ArrayList<>(); + res.forEach(tsUser -> { + UpDTO upDTO=new UpDTO(); + upDTO.setValue(tsUser.getUname()+"("+tsUser.getAccount()+")"); + upDTO.setId(tsUser.getUserId()); + result.add(upDTO); + }); + return result; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java index 329e1fe9..dcd769af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -7,12 +7,18 @@ import java.util.List; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEO; import com.adc.da.slrs.standardSplit.service.*; import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,21 +168,56 @@ public class SarFileSplitInfoEOController extends BaseController sarFileSplitInfoEOList) throws Exception { - for (SarFileSplitInfoEO sarFileSplitInfoEO:sarFileSplitInfoEOList) { - List getList = new ArrayList<>(); - List sarLawsInfoEOList = new ArrayList<>(); + List querySame = null; + + /** + * 删除原来的分解单 + */ + + QueryWrapper removeWrapper = new QueryWrapper<>(); + removeWrapper.eq("STAND_ID",sarFileSplitInfoEOList.get(0).getStandId()) + .eq("FILE_TYPE",sarFileSplitInfoEOList.get(0).getFileType()); + ServiceImpl.remove(removeWrapper); + for (SarFileSplitInfoEO sarFileSplitInfoEO : sarFileSplitInfoEOList) { +// List getList = new ArrayList<>(); +// List sarLawsInfoEOList = new ArrayList<>(); + + querySame = sarFileSplitInfoEOService.querySame(sarFileSplitInfoEO); + + /** + * 使选定的拆分条款 插入分解单 + */ + querySame.forEach(item->{ + QueryWrapper sarStandItemsQueryWrapper = new QueryWrapper<>(); + sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag()); + SarStandItems sarStandItems = new SarStandItems(); + sarStandItems.setStandId(sarFileSplitInfoEO.getStandId()); + sarStandItems.setEditFlag(item.getEditFlag()); + sarStandItems.setItemsName(item.getItemsName()); + sarStandItems.setTermsConditions(item.getItermsConditions()); + sarStandItems.setItemsNum(item.getItemsNum()); + sarStandItems.setId(UUIDUtils.randomUUID20()); + sarStandItems.setFileType(sarFileSplitInfoEO.getFileType()); + ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper); + + }); + + //根据标准号查询标准是否存在 - String standNum=""; - if (StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandId())) { - standNum=sarFileSplitInfoEO.getShowNumber(); - } else if(StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandNumSplit())){ - standNum=sarFileSplitInfoEO.getStandNumSplit(); - }else{ - return Result.error("标准号不能为空"); - } +// String standNum=""; +// if (StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandId())) { +// standNum=sarFileSplitInfoEO.getShowNumber(); +// } else if(StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandNumSplit())){ +// standNum=sarFileSplitInfoEO.getStandNumSplit(); +// }else{ +// return Result.error("标准号不能为空"); +// } // if (sarFileSplitInfoEO.getFileType().equals("ZCWB") || sarFileSplitInfoEO.getFileType().equals("GCGJ")) { // SarLawsInfoEOPage page = new SarLawsInfoEOPage(); // page.setLawsType("FOREIGN"); @@ -201,7 +242,8 @@ public class SarFileSplitInfoEOController extends BaseController { int deleteByIds(SarFileSplitInfoEO sarFileSplitInfoEO); + List querySame (SarFileSplitInfoEO sarFileSplitInfoEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java index f54ed2ad..e99a16d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java @@ -4,6 +4,7 @@ import com.adc.da.base.page.BasePage; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import java.util.List; @@ -30,4 +31,6 @@ public interface SarFileSplitInfoEOService { PersonMsgEO updateNew(PersonMsgEO val) throws Exception; String getClauseBySplitId(String standNum, String fileType); + + List querySame (SarFileSplitInfoEO sarFileSplitInfoEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 91b02664..6c6bf9ca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.service.impl; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; @@ -10,8 +11,11 @@ import com.adc.da.base.page.BasePage; import com.adc.da.common.ReadWordTable; import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; +import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.poi.xwpf.usermodel.*; @@ -46,6 +50,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); + @Autowired + private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + @Autowired private IAttFileEOService attFileEOService; @Value("${file.path}") @@ -335,7 +342,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService middle=messageList; for (SarFileSplitItemsEO mis:messageList) { mis.setWorkFlowShow("1"); - if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ + if (mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ mis.setWorkFlowShow("0"); } else { @@ -349,6 +356,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } } + messageList.forEach(sarFileSplitItemsEO -> { + if (sarFileSplitItemsEO.getItemsNum().equals("1")){ + sarFileSplitItemsEO.setWorkFlowShow("1"); + } + }); sarFileSplitMenuEODao.insertForeach(treeList); sarFileSplitItemsEODao.insertForeach(messageList); sarFileSplitItemsValEODao.insertForeach(itemValList); @@ -583,11 +595,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService page.getPager().setRowCount(rowCount); List rows = sarFileSplitInfoEODao.queryByPageOwn(page); Map map = new HashMap<>(); - map.put("CA", "草稿"); - map.put("ZQYJG", "征求意见稿"); - map.put("BPG", "报批稿"); - map.put("SSG", "送审稿"); - map.put("FBGBJBD", "发布稿（必读）"); + + List selectionResults = sarStandAttrDetailsEOService.selectFileFieldForSel(null); + selectionResults.forEach(detailsEO->{ + map.put(detailsEO.getValue(),detailsEO.getLabel()); + }); if (rows != null && !rows.isEmpty()) { for (SarFileSplitInfoEO infoEO : rows) { @@ -730,4 +742,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService return rows.get(0).getId(); } + @Override + public List querySame (SarFileSplitInfoEO sarFileSplitInfoEO){ + return dao.querySame(sarFileSplitInfoEO); + }; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index 0e8f8207..6002aa1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,14 +102,18 @@ public class BussStandExportUtil { case "英文名称": value = sarStandardsInfoEO.getStandEnName(); break; - case "标准状态": + case "文本状态": value = sarStandardsInfoEO.getStandStatusShow(); break; case "标准实施日期": - if (sarStandardsInfoEO.getPutTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getPutTime()); - value = issueTime; + String putTime=""; + if (Date.class.equals(sarStandardsInfoEO.getPutTime())) { + putTime = sdf.format(sarStandardsInfoEO.getPutTime()); + + }else { + putTime=sarStandardsInfoEO.getPutTime(); } + value = putTime; break; case "代替企标编号": value = sarStandardsInfoEO.getReplaceStandNum(); @@ -117,10 +122,13 @@ public class BussStandExportUtil { value = sarStandardsInfoEO.getReplacedStandNum(); break; case "发布日期": - if (sarStandardsInfoEO.getIssueTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getIssueTime()); - value = issueTime; + String issueTime=""; + if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){ + issueTime = sdf.format(sarStandardsInfoEO.getIssueTime()); + }else { + issueTime=sarStandardsInfoEO.getIssueTime(); } + value = issueTime; break; case "复审日期": String field1 = attrInfoMap.get(name); 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 e0966339..1625cb2f 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 @@ -31,7 +31,7 @@ public class FieldConvertUtil { "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + - "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," + + "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用认证,能源类型," + "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段 public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + @@ -51,7 +51,7 @@ public class FieldConvertUtil { "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," + "相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料"; - public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,标准状态,发布日期,标准实施日期," + + public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,标准实施日期," + "代替企标编号,被代替企标编号"; public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," + diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 7cd978cf..47f597c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -101,10 +101,14 @@ public class StandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "标准性质": - value = sarStandardsInfoEO.getStandNature(); + value = sarStandardsInfoEO.getStandNatureShow(); break; case "是否纳入认证清单": - value = sarStandardsInfoEO.getIsRelateAccess(); + switch (sarStandardsInfoEO.getIsRelateAccess()){ + case "0": value="否"; break; + case "1": value="是"; break; + default:value=""; + } break; case "标准体系": value = sarStandardsInfoEO.getStandSystem(); @@ -137,8 +141,8 @@ public class StandExportUtil { case "英文名称": value = sarStandardsInfoEO.getStandEnName(); break; - case "标准状态": - value = sarStandardsInfoEO.getStandStateShow(); + case "文本状态": + value = sarStandardsInfoEO.getStandTextStatusShow(); break; case "发布日期": if (sarStandardsInfoEO.getIssueTime() != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 748bf902..72b72ba9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -408,12 +408,14 @@ @@ -729,7 +731,7 @@ - SELECT ${fieldInfo} + SELECT STAND_ID,${fieldInfo} FROM SAR_BUSS_STAND_ATTR_INFO WHERE valid_flag=0 and stand_id = #{standId} @@ -161,4 +161,4 @@ FROM SAR_BUSS_STAND_ATTR_INFO WHERE stand_id = #{standId} and valid_flag=0 - \ No newline at end of file + 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 0aecf221..a5106033 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 @@ -363,6 +363,17 @@ left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) where 1=1 + + + and put_time=#{putTime} + + + and issue_time=#{issueTime} + + + and text_status_buss=#{textStatusBuss} + + - select FROM sar_standards_info LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID - WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') >= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D') + WHERE + DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( + SAR_STANDARDS_INFO.ISSUE_TIME, + '%Y-%m-%d' + ) + AND + sar_standards_info.VALID_FLAG='0' + AND TEXT_STATUS=#{typeCode} ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC LIMIT #{limit} @@ -739,6 +751,11 @@ dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id where SAR_STANDARDS_INFO.id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 158d3b20..6c5a5869 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -28,13 +28,29 @@ - select u.*,p.id p_id,p.name p_name from ts_user u left join ts_user_position up on u.usid=up.user_id left join ts_position p on up.position_id=p.id - where u.institution_id=#{institutionId} + where u.institution_id=#{TsUser.institutionId} + + and u.uname like concat('%',#{TsUser.uname},'%') + + + and u.email like concat('%',#{TsUser.email},'%') + + limit #{start},#{end} + + + - select + select from SAR_FILE_SPLIT_INFO where id = #{value} @@ -290,7 +290,7 @@ + select * from SAR_FILE_SPLIT_ITEMS + LEFT JOIN SAR_FILE_SPLIT_INFO ON SAR_FILE_SPLIT_ITEMS.INFO_ID = SAR_FILE_SPLIT_INFO.ID + where SAR_FILE_SPLIT_INFO.ID = #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 3d7f4b6b..c36b52f1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -308,7 +308,6 @@ and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType} - GROUP BY STAND_ID order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index 6c8336df..760f65cd 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -21,7 +21,7 @@ public class SyncUserService { public static void main(String[] args) throws Exception { SyncUserService syncUserService=new SyncUserService(); - syncUserService.syncFotonOrg(); + syncUserService.syncFotonUser(); } /** @@ -50,7 +50,7 @@ public class SyncUserService { json.add(rs); JSONObject responseStr = JSON.parseObject(rs); - + System.out.println(rs); if (responseStr.containsKey("cookie")) { try { JSONArray entries = responseStr.getJSONArray("cookie"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/OrgEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/OrgEODao.java index 2cec8f1a..8057fe85 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/OrgEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/OrgEODao.java @@ -162,4 +162,6 @@ public interface OrgEODao extends BaseMapper { public OrgEO getOrgParentInfoOrgId(OrgEO orgEO); public List getOrgRootTree(); + + int clearData(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java index 2d961ec6..cf336364 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java @@ -1,6 +1,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@TableName(value = "ts_org") public class OrgEO extends BaseEntity implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml index 062104ed..2d64c352 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml @@ -762,6 +762,9 @@ AND parent_idS IS NOT NULL + + delete from TS_ORG +