ソースを参照

知识产权维权部分

limin 7 年 前
コミット
eee28cb9a6

+ 58 - 53
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,58 +1,57 @@
 package com.goafanti.common.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.stereotype.Controller;
-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.servlet.ModelAndView;
-
-import com.goafanti.achievement.service.AchievementInterestService;
-import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.banners.enums.BannersType;
-import com.goafanti.banners.service.BannersService;
-import com.goafanti.business.bo.JtBusinessCategoryBo;
-import com.goafanti.business.bo.JtBusinessCategoryTree;
-import com.goafanti.business.bo.JtBusinessProjectResult;
-import com.goafanti.business.service.JtBusinessService;
-import com.goafanti.common.bo.PolicyEntity;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.bo.fieldGlossoryBo;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.ProjectInterestMapper;
-import com.goafanti.common.model.AchievementInterest;
-import com.goafanti.common.model.Banners;
-import com.goafanti.common.model.DemandInterest;
-import com.goafanti.common.model.JtBusinessCategory;
-import com.goafanti.common.model.JtBusinessProject;
-import com.goafanti.common.model.News;
-import com.goafanti.common.model.Policy;
-import com.goafanti.common.model.User;
-import com.goafanti.common.utils.LimitLengthUtil;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.demand.bo.DemandListBo;
-import com.goafanti.demand.service.DemandInterestService;
-import com.goafanti.demand.service.DemandService;
-import com.goafanti.user.bo.OrgIdentityBo;
-import com.goafanti.user.bo.UserIdentityBo;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
-import com.goafanti.user.service.UserService;
-import com.goafanti.news.bo.NewsPortalList;
-import com.goafanti.news.bo.PolicyResult;
-import com.goafanti.news.enums.NewsType;
-import com.goafanti.news.service.NewsService;
-import com.goafanti.news.service.PolicyService;
-import com.goafanti.portal.bo.AchievementObject;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.stereotype.Controller;
+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.servlet.ModelAndView;
+
+import com.goafanti.achievement.service.AchievementInterestService;
+import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.banners.service.BannersService;
+import com.goafanti.business.bo.JtBusinessCategoryBo;
+import com.goafanti.business.bo.JtBusinessCategoryTree;
+import com.goafanti.business.bo.JtBusinessProjectResult;
+import com.goafanti.business.service.JtBusinessService;
+import com.goafanti.common.bo.PolicyEntity;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.bo.fieldGlossoryBo;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.ProjectInterestMapper;
+import com.goafanti.common.model.AchievementInterest;
+import com.goafanti.common.model.Banners;
+import com.goafanti.common.model.DemandInterest;
+import com.goafanti.common.model.JtBusinessCategory;
+import com.goafanti.common.model.JtBusinessProject;
+import com.goafanti.common.model.News;
+import com.goafanti.common.model.Policy;
+import com.goafanti.common.model.User;
+import com.goafanti.common.utils.LimitLengthUtil;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.demand.bo.DemandListBo;
+import com.goafanti.demand.service.DemandInterestService;
+import com.goafanti.demand.service.DemandService;
+import com.goafanti.news.bo.NewsPortalList;
+import com.goafanti.news.bo.PolicyResult;
+import com.goafanti.news.enums.NewsType;
+import com.goafanti.news.service.NewsService;
+import com.goafanti.news.service.PolicyService;
+import com.goafanti.portal.bo.AchievementObject;
+import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.service.OrganizationIdentityService;
+import com.goafanti.user.service.UserIdentityService;
+import com.goafanti.user.service.UserService;
 
 @Controller
 public class WebpageController extends BaseController {
@@ -1215,4 +1214,10 @@ public class WebpageController extends BaseController {
 		return res;
 	}
 	
+	@RequestMapping(value = "/portal/service/safeguarding", method = RequestMethod.GET)
+	public ModelAndView portalServiceSafeguarding(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/service/safeguarding");
+		return modelview;
+	}
+	
 }

+ 6 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -212,6 +212,12 @@
 	                        </ol>
                         </div>
                     </li>                           
+                    <!-- <li th:class="${subM}=='safeguarding'?active:''" >
+                    <div>
+                        <a th:href="@{/portal/service/safeguarding}">知识产权维权</a>
+ 
+                       </div>
+                    </li> -->
  <!--                    <li th:class="${subM}=='protect'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html