修改精彩活动

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityList.java

@@ -96,6 +96,20 @@ public class ActivityList implements Serializable {
     @Column(name = "picture")
 	@ApiModelProperty(value = "活动图片")
     private Integer picture;
-	
+
+	/**
+	 * 活动类型
+	 */
+	@Column(name = "type")
+	@ApiModelProperty(value = "活动类型")
+	private Integer type;
+
+	/**
+	 * 活动页面链接
+	 */
+	@Column(name = "url")
+	@ApiModelProperty(value = "活动页面链接")
+	private Integer url;
+
 
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityManagement.java

@@ -76,4 +76,18 @@ public class ActivityManagement {
     @Column(name = "picture")
     @ApiModelProperty(value = "活动图片")
     private Integer picture;
+
+    /**
+     * 活动类型
+     */
+    @Column(name = "type")
+    @ApiModelProperty(value = "活动类型")
+    private Integer type;
+
+    /**
+     * 活动页面链接
+     */
+    @Column(name = "url")
+    @ApiModelProperty(value = "活动页面链接")
+    private Integer url;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityManagementBiz.java

@@ -33,18 +33,17 @@ public class ActivityManagementBiz extends BaseBiz<ActivityManagementMapper, Act
      * @throws InvocationTargetException
      * @throws IllegalAccessException
      */
-    public List<ActivityManagement> selectedActivityManagement() throws InvocationTargetException, IllegalAccessException {
-
+    public List<ActivityList> selectedActivityManagement() throws InvocationTargetException, IllegalAccessException {
+        long currentTime = System.currentTimeMillis();
+        Example exa=Example.builder(ActivityList.class).where(WeekendSqls.<ActivityList>custom()
+                .andGreaterThanOrEqualTo(ActivityList::getEndTime,currentTime)
+                .andLessThanOrEqualTo(ActivityList::getStartTime,currentTime)
+        ).orderByAsc("sort").build();
+        activityListBiz.selectByExample(exa);
         List<ActivityList> activityLists = activityListBiz.selectListAll();
-        if (activityLists==null||activityLists.size()==0) {
-            return null;
-        }
-        ArrayList<ActivityManagement> activityManagements = new ArrayList<>();
-        for (ActivityList activityList : activityLists) {
-            ActivityManagement activityManagement =getActivityManagement(activityList);
-            activityManagements.add(activityManagement);
-        }
-        return activityManagements;
+
+
+        return activityLists;
     }
 
     /**

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityManagementController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.activity.rest;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.ActivityManagementBiz;
+import com.xxfc.platform.activity.entity.ActivityList;
 import com.xxfc.platform.activity.entity.ActivityManagement;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,10 +27,21 @@ public class ActivityManagementController extends BaseController<ActivityManagem
     @RequestMapping("/activity/findAll")
     public ObjectRestResponse<List<ActivityManagement>> findAll() throws InvocationTargetException, IllegalAccessException {
 
-        List<ActivityManagement> list= baseBiz.selectedActivityManagement();
+        List<ActivityList> list= baseBiz.selectedActivityManagement();
       return ObjectRestResponse.succ(list);
     }
 
+    /**
+     * 精彩活动列表
+     * @return
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     */
+    @RequestMapping("/app/unauth/activity/findAll")
+    public ObjectRestResponse<List<ActivityManagement>>  appFindAll() throws InvocationTargetException, IllegalAccessException {
+        List<ActivityList> list= baseBiz.selectedActivityManagement();
+        return ObjectRestResponse.succ(list);
+    }
 
     /**
      * 查找一条