diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index a88b02db..cec06d68 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -128,6 +128,13 @@ public class ReportDataController { return R.ok(result); } + @GetMapping("/abnormalRate") + public R findAbnormalRate(@RequestParam(required = false) Map paramMap) { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findAbnormalRate(paramMap); + return R.ok(result); + } + @GetMapping("/userPassRate") public R findUserPassRate(@RequestParam(required = false) Map paramMap) { paramMap.put("site", CommonMethods.getSite()); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index 45e09153..b7bfca70 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -29,6 +29,8 @@ public interface ReportDataMapper { List> findCheckUserPassRate(Map paramMap); + List> findAbnormalRate(Map paramMap); + List> findUserPassRate(Map paramMap); List> findInspectionDetailPassRate(Map paramMap); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java index 47bef354..49bffab6 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java @@ -47,6 +47,7 @@ public interface ReportDataService { List> findCheckUserPassRate(Map paramMap); + List> findAbnormalRate(Map paramMap); List> findUserPassRate(Map paramMap); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java index 4f851c90..d2e2ed43 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java @@ -1,10 +1,10 @@ package com.foreverwin.mesnac.common.service.impl; -import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.ftp.CappFtpClient; import com.foreverwin.mesnac.common.service.FileService; import com.foreverwin.mesnac.common.util.ExceptionUtil; +import com.foreverwin.mesnac.common.util.GetDrawingVersionUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.model.Sfc; import com.foreverwin.mesnac.meapi.model.SfcDispatchDrawing; @@ -17,7 +17,6 @@ import org.apache.commons.net.ftp.FTPFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.File; import java.io.IOException; import java.util.*; import java.util.regex.Pattern; @@ -89,13 +88,16 @@ public class FileServiceImpl implements FileService { @Override public Map getFilePathsByItemBo(String itemBo) throws IOException { - String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/"; FTPClient connect = null; Map pathMap = new HashMap<>(); try { connect = cappFtpClient.login(); + String vision= GetDrawingVersionUtil.GetDrawingVerson(itemBo, connect); + String path="/"+ StringUtil.trimHandle(itemBo)+"_"+vision+"/"; + connect.changeWorkingDirectory(path); connect.enterLocalPassiveMode(); + FTPFile[] files = connect.listFiles(); if(files!=null){ for (int i = 0; i < files.length; i++) { diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index 8b021f78..711f7efa 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -80,6 +80,11 @@ public class ReportDataServiceImpl implements ReportDataService{ return reportDataMapper.findCheckUserPassRate(paramMap); } + @Override + public List> findAbnormalRate(Map paramMap) { + return reportDataMapper.findAbnormalRate(paramMap); + } + @Override public List> findUserPassRate(Map paramMap) { return reportDataMapper.findUserPassRate(paramMap); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/GetDrawingVersionUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/GetDrawingVersionUtil.java index 4e95f1c5..d3eb1495 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/util/GetDrawingVersionUtil.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/util/GetDrawingVersionUtil.java @@ -1,9 +1,6 @@ package com.foreverwin.mesnac.common.util; -import com.foreverwin.mesnac.common.ftp.CappFtpClient; import org.apache.commons.net.ftp.FTPClient; -import org.apache.commons.net.ftp.FTPFile; -import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; import java.util.ArrayList; @@ -11,7 +8,7 @@ import java.util.List; public class GetDrawingVersionUtil { // CappFtpClient cappFtpClient=new CappFtpClient(); - public String GetDrawingVerson(String itemBo, FTPClient connect) throws IOException { + public static String GetDrawingVerson(String itemBo, FTPClient connect) throws IOException { char VersionInit = 'A'; List list = new ArrayList<>(); for (int i = 0; i < 26; i++) { diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 8f8c7227..5c3285ae 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -709,6 +709,29 @@ + + UPDATE Z_SFC_DISPATCH ZSD SET ZSD.OTHER_3 = 'true' WHERE ZSD.HANDLE IN @@ -717,4 +740,5 @@ AND ZSD.SITE = #{site} + \ No newline at end of file