Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/HpjxApplication.java

@@ -8,7 +8,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 @SpringBootApplication(scanBasePackages = "com.baosight")
 @ServletComponentScan("com.baosight.iplat4j.core.web.servlet")
@@ -26,4 +28,12 @@ public class HpjxApplication extends SpringBootServletInitializer {
         return application.sources(HpjxApplication.class);
     }
 
+    @Bean("multipartResolver")
+    public CommonsMultipartResolver multipartResolver(){
+        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+        resolver.setDefaultEncoding("UTF-8");
+        resolver.setMaxInMemorySize(10000);
+        return resolver;
+    }
+
 }

src/main/java/com/baosight/hpjx/controller/FileUploadController.java

+package com.baosight.hpjx.controller;
+
+import com.baosight.hpjx.hp.mt.untils.Base64ToMultipartFile;
+import com.baosight.hpjx.hp.mt.untils.UploadUtils2;
+import com.baosight.hpjx.util.FileUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.MapUtils;
+import com.baosight.hpjx.util.StringUtils;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.soa.XServiceManager;
+import com.baosight.iplat4j.eu.dm.document.bos.s3.api.signed.SignedBosHelp;
+import com.baosight.iplat4j.eu.dm.document.bos.s3.param.BosParamHelp;
+import com.google.common.base.Joiner;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author:songx
+ * @date:2024/3/14,14:26
+ */
+@CrossOrigin
+@RestController
+@RequestMapping({"/upload/file"})
+public class FileUploadController {
+	
+	/**
+	 * 更具docId上传文件
+	 *
+	 * @param file
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/app", method = RequestMethod.POST)
+	public Map upload(MultipartFile file) throws IOException {
+		Map resultMap = new HashMap();
+		try {
+			JSONObject upload = UploadUtils2.upload((CommonsMultipartFile)file);
+			resultMap.put("id",upload.getString("docId"));
+			resultMap.put("status", EiConstant.STATUS_SUCCESS);
+			resultMap.put("message", "SUCCESS");
+			return resultMap;
+		} catch (Exception e) {
+			resultMap.put("status", 500);
+			resultMap.put("message", LogUtils.getMsg(e));
+			return resultMap;
+		}
+	}
+}

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT002.java

@@ -206,15 +206,9 @@ public class ServiceHPMT002 extends ServiceBase {
             List<HPZL001A> docIdlist = this.dao.query("HPZL001A.queryDev", Map);
             List<String> imgList = new ArrayList<>();
             for (int i = 0; i < docIdlist.size(); i++) {
-                Map dirId = new HashMap();
                 HPZL001A hpzl001A = docIdlist.get(i);
                 String docId = hpzl001A.getDocId();
-                dirId.put("docId", docId);
-                List<Map> query = this.dao.query("HPMT002.queryFile", dirId);
-                File file = new File(ROOT_PATH + "/A/" + query.get(0).get("CHG_NAME"));
-                BufferedImage bf = ImageIO.read(file);
-                String imgBase64 = UploadUtils.imageToBase64(bf);
-                imgList.add(imgBase64);
+                imgList.add(docId);
             }
             //处理的文件
             Map Map2 = new HashMap();
@@ -223,22 +217,14 @@ public class ServiceHPMT002 extends ServiceBase {
             List<HPZL001A> docIdlist2 = this.dao.query("HPZL001A.queryDev", Map2);
             List<String> imgList2 = new ArrayList<>();
             for (int i = 0; i < docIdlist2.size(); i++) {
-                Map dirId = new HashMap();
                 HPZL001A hpzl001A = docIdlist2.get(i);
                 String docId = hpzl001A.getDocId();
-                dirId.put("docId", docId);
-                List<Map> query = this.dao.query("HPMT002.queryFile", dirId);
-                File file = new File(ROOT_PATH+ "/A/" + query.get(0).get("CHG_NAME"));
-                BufferedImage bf = ImageIO.read(file);
-                String imgBase64 = UploadUtils.imageToBase64(bf);
-                imgList2.add(imgBase64);
+                imgList2.add(docId);
             }
             Map sqlMap = new HashMap();
             sqlMap.put("companyCode", companyCode);
             sqlMap.put("id", id);
             List<Map> rows = this.dao.query("HPMT002.pmQualityDetail", sqlMap);
-            EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
-            eiBlock.setRows(rows);
             resultMap.put("result",rows);
             resultMap.put("img",imgList);
             resultMap.put("img2",imgList2);

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml

@@ -231,7 +231,7 @@
 
 
         <select id="queryFile" resultClass="java.util.HashMap">
-                SELECT CHG_NAME   FROM iplat.TEUDM02 where DOC_ID=#docId#
+                SELECT URL  FROM iplat.TEUDM05 where RES_ID=#docId#
         </select>
 
 

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java

@@ -61,6 +61,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null,false);
 			inInfo = super.query(inInfo, HPPZ006.QUERY, new HPPZ006());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/webapp/HP/SC/HPSC006.js

@@ -121,7 +121,7 @@ $(function () {
                         }*/
                         if (filePath1) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                                + 'onclick="showUploadFile(' + filePath1 + ',\'XL\')"  >下料附件清单</a>';
+                                + 'onclick="showUploadFile(' + item.id + ')"  >下料附件清单</a>';
                         }
                         return template
                     }
@@ -386,9 +386,9 @@ function reqDetails(projCode) {
         height: "90%"
     });
 }
-function showUploadFile(id,type) {
+function showUploadFile(id) {
     JSColorbox.open({
-        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType="+type+"&inqu_status-0-id=" + id,
+        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType=XL&inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

src/main/webapp/HP/SC/HPSC097.js

 $(function () {
     // 提交
     $("#btn_upload").on("click", upload);
+
+    $("#cancel").on("click", cancel);
 });
+
+let cancel = function(){
+    parent.JSColorbox.close();
+}
 /**
  * 上传文件
  */

src/main/webapp/HP/SC/HPSC097.jsp

@@ -6,7 +6,9 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
 <EF:EFPage title="导入">
+
     <EF:EFRegion id="upload" title="文件导入区">
+
     <EF:EFInput ename="inqu_status-0-id" cname="服务Id" type="hidden"/>
     <EF:EFInput ename="inqu_status-0-parentId" cname="父Id" type="hidden"/>
     <EF:EFInput ename="inqu_status-0-projCode" cname="项目代码" type="hidden"/>
@@ -14,7 +16,13 @@
     <EF:EFInput ename="inqu_status-0-parentPrdtName" cname="项目部件名称" type="hidden"/>
     <EF:EFInput ename="inqu_status-0-productionOrderNo" cname="生产订单号" type="hidden"/>
     <EF:EFInput cname="上传文件" blockId="inqu_status" ename="file" row="0" type="file" />
-    <button id="btn_upload"  type="submit">提交</button>
+    <%--<button id="btn_upload"  type="submit">提交</button>--%>
+   <%--     <EF:EFButton cname="提交" ename="btn_upload"></EF:EFButton>--%>
+        <div class="row">
+            <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-align-right"/>
+            <EF:EFButton ename="btn_upload"  cname="确认" type="button" class="btn-align-right"/>
+        </div>
+
     </EF:EFRegion>
 </EF:EFPage>
 <script src="${ctx}/HP/SC/HPSC097.js"></script>