PDM前端改造

文件夹功能、查找E视图接口

src/com/yonde/basedata/controller/AbstractBaseController.java

@@ -7,7 +7,6 @@ import com.yonde.basedata.search.SearchQueryCondition;
 import com.yonde.basedata.service.BaseSearchService;
 import com.yonde.basedata.vo.IdVO;
 import com.yonde.basedata.vo.lc.LifecycleTemplateVO;
-import com.yonde.change.service.DXChangeOrderService;
 import com.yonde.common.ObjectsUtil;
 import com.yonde.common.entity.DXFolder;
 import com.yonde.part.vo.DxPartDescribeLinkVO;
@@ -119,13 +118,13 @@ public class AbstractBaseController {
 
     @GetMapping({"/folder/getFolderList"})
     //@ApiOperation("获取副本")
-    public DXFolder getWorkingCopy(@RequestParam String containerName, @RequestParam(value = "id", required = false) Long id, HttpServletRequest request) {
+    public DXFolder getFolderList(@RequestParam String containerName, @RequestParam(value = "id", required = false) String id, HttpServletRequest request) {
         DXFolder dxFolder = null;
         try {
-            if (ObjectsUtil.isNull(id) || id == 0) {
+            if (StringUtils.isEmpty(id)) {
                 dxFolder = BaseSearchService.getFolderList(containerName);
             } else {
-                dxFolder = BaseSearchService.getFolderList(containerName, id);
+                dxFolder = BaseSearchService.getFolderList(containerName, Long.valueOf(id));
             }
         } catch (Exception e) {
             e.printStackTrace();

src/com/yonde/basedata/service/BaseSearchService.java

@@ -360,7 +360,7 @@ public class BaseSearchService <V extends IdVO> implements RemoteAccess {
     private static DXFolder getDxFolder(Folder folder) throws WTException {
         DXFolder dxFolder = new DXFolder(folder);
         List<SubFolder> subFolders = FolderUtil.getSubFolders(folder, false);
-        if (CollectionUtils.isEmpty(subFolders)) {
+        if (CollectionUtils.isNotEmpty(subFolders)) {
             List<DXFolder> subList = new ArrayList<DXFolder>();
             for (SubFolder subFolder : subFolders) {
                 subList.add(new DXFolder(subFolder));

src/com/yonde/part/controller/DxPartController.java

@@ -235,4 +235,17 @@ public class DxPartController extends AbstractBaseController {
         }
         return resultList;
     }
+
+    @GetMapping({"/pdmPlanning/search"})
+    //@ApiOperation("获取更改相关对象")
+    public DxPartVO getPdmPlanningPart(@RequestParam(value = "number") String number, @RequestParam(value = "version") String version, HttpServletRequest request) {
+        DxPartVO dxPartVO = null;
+        try {
+            //下游对等件
+            dxPartVO = DxPartService.getPlanningPart(number, version);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return dxPartVO;
+    }
 }

src/com/yonde/part/service/DxPartService.java

@@ -25,6 +25,7 @@ import wt.session.SessionContext;
 import wt.session.SessionHelper;
 import wt.session.SessionServerHelper;
 import wt.util.WTException;
+import wt.vc.VersionControlHelper;
 import wt.vc.views.ViewHelper;
 import wt.vc.wip.WorkInProgressHelper;
 
@@ -675,4 +676,33 @@ public class DxPartService implements RemoteAccess, Serializable {
         }
         return resultList;
     }
+
+    /**
+     * 获取planning
+     * @param number
+     * @return
+     * @throws Exception
+     */
+    public static DxPartVO getPlanningPart(String number, String version) throws Exception {
+        if (!RemoteMethodServer.ServerFlag) {
+            return (DxPartVO) RemoteMethodServer.getDefault().invoke("getPlanningPart", DxPartService.class.getName(), null,
+                    new Class[] { String.class, String.class },
+                    new Object[] { number, version});
+        }
+        DxPartVO nextVersion = null;
+        CommonUtil.initSessionContext(null);
+        WTPart wtPart = DxPartUtil.getPartByNumberAndView(number, SearchOperatorEnumUtil.viewMap.get("2"), false);
+        if (ObjectsUtil.nonNull(wtPart)) {
+            QueryResult qr = VersionControlHelper.service.allVersionsOf(wtPart.getMaster());
+            while (qr.hasMoreElements()) {
+                wtPart = (WTPart) qr.nextElement();
+                if (wtPart.getViewName().equals(SearchOperatorEnumUtil.viewMap.get("2"))
+                        && wtPart.getVersionIdentifier().getValue().startsWith(version)) {
+                    nextVersion = new DxPartVO(wtPart);
+                    break;
+                }
+            }
+        }
+        return nextVersion;
+    }
 }