Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

liurunyu

2024-08-15 3083fccba0a65d78702f201222f4072c907b5d07

Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -118,9 +118,9 @@
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx服务路径
            webDownloadPath: /download/down?id=  #实际下载webUrl= restUrl + webDownloadPath
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -129,7 +129,7 @@
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pms.file2.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
        sv3:
            id: dyFile3
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -138,7 +138,7 @@
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pms.file3.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
        sv4:
            id: dyFile4
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -147,7 +147,7 @@
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pms.file4.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
        sv5:
            id: dyFile5
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -156,7 +156,7 @@
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pms.file5.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
        sv6:
            id: dyFile6
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -165,7 +165,7 @@
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pms.file6.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
        sv7:
            id: dyFile7
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -174,7 +174,7 @@
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pms.file7.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
        sv8:
            id: dyFile8
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -183,7 +183,7 @@
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pms.file8.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
        sv9:
            id: dyFile9
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -192,7 +192,7 @@
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pms.file9.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
        sv10:
            id: dyFile10
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -201,7 +201,7 @@
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pms.file10.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
        sv11:
            id: dyFile11
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -210,7 +210,7 @@
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pms.file11.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
        sv12:
            id: dyFile12
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -219,4 +219,4 @@
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pms.file12.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
            webDownloadPath: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=

 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java

@@ -177,7 +177,7 @@
                     return;
                 }
                 FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
                 doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
                 doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
                 doc.orgName = file.orgName;
                 doc.extName = file.extName;
             });
@@ -211,37 +211,37 @@
                    item.qrCode = "data:image/jpeg;base64," + Base64.encode(codes);
                    item = addWebUrl(item);
                } catch (IOException e) {
                    e.printStackTrace();
                    log.error("IOException:",e);
                } catch (WriterException e) {
                    e.printStackTrace();
                    log.error("WriterException:",e);
                }
            });
        }
        return rsVo ;
    }

    /**
     * 添加产品文档关联
     * @param proId 产品id
     * @param fileId 文档id
     * @return 更新数量
     */
    public int addDoc(long proId,long fileId,String fileType){
        PltProductFile pf=new PltProductFile();
        pf.fileId = fileId;
        pf.proId = proId;
        pf.fileType = fileType;
        return pfDao.insertSelective(pf);
    }
//    /**
//     * 添加产品文档关联
//     * @param proId 产品id
//     * @param fileId 文档id
//     * @return 更新数量
//     */
//    public int addDoc(long proId,long fileId,String fileType){
//        PltProductFile pf=new PltProductFile();
//        pf.fileId = fileId;
//        pf.proId = proId;
//        pf.fileType = fileType;
//        return pfDao.insertSelective(pf);
//    }

    /**
     * 查询产品关联文档
     * @param proId 产品id
     * @return 返回关联文档集合
     */
    public List<OthFile> selectDoc(long proId){
        return othFileMapper.selectByProId(proId);
    }
//    /**
//     * 查询产品关联文档
//     * @param proId 产品id
//     * @return 返回关联文档集合
//     */
//    public List<OthFile> selectDoc(long proId){
//        return othFileMapper.selectByProId(proId);
//    }


    public List<PltProduct> selectAll(QueryVo queryVo) {
@@ -250,7 +250,7 @@
    }


    public void downloadDoc(HttpServletResponse response) {
        PltProduct pro=dao.selectByPrimaryKey(Long.valueOf(1));
    }
//    public void downloadDoc(HttpServletResponse response) {
//        PltProduct pro=dao.selectByPrimaryKey(Long.valueOf(1));
//    }
}

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -524,27 +524,27 @@
        ins.extName = file.extName;
    }

    private PltProduct addWebUrl(PltProduct pro) {
        if (pro != null) {
            if (pro.image != null) {
                String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
                pro.imageWebPath = filePathWithWebUrl;
                pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
            }

            pro.proFiles.stream().forEach(doc -> {
                OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
                if (file == null) {
                    return;
                }
                FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
                doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
                doc.orgName = file.orgName;
                doc.extName = file.extName;
            });
        }
        return pro;
    }
//    private PltProduct addWebUrl(PltProduct pro) {
//        if (pro != null) {
//            if (pro.image != null) {
//                String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
//                pro.imageWebPath = filePathWithWebUrl;
//                pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
//            }
//
//            pro.proFiles.stream().forEach(doc -> {
//                OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
//                if (file == null) {
//                    return;
//                }
//                FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
//                doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
//                doc.orgName = file.orgName;
//                doc.extName = file.extName;
//            });
//        }
//        return pro;
//    }

    private String getFilePathWithWebUrl(Long fileId) {
        OthFile file = othFileMapper.selectByPrimaryKey(fileId);