Merge pull request '20240411' (#3) from ljh into main

Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/3
pull/8/head
李建辉 1 year ago
commit fc9347adde

@ -989,6 +989,9 @@ public class MySceneController extends KFXPanelController {
TempBean tempBean = beans.get(selectedIndex); TempBean tempBean = beans.get(selectedIndex);
String jdbBh2 = tempBean.getJdbBh(); String jdbBh2 = tempBean.getJdbBh();
jdbbh.setText(jdbBh2); jdbbh.setText(jdbBh2);
String version = tempBean.getVersion();
System.out.println("version=========================================="+version);
revId.setText(version);
String selectedItem = cb_thqd.getSelectionModel().getSelectedItem(); String selectedItem = cb_thqd.getSelectionModel().getSelectedItem();
String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session); String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session);
try { try {

@ -81,8 +81,10 @@ public class FileIntegrationHandler extends AbstractHandler{
//´´½¨JSON //´´½¨JSON
String projectId = ""; String projectId = "";
String item_id = "";
try { try {
projectId = project.getProperty("zt2_ProjectNo"); projectId = project.getProperty("zt2_ProjectNo");
item_id = project.getProperty("item_id");
} catch (Exception e1) { } catch (Exception e1) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e1.printStackTrace(); e1.printStackTrace();
@ -96,6 +98,7 @@ public class FileIntegrationHandler extends AbstractHandler{
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
top.put("projectId", projectId); top.put("projectId", projectId);
top.put("userId", userId); top.put("userId", userId);
top.put("itemId", item_id);
// //
TCComponent[] relatedComponents = sqzlFolder.getRelatedComponents("contents"); TCComponent[] relatedComponents = sqzlFolder.getRelatedComponents("contents");

Loading…
Cancel
Save