Skip to content

C
cloud-platform
Commit 31db0fdc authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master_activity-hf' into base-modify

parents d9ddc095 ede30c86
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 42 deletions
xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityQuery.java
View file @ 31db0fdc
...@@ -10,6 +10,7 @@ public class ActivityQuery extends Query { ...@@ -10,6 +10,7 @@ public class ActivityQuery extends Query {
private String title; private String title;
private Long startTime; private Long startTime;
private Integer status; private Integer status;
/** /**
* 1.管理后台,2.h5页面 * 1.管理后台,2.h5页面
*/ */
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java
View file @ 31db0fdc
...@@ -34,44 +34,41 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> { ...@@ -34,44 +34,41 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
public Object getList(ActivityQuery query) { public Object getList(ActivityQuery query) {
Example exa = new Example(Activity.class); // Example exa = new Example(Activity.class);
Example.Criteria criteria = exa.createCriteria(); // Example.Criteria criteria = exa.createCriteria();
criteria.andEqualTo("isDel", NOT_DELETE); // criteria.andEqualTo("isDel", NOT_DELETE);
if (StringUtils.isNotBlank(query.getTitle())) { // if (StringUtils.isNotBlank(query.getTitle())) {
criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim())); // criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
} // }
if (query.getStartTime() != null) { // if (query.getStartTime() != null) {
criteria.andLike("startTime", query.getStartTime() / (1000 * 60 * 60) + "%"); // criteria.andLike("startTime", query.getStartTime() / (1000 * 60 * 60) + "%");
} // }
if (query.getStatus() != null) { // if (query.getStatus() != null) {
criteria.andEqualTo("status", query.getStatus()); // criteria.andEqualTo("status", query.getStatus());
switch (query.getStatus()) { // switch (query.getStatus()) {
case 1: // case 1:
criteria.orLessThan("startTime", System.currentTimeMillis()); //
break; // criteria.orLessThan("startTime", System.currentTimeMillis());
case 2: // break;
criteria.orBetween("startTime", System.currentTimeMillis(),"endTime"); // case 2:
break; // criteria.orBetween("startTime", System.currentTimeMillis(),"endTime");
case 3: // break;
criteria.orGreaterThan("endTime", System.currentTimeMillis()); // case 3:
break; // criteria.orGreaterThan("endTime", System.currentTimeMillis());
default: // break;
throw new IllegalStateException("Unexpected value: " + query.getStatus()); // default:
} // throw new IllegalStateException("Unexpected value: " + query.getStatus());
} // }
// }
if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) { //
criteria.andEqualTo("isPublish", PUBLISHED); // if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
} // criteria.andEqualTo("isPublish", PUBLISHED);
exa.orderBy("rank").asc().orderBy("startTime").desc(); // }
// exa.orderBy("rank").asc().orderBy("startTime").desc();
// if (AccessType.PUBLIC.getCode().equals(query.getType())) {
//// return mapper.selectByExample(exa);
//// }
PageHelper.startPage(query.getPage(), query.getLimit()); PageHelper.startPage(query.getPage(), query.getLimit());
List<Activity> activities = mapper.selectByExample(exa); List<Activity> activities = mapper.selectByQuery (query);
return new PageInfo<Activity>(activities); return new PageInfo<Activity>(activities);
} }
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java
View file @ 31db0fdc
...@@ -158,18 +158,27 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> { ...@@ -158,18 +158,27 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
log.info("-----userBmByKey---key已存在去报名/签到----报名/签到成功"); log.info("-----userBmByKey---key已存在去报名/签到----报名/签到成功");
if (activityBm.getBmStatus()==1){ if (activityBm.getBmStatus()==1){
jsonObject.put("isbm",1); jsonObject.put("isbm",1);
jsonObject.put("bm_status",1); jsonObject.put("bmStatus",1);
}else if (activityBm.getQdStatus()==1){ }else if (activityBm.getQdStatus()==1){
jsonObject.put("isqd",1); jsonObject.put("isqd",1);
jsonObject.put("qd_status",1); jsonObject.put("qdStatus",1);
} }
}else { }else if (restResponse.getStatus()==ResultCode.EXIST_CODE){
log.info("-----userBmByKey---key已存在已报名/签到----");
if (activityBm.getBmStatus()==1){
jsonObject.put("isbm",1);
}else if (activityBm.getQdStatus()==1){
jsonObject.put("isqd",1);
}
jsonObject.put("value",activityBm);
} else {
log.info("-----userBmByKey---key已存在去报名/签到----报名/签到失败"); log.info("-----userBmByKey---key已存在去报名/签到----报名/签到失败");
if (activityBm.getBmStatus()==1){ if (activityBm.getBmStatus()==1){
jsonObject.put("bm_status",2); jsonObject.put("bmStatus",2);
}else if (activityBm.getQdStatus()==1){ }else if (activityBm.getQdStatus()==1){
jsonObject.put("qd_status",2); jsonObject.put("qdStatus",2);
} }
jsonObject.put("value",activityBm);
} }
summbitRedisTemplate.delete(key); summbitRedisTemplate.delete(key);
} }
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ActivityMapper.java
View file @ 31db0fdc
...@@ -2,7 +2,11 @@ package com.xxfc.platform.summit.mapper; ...@@ -2,7 +2,11 @@ package com.xxfc.platform.summit.mapper;
import com.xxfc.platform.summit.entity.Activity; import com.xxfc.platform.summit.entity.Activity;
import com.xxfc.platform.summit.pojo.ActivityQuery;
import tk.mybatis.mapper.common.Mapper; 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; ...@@ -10,4 +14,5 @@ import tk.mybatis.mapper.common.Mapper;
*/ */
public interface ActivityMapper extends Mapper<Activity> { 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
View file @ 31db0fdc
...@@ -79,8 +79,10 @@ public class AccessTokenService { ...@@ -79,8 +79,10 @@ public class AccessTokenService {
* @return String accessToken * @return String accessToken
*/ */
public String getAccessTokenStr() { public String getAccessTokenStr() {
return getAccessToken().getAccessToken(); // return getAccessToken().getAccessToken();
return null;
} }
/** /**
* 强制更新 access token 值 * 强制更新 access token 值
...@@ -100,7 +102,7 @@ public class AccessTokenService { ...@@ -100,7 +102,7 @@ public class AccessTokenService {
obj.put(wy_appid, result); obj.put(wy_appid, result);
Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid, obj.toJSONString()); Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid, obj.toJSONString());
if (suc) { 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
View file @ 31db0fdc
...@@ -2,4 +2,30 @@ ...@@ -2,4 +2,30 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment