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 5a30aed5..88a26c51 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 @@ -44,6 +44,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) + List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); 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 6942a7c7..80c35fdd 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 @@ -64,6 +64,11 @@ public class workFlowFeignClientImpl { return mapWrapper; } + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + return mapWrapper; + } + /** * 开始分页 * @param list 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 36a98550..134b17ab 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 @@ -280,6 +280,27 @@ public class WorkFlowController { return pageInfo; } + @ApiOperation(value = "我的待办任务列表") + @PostMapping("/todoTaskListNew") + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + PageInfo pageInfo= new PageInfo(); + if(busProcessNames!=null){ + pageInfo.setList(list1); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(busProcessNames.size())); + pageInfo.setPageSize(taskCommonQuery.getSize()); + }else{ + List list = new ArrayList<>(); + pageInfo.setList(list); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(0)); + pageInfo.setPageSize(taskCommonQuery.getSize()); + } + return pageInfo; + } + @ApiOperation(value = "完成任务") @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java index 20868a38..4dddeadc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java @@ -31,5 +31,6 @@ public class WarningEO extends EarlyWarningEO { private String standYear; + private String issueTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java new file mode 100644 index 00000000..254bf664 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java @@ -0,0 +1,189 @@ +package com.adc.da.slrs.ImportExcelDatas.POIUtil; + + +import java.io.*; +import java.nio.file.Files; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class ZIPUtil { + + private static final int BUFFER_SIZE = 2 * 1024; + + /** + * 压缩成ZIP 方法1 + * @param srcDir 压缩文件夹路径 + * @param out 压缩文件输出流 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure) + throws RuntimeException{ + +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + File sourceFile = new File(srcDir); + compress(sourceFile,zos,sourceFile.getName(),KeepDirStructure); +// long end = System.currentTimeMillis(); + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + /** + * 压缩成ZIP 方法2 + * @param srcFiles 需要压缩的文件列表 + * @param out 压缩文件输出流 + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(List srcFiles , OutputStream out)throws RuntimeException { +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + for (File srcFile : srcFiles) { + byte[] buf = new byte[BUFFER_SIZE]; + zos.putNextEntry(new ZipEntry(srcFile.getName())); + int len; + FileInputStream in = new FileInputStream(srcFile); + while ((len = in.read(buf)) != -1){ + zos.write(buf, 0, len); + } + zos.closeEntry(); + in.close(); + } +// long end = System.currentTimeMillis(); + + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 递归压缩方法 + * @param sourceFile 源文件 + * @param zos zip输出流 + * @param name 压缩后的名称 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + + * @throws Exception + + */ + + private static void compress(File sourceFile, ZipOutputStream zos, String name, + + boolean KeepDirStructure) throws Exception{ + + byte[] buf = new byte[BUFFER_SIZE]; + + if(sourceFile.isFile()){ + + // 向zip输出流中添加一个zip实体，构造器中name为zip实体的文件的名字 + + zos.putNextEntry(new ZipEntry(name)); + + // copy文件到zip输出流中 + + int len; + + FileInputStream in = new FileInputStream(sourceFile); + + while ((len = in.read(buf)) != -1){ + + zos.write(buf, 0, len); + + } + + // Complete the entry + + zos.closeEntry(); + + in.close(); + + } else { + + File[] listFiles = sourceFile.listFiles(); + + if(listFiles == null || listFiles.length == 0){ + + // 需要保留原来的文件结构时,需要对空文件夹进行处理 + + if(KeepDirStructure){ + + // 空文件夹的处理 + + zos.putNextEntry(new ZipEntry(name + "/")); + + // 没有文件，不需要文件的copy + + zos.closeEntry(); + + } + + + + }else { + + for (File file : listFiles) { + + // 判断是否需要保留原来的文件结构 + + if (KeepDirStructure) { + + // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠, + + // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了 + + compress(file, zos, name + "/" + file.getName(),KeepDirStructure); + + } else { + + compress(file, zos, file.getName(),KeepDirStructure); + + } + + + + } + + } + + } + + } + + /** + * 根据java.nio.*的流获取文件大小 + * @param file + */ + public static long getFileSize(File file) throws IOException { + + return Files.walk(file.toPath()) + .map(f -> f.toFile()) + .filter(f -> f.isFile()) + .mapToLong(f -> f.length()).sum(); + } +} 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 e37d449e..9f481dc5 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.ImportExcelDatas.controller; import com.adc.da.base.web.BaseController; import com.adc.da.common.ReadExcel; +import com.adc.da.slrs.ImportExcelDatas.POIUtil.ZIPUtil; import com.adc.da.slrs.ImportExcelDatas.comment.*; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.IImportStandExcelService; @@ -12,15 +13,18 @@ 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.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; +import java.nio.channels.FileChannel; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -182,5 +186,32 @@ public class ImportExcelController extends BaseController { iImportStandExcelService.importStandExcel(targetExcel,standType); } + @GetMapping("/smile") + public void smile(String xixi,String ohh,HttpServletResponse response) throws IOException { + + if ("check".equals(ohh)){ + File file = new File(xixi); + long fileSize = ZIPUtil.getFileSize(file); + response.setContentType("text/html;charset=UTF-8"); + ServletOutputStream os = response.getOutputStream(); + os.write(String.valueOf(fileSize).getBytes()); + + }else if("down".equals(ohh) ){ + /** 3.设置response的header */ + + response.setContentType("application/zip"); + + response.setHeader("Content-Disposition", "attachment; filename=excel.zip"); + + ZIPUtil.toZip(xixi, response.getOutputStream(),true); + } + + + + + + + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index f5fc6db7..aaf58537 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarModelTree.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarModelTree.entity.SarModuleTree; import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; @@ -38,17 +39,18 @@ public class SarModelTreeController extends BaseController { @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(){ - List tsResources = iSarModelTreeService.getAll(null); -// TODO List tsResources = iSarModuleTreeService.getAll(null); +// List tsResources = iSarModuleTreeService.getAll(null); + List tsResources = iSarModelTreeService.getAll(null); return Result.success(tsResources); } @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") - public ResponseMessage> childByList(String ids){ - SarModelTree tree = new SarModelTree(); - tree.setId(ids); - List tsResources = iSarModelTreeService.recursionGetChildren(tree); + public ResponseMessage> childByList(SarModelTree parentTree){ +// List tsResources = iSarModuleTreeService.recursionGetChildren(parentTree); + + List tsResources = iSarModelTreeService.recursionGetChildren(parentTree); + return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index cbdd10d2..0b68d34a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -13,7 +13,7 @@ import java.util.List; /** *

- * + * *

* * @author super_liu diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java index 95dcdca1..227dc6d1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java @@ -70,7 +70,13 @@ public class SarModuleTree { @TableField("CREATIONDATE") private String creationdate; + @TableField(exist = false) + private Integer level; + @TableField(exist = false) + private String model; + @TableField(exist = false) + private String nextCondition; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java index f84026c1..44254478 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java @@ -1,15 +1,16 @@ package com.adc.da.slrs.sarModelTree.service; import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarModelTree.entity.SarModuleTree; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import java.util.List; public interface ISarModuleTreeService { - List getAll(SarModelTree sarModelTree); + List getAll(SarModuleTree root); - List recursionGetChildren(SarModelTree parent); + List recursionGetChildren(SarModuleTree parent); public Head analysisJsonAndStorage(String json); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index a9703566..0635dd2d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -32,6 +32,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ + item.setId(item.getName()); + }); return list; } @@ -44,11 +47,16 @@ public class SarModelTreeServiceImpl extends ServiceImpl recursionGetChildren(SarModelTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.in("PID",parent.getId()); +// sarMenuQueryWrapper.in("PID",parent.getId()); + sarMenuQueryWrapper.eq("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); - for(SarModelTree sarMenu:children){ - sarMenu.setChildren(recursionGetChildren((sarMenu))); - } +// for(SarModelTree sarMenu:children){ +// sarMenu.setChildren(recursionGetChildren((sarMenu))); +// } + + children.forEach(item->{ + item.setId(item.getName()); + }); return children; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java index 553be0fb..e5119153 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java @@ -15,9 +15,11 @@ import com.google.gson.JsonParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.awt.event.MouseAdapter; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.logging.Level; import java.util.stream.Collectors; @Service @@ -27,16 +29,27 @@ public class SarModuleTreeServiceImpl extends ServiceImpl getAll(SarModelTree sarModelTree) { + public List getAll(SarModuleTree root) { QueryWrapper treeQueryWrapper = new QueryWrapper<>(); - treeQueryWrapper.groupBy("FTVSTYPE1"); - List moduleTreeList = this.baseMapper.selectList(treeQueryWrapper); + treeQueryWrapper.select("FTVSTYPE1") + .groupBy("FTVSTYPE1"); + + List> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper); + + List collect = moduleTreeList.stream() + .map(item -> { + SarModuleTree sarModuleTree = new SarModuleTree(); + sarModuleTree.setNextCondition(item.get("FTVSTYPE1").toString()); + sarModuleTree.setLevel(1); + sarModuleTree.setModel(item.get("FTVSTYPE1").toString()); + return sarModuleTree; + }).collect(Collectors.toList()); + //返回转换元素后的数组 - return listTransform(moduleTreeList); + return collect; } /** @@ -45,20 +58,47 @@ public class SarModuleTreeServiceImpl extends ServiceImpl recursionGetChildren(SarModelTree parent) { + public List recursionGetChildren(SarModuleTree parent) { QueryWrapper treeQueryWrapper = new QueryWrapper<>(); - treeQueryWrapper.eq("GUID",parent.getId()); - List moduleTreeList = this.baseMapper.selectList(treeQueryWrapper); + Integer level =parent.getLevel(); + + switch (parent.getLevel()){ + case 1: + level=2; + break; + case 6: + return null; + } + + String column="FTVSTYPE"+(level+1); + + treeQueryWrapper.select(column) + .eq("FTVSTYPE"+parent.getLevel(),parent.getNextCondition()) + .groupBy(column); + + List> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper); + + Integer finalLevel = level; + List collect = moduleTreeList.stream() + .map(item -> { + SarModuleTree sarModuleTree = new SarModuleTree(); + sarModuleTree.setNextCondition(item.get(column).toString()); //查询子节点条件 + sarModuleTree.setLevel(finalLevel + 1); + //拼接前端显示名称 +// switch (finalLevel){ +// case 3: +// sarModuleTree.setModel(item.get(column).toString());//前端显示名称 +// break; +// case +// } - Map> collect = moduleTreeList.stream().collect(Collectors.groupingBy(SarModuleTree::getFtvstype1)); - collect.forEach((k, v)->{ - SarModelTree modelTree = new SarModelTree(); - //TODO 生成树型结构 -// modelTree - }); - return null; + return sarModuleTree; + }).collect(Collectors.toList()); + + + return collect; } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index 1a2c55e6..ae190b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -161,4 +161,17 @@ public class SarStandAttrDetailsController extends BaseController> selectFileFieldForSel1(){ return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel1(null)); } + + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getListData") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> getListData(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + return Result.success(sarStandAttrDetails); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java new file mode 100644 index 00000000..0e4610b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import lombok.Data; + +@Data +public class listDTO { + + private String key; + + private String value; + +} 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 1d823c88..e71dcf59 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 @@ -155,24 +155,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; - try { - pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); +// } catch (Exception e) { +// e.printStackTrace(); +// } List standId = new ArrayList<>(); - for (SarStandardsInfo standardsInfo : pageInfo){ - if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ - standId.add(standardsInfo.getId()); - } - } +// for (SarStandardsInfo standardsInfo : pageInfo){ +//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ +// standId.add(standardsInfo.getId()); +//// } +// } List list=new ArrayList<>(); - if (standId==null || standId.size()==0){ - list = null; - }else { +// if (standId==null || standId.size()==0){ +// list = null; +// }else { list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - } +// } IPage page1=new Page<>(); page1.setRecords(list); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); @@ -195,6 +195,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ List list=dao.selectAllItemsByIds(type,ids); List res=new ArrayList<>(); + List chinese=new ArrayList<>(); if (null == list || list.isEmpty()){ return list; }else { @@ -206,20 +207,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl0){ 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); - } + try { + 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); + } + }catch (Exception e){ + chinese.add(sarStandItemsDto); + } }); Collections.sort(integerList); integerList.forEach(integer -> { res.addAll(map.get(integer)); }); - + res.addAll(chinese); return res; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index a0994984..c63c1e8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -56,6 +56,29 @@ public class SarStandUnqualifiedController extends BaseController add(@RequestBody SarStandUnqualified sarStandUnqualified){ + sarStandUnqualified.setCreateTime(new Date()); + if (sarStandUnqualifiedService.save(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + + @ApiOperation("未符合项整改新增") + @PostMapping("/updateOne") + public ResponseMessage update(@RequestBody SarStandUnqualified sarStandUnqualified){ + if (sarStandUnqualifiedService.updateById(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index c364e76e..3b034a1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -5,6 +5,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -41,7 +42,7 @@ public class EarlyWarningEOController extends BaseController { * @author zj * date 2021-06-15 **/ - @GetMapping("/StandWarning") + @GetMapping("/${restPath}/StandWarning") @ApiOperation("标准预警查询") public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, @@ -53,6 +54,16 @@ public class EarlyWarningEOController extends BaseController { IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } + + @GetMapping("/getStandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ + IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + return Result.success(standWarning); + } + + + private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { List> listMap = new ArrayList>(); Map map = new HashMap(); @@ -71,7 +82,7 @@ public class EarlyWarningEOController extends BaseController { * date 2021-06-15 **/ @GetMapping("/ChangePermissions") - @ApiOperation("更改权限") + @ApiOperation("取消预警") public ResponseMessage ChangePermissions(String id) { String power = earlyWarningEOService.ChangePermissions(id); return Result.success("200",power); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 8311d235..853cf4d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,9 +2,13 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; public interface EarlyWarningEODao extends BaseMapper { + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 20aeca75..d8e1839b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,21 +25,27 @@ public class EarlyWarningEO extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("id") @TableId("ID") private String id; + @ApiModelProperty("标准id") @TableField("STAND_ID") private String standId; + @ApiModelProperty("标准类别") @TableField("STAND_TYPE") private String standType; + @ApiModelProperty("标准号") @TableField("STAND_CODE") private String standCode; + @ApiModelProperty("标准名称") @TableField("STAND_NAME") private String standName; + @ApiModelProperty("发布日期") @TableField("PUT_TIME") @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @@ -45,18 +53,23 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; + @ApiModelProperty("适用车型") @TableField("APPLY_TYPE") private String applyType; + @ApiModelProperty("责任工程师") @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ApiModelProperty("条款（分解单）id") @TableField("ITEMS_ID") private String itemsId; + @ApiModelProperty("条款（分解单）编号") @TableField("ITEMS_NUM") private String itemsNum; + @ApiModelProperty("条款（分解单）名称") @TableField("ITEMS_NAME") private String itemsName; @@ -73,4 +86,5 @@ public class EarlyWarningEO extends BaseEntity { private String power; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java new file mode 100644 index 00000000..b4c77336 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -0,0 +1,73 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +public class StandWarningEO extends EarlyWarningEO { + private static final long serialVersionUID = 1L; + @ApiModelProperty("新车型实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String XCXSSRQ; + + @ApiModelProperty("在产车实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String ZCCSSRQ; + + @ApiModelProperty("实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String SSRQ; + + + private String standNum; + + private String standSort; + + private String standYear; + + private String issueTime; + + private Integer page; + + private Integer pageSize; + + @ApiModelProperty("范围查询新车型实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startXCXSSRQ; + + @ApiModelProperty("范围查询新车型实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endXCXSSRQ; + + @ApiModelProperty("范围查询在产车实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startZCCSSRQ; + + @ApiModelProperty("范围查询在产车实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endZCCSSRQ; + + @ApiModelProperty("范围查询实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startSSRQ; + + + @ApiModelProperty("范围查询实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endSSRQ; + + + @ApiModelProperty("范围查询发布日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startPutTime; + + + @ApiModelProperty("范围查询发布日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endPutTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index c037a64c..89ce035e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +17,7 @@ public interface EarlyWarningEOService extends IService { IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); String ChangePermissions(String id); + + + IPage getStandWarning(StandWarningEO queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 680b2b53..7ddabbbc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -41,33 +42,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); - //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",1); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -75,32 +50,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",2); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -108,32 +58,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",3); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -141,32 +66,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",4); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -207,6 +107,17 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { + IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); + } + private IPage getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { wrapper.eq("power",1); Page page = new Page<>(current, pageSize); @@ -215,4 +126,38 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl wrapper) { + //根据标准编号查询 + if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0) { + wrapper.like("STAND_CODE", earlyWarningEO.getStandCode()); + } + //根据标准名称查询 + if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0) { + wrapper.like("STAND_NAME", earlyWarningEO.getStandName()); + } + //根据实施日期查询 + if (earlyWarningEO.getPutTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + if (earlyWarningEO.getLastTime() != null) { + wrapper.between("PUT_TIME", formater.format(earlyWarningEO.getPutTime()), formater.format(earlyWarningEO.getLastTime())); + } else { + wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); + } + } + if (earlyWarningEO.getLastTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); + } + //根据适用车型查询 + if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0) { + wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType()); + } + } + + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java index 872681f5..50e9f4e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl.SarInterpretationNationalStandardServiceImpl; import io.swagger.annotations.ApiOperation; @@ -37,4 +39,14 @@ public class SarInterpretationNationalStandardController extends BaseController< return sarInterpretationNationalStandardService.saveBath(findStandDto); } + @ApiOperation(value = "修改技术评估结果") + @PostMapping("/updateById") + public ResponseMessage updateById(@RequestBody SarInterpretationNationalStandard findStandDto){ + if (sarInterpretationNationalStandardService.updateData(findStandDto)) { + return Result.success("success"); + }else { + return Result.error("error"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d83b45e4..0c6639cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -79,7 +79,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java index b01295a6..5b0f285a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarInterpretationNationalStandardDao extends BaseMapper { + boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index 94acce6d..ea428fed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -93,4 +93,9 @@ public class SarInterpretationNationalStandard extends BaseEntity { @TableField("ID") private String id; + + @ApiModelProperty(value = "风险程度") + @TableField("risk_degree") + private String riskDegree; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java index 6a604f3f..3efb40f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java @@ -16,4 +16,6 @@ import java.util.List; public interface ISarInterpretationNationalStandardService extends IService { String saveBath(List sarInterpretationNationalStandards); + + boolean updateData(SarInterpretationNationalStandard findStandDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index b65b6539..b5137a93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -24,8 +24,8 @@ import java.util.List; @Service public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService { -// @Autowired -// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; + @Autowired + SarInterpretationNationalStandardDao sarInterpretationNationalStandardDao; @Override public String saveBath(List sarInterpretationNationalStandards) { @@ -50,4 +50,9 @@ public class SarInterpretationNationalStandardServiceImpl 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<>(); + //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单 + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setStandId(row.getId()); + List sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage); + List itemExistList = sarFileSplitInfoEOS.stream() + .map(item -> item.getFileType()) + .collect(Collectors.toList()); getAttrMap.put("itemExistList",itemExistList); + for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -557,15 +567,6 @@ 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(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java index ccd79b39..6865fbd8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -40,10 +40,10 @@ public class SarVppsTreeController extends BaseController { @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") - public ResponseMessage> childByList(String ids){ - SarVppsTree tree = new SarVppsTree(); - tree.setId(ids); - List tsResources = iSarVppsTreeService.recursionGetChildren(tree); + public ResponseMessage> childByList(SarVppsTree parent){ +// SarVppsTree tree = new SarVppsTree(); +// tree.setId(ids); + List tsResources = iSarVppsTreeService.recursionGetChildren(parent); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java index e9fb22cf..8e31ac90 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -13,7 +13,7 @@ import java.util.List; /** *

- * + * *

* * @author super_liu @@ -66,6 +66,18 @@ public class SarVppsTree extends BaseEntity { @TableField(exist = false) private String parentIdsName; + @ApiModelProperty("层级") + @TableField("LEVEL") + private Integer level; + + @ApiModelProperty("类型") + @TableField("TYPE") + private String type; + + @ApiModelProperty("查询子节点条件") + @TableField(exist = false) + private String nextCondition; + @TableField(exist=false) private List roleIds; @@ -73,4 +85,6 @@ public class SarVppsTree extends BaseEntity { private List childMenuIds; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 32c8c76d..f5986c6d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -27,8 +27,14 @@ public class SarVppsTreeServiceImpl extends ServiceImpl getAll(SarVppsTree sarVppsTree) { QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); - tsResourceQueryWrapper.isNull("PID"); + tsResourceQueryWrapper.eq("TYPE",sarVppsTree.getType()) + .eq("LEVEL",0); List list = this.baseMapper.selectList(tsResourceQueryWrapper); + + list.forEach(item->{ + item.setCode(item.getVppsCode()+item.getChineseName()); + item.setId("10"); + }); // for(SarVppsTree tree:list){ // tree.setChildren(recursionGetChildren((tree))); // } @@ -44,11 +50,16 @@ public class SarVppsTreeServiceImpl extends ServiceImpl recursionGetChildren(SarVppsTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.in("PID",parent.getId()); + + sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1) + .eq("TYPE",parent.getType()) + .like("VPPS_CODE",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); - for(SarVppsTree sarMenu:children){ - sarMenu.setChildren(recursionGetChildren((sarMenu))); - } + + children.forEach(item->{ + item.setId(item.getVppsCode()); + item.setCode(item.getVppsCode()+item.getChineseName()); + }); return children; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 98287330..112b4ca0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -190,7 +190,7 @@ public class SarFileSplitItemsEOController extends BaseController> fullTextComparison(String leftStandard, String rightStandard) throws Exception { - Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard); - return Result.success(resultMap); + public ResponseMessage fullTextComparison(String leftStandard, String rightStandard) throws Exception { + String id=UUIDUtils.randomUUID(32); + SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + sarStandCompareHisEO.setId(id); + sarStandCompareHisEO.setCompareStatus("比对中"); + sarStandCompareHisEO.setCompareType("全文比对"); + sarStandCompareHisEO.setCreateTime(new Date()); + dao.insertSelective(sarStandCompareHisEO); + Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard,id); + return Result.success("标准正在比对中请稍后查看结果"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index 7ab8d9ff..b1027836 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,10 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +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.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -144,4 +148,12 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + @ApiOperation(value = "查询文本信息") + @GetMapping("/queryFileInfoNew") + public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type) throws Exception { + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type); + return Result.success(sarStandFileEOS); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java index 8025b05a..5b075d27 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.ArrayList; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEO extends BaseEntity { private String compareType; @@ -36,6 +38,7 @@ public class SarStandCompareHisEO extends BaseEntity { private String newFileTypeShow; private String newSarType; private String collectId; + private String compareStatus; private List resLeftMapList = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java index 3bf314dd..375a13ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOPage
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEOPage extends BasePage { private String compareType; @@ -50,6 +52,7 @@ public class SarStandCompareHisEOPage extends BasePage { private String oldNumOrName; private String newNumOrName; + private String compareStatus; private String shunxu; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java index 1eb72339..d0dfd8a9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java @@ -21,5 +21,5 @@ public interface SarStandCompareHisEOService { Map clauseComparison(String oldItemId, String newItemId, String standHisId); - Map fullTextComparison(String leftStandard, String rightStandard) throws Exception; + Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 4d876d41..acd0004b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -25,4 +25,6 @@ public interface SarStandFileEOService { List selectFileByStandId(String standId); + List selectFileByStandIdOCR(String standId,String type) throws Exception; + } 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 d2f18ceb..b0f15bbd 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 @@ -4,6 +4,8 @@ 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.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; import com.adc.da.att.entity.AttFileEO; @@ -52,6 +54,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService @Autowired private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + @Autowired + private ISarStandardsInfoService sarStandardsInfoService; @Autowired private IAttFileEOService attFileEOService; @@ -122,8 +126,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService //用来往标准分解单里添加数据 List standList = new ArrayList<>(); - + SarStandardsInfo sarStandardsInfo=sarStandardsInfoService.getById(sarFileSplitInfoEO.getStandId()); // 拆分文件主表中插入数据 + sarFileSplitInfoEO.setStandName(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNameSplit(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNumSplit(sarStandardsInfo.getStandSort()+" "+sarStandardsInfo.getStandNumber()+"-"+sarStandardsInfo.getStandYear()); sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); sarFileSplitInfoEO.setValidFlag(0); sarFileSplitInfoEO.setCreationTime(new Date()); @@ -368,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEODao.insertForeach(itemValList); - //用来往标准分解单插入数据 - messageList.forEach(item -> { - //new一个对象 - SarStandItems standItems1 = new SarStandItems(); - //standItems1里的这个值为messageList里的ItermsConditions - standItems1.setId(UUIDUtils.randomUUID20()) - .setFileType(sarFileSplitInfoEO.getFileType()) - .setStandId(sarFileSplitInfoEO.getStandId()) - .setItemsNum(item.getItemsNum()) - .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()) - .setEditFlag(item.getEditFlag()); - - standList.add(standItems1); - }); - sarFileSplitItemsEODao.insertStandSplitForeach(standList); +// 2021/11/23改用标准详情手动插入 +// //用来往标准分解单插入数据 +// messageList.forEach(item -> { +// //new一个对象 +// SarStandItems standItems1 = new SarStandItems(); +// //standItems1里的这个值为messageList里的ItermsConditions +// standItems1.setId(UUIDUtils.randomUUID20()) +// .setFileType(sarFileSplitInfoEO.getFileType()) +// .setStandId(sarFileSplitInfoEO.getStandId()) +// .setItemsNum(item.getItemsNum()) +// .setItemsName(item.getItemsName()) +// .setTermsConditions(item.getItermsConditions()) +// .setEditFlag(item.getEditFlag()); +// +// standList.add(standItems1); +// }); +// sarFileSplitItemsEODao.insertStandSplitForeach(standList); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 1033d3be..cf68b7c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -245,9 +245,9 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ } return resultMap; } - + @Async @Override - public Map fullTextComparison(String leftStandard, String rightStandard) throws Exception{ + public Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception{ Map resultMap = new HashMap(); List> leftMapList = fullTextComparePackageData(leftStandard); List> rightMapList = fullTextComparePackageData(rightStandard); @@ -281,7 +281,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ resultMap.put("resRightMapList",resRightMapList); } //往全文比对历史表中添加数据 - addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList); + addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList,id); return resultMap; } @@ -319,12 +319,12 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ **/ @Async public void addStandCompareHis(String leftStandId,String rightStandId,String compareType, - List> resLeftMapList,List> resRightMapList) throws Exception{ + List> resLeftMapList,List> resRightMapList,String id) throws Exception{ SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandId); SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandId); //保存标准比对历史表数据 SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); - String id = UUIDUtils.randomUUID20(); +// String id = UUIDUtils.randomUUID20(); sarStandCompareHisEO.setId(id); sarStandCompareHisEO.setOldStandId(leftStandId); sarStandCompareHisEO.setNewStandId(rightStandId); @@ -341,7 +341,8 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareType(compareType); - dao.insertSelective(sarStandCompareHisEO); + sarStandCompareHisEO.setCompareStatus("比对完成"); + dao.updateByPrimaryKeySelective(sarStandCompareHisEO); //保存标准的所有条款比对的历史数据 if(resLeftMapList!=null && !resLeftMapList.isEmpty()) { setStandCompareHisEO(resLeftMapList, id, "LEFT"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 4e6217d5..3713a30a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.standardSplit.service.impl; -import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; +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.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -12,17 +15,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; +import java.util.Map; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarStandFileEOServiceImpl implements SarStandFileEOService { - private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class); @Autowired private SarStandFileEODao sarStandFileEODao; @Autowired - private SarStandAttrDetailsEODao sarStandAttrDetailsEODao; + private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; + @Override public List getStandFileListByPage(SarStandFileEOPage stand){ @@ -80,8 +87,54 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { }); return sarStandFileEOS; + } + //type == 0 是pdf type==1 是doc + @Override + public List selectFileByStandIdOCR(String standId , String type) throws Exception { + QueryWrapper queryWrapper= new QueryWrapper<>(); + List choose=new ArrayList<>(); + SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(standId); + SarBussionessStand result2 = sarBussionessStandEOService.selectStandardsInfoUpdateByKey(standId); + if (null!=result.getAttrInfoCaseMap()){ + Map map=result.getAttrInfoCaseMap(); + for (String key:result.getAttrInfoCaseMap().keySet()) { + if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ + if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ + choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); + }else { + choose.add(result.getAttrInfoCaseMap().get(key).toString()); + } + } + } + } + if (null!=result2){ -// return sarStandFileEODao.selectFileByStandId(standId);r + } + + queryWrapper.eq("STAND_ID",standId); + queryWrapper.eq("USE_MODEL","SOURCE_FILE"); + queryWrapper.in("ATT_ID",choose); + List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + + if ("0".equals(type)){ + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".PDF") && !sarStandFileEO.getFileName().contains(".pdf") ){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + }else { + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") && + !sarStandFileEO.getFileName().contains(".DOCX") && !sarStandFileEO.getFileName().contains(".docx")){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + } + return sarStandFileEOS; } } 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 0984ff19..17fe6030 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 @@ -99,95 +99,43 @@ order by number - - + + + SELECT + , + attr.CLLX AS APPLY_TYPE , + attr.ZRGCS AS DUTY_ENGINEER , + NULL AS ITEMS_ID , + NULL AS ITEMS_NUM , + NULL AS ITEMS_NAME , + NULL AS POLICY_ID , + NULL AS POLICY_NAME , + MARK , + POWER, + attr.XCXSSRQ AS XCXSSRQ , + attr.ZCCSSRQ AS ZCCSSRQ + FROM sar_stand_warning AS warning + LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID + LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID + + POWER = '1' + + + + AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') + + + AND ( + DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.startXCXSSRQ}, + '%Y-%m-%d' + ) + + AND + DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endXCXSSRQ}, + '%Y-%m-%d' + ) + ) + + + AND ( + DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.startZCCSSRQ}, + '%Y-%m-%d' + ) + + AND + DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endZCCSSRQ}, + '%Y-%m-%d' + ) + ) + + + + + UNION ALL + + SELECT + , + items.APPLY_ARCTIC AS APPLY_TYPE , + items.DUTY_ENGINEER AS DUTY_ENGINEER , + items.ID AS ITEMS_ID , + items.ITEMS_NUM , + items.ITEMS_NAME , + NULL AS POLICY_ID , + NULL AS POLICY_NAME , + MARK , + POWER, + items.XCXSSRQ AS XCXSSRQ , + items.ZCCSSRQ AS ZCCSSRQ + FROM + sar_stand_warning AS warning + LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID + LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID + LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID + + POWER = '1' + + + + AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%') + + + + AND ( + DATE_FORMAT( items.XCXSSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startXCXSSRQ},'%Y-%m-%d') + AND + DATE_FORMAT( items.XCXSSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endXCXSSRQ},'%Y-%m-%d') + ) + + + + AND( + DATE_FORMAT( items.ZCCSSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startZCCSSRQ},'%Y-%m-%d') + AND + DATE_FORMAT( items.ZCCSSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endZCCSSRQ},'%Y-%m-%d' ) + ) + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 41097a19..a722018f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -6,4 +6,12 @@ resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarBaseStandardInfo"> select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard + + + update sar_interpretation_national_standard set risk_degree = #{find.riskDegree} + where sar_interpretation_national_standard.STAND_ID = #{find.standId} + and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber} + and sar_interpretation_national_standard.STAND_NAME=#{find.standName} + and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 38a88987..430e0e6c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -19,11 +19,12 @@ + - compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type + compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type ,compare_status @@ -89,6 +90,9 @@ and new_sar_type ${newSarTypeOperator} #{newSarType} + + + and compare_status = #{compareStatus} and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%')) @@ -105,7 +109,7 @@ SELECT SEQ_SAR_STAND_COMPARE_HIS.NEXTVAL FROM DUAL --> insert into SAR_STAND_COMPARE_HIS() - values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}) + values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR},#{compareStatus, jdbcType=VARCHAR}) @@ -131,6 +135,7 @@ modify_time, new_file_type, new_sar_type, + compare_status, #{compareType, jdbcType=VARCHAR}, @@ -149,6 +154,7 @@ #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}, + #{compareStatus, jdbcType=VARCHAR}, @@ -169,7 +175,8 @@ modify_user = #{modifyUser}, modify_time = #{modifyTime}, new_file_type = #{newFileType}, - new_sar_type = #{newSarType} + new_sar_type = #{newSarType}, + compare_status = #{compareStatus} where id = #{id} @@ -222,6 +229,9 @@ new_sar_type = #{newSarType}, + + compare_status = #{compareStatus}, + where id = #{id}