增加style字段后续geoserver用

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/resManager/catalog/controller/RescatalogController.java

@@ -75,7 +75,7 @@ public class RescatalogController extends JeecgController<Rescatalog, IRescatalo
     public Result<?> getResListByUserName(@RequestParam("username") String username, @RequestParam("topicId") String topicId) {
         long start = System.currentTimeMillis();
         List<JSONObject> resList = new ArrayList<>();
-//		 List<Rescatalog> rescatalogList = rescatalogService.queryByUser(username);
+        //List<Rescatalog> rescatalogList = rescatalogService.queryByUser(username);
         resList = getResListByUser("0", username, topicId);
         log.info("======用户资源目录查询成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
         return Result.OK(resList);
@@ -106,12 +106,14 @@ public class RescatalogController extends JeecgController<Rescatalog, IRescatalo
                 }
                 String has_child = rescatalog.getHasChild();
                 if (("1").equals(has_child)) {
+                    //一级路径
                     jsonObject.put("id", rescatalog.getId());
                     jsonObject.put("name", rescatalog.getAlias());
                     jsonObject.put("displayorder", rescatalog.getDisplayorder());
                     jsonObject.put("layers", getResListByUser(rescatalog.getId(), username, topicId));
 
                 } else {
+                    //二级路径
                     jsonObject.put("id", rescatalog.getId());
                     jsonObject.put("name", rescatalog.getName());
                     jsonObject.put("alias", rescatalog.getAlias());
@@ -120,6 +122,8 @@ public class RescatalogController extends JeecgController<Rescatalog, IRescatalo
                     jsonObject.put("dataport", rescatalog.getDataport());
                     jsonObject.put("relfield", rescatalog.getRelfield());
                     jsonObject.put("legend", rescatalog.getLegend());
+                    //样式名称为图层名称去掉工作区
+                    jsonObject.put("style", rescatalog.getStyle());
                     if (!displayers.isEmpty() && displayers.indexOf(rescatalog.getId()) != -1) {
                         jsonObject.put("visible", true);
                     } else {
@@ -190,6 +194,7 @@ public class RescatalogController extends JeecgController<Rescatalog, IRescatalo
                     jsonObject.put("servicetype", rescatalog.getServicetype());
                     jsonObject.put("zIndex", rescatalog.getZindex());
                     jsonObject.put("displayorder", rescatalog.getDisplayorder());
+                    //jsonObject.put("style", rescatalog.getStyle());
 
 //					 //组装fields（改为从通用查询配置中获取）
 //					 LambdaQueryWrapper<Layerfields> fieldsQueryWrapper = new LambdaQueryWrapper<>();

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/resManager/catalog/entity/Rescatalog.java

@@ -168,4 +168,8 @@ public class Rescatalog implements Serializable {
     @Excel(name = "查询字段中文名称", width = 15)
     @ApiModelProperty(value = "查询字段中文名称")
     private java.lang.String chinesename;
+    /**图层样式*/
+    @Excel(name = "图层样式", width = 15)
+    @ApiModelProperty(value = "图层样式")
+    private java.lang.String style;
 }