修改代码

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMonitorimageController.java

@@ -29,6 +29,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
 
     @RequestMapping(value = "/app/unauth/publishMap",method={RequestMethod.POST})
     @ResponseBody
+    @IgnoreUserToken
     public ObjectRestResponse<String> publishMap(@RequestBody PublishMapDTO dto){
         if(StrUtil.isBlank(dto.getWorkSpace())) {
             dto.setWorkSpace("gdxm");
@@ -44,11 +45,20 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
         if(dto.getType() == 2213) {
             rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/植被覆盖度图例.png");
         }
+        if(dto.getType() == 2214) {
+            rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/乡镇绿地图例.png");
+        }
+        if(dto.getType() == 2215) {
+            rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/水体识别图例.png");
+        }
         if(dto.getType() == 2216) {
             rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/火灾风险等级图例.png");
         }
+        if(dto.getType() == 2217) {
+            rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/病虫害林地图例.png");
+        }
         if(dto.getType() == 2218) {
-            rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/植被覆盖变化图例.png");
+            rscpMonitorimage.setLegendurl("https://hstandfarm.upyuns.com/legend/植被覆盖变化图例.png ");
         }
         rscpMonitorimage.setUrl("https://hstandfarm.upyuns.com/geoserver/"+dto.getWorkSpace()+"/wms");
         rscpMonitorimage.setTitle(dto.getTitle());

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/DataMenuController.java

@@ -47,4 +47,29 @@ public class DataMenuController extends BaseController<DataMenuBiz,DataMenu> {
         return ObjectRestResponse.succ(baseBiz.getImageMenuTree(baseBiz.selectByExample(example), parentId));
     }
 
+    @RequestMapping(value = "/app/unauth/info", method = RequestMethod.GET)
+    @IgnoreUserToken
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse<List<DataMenuTree>> info(Integer parentId) {
+        try {
+            if (parentId == null) {
+                parentId = AdminCommonConstant.ROOT;
+            }
+        } catch (Exception e) {
+            return ObjectRestResponse.succ(new ArrayList<DataMenuTree>());
+        }
+        List<DataMenuTree> trees = new ArrayList<DataMenuTree>();
+        DataMenuTree node = null;
+        Example example = new Example(DataMenu.class);
+        DataMenu parent = baseBiz.selectById(parentId);
+        if(null != parent) {
+            example.createCriteria().andLike("path", parent.getPath() + "%").andNotEqualTo("id",parent.getId());
+        }else {
+            example.createCriteria().andNotEqualTo("id",parentId);
+        }
+        example.setOrderByClause("order_num asc, id asc");
+        return ObjectRestResponse.succ(baseBiz.getImageMenuTree(baseBiz.selectByExample(example), parentId));
+    }
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ImageimgMenuController.java

@@ -26,7 +26,7 @@ public class ImageimgMenuController extends BaseController<ImageimgMenuBiz,Image
     @IgnoreUserToken
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<List<DataMenuTree>> imageimgMenuTree(Integer parentId) {
+    public ObjectRestResponse<List<DataMenuTree>> imageimgMenuTree(Integer parentId, Integer topicId) {
         try {
             if (parentId == null) {
                 parentId = AdminCommonConstant.ROOT;
@@ -39,9 +39,9 @@ public class ImageimgMenuController extends BaseController<ImageimgMenuBiz,Image
         Example example = new Example(DataMenu.class);
         ImageimgMenu parent = baseBiz.selectById(parentId);
         if(null != parent) {
-            example.createCriteria().andLike("path", parent.getPath() + "%").andNotEqualTo("id",parent.getId());
+            Example.Criteria criteria = example.createCriteria().andLike("path", parent.getPath() + "%").andNotEqualTo("id",parent.getId());
         }else {
-            example.createCriteria().andNotEqualTo("id",parentId);
+            Example.Criteria criteria = example.createCriteria().andNotEqualTo("id",parentId);
         }
         example.setOrderByClause("order_num asc, id asc");
         return ObjectRestResponse.succ(baseBiz.getImageimgMenuTree(baseBiz.selectByExample(example), parentId));

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/LmyxmonitorimageController.java

@@ -55,6 +55,11 @@ public class LmyxmonitorimageController extends BaseController<LmyxmonitorimageB
         return ObjectRestResponse.succ(baseBiz.selectList(entity));
     }
 
+    /**
+     * 类型：2212--温度反演；2213--植被覆盖度；2214--植被识别；2215--水体识别；2216--风险等级；2217--病虫害监测；2218--植被覆盖变化
+     * @param dto
+     * @return
+     */
     @RequestMapping(value = "/app/unauth/publishMap",method={RequestMethod.POST})
     @ResponseBody
     public ObjectRestResponse<String> publishMap(@RequestBody PublishMapDTO dto){
@@ -72,9 +77,21 @@ public class LmyxmonitorimageController extends BaseController<LmyxmonitorimageB
         if(dto.getType() == 2213) {
             lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/植被覆盖度图例.png");
         }
+        if(dto.getType() == 2214) {
+            lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/乡镇绿地图例.png");
+        }
+        if(dto.getType() == 2215) {
+            lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/水体识别图例.png");
+        }
         if(dto.getType() == 2216) {
             lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/火灾风险等级图例.png");
         }
+        if(dto.getType() == 2217) {
+            lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/病虫害林地图例.png");
+        }
+        if(dto.getType() == 2218) {
+            lmyxmonitorimage.setLegendUrl("https://hstandfarm.upyuns.com/legend/植被覆盖变化图例.png ");
+        }
         lmyxmonitorimage.setUrl("https://hstandfarm.upyuns.com/geoserver/"+dto.getWorkSpace()+"/wms");
         lmyxmonitorimage.setTitle(dto.getTitle());
         lmyxmonitorimage.setResourcename(dto.getLayerName());