修改峰会

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityQuery.java

@@ -10,6 +10,7 @@ public class ActivityQuery extends Query {
     private String title;
     private Long startTime;
     private Integer status;
+
     /**
      * 1.管理后台,2.h5页面
      */

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

@@ -36,44 +36,41 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
 
     public Object getList(ActivityQuery query) {
 
-        Example exa = new Example(Activity.class);
-        Example.Criteria criteria = exa.createCriteria();
-        criteria.andEqualTo("isDel", NOT_DELETE);
-        if (StringUtils.isNotBlank(query.getTitle())) {
-            criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
-        }
-        if (query.getStartTime() != null) {
-            criteria.andLike("startTime", query.getStartTime() / (1000 * 60 * 60) + "%");
-        }
-        if (query.getStatus() != null) {
-            criteria.andEqualTo("status", query.getStatus());
-            switch (query.getStatus()) {
-                case 1:
-                     criteria.orLessThan("startTime", System.currentTimeMillis());
-                     break;
-                case 2:
-                    criteria.orBetween("startTime", System.currentTimeMillis(),"endTime");
-                    break;
-                case 3:
-                    criteria.orGreaterThan("endTime", System.currentTimeMillis());
-                    break;
-                default:
-                    throw new IllegalStateException("Unexpected value: " + query.getStatus());
-            }
-        }
-
-        if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
-            criteria.andEqualTo("isPublish", PUBLISHED);
-        }
-        exa.orderBy("rank").asc().orderBy("startTime").desc();
-
-//        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
-////            return mapper.selectByExample(exa);
-////        }
+//        Example exa = new Example(Activity.class);
+//        Example.Criteria criteria = exa.createCriteria();
+//        criteria.andEqualTo("isDel", NOT_DELETE);
+//        if (StringUtils.isNotBlank(query.getTitle())) {
+//            criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
+//        }
+//        if (query.getStartTime() != null) {
+//            criteria.andLike("startTime", query.getStartTime() / (1000 * 60 * 60) + "%");
+//        }
+//        if (query.getStatus() != null) {
+//            criteria.andEqualTo("status", query.getStatus());
+//            switch (query.getStatus()) {
+//                case 1:
+//
+//                     criteria.orLessThan("startTime", System.currentTimeMillis());
+//                     break;
+//                case 2:
+//                    criteria.orBetween("startTime", System.currentTimeMillis(),"endTime");
+//                    break;
+//                case 3:
+//                    criteria.orGreaterThan("endTime", System.currentTimeMillis());
+//                    break;
+//                default:
+//                    throw new IllegalStateException("Unexpected value: " + query.getStatus());
+//            }
+//        }
+//
+//        if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
+//            criteria.andEqualTo("isPublish", PUBLISHED);
+//        }
+//        exa.orderBy("rank").asc().orderBy("startTime").desc();
 
 
         PageHelper.startPage(query.getPage(), query.getLimit());
-        List<Activity> activities = mapper.selectByExample(exa);
+        List<Activity> activities = mapper.selectByQuery (query);
         return new PageInfo<Activity>(activities);
     }
 

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ActivityMapper.java

@@ -2,7 +2,11 @@ package com.xxfc.platform.summit.mapper;
 
 
 import com.xxfc.platform.summit.entity.Activity;
+import com.xxfc.platform.summit.pojo.ActivityQuery;
 import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 
 /**
@@ -10,4 +14,5 @@ import tk.mybatis.mapper.common.Mapper;
  */
 public interface ActivityMapper extends Mapper<Activity> {
 
+    List<Activity> selectByQuery(ActivityQuery query);
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/AccessTokenService.java

@@ -83,8 +83,10 @@ public class AccessTokenService {
 	 * @return String accessToken
 	 */
 	public  String getAccessTokenStr() {
-		return getAccessToken().getAccessToken();
+//		return getAccessToken().getAccessToken();
+		return null;
 	}
+
 	
 	/**
 	 * 强制更新 access token 值
@@ -105,7 +107,7 @@ public class AccessTokenService {
 		obj.put(wy_appid, result);
 		Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid,  obj.toJSONString());
 		if (suc) {
-			summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
+//			summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
 		}
 	}
 }
\ No newline at end of file

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityMapper.xml

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.xxfc.platform.summit.mapper.ActivityMapper">
+    <select id="selectByQuery" resultType="com.xxfc.platform.summit.entity.Activity"
+            parameterType="com.xxfc.platform.summit.pojo.ActivityQuery">
+        select * from fc_activity
+        where
+        is_del=0
+
+        <if test="title != null and title.trim() != '' ">
+            and title like CONCAT('%',#{title},'%')
+        </if>
+        <if test="startTime != null">
+            and from_unixtime(start_time,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
+        </if>
+        <if test="status != null and status == 1">
+            and (status=#{status} or (status=0 and  (start_time/1000) &gt;= unix_timestamp())  )
+        </if>
+        <if test="status != null and status == 2">
+            and (status=#{status} or (status=0 and  (start_time/1000) &lt; unix_timestamp() and (end_time/1000)&gt;=unix_timestamp()))
+        </if>
+        <if test="status != null and status == 3">
+            and (status=#{status} or (status=0 and   (end_time/1000)&lt;unix_timestamp()))
+        </if>
+        <if test="type ==2">
+          and  is_publish=1
+        </if>
+        order  by  rank asc , start_time desc
+    </select>
 </mapper>
\ No newline at end of file