知识库——子系统配置 V1.4

为返回值添加PID以及FromID

cx-knowledge-base/cx-knowledge-base-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SubConfigServiceImpl.java

@@ -25,11 +25,12 @@ import java.util.stream.Collectors;
 @Service
 public class SubConfigServiceImpl implements SubConfigService {
 
+    //0-21
     private final String[] JSON_NAME = {
             "urladdr", "insttype", "roption", "global", "base", "editPage", "id",
             "rowEdit", "layout", "form", "data", "tableColumnName", "columns",
             "tableColumnType", "tableName", "label", "dataSource", "formData",
-            "insttype", "heads", "field"
+            "insttype", "heads", "field","fullpid"
     };
 
     private final String[] TYPE_NAME = {
@@ -66,9 +67,11 @@ public class SubConfigServiceImpl implements SubConfigService {
         if (pagePart == null) {
             return R.error("该菜单未配置编辑页或页编辑，请重新选择！");
         }
+        String fullPid = module.getStr(JSON_NAME[21]);
+        String subsystemId = fullPid.split(",")[1];
         // 查询页面展示的所有字段
         IPage<KdSubsystemDetailVo> res = new Page<>();
-        res.setRecords(getTableNameByData(pagePart));
+        res.setRecords(getTableNameByData(pagePart,pagePartId,subsystemId));
         return R.ok(res);
     }
 
@@ -109,13 +112,14 @@ public class SubConfigServiceImpl implements SubConfigService {
     /**
      * 查询页面展示的所有表名
      *
-     * @param pagePart
-     * @return {@link List< String>}
+     * @param pagePart 编辑页ID
+     * @param subsystemId   子系统ID
+     * @return {@link List<String>}
      * @date 2024/1/8 10:09
      * @author shangmi
      */
 
-    public List<KdSubsystemDetailVo> getTableNameByData(String pagePart) {
+    public List<KdSubsystemDetailVo> getTableNameByData(String pagePart,String pagePartId,String subsystemId) {
         boolean instType = "table".equals(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[16])).get(JSON_NAME[17])).get(JSON_NAME[18], String.class));
         // 获得layout中的form
         List<String> form = JSONUtil.toList(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[8])).get(instType ? JSON_NAME[19] : JSON_NAME[9], String.class), String.class);
@@ -133,6 +137,8 @@ public class SubConfigServiceImpl implements SubConfigService {
                     JSONObject json = JSONUtil.parseObj(JSONUtil.parseObj(info).get(JSON_NAME[4]));
                     String tableColumnNane = json.get(JSON_NAME[11], String.class);
                     kdSubsystemDetail.setTABLECOLUMNNANE(tableColumnNane);
+                    kdSubsystemDetail.setPID(subsystemId);
+                    kdSubsystemDetail.setFROMID(pagePartId);
                     kdSubsystemDetail.setTABLECOLUMNTYPE(json.get(JSON_NAME[13], String.class));
                     kdSubsystemDetail.setTABLENAME(json.get(JSON_NAME[14], String.class));
                     kdSubsystemDetail.setLABEL(json.get(JSON_NAME[15], String.class));

cx-knowledge-base/cx-knowledge-base-entity/src/main/java/com/rongwei/bsentity/vo/KdSubsystemDetailVo.java

@@ -68,6 +68,30 @@ public class KdSubsystemDetailVo {
     @JSONField(name = "DATAORIGIN")
     private String DATAORIGIN;
 
+    @JSONField(name = "PID")
+    private String PID;
+
+    @JSONField(name = "FROMID")
+    private String FROMID;
+
+    @JsonProperty("PID")
+    public String getPID() {
+        return PID;
+    }
+
+    public void setPID(String PID) {
+        this.PID = PID;
+    }
+
+    @JsonProperty("FROMID")
+    public String getFROMID() {
+        return FROMID;
+    }
+
+    public void setFROMID(String FROMID) {
+        this.FROMID = FROMID;
+    }
+
     @JsonProperty("TABLENAME")
     public String getTABLENAME() {
         return TABLENAME;