修改预案演练树查询接口

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -71,9 +71,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         for (Object obj : list) {
             TreeSubjectVo treeItem = new TreeSubjectVo();
             LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) obj;
-            treeItem.setId((Integer) map.get("id"));
+            treeItem.setId((String) map.get("id"));
             treeItem.setTreeName((String) map.get("treeName"));
-            treeItem.setParentId((Integer) map.get("parentId"));
+            treeItem.setParentId((String) map.get("parentId"));
             treeItem.setMaxSubjectNumber((Integer) map.get("maxSubjectNumber"));
             treeItem.setType("treeNode");
 
@@ -91,10 +91,10 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                     TreeSubjectVo subjectVo = new TreeSubjectVo();
                     LinkedHashMap<String, Object> map1 = (LinkedHashMap<String, Object>) r;
                     subjectVo.setType("listNode");
-                    subjectVo.setParentId((Integer) map.get("id"));
-                    subjectVo.setId((Integer) map1.get("id"));
-                    subjectVo.setDelete(map1.get("isDelete") == null ? false : (Boolean) map1.get("isDelete"));
-                    subjectVo.setCreateTime((Long) map1.get("createTime"));
+                    subjectVo.setParentId((String) map.get("id"));
+                    subjectVo.setId((String) map1.get("id"));
+                    subjectVo.setDelete(map1.get("isDelete") == null || (Integer) map1.get("isDelete") == 0 ? false : true);
+                    subjectVo.setCreateTime((String) map1.get("createTime"));
                     subjectVo.setCreator(map1.get("creator") == null ? 0 : (Integer) map1.get("creator"));
                     subjectVo.setSubjectName((String) map1.get("subjectName"));
                     subjectVo.setTreeName((String) map1.get("subjectName"));
@@ -102,16 +102,16 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                     subjectVo.setSubjectType((String) map1.get("subjectType"));
                     subjectVo.setSubjectTypeName((String) map1.get("subjectTypeName"));
                     subjectVo.setPublishState((Integer) map1.get("publishState"));
-                    subjectVo.setBelongTreeId((Integer) map1.get("belongTreeId"));
+                    subjectVo.setBelongTreeId((String) map1.get("belongTreeId"));
                     subjectVo.setScenes(map1.get("scenes") == null ? "" : (String) map1.get("scenes"));
 
                     //关联文字预案
                     List<TextPlan> textPlans = iTextPlanDao.findByAppId(String.valueOf(subjectVo.getId()));
                     textPlans.forEach(t -> {
                         TreeSubjectVo textTreeSubjectVo = new TreeSubjectVo();
-                        textTreeSubjectVo.setParentId(Integer.valueOf(t.getAppId()));
+                        textTreeSubjectVo.setParentId(String.valueOf(t.getAppId()));
                         textTreeSubjectVo.setTreeName(t.getTextName());
-                        textTreeSubjectVo.setId((int) t.getId());
+                        textTreeSubjectVo.setId(String.valueOf(t.getId()));
                         textTreeSubjectVo.setType("textNode");
                         subjectVo.getChildren().add(textTreeSubjectVo);
                     });

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/TreeSubjectVo.java

@@ -5,11 +5,11 @@ import java.util.List;
 
 public class TreeSubjectVo {
 
-    private Integer id;
+    private String id;
 
     private String treeName;
 
-    private Integer parentId;
+    private String parentId;
 
     private Integer maxSubjectNumber;
 
@@ -17,7 +17,7 @@ public class TreeSubjectVo {
 
     private List<TreeSubjectVo> children = new ArrayList<>();
 
-    private Long createTime;
+    private String createTime;
 
     private Integer creator;
 
@@ -33,17 +33,17 @@ public class TreeSubjectVo {
 
     private int publishState;
 
-    private int belongTreeId;
+    private String belongTreeId;
 
     private String scenes;
 
     List<TreeSubjectVo> subjectChildren = new ArrayList<>();
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 
@@ -55,11 +55,11 @@ public class TreeSubjectVo {
         this.treeName = treeName;
     }
 
-    public Integer getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Integer parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
@@ -79,11 +79,11 @@ public class TreeSubjectVo {
         this.children = children;
     }
 
-    public Long getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Long createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
@@ -143,11 +143,11 @@ public class TreeSubjectVo {
         this.publishState = publishState;
     }
 
-    public int getBelongTreeId() {
+    public String getBelongTreeId() {
         return belongTreeId;
     }
 
-    public void setBelongTreeId(int belongTreeId) {
+    public void setBelongTreeId(String belongTreeId) {
         this.belongTreeId = belongTreeId;
     }