资源目录提交

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/ZymlTreeDataDTO.java

@@ -1,6 +1,7 @@
 package com.onemap.apply.domain.yzt;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,11 +12,38 @@ public class ZymlTreeDataDTO {
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String pid;
     private String label;
+    private String title;
     private String type;
     private String url;
-    private Boolean disabled;
+    private Boolean disabled = false;
+    private Boolean expand = false;
+    private Boolean contextmenu = true;
     private List<ZymlTreeDataDTO> children = new ArrayList<>();
 
+    public Boolean getExpand() {
+        return expand;
+    }
+
+    public void setExpand(Boolean expand) {
+        this.expand = expand;
+    }
+
+    public Boolean getContextmenu() {
+        return contextmenu;
+    }
+
+    public void setContextmenu(Boolean contextmenu) {
+        this.contextmenu = contextmenu;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getLabel() {
         return label;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/ZymlServiceImpl.java

@@ -98,10 +98,11 @@ public class ZymlServiceImpl implements IZymlService {
             for (int i = 0; i < res.size(); i++) {
                 ZymlDTO cur = res.get(i);
                 ZymlTreeDataDTO c = new ZymlTreeDataDTO();
-                c.setDisabled((cur.getParent() == 1));
+//                c.setDisabled((cur.getParent() == 1));
                 c.setId(cur.getBsm());
                 c.setPid(cur.getPbsm());
                 c.setLabel(cur.getName());
+                c.setTitle(cur.getName());
                 c.setType(cur.getType());
                 c.setUrl(cur.getUrl());
                 treedata.add(c);

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/yzt/ZymlMapper.xml

@@ -18,10 +18,10 @@
         SELECT count(1) FROM a where a.parent = '0') as "count",
         t.bsm as "bsm",
         t.name as "name",
-        case when t.sde is null then t.type else CAST(dblayer.servicetype as varchar) end as "type",
+        t.type as "type",
         t.pbsm as "pbsm",
         t.icon as "icon",
-        case when t.sde is null then t.url else CAST(dblayer.address as varchar) end as "url",
+        t.url as "url",
         t.lev as "lev",
         t.sort as "sort",
         t.state as "state",

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TYztZymlMapper.xml

@@ -82,6 +82,7 @@ SELECT t.layeralias
             <if test="legend != null  and legend != ''">and legend = #{legend}</if>
             <if test="ywlx != null  and ywlx != ''">and ywlx = #{ywlx}</if>
         </where>
+        order by sort
     </select>
 
     <select id="selectTYztZymlByBsm" parameterType="String" resultMap="TYztZymlResult">

pom.xml

@@ -248,7 +248,6 @@
     <modules>
         <module>onemap-auth</module>
         <module>onemap-gateway</module>
-        <module>onemap-visual</module>
         <module>onemap-modules</module>
         <module>onemap-api</module>
         <module>onemap-common</module>