添加url处理接口

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageimgMenuBiz.java

@@ -5,13 +5,11 @@ import com.github.wxiaoqi.security.common.util.TreeUtil;
 import com.github.wxiaoqi.security.common.vo.TreeNode;
 import com.upyuns.platform.rs.website.entity.ImageImgStorage;
 import com.upyuns.platform.rs.website.entity.ImageimgMenu;
-import com.upyuns.platform.rs.website.entity.GainData;
 import com.upyuns.platform.rs.website.vo.ImageimgMenuTree;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.upyuns.platform.rs.website.entity.ImageimgMenu;
 import com.upyuns.platform.rs.website.mapper.ImageimgMenuMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
@@ -32,7 +30,7 @@ public class ImageimgMenuBiz extends BaseBiz<ImageimgMenuMapper,ImageimgMenu> {
     @Autowired
     ImageImgStorageBiz imageImgStorageBiz;
 
-    public List<ImageimgMenuTree> getImageMenuTree(List<ImageimgMenu> menus, int root) {
+    public List<ImageimgMenuTree> getImageimgMenuTree(List<ImageimgMenu> menus, int root) {
         List<ImageimgMenuTree> trees = new ArrayList<ImageimgMenuTree>();
         ImageimgMenuTree node = null;
         for (ImageimgMenu imageMenu : menus) {

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

@@ -159,6 +159,8 @@ public class AdminDataTempcacheController extends BaseController<DataTempcacheBi
                 dataTempcache.setFilesize(fileSizeString);
                 dataTempcache.setFilepath(serverPath + "/" + dataTempcache.getFilename());
                 dataTempcache.setFileurl(xx_url+ SystemConfig.XXMP_URL + realPath + "/" + dataTempcache.getFilename());
+            }else {
+                dataTempcache.setFileurl(dataTempcache.getUpurl());
             }
         }
 

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

@@ -6,7 +6,6 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageimgMenuBiz;
 import com.upyuns.platform.rs.website.entity.DataMenu;
 import com.upyuns.platform.rs.website.entity.ImageimgMenu;
-import com.upyuns.platform.rs.website.vo.DataMenuTree;
 import com.upyuns.platform.rs.website.vo.ImageimgMenuTree;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +27,6 @@ public class AdminImageimgMenuController extends BaseController<ImageimgMenuBiz,
         if (StringUtils.isNotBlank(title)) {
             example.createCriteria().andLike("title", "%" + title + "%");
         }
-        return ObjectRestResponse.succ(baseBiz.getImageMenuTree(baseBiz.selectByExample(example), AdminCommonConstant.ROOT));
+        return ObjectRestResponse.succ(baseBiz.getImageimgMenuTree(baseBiz.selectByExample(example), AdminCommonConstant.ROOT));
     }
 }
\ No newline at end of file

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

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.ImageimgMenuBiz;
+import com.upyuns.platform.rs.website.entity.DataMenu;
+import com.upyuns.platform.rs.website.entity.ImageimgMenu;
+import com.upyuns.platform.rs.website.vo.DataMenuTree;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("imageimgMenu/web")
+public class ImageimgMenuController extends BaseController<ImageimgMenuBiz,ImageimgMenu> {
+
+    @RequestMapping(value = "/app/unauth/imageimgMenuTree", method = RequestMethod.GET)
+    @IgnoreUserToken
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse<List<DataMenuTree>> listMenu(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);
+        ImageimgMenu 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.getImageimgMenuTree(baseBiz.selectByExample(example), parentId));
+    }
+}
\ No newline at end of file