获取物料PLM文件调整

uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java

@@ -2,9 +2,10 @@ package nccloud.web.uapbd.material.action;
 
 import nc.bs.uapbd.util.GetPlmFileUtil;
 import nccloud.framework.core.io.WebFile;
+import nccloud.framework.web.action.itf.ICommonAction;
 import nccloud.framework.web.container.IRequest;
-import nccloud.web.action.NCCAction;
+
-import nccloud.web.uapbd.commons.web.ParamUtils;
+import java.util.Map;
 
 /**
  * 获取物料PLM文件
@@ -12,15 +13,21 @@ import nccloud.web.uapbd.commons.web.ParamUtils;
  * @author mzr
  * @date 2025/8/4
  */
-public class MaterialPlmDownloadAction extends NCCAction {
+public class MaterialPlmDownloadAction implements ICommonAction {
+
     @Override
-    public <T> Object execute(IRequest request, T para) throws Exception {
+    public Object doAction(IRequest request) {
-        ParamUtils param = new ParamUtils(request);
+        WebFile files = null;
-        String materialCode = param.getString("materialCode", null);
+        try {
-        materialCode = "101092250323";
+            Map<String, String[]> params_1 = request.readParameters();
-        String[] materialCodeArr = materialCode.split(",", -1);
+            String[] pks = params_1.get("materialCode"); // »ñÈ¡ËùÓÐ pk
-        GetPlmFileUtil fileUtil = new GetPlmFileUtil();
+            String materialCode = "101092250323,101092250323";
-        WebFile files = fileUtil.getPlmFiles(materialCodeArr);
+            String[] materialCodeArr = materialCode.split(",", -1);
+            GetPlmFileUtil fileUtil = new GetPlmFileUtil();
+            files = fileUtil.getPlmFiles(materialCodeArr);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         return files;
     }
 }

uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java

@@ -38,21 +38,28 @@ public class MaterialToEpicMesListener implements IBusinessListener {
         BDCommonEvent e = (BDCommonEvent) event;
         String eventType = event.getEventType();
         Object[] objs = e.getObjs();
-        MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class);
 
         // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后
         if ("1002".equals(eventType) || "1004".equals(eventType)) {
+            MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class);
             configParams = MyHelper.getConfigParams("Dldz-config", null);
             if (configParams.isEmpty()) {
                 throw new BusinessException("电力电子的艾普MES接口缺少配置");
             }
             buildSyncData(useVOs, eventType);
         } else if ("1071".equals(eventType) || "1069".equals(eventType)) {
+            MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class);
             configParams = MyHelper.getConfigParams("Dldz-config", null);
             if (configParams.isEmpty()) {
                 throw new BusinessException("电力电子的艾普MES接口缺少配置");
             }
-
+        } else if ("1009".equals(eventType)) {
+            Object[] newObjs = e.getNewObjs();
+            // 物料可见性范围-分配后
+            for (Object obj : newObjs) {
+                MaterialVO vo = (MaterialVO) obj;
+                String pkMaterial = vo.getPk_material();
+            }
         }
     }
 

uapbd/src/public/nc/bs/uapbd/util/GetPlmFileUtil.java

@@ -1,5 +1,6 @@
 package nc.bs.uapbd.util;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import nc.bs.dao.DAOException;
 import nc.bs.logging.Log;
@@ -41,11 +42,11 @@ public class GetPlmFileUtil {
     private String token = "";
     private static final String tokenUrl = "/sipmweb/api/oauth";
     // 根据物料编码获取零部件ID
-    private String materialIdUrl = "/sipmweb/api/{rid}/search/{t}?key={key}&start={start}&size={size}";
+    private String materialIdUrl = "/sipmweb/api/{rid}/search/{t}";
     // 根据零部件ID获取二维图档ID及信息
-    private String materialFileIdUrl = "/sipmweb/api/{rid}/relation/{t}/{id}/data?re={re}&start={start}&item={item}";
+    private String materialFileIdUrl = "/sipmweb/api/{rid}/relation/{t}/{id}/data";
     // 下载文件
-    private String downlownUrl = "/sipmweb/web/download?rid={rid}&id={id}&t={t}&type={type}";
+    private String downlownUrl = "/sipmweb/web/download";
     // http请求
     private static final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
     private static final CloseableHttpClient httpClient;
@@ -93,29 +94,29 @@ public class GetPlmFileUtil {
             ByteArrayOutputStream zipOut = new ByteArrayOutputStream();
             ZipOutputStream zipStream = new ZipOutputStream(zipOut);
             try {
-                for (String materialCode : materialCodeArr) {
+            for (String materialCode : materialCodeArr) {
-                    JSONObject plmFileJson = this.getPlmFile(materialCode);
+                JSONObject plmFileJson = this.getPlmFile(materialCode);
-                    String objId = plmFileJson.getString("objId");
+                String objId = plmFileJson.getString("objId");
-                    String fname = plmFileJson.getString("fname");
+                String fname = plmFileJson.getString("fname");
                     InputStream ins = this.doDownloadPlmFile(objId);
-                    try {
+                try {
                         byte[] bytes = parseFileStream(ins);
-                        zipStream.putNextEntry(new ZipEntry(fname));
+                    zipStream.putNextEntry(new ZipEntry(fname));
-                        zipStream.write(bytes);
+                    zipStream.write(bytes);
-                        zipStream.closeEntry();
+                    zipStream.closeEntry();
                     } finally {
                         if (ins != null) {
                             try {
                                 ins.close();
-                            } catch (IOException e) {
+                } catch (IOException e) {
-                                logger.error("Failed to close input stream: " + e.getMessage());
+                    logger.error("Failed to close input stream: " + e.getMessage());
-                            }
+                }
-                        }
+            }
                     }
                 }
-                zipStream.finish();
+            zipStream.finish();
             } finally {
-                zipStream.close();
+            zipStream.close();
             }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss");
             String zipName = "物料图纸下载_" + sdf.format(new Date());
@@ -165,7 +166,13 @@ public class GetPlmFileUtil {
         String result = doGet(fileUrl, map);
         logger.error("GetPlmFileUtil-getMaterialId-result = " + result);
         JSONObject jsonObject = JSONObject.parseObject(result);
-        String objId = jsonObject.getString("objId");
+        String list = jsonObject.getString("list");
+        JSONArray jsonArray = JSONObject.parseArray(list);
+        if (jsonArray == null || jsonArray.isEmpty()) {
+            throw new BusinessException("获取PLM物料id失败");
+        }
+        JSONObject listJson = jsonArray.getJSONObject(0);
+        String objId = listJson.getString("objId");
         if (objId == null || objId.isEmpty()) {
             throw new BusinessException("获取PLM物料id失败");
         }
@@ -189,11 +196,17 @@ public class GetPlmFileUtil {
         String result = doGet(fileUrl, map);
         logger.error("GetPlmFileUtil-getFileId-result = " + result);
         JSONObject jsonObject = JSONObject.parseObject(result);
-        String objId = jsonObject.getString("objId");
+        String list = jsonObject.getString("list");
+        JSONArray jsonArray = JSONObject.parseArray(list);
+        if (jsonArray == null || jsonArray.isEmpty()) {
+            throw new BusinessException("获取PLM物料的文件信息失败");
+        }
+        JSONObject listJson = jsonArray.getJSONObject(0);
+        String objId = listJson.getString("objId");
         if (objId == null || objId.isEmpty()) {
             throw new BusinessException("获取PLM物料的文件信息失败");
         }
-        return jsonObject;
+        return listJson;
     }
 
     /**