Merge branch 'dev' of wangzhinan/wlyy2.0 into dev

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

@@ -16,34 +16,34 @@ import java.io.Serializable;
public class AccountDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
    private String saasId; //saasId
    @Column(name = "patient_id")
    private String patientId;
    private String patientId;//居民id
    @Column(name = "account_name")
    private String accountName;
    private String accountName;//账户名
    @Column(name = "total")
    private int total;
    private int total;//积分总数
    @Column(name = "password")
    private String password;
    private String password;//密码
    @Column(name = "card_number")
    private String cardNumber;
    private String cardNumber;//卡号
    @Column(name = "hospital_name")
    private String hospitalName;
    private String hospitalName;//社区名字
    @Column(name = "hospital")
    private String hospital;
    private String hospital;//社区
    @Transient
    private String sum;
    private String sum;//总积分（已用积分和剩余积分）
    @Transient
    private int usedTotal;
    private int usedTotal;//已用积分
    public String getSaasId() {
        return saasId;

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

@@ -17,30 +17,30 @@ import java.util.Date;
public class ActivityDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
    private String saasId;//saasId
    @Column(name = "activity_title")
    private String activityTitle;
    private String activityTitle;//活动标题
    @Column(name = "activity_content")
    private String activityContent;
    private String activityContent;//活动内容
    @Column(name = "start_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date startTime;
    private Date startTime;//开始时间
    @Column(name = "over_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date overTime;
    private Date overTime; //结束时间
    @Column(name = "status")
    private int status;
    private int status;//状态（上架/下架）
    @Column(name = "hospital")
    private String hospital;
    private String hospital;//社区
    @Column(name = "organizer")
    private String organizer;
    private String organizer;//发布者
    public String getSaasId() {
        return saasId;

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

@@ -14,13 +14,13 @@ import java.io.Serializable;
@Table(name = "wlyy_health_bank_activity_rule")
public class ActivityRuleDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
    private String saasId;//saasid
    @Column(name = "activity_id")
    private String activityId;
    private String activityId;//活动id
    @Column(name = "rule_code")
    private String ruleCode;
    private String ruleCode;//规则代码
    public String getSaasId() {
        return saasId;

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

@@ -16,37 +16,40 @@ import java.io.Serializable;
public class CreditsDetailDO extends IdEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;
    private String saasId; //saasid
    @Column(name = "trade_type")
    private String tradeType;
    private String tradeType; //交易类型
    @Column(name = "transaction_id")
    private String transactionId;
    private String transactionId;//业务ID
    @Column(name="integrate")
    private int integrate;
    private int integrate;//积分
    @Column(name = "status")
    private int status;
    private int status;//状态（有效/无效）
    @Column(name = "trade_direction")
    private int tradeDirection;
    private int tradeDirection;//交易方向
    @Column(name = "account_id")
    private String accountId;
    private String accountId;//账户id
    @Column(name = "patient_id")
    private String patientId;
    private String patientId;//居民id
    @Column(name = "hospital")
    private String hospital;
    private String hospital;//社区
    @Transient
    private TaskDO taskDO;
    private TaskDO taskDO;//任务对象
    @Transient
    private ActivityDO activityDO;
    private ActivityDO activityDO;//活动对象
    @Transient
    private String flag ; // 标识是什么任务
    public String getSaasId() {
        return saasId;
@@ -135,4 +138,12 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
    public void setActivityDO(ActivityDO activityDO) {
        this.activityDO = activityDO;
    }
    public String getFlag() {
        return flag;
    }
    public void setFlag(String flag) {
        this.flag = flag;
    }
}

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

@@ -20,19 +20,19 @@ import java.io.Serializable;
public class ExchangeGoodsDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
    private String saasId;//saasid
    @Column(name = "goods_id")
    private String goodsId;
    private String goodsId;//商品id
    @Column(name = "integrate")
    private String integrate;
    private String integrate;//积分
    @Column(name = "patient_id")
    private String patientId;
    private String patientId;//居民id
    @Transient
    private GoodsDO goodsDO;
    private GoodsDO goodsDO;//商品对象
    public String getSaasId() {

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

@@ -17,33 +17,33 @@ import java.util.Date;
public class GoodsDO extends IdEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;
    private String saasId;//saasid
    @Column(name = "name")
    private String name;
    private String name;//商品名称
    @Column(name = "img_url")
    private String imgUrl;
    private String imgUrl;//图片地址
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "start_time")
    private Date startTime;
    private Date startTime;//开始时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "over_time")
    private Date overTime;
    private Date overTime;//结束时间
    @Column(name = "status")
    private String status;
    private String status;//状态
    @Column(name = "require_integrate")
    private String requireIntegrate;
    private String requireIntegrate; //兑换产品所需积分
    @Column(name = "content")
    private String content;
    private String content;//商品内容
    @Column(name = "community")
    private String community;
    private String community;//社区字段
    public String getSaasId() {
        return saasId;

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

@@ -16,28 +16,31 @@ import java.io.Serializable;
public class TaskDO extends IdEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;
    private String saasId; //saasid
    @Column(name = "task_title")
    private String taskTitle;
    private String taskTitle; //任务标题
    @Column(name = "task_content")
    private String taskContent;
    private String taskContent; //任务内容
    @Column(name = "trade_type")
    private String tradeType;
    private String tradeType; //交易类型
    @Column(name = "transaction_id")
    private String transactionId;
    private String transactionId; // 业务id
    @Column(name = "period")
    private int period;
    private int period; //周期性
    @Column(name = "patient_id")
    private String patientId;
    private String patientId; //居民id
    @Column(name = "task_code")
    private String taskCode ; // 标识是什么任务
    @Transient
    private int status;
    private int status; //状态
    public String getSaasId() {
        return saasId;
@@ -102,4 +105,12 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
    public void setStatus(int status) {
        this.status = status;
    }
    public String getTaskCode() {
        return taskCode;
    }
    public void setTaskCode(String taskCode) {
        this.taskCode = taskCode;
    }
}

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

@@ -15,25 +15,25 @@ import java.io.Serializable;
public class TaskDetailDO extends IdEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;
    private String saasId; //saasid
    @Column(name = "status")
    private String status;
    private String status;//状态（完成/未完成）
    @Column(name = "patient_id")
    private String patientId;
    private String patientId;//居民id
    @Column(name = "doctor_id")
    private String doctorId;
    private String doctorId;//医生id
    @Column(name = "integrate")
    private int integrate;
    private int integrate;//积分
    @Column(name = "trade_direction")
    private int tradeDirection;
    private int tradeDirection;//交易方向
    @Column(name = "task_id")
    private String taskId;
    private String taskId;//任务id
    public String getSaasId() {
        return saasId;

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

@@ -15,13 +15,13 @@ import java.io.Serializable;
public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;
    private String saasId; //saasid
    @Column(name = "task_id")
    private String taskId;
    private String taskId; //任务id
    @Column(name = "rule_code")
    private String ruleCode;
    private String ruleCode; //任务编码
    public String getSaasId() {
        return saasId;

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

@@ -12,6 +12,7 @@ public class HealthBankMapping {
    public static class healthBank{
        public static final String createAccount = "/createAccount";
        public static final String selectAccount = "/selectAccount";
        public static final String findAccount = "/findAccount";
        public static final String createTask = "/createTask";
        public static final String deleteTask ="/deleteTask";
        public static final String findTask = "/findTask";

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

@@ -40,7 +40,8 @@ public class AccountController extends EnvelopRestController {
    /**
     * 添加账户
     * @param account
     * @param account 实体类account
     *
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createAccount)
@@ -61,7 +62,7 @@ public class AccountController extends EnvelopRestController {
    /**
     * 获取账户
     *
     * @param creditsDetail
     * @param creditsDetail 积分对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.selectAccount)
@@ -77,4 +78,32 @@ public class AccountController extends EnvelopRestController {
            return Envelop.getError(e.getMessage());
        }
    }
    /**
     * 查看银行账户信息
     *
     * @param account 账户信息对象
     * @param page 页码
     * @param size 每页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findAccount)
    @ApiOperation(value = "查看账户信息")
    public Envelop<AccountDO> getAccount(@ApiParam(name = "account",value = "账户JSON")
                                           @RequestParam(value = "account",required = false)String account,
                                           @ApiParam(name = "page", value = "第几页，从1开始")
                                           @RequestParam(value = "page", defaultValue = "1",required = false)Integer page,
                                           @ApiParam(name = "size",defaultValue = "10",value = "，每页分页大小")
                                           @RequestParam(value = "size", required = false)Integer size){
        try{
            AccountDO accountDO = toEntity(account,AccountDO.class);
            return service.findByCondition(accountDO,page,size);
        }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/controller/ActivityController.java

@@ -33,7 +33,7 @@ public class ActivityController extends EnvelopRestController{
    /**
     *  publish activity
     *
     * @param activity
     * @param activity 活动对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createActivity)
@@ -53,9 +53,9 @@ public class ActivityController extends EnvelopRestController{
    /**
     * find health activity
     *
     * @param activity
     * @param page
     * @param size
     * @param activity 活动对象
     * @param page 页码
     * @param size 分页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findActivity)
@@ -80,7 +80,7 @@ public class ActivityController extends EnvelopRestController{
    /**
     * out activity
     *
     * @param activity
     * @param activity 活动对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.updateActivity)

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

@@ -35,6 +35,14 @@ public class CreditsDetailController extends EnvelopRestController {
    @Autowired
    private CreditsDetailService service;
    /**
     * 查看积分记录
     *
     * @param creditsDetail 积分对象
     * @param page 页码
     * @param size 分页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findCreditsLogInfo)
    @ApiOperation(value = "查看积分记录")
    public Envelop<CreditsDetailDO> selectCreditsLogInfo(@ApiParam(name = "creditsDetail",value = "积分记录JSON")
@@ -57,12 +65,12 @@ public class CreditsDetailController extends EnvelopRestController {
    /**
     * 添加积分
     *
     * @param creditsDetail
     * @param creditsDetail 积分对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createCreditsDetail)
    @ApiOperation(value = "添加积分记录")
    public Envelop<Boolean> insert(@ApiParam(name = "creditsDetail",value = "积分记录JSON")
    public Envelop<CreditsDetailDO> insert(@ApiParam(name = "creditsDetail",value = "积分记录JSON")
                                   @RequestParam(value = "creditsDetail",required = true)String creditsDetail){
        try {
            CreditsDetailDO creditsDetailDO = toEntity(creditsDetail,CreditsDetailDO.class);
@@ -74,8 +82,12 @@ public class CreditsDetailController extends EnvelopRestController {
        }
    }
    /**
     * 查看积分排行
     *
     * @param object {"filter":[""],"page":"","size":""}
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.selectByRanking)
    @ApiOperation(value = "查询积分排名")
    public Envelop<AccountDO> selectByRanking(@RequestBody JSONObject object){

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

@@ -34,11 +34,11 @@ public class ExchangeGoodsController extends EnvelopRestController {
    /**
     * find exchange goods
     * 查看兑换的产品
     *
     * @param exchangeGoods
     * @param page
     * @param size
     * @param exchangeGoods  兑换产品json
     * @param page 页码
     * @param size  每页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findExchangeGoods)

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

@@ -33,7 +33,7 @@ public class GoodsController extends EnvelopRestController {
    /**
     * patient publish  gooods
     *
     * @param goods
     * @param goods 商品对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createGoods)
@@ -54,9 +54,9 @@ public class GoodsController extends EnvelopRestController {
    /**
     * find health goods
     *
     * @param goods
     * @param page
     * @param size
     * @param goods 商品对象
     * @param page 页码
     * @param size 每页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findGoods)
@@ -80,7 +80,7 @@ public class GoodsController extends EnvelopRestController {
    /**
     * patient update goods status
     *
     * @param goods
     * @param goods 商品对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.updateGoods)

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

@@ -33,9 +33,9 @@ public class TaskController extends EnvelopRestController {
    private Tracer tracer;
    /**
     * doctor assigning task patient
     * 指派任务
     *
     * @param task
     * @param task 任务对象
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createTask)
@@ -52,6 +52,14 @@ public class TaskController extends EnvelopRestController {
        }
    }
    /**
     *  查询任务
     *
     * @param task 任务对象
     * @param page 页码
     * @param size 分页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findTask)
    @ApiOperation(value = "查询任务")
    public Envelop<TaskDO> assigningTask(@ApiParam(name = "task",value = "健康任务JSON")

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

@@ -32,9 +32,9 @@ public class TaskDetailController extends EnvelopRestController {
    /**
     * doctor assigning task patient
     * 居民参加活动
     *
     * @param taskDetail
     * @param taskDetail 任务
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createTaskDetail)

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

@@ -6,10 +6,17 @@ import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.dao.AccountDao;
import com.yihu.jw.entity.health.bank.AccountDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.util.ISqlUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
/**
 * @author wangzhinan
@@ -22,11 +29,42 @@ public class AccountService extends BaseJpaService<AccountDO,AccountDao> {
    @Autowired
    private AccountDao accountDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 添加银行账户信息
     *
     * @param accountDO 银行账户对象
     * @return
     */
    public Envelop<Boolean> insert(AccountDO accountDO){
        accountDao.save(accountDO);
        Envelop<Boolean> envelop = new Envelop<>();
        envelop.setObj(true);
        return envelop;
    }
    /**
     * 获取银行账户信息
     *
     * @param accountDO 银行账户对象
     * @param page 页码
     * @param size 每页大小
     * @return
     * @throws ParseException
     */
    public Envelop<AccountDO> findByCondition(AccountDO accountDO, Integer page, Integer size) throws ParseException {
        String sql = new ISqlUtils().getSql(accountDO,page,size,"*");
        List<AccountDO> accountDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(AccountDO.class));
        String sqlcount = new ISqlUtils().getSql(accountDO,0,0,"count");
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sqlcount);
        Long count = 0L;
        if(rstotal!=null&&rstotal.size()>0){
            count = (Long) rstotal.get(0).get("total");
        }
        return Envelop.getSuccessListWithPage(HealthBankMapping.api_success,accountDOS,page,size,count);
    }
}

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

@@ -35,7 +35,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
    /**
     * insert activityDO
     *
     * @param activityDO
     * @param activityDO 活动参数对象
     * @return
     */
    public Envelop<Boolean> insert(ActivityDO activityDO){
@@ -49,9 +49,9 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
    /**
     *  find by condition
     *
     * @param activityDO
     * @param page
     * @param size
     * @param activityDO 活动参数对象
     * @param page 页码
     * @param size 每页大小
     * @return
     * @throws ParseException
     */
@@ -71,7 +71,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
    /**
     * update activityDO
     *
     * @param activityDO
     * @param activityDO 活动采参数对象
     * @return
     */
    public Envelop<Boolean> update(ActivityDO activityDO){

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -173,7 +174,20 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
     * @param creditsDetailDO
     * @return
     */
    public Envelop<Boolean> insert(CreditsDetailDO creditsDetailDO){
    public Envelop<CreditsDetailDO> insert(CreditsDetailDO creditsDetailDO){
        TaskDO taskDO = new TaskDO();
        taskDO.setTaskCode(creditsDetailDO.getFlag());
        taskDO.setPatientId(creditsDetailDO.getPatientId());
        String sql = ISqlUtils.getSql(taskDO,1,1,"*");
        List<TaskDO> taskDOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskDO.class));
        if (taskDOList != null && taskDOList.size() != 0){
            creditsDetailDO.setTransactionId(taskDOList.get(0).getId());
        }
        String sqlAccount = "select * from wlyy_health_bank_account ba where ba.patient_id = '"+creditsDetailDO.getPatientId() +"'";
        List<AccountDO> accountDOList = jdbcTemplate.query(sqlAccount,new BeanPropertyRowMapper(AccountDO.class));
        if (accountDOList != null && accountDOList.size() != 0){
            creditsDetailDO.setAccountId(accountDOList.get(0).getId());
        }
        if (creditsDetailDO.getTradeDirection() == 1){
            if (creditsDetailDO.getTradeType().equals("HEALTH_TASK")){
                TaskDetailDO taskDetailDO = new TaskDetailDO();
@@ -187,6 +201,9 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            }
        }
        CreditsDetailDO creditsDetailDO1 =credittsLogDetailDao.save(creditsDetailDO);
        creditsDetailDO1.setFlag(creditsDetailDO.getFlag());
        List<CreditsDetailDO> creditsDetailDOList = new ArrayList<>();
        creditsDetailDOList.add(creditsDetailDO1);
        AccountDO accountDO = accountDao.findOne(creditsDetailDO1.getAccountId());
        if (creditsDetailDO1.getTradeDirection() == 1){
            accountDO.setTotal(accountDO.getTotal()+creditsDetailDO1.getIntegrate());
@@ -194,8 +211,8 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            accountDO.setTotal(accountDO.getTotal()-creditsDetailDO1.getIntegrate());
        }
        accountDao.save(accountDO);
        Envelop<Boolean> envelop = new Envelop<>();
        envelop.setObj(true);
        Envelop<CreditsDetailDO> envelop = new Envelop<>();
        envelop.setDetailModelList(creditsDetailDOList);
        return envelop;
    }

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

@@ -70,8 +70,8 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
               if (taskDetailList != null && taskDetailList.size() != 0){
                   taskDO1.setStatus(1);
               }
               taskDOList.add(taskDO1);
           }
           taskDOList.add(taskDO1);
       }
       String sqlcount = new ISqlUtils().getSql(taskDO,0,0,"count");
       List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sqlcount);