Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/SystemConfig.java

@@ -9,7 +9,8 @@ public class SystemConfig {
 	public static final String XXMP_URL = SystemProperty.getConfig("XXMP_URL");
 	// 视频url
 	public static final String VIDEO_URL = SystemProperty.getConfig("VIDEO_URL");
-	// token到期时间
+    public static final String RENOVATE =SystemProperty.getConfig("RENOVATE") ;
+    // token到期时间
 	// token到期时间
 	public static Integer TOKENOVERTIME = Integer.valueOf(SystemProperty.getConfig("TOKEN_OVER_TIME"));
 	// redis缓存时间

ace-common/src/main/resources/properties/systemconfig.properties

 #\u9879\u76EEurl
 XXMP_URL=/image
+#\u538B\u7F29\u5305\u89E3\u538B\u540E\u4FDD\u5B58\u7684\u8DEF\u5F84
+RENOVATE=/renovate
 #\u89C6\u9891\u4FDD\u5B58\u6587\u4EF6
 VIDEO_URL=/video
 #token\u5230\u671F\u65F6\u95F4

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -40,7 +40,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
      */
     private Integer PUBLISHED = 1;
 
-    public Object getList(ActivityQuery query) {
+    public List<Activity> getList(ActivityQuery query) {
 
 //        Example exa = new Example(Activity.class);
 //        Example.Criteria criteria = exa.createCriteria();

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

 package com.xxfc.platform.summit.controller;
 
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
@@ -9,6 +10,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author Administrator
  */
@@ -21,7 +24,26 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
     @PostMapping("/app/unauth/list")
     @ApiOperation(value = "峰会列表",notes = "峰会列表")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
-        return ObjectRestResponse.succ(baseBiz.getList(query));
+        List<Activity> list = baseBiz.getList(query);
+        if (query.getType()==1) {
+            for (Activity activity : list) {
+                if (activity.getStatus()==0){
+                    long millis = System.currentTimeMillis();
+                    Long startTime = activity.getStartTime();
+                    Long endTime = activity.getEndTime();
+                    if (millis< startTime) {
+                        activity.setStatus(1);
+                    }
+                    if (millis>=startTime&&millis<=endTime){
+                        activity.setStatus(2);
+                    }
+                    if (millis>endTime){
+                        activity.setStatus(3);
+                    }
+                }
+            }
+        }
+        return ObjectRestResponse.succ();
     }
 
     @Override

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java

@@ -91,7 +91,7 @@ public class UploadZipServiceImpl implements UploadZipService {
                     String realFileRelPath = dirPathToday + File.separator + no +format;
                     File targetFile = new File(uploadPath+File.separator+realFileRelPath);
                     FileUtils.copyInputStreamToFile(zipFile.getInputStream(entry),targetFile);
-                    realFileRelPath=xx_url+ SystemConfig.XXMP_URL+File.separator+realFileRelPath;
+                    realFileRelPath=xx_url+ SystemConfig.RENOVATE+File.separator+realFileRelPath;
                     result.append(realFileRelPath+",");
                 }
             }