竞走活动判断接口补充

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@@ -42,6 +42,7 @@ public class HealthBankMapping {
        public static final String updateActivity="/updateActivity";
        public static final String editActivity="/editActivity";
        public static final String findActivityById="/findActivityById";
        public static final String findActivityByType="/findActivityByType";
        public static final String batchActivity = "/batchActivity";
        public static final String daleteActivity = "/daleteActivity";
        public static final String createActivityInfo ="/createActivityInfo";

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@@ -4,6 +4,7 @@ package com.yihu.jw.controller;/**
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.sun.org.apache.xpath.internal.operations.Bool;
import com.yihu.jw.entity.health.bank.ActivityDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -298,9 +299,9 @@ public class ActivityController extends EnvelopRestEndpoint {
            }
            if (null != status && "2".equals(status) ) {
                stringBuffer.append("status=2;");
                stringBuffer.append("status>1;").append("status<0;");
            } else if (null != status && "1".equals(status) ) {
                stringBuffer.append("status<2;");
                stringBuffer.append("status>=0;").append("status<2;");
            }
            if(null!=crowdType&&StringUtils.isNotBlank(crowdType)){
                stringBuffer.append("crowdType="+crowdType+";");
@@ -322,6 +323,27 @@ public class ActivityController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 编辑活动:上下线、推荐
     *
     * @param type
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findActivityByType)
    @ApiOperation(value = "获取是否存在在线的竞走活动")
    public ObjEnvelop<Boolean> findActivityByType(
            @ApiParam(name = "type", value = "活动类型")
            @RequestParam(value = "type", required = true) String type) {
        try {
            JSONObject obj=service.findActivityByType(type);
            return  ObjEnvelop.getSuccess("获取成功！",obj);
        } catch (Exception e) {
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError("获取失败！"+e.getMessage());
        }
    }

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ActivityDao.java

@@ -6,10 +6,15 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by wang zhinan on 2018/4/27.
 */
public interface ActivityDao extends PagingAndSortingRepository<ActivityDO,String>,JpaSpecificationExecutor<ActivityDO> {
    @Query("select t from ActivityDO t where t.id=?1")
    ActivityDO selectById(String id);
    @Query("select t from ActivityDO t where t.type=?1 and (t.status=0 or t.status=1) and t.delFlag=1")
    List<ActivityDO> findByIdAndType(String type);
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -5,6 +5,7 @@ package com.yihu.jw.service;/**
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Joiner;
import com.netflix.discovery.util.StringUtil;
import com.yihu.jw.dao.*;
import com.yihu.jw.entity.health.bank.*;
@@ -24,10 +25,7 @@ import javax.transaction.RollbackException;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * @author wangzhinan
@@ -854,4 +852,19 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        return envelop;
    }
    public JSONObject findActivityByType(String type){
        JSONObject object=new JSONObject();
        List<String> types = Arrays.asList(type.split(","));
        for(String str:types){
            List<ActivityDO>  lst=   activityDao.findByIdAndType(str);
            if(null!=lst&&lst.size()>0){
                object.put(str,true);
            }else {
                object.put(str,false);
            }
        }
        return object;
    }
}