Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev1

# Conflicts:
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/ISqlUtils.java

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDO.java

@@ -65,6 +65,8 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
    private List<TaskPatientDetailDO> taskPatientDetailDOS;//参与人详情
    @Transient
    private String ruleName;//规则名称
    @Transient
    private List<CreditsDetailDO> creditsDetailDOS;//积分详情列表
    public String getSaasId() {
        return saasId;
@@ -201,4 +203,12 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
    public void setRuleName(String ruleName) {
        this.ruleName = ruleName;
    }
    public List<CreditsDetailDO> getCreditsDetailDOS() {
        return creditsDetailDOS;
    }
    public void setCreditsDetailDOS(List<CreditsDetailDO> creditsDetailDOS) {
        this.creditsDetailDOS = creditsDetailDOS;
    }
}

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

@@ -59,5 +59,6 @@ public class HealthBankMapping {
        public static final String doctorAddIntegrate = "/doctorAddIntegrate";
        public static final String addStepIntegrate = "/addStepIntegrate";
        public static final String weekReward = "/weekReward";
        public static final String selectByDate = "/selectByDate";
    }
}

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

@@ -191,4 +191,19 @@ public class TaskController extends EnvelopRestController {
            return Envelop.getError(e.getMessage());
        }
    }*/
    @PostMapping(value = HealthBankMapping.healthBank.selectByDate)
    @ApiOperation(value = "某个时刻任务的积分详情")
    public Envelop<TaskDO> selectByDate(@ApiParam(name="object",value = "id集合[]")
                                        @RequestParam(value = "object",required = false)String object){
        try{
            Envelop<TaskDO> envelop = new Envelop<>();
            JSONObject jsonObject = JSONObject.parseObject(object);
            return service.selectByDate(jsonObject);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return Envelop.getError(e.getMessage());
        }
    }
}

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

@@ -772,9 +772,12 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                    creditsDetailDO.setAccountId(accountDOS.get(0).getId());
                }
                TaskDO taskDO = taskDao.findOne(creditsDetailDO.getTransactionId());
                String sql1 = "select *  from wlyy_health_bank_task_patient_detail where patient_openid = '"+creditsDetailDO.getOpenId()+"' " +
                        "AND patient_idcard = '"+creditsDetailDO.getIdCard()+"' AND union_id = '"+creditsDetailDO.getUnionId()+"' AND task_id = '"+creditsDetailDO.getTransactionId()+"'";
                String sql1 = "select *  from wlyy_health_bank_task_patient_detail where "+
                        " patient_idcard = '"+creditsDetailDO.getIdCard()+"' AND union_id = '"+creditsDetailDO.getUnionId()+"' AND task_id = '"+creditsDetailDO.getTransactionId()+"'";
                List<TaskPatientDetailDO> taskPatientDetailDOList = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(TaskPatientDetailDO.class));
                if(taskPatientDetailDOList == null || taskPatientDetailDOList.size()==0){
                    throw new Exception("该居民参与活动查不到!");
                }
                TaskPatientDetailDO taskPatientDetailDO = taskPatientDetailDOList.get(0);
                String sql = "select * from wlyy_health_bank_credits_detail where patient_id = '"+creditsDetailDO.getPatientId()+"' AND " +
                        "transaction_id = '"+creditsDetailDO.getTransactionId()+"' AND create_time > '"+DateUtils.getDayBegin() +"' AND" +

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

@@ -14,6 +14,8 @@ import com.yihu.jw.entity.health.bank.TaskRangDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.util.ISqlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -32,6 +34,7 @@ import java.util.Map;
@Service
@Transactional
public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,TaskPatientDetailDao> {
    private Logger logger = LoggerFactory.getLogger(TaskPatientDtailService.class);
    @Autowired
    private TaskPatientDetailDao taskPatientDetailDao;
    @Autowired
@@ -145,10 +148,13 @@ public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,
     * @return
     */
    public TaskPatientDetailDO selectByPatientId(String openId,String idCard,String unionId,String taskCode){
        String sql ="select * from wlyy_health_bank_task_patient_detail where patient_openid = '"+openId+"'" +
                " AND patient_idcard = '"+idCard+"' AND union_id ='"+unionId+"' AND task_id = " +
        logger.info("openId:"+openId+"idCard:"+idCard+"unionId:"+unionId+"taskCode:"+taskCode);
        String sql ="select * from wlyy_health_bank_task_patient_detail where " +
                " (patient_idcard = '"+idCard+"' OR union_id ='"+unionId+"') AND task_id = " +
                "(select id from wlyy_health_bank_task where task_code = '"+taskCode+"' )";
        List<TaskPatientDetailDO> taskPatientDetailDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskPatientDetailDO.class));
        logger.info("参与信息："+taskPatientDetailDOS);
        return taskPatientDetailDOS.get(0);
    }
}

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

@@ -3,20 +3,19 @@ package com.yihu.jw.service;/**
 */
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.dao.ActivityDao;
import com.yihu.jw.dao.TaskDao;
import com.yihu.jw.dao.TaskPatientDetailDao;
import com.yihu.jw.dao.TaskRuleDao;
import com.yihu.jw.entity.health.bank.ActivityDO;
import com.yihu.jw.entity.health.bank.TaskDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
import com.yihu.jw.entity.health.bank.TaskRuleDO;
import com.yihu.jw.entity.health.bank.*;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.util.DateUtils;
import com.yihu.jw.util.ISqlUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ListOperations;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -237,4 +236,30 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
        }
        return envelop;
    }
    /**
     * 查询某个时间任务的积分情况
     *
     * @param object{"taskCode":,"startTime":,"endTime":,"patientId":""}
     * @return
     */
    public Envelop<TaskDO> selectByDate(JSONObject object){
        Envelop<TaskDO> envelop = new Envelop<>();
        String taskSql = "select * from wlyy_health_bank_task where task_code = '"+object.getString("taskCode")+ "'";
        List<TaskDO> taskDOList = jdbcTemplate.query(taskSql,new BeanPropertyRowMapper(TaskDO.class));
        List<TaskDO> taskDOS = new ArrayList<>();
        if (taskDOList != null && taskDOList.size() != 0){
            TaskDO taskDO = taskDOList.get(0);
            String creditSql = "select * from wlyy_health_bank_credits_detail where transaction_id ='"+taskDO.getId()+
                    "' and DATE_FORMAT(create_time,'%Y-%m-%d') >= '"+object.getString("startTime")+"' and DATE_FORMAT(create_time,'%Y-%m-%d') <= '" +object.getString("endTime")+"'"
                    +" and patient_id = '"+object.getString("patientId")+"'";
            List<CreditsDetailDO> creditsDetailDOS = jdbcTemplate.query(creditSql,new BeanPropertyRowMapper(CreditsDetailDO.class));
            taskDO.setCreditsDetailDOS(creditsDetailDOS);
            taskDOS.add(taskDO);
        }
        envelop.setDetailModelList(taskDOS);
        return envelop;
    }
}

svr/svr-wlyy-health-bank/src/main/resources/application.yml

@@ -88,8 +88,8 @@ spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.17.110.160:3306/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
    username: linzhou
    password: linzhou
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.