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 81d65903..79a0bb79 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 @@ -24,8 +24,8 @@ import org.springframework.stereotype.Component; import java.time.LocalDate; import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.regex.Pattern; + @EnableScheduling @Component @@ -215,56 +215,50 @@ public class ScheduledJob { //查询代替标准字段得到一个 被代替了的标准的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(); //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021) - if (!DTBJHStr.equals("")){ - try{ - String[] DTBJHArray = DTBJHStr.split(","); - for (String DTBJH : DTBJHArray) { - String[] sortAndNumberAndYear = DTBJH.split("\\s+"); - String sort = sortAndNumberAndYear[0]; - - String[] numberAndYear = sortAndNumberAndYear[1].split("\\-"); - String number=numberAndYear[0]; - String year=numberAndYear[1]; - - 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); - } - } - - + if (!DTBJHStr.equals("")) { + String[] DTBJHArray = DTBJHStr.split(","); + for (String DTBJH : DTBJHArray) { + if (!pattern.matcher(DTBJH).matches()){ + continue; } - }catch (Exception e){ - System.out.println("=====错误===="+item+"=====错误====="); + + 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); + } + } + + } } - - - - } }); 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 index 39b46fc5..1a36d323 100644 --- 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 @@ -47,11 +47,10 @@ public class ImportExcelController extends BaseController { @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); -// ResponseMessage responseMessage=new ResponseMessage(); -// responseMessage.setMessage(mapMap.toString()); -// responseMessage.isOk(); - + 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 { 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 index c6635b30..ab9b75b9 100644 --- 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 @@ -34,7 +34,9 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.InputStream; +import java.text.SimpleDateFormat; import java.util.*; +import java.util.regex.Pattern; @Service public class ImportExcelServiceImpl extends ServiceImpl implements ImportExcelService { @@ -75,16 +77,19 @@ public class ImportExcelServiceImpl extends ServiceImpl> 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("文件上传错误，重新上传"); } @@ -133,7 +138,7 @@ public class ImportExcelServiceImpl extends ServiceImpl { //判断是否是正确的数据 String[] as = items.split(","); - if (!inDate(as[0])) { + if (!inDate(as[0],dates)) { ImportDto importDto = getImportDto(as); error.add(importDto); middle.put(as[0].trim(), "error-"+error.size()); @@ -176,8 +181,7 @@ public class ImportExcelServiceImpl extends ServiceImpl dates = new ArrayList<>(Arrays.asList(DATE.split(","))); + private boolean inDate(String as,List dates) { if (null != as && !"".equals(as)) { for (String s : dates) { if (s.equals(as.trim())) { @@ -283,6 +287,8 @@ public class ImportExcelServiceImpl extends ServiceImpl error=new ArrayList<>(); + + private List fileError=new ArrayList<>(); @Override public List storageExclData(Map> importListMap) { @@ -296,8 +302,8 @@ public class ImportExcelServiceImpl extends ServiceImpl analysis = analysisStandId(importDto); + if (analysis==null){ + return null; + }else { - System.out.println("id为"+importDto.getStandId()+"格式无法解析"); -// return null; + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + sarStandardsInfo.setId(standId); + + + sarStandardsInfo.setStandSort(analysis.get("sort")); + sarStandardsInfo.setStandNumber(analysis.get("number")); + sarStandardsInfo.setStandYear(analysis.get("year")); + + sarStandardsInfo.setStandName(importDto.getStandName()); + sarStandardsInfo.setStandEnName(importDto.getStandNameEN()); + + String issueDate = importDto.getPublishTime().substring(0, 9); + sarStandardsInfo.setIssueTime(issueDate);//标准发布日期 + + String standStatus = importDto.getStandStatus(); + if ("有效".equals(standStatus)) { + sarStandardsInfo.setTextStatus("vsaga7nwub");//现行有效 + } + + return sarStandardsInfo; } - - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); - sarStandardsInfo.setId(standId); - - - sarStandardsInfo.setStandSort(sort); - sarStandardsInfo.setStandNumber(number); - sarStandardsInfo.setStandYear(year); - - sarStandardsInfo.setStandName(importDto.getStandName()); - sarStandardsInfo.setStandEnName(importDto.getStandNameEN()); - sarStandardsInfo.setIssueTime(importDto.getPublishTime());//标准发布日期 - - String standStatus = importDto.getStandStatus(); - if ("有效".equals(standStatus)){ - sarStandardsInfo.setTextStatus("vsaga7nwub");//现行有效 - } - - return sarStandardsInfo; } @@ -529,7 +521,9 @@ public class ImportExcelServiceImpl extends ServiceImpl 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"); + } + return sarBussionessStand; } - String sort=""; - String number=""; - String year=""; - try { - String[] sortAndNumberAndYear = importDto.getStandId().split("\\s+"); - sort = sortAndNumberAndYear[0]; - String[] numberAndYear = sortAndNumberAndYear[1].split("\\-"); - number=numberAndYear[0]; - year=numberAndYear[1]; - }catch (Exception e){ - System.out.println("id为"+importDto.getStandId()+"格式无法解析"); -// return null; - } - - SarBussionessStand sarBussionessStand = new SarBussionessStand(); - sarBussionessStand.setId(standId); - sarBussionessStand.setStandSort(sort); - sarBussionessStand.setStandYear(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"); - } - return sarBussionessStand; } @@ -672,7 +654,7 @@ public class ImportExcelServiceImpl extends ServiceImpl 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); + return result; + } + + + } + } 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/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9028d493..37584cbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -288,6 +288,8 @@ 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())); 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 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..9c2466f9 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(start != null, "start_time", start) + .le(end != null, "end_time", end) + .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 +78,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/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml index 1e4eafe9..4ec8d322 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml @@ -136,7 +136,7 @@ @@ -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/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 48a89181..66c8e249 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -122,7 +122,6 @@ #{item} - group by a.ID limit #{start},#{end} @@ -150,13 +149,12 @@ #{item} - group by a.ID