公告列表，详情

src/main/java/com/metro/auth/platform/domain/dto/FileDownDTO.java

@@ -48,5 +48,8 @@ public class FileDownDTO {
     @ApiModelProperty(value = "filepath")
     private String filepath;//
     private List<FileDownFileDTO> filelist;
-
+    @ApiModelProperty(value = "collectNum")
+    private String collectNum;//
+    @ApiModelProperty(value = "video")
+    private String video;//
 }

src/main/java/com/metro/auth/platform/domain/dto/NoticeManageActivitiDTO.java

@@ -48,5 +48,8 @@ public class NoticeManageActivitiDTO {
     private String first;
 
     private String sortRules;
-
+    private String realNoticeId;
+    private String isCollect;
+    private String isSubscriber;
+    private String accountId;
 }

src/main/java/com/metro/auth/platform/outlineapi/PlatformUrlManager.java

@@ -69,7 +69,19 @@ public class PlatformUrlManager {
      * 获得栏目集合接口地址
      */
     public static String API_COLUMN_URL;
+    public static String API_FIXED_COLUMN_URL;
+    /**
+     * 获得我收藏公告
+     */
+    public static String API_COLLECT_ACTIVITI_ME_URL;
+    /**
+     * 获得我评论公告
+     */
+    public static String API_COMMENT_ACTIVITI_ME_URL;
+
+    public static String API_THUMBS_ACTIVITI_ME_URL;
 
+    public static String API_SUBSCRIBER_ME_URL;
     /**
      * 获得公告接口地址
      */
@@ -79,10 +91,15 @@ public class PlatformUrlManager {
      * 获得公告详情接口地址
      */
     public static String API_ACTIVITI_DETAIL_URL;
+    public static String API_COLLECT_INFO_URL;
     /**
      * 获得公告列表
      */
     public static String API_COLUMN_List_URL;
+    /**
+     * 我发布公告列表
+     */
+    public static String API_ACTIVITI_ME_URL;
     public  static  String  API_IMGURL;
     /**
      * 获得法律列表
@@ -124,6 +141,8 @@ public class PlatformUrlManager {
      */
     public static String API_HUMBS_ADD_URL;
 
+    public static String API_COLLECT_ADD_URL;
+
     /**
      * 获得取消点赞接口地址
      */
@@ -217,6 +236,12 @@ public class PlatformUrlManager {
     @Value("${notice-manage.api_column_list_url}")
     public void setApiColumnListUrl(String apiColumnListUrl) {    API_COLUMN_List_URL = apiColumnListUrl;
     }
+
+    @Value("${notice-manage.api_activiti_me_url}")
+    public void setApiActivitiMeUrl(String apiActivitiMeUrl) {
+        API_ACTIVITI_ME_URL = apiActivitiMeUrl;
+    }
+
     @Value("${notice-manage.api_imgurl}")
     public void setApiImgUrl(String apiImgUrl) {    API_IMGURL = apiImgUrl;
     }
@@ -234,6 +259,28 @@ public class PlatformUrlManager {
     public void setApiColumnUrl(String apiColumnUrl) {
         API_COLUMN_URL = apiColumnUrl;
     }
+    @Value("${notice-manage.api_fixed_column_url}")
+    public void setApiFixedColumnUrl(String apiFixedColumnUrl) {
+        API_FIXED_COLUMN_URL = apiFixedColumnUrl;
+    }
+    @Value("${notice-manage.api_collect_activiti_me_url}")
+    public  void setApiCollectActivitiMeUrl(String apiCollectActivitiMeUrl) {
+        API_COLLECT_ACTIVITI_ME_URL = apiCollectActivitiMeUrl;
+    }
+
+    @Value("${notice-manage.api_comment_activiti_me_url}")
+    public  void setApiCommentActivitiMeUrl(String apiCommentActivitiMeUrl) {
+        API_COMMENT_ACTIVITI_ME_URL = apiCommentActivitiMeUrl;
+    }
+    @Value("${notice-manage.api_thumbs_activiti_me_url}")
+    public void setApiThumbsActivitiMeUrl(String apiThumbsActivitiMeUrl) {
+        API_THUMBS_ACTIVITI_ME_URL = apiThumbsActivitiMeUrl;
+    }
+
+    @Value("${notice-manage.api_subscriber_me_url}")
+    public void setApiSubscriberMeUrl(String apiSubscriberMeUrl) {
+        API_SUBSCRIBER_ME_URL = apiSubscriberMeUrl;
+    }
 
     @Value("${notice-manage.api_activiti_url}")
     public void setApiActivitiUrl(String apiActivitiUrl) {
@@ -243,6 +290,10 @@ public class PlatformUrlManager {
     public void setApiActivitiDetailUrl(String apiActivitidetailUrl) {
         API_ACTIVITI_DETAIL_URL = apiActivitidetailUrl;
     }
+    @Value("${notice-manage.api_collect_info_url}")
+    public  void setApiCollectInfoUrl(String apiCollectInfoUrl) {
+        API_COLLECT_INFO_URL = apiCollectInfoUrl;
+    }
 
     @Value("${notice-manage.api_comments_add_url}")
     public void setApiCommentsAddUrl(String apiCommentsAddUrl) {
@@ -273,6 +324,11 @@ public class PlatformUrlManager {
         API_HUMBS_ADD_URL = apiHumbsAddUrl;
     }
 
+    @Value("${notice-manage.api_collect_add_url}")
+    public void setApiCollectAddUrl(String apiCollectAddUrl) {
+        API_COLLECT_ADD_URL = apiCollectAddUrl;
+    }
+
     @Value("${notice-manage.api_thumbs_del_url}")
     public void setApiHumbsDelUrl(String apiHumbsDelUrl) {
         API_HUMBS_DEL_URL = apiHumbsDelUrl;

src/main/resources/application-test153.yml

@@ -116,10 +116,24 @@ metro-daily:
 notice-manage:
   #栏目
   api_column_url : http://10.12.111.48:5101/NoticeManage/api/column/list
+  #固定栏目列表
+  api_fixed_column_url: http://10.12.111.48:5101/NoticeManage/api/column/tabColumnListPortal
   #栏目列表
   api_column_list_url: http://10.12.111.48:5101/NoticeManage/api/activiti/scopeAndColumn
   #公告
   api_activiti_url : http://10.12.111.48:5101/NoticeManage/api/activiti/scopeforportallist
+  # 我发布公告
+  api_activiti_me_url : http://10.12.111.48:5101/NoticeManage/api/noticeInfoController/noticeBymePortal
+  # 我收藏公告
+  api_collect_activiti_me_url: http://10.12.111.48:5101/NoticeManage/api/collect/collectListPortal
+  # 我评论公告
+  api_comment_activiti_me_url: http://10.12.111.48:5101/NoticeManage/api/comments/infoWithCommentProtal
+  # 我点赞公告
+  api_thumbs_activiti_me_url: http://10.12.111.48:5101/NoticeManage/api/subscriber/thumbsinfoListProtal
+  # 我订阅账户
+  api_subscriber_me_url: http://10.12.111.48:5101/NoticeManage/api/subscriber/getSubscriberByUserIdProtal
+  #点赞信息
+  api_collect_info_url: http://10.12.111.48:5101/NoticeManage/api/collect/info
   #公告详情
   api_activiti_detail_url : http://10.12.111.48:5101/NoticeManage/api/activiti/noticeInfo/
   #添加评论
@@ -142,6 +156,8 @@ notice-manage:
   api_thumbs_add_url : http://10.12.111.48:5101/NoticeManage/api/thumbs/add
   #取消点赞
   api_thumbs_del_url : http://10.12.111.48:5101/NoticeManage/api/thumbs/del
+  #收藏
+  api_collect_add_url: http://10.12.111.48:5101/NoticeManage/api/activiti/toOperateNoticePortal
   #文件下载
   api_fileinfo_file_url: http://10.12.111.48:5101/NoticeManage/api/fileinfo/file
   #图片访问地址前缀