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/AccountDO.java

@@ -40,6 +40,12 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "hospital")
    private String hospital;//社区
    @Column(name = "status")
    private Integer status;//状态（1有效，-1失效）
    @Transient
    private String idCard;//身份证号码
    @Transient
    private Long sum;//总积分（已用积分和剩余积分）
@@ -224,4 +230,20 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    public void setActivityIntegrate(Long activityIntegrate) {
        this.activityIntegrate = activityIntegrate;
    }
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

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

@@ -45,16 +45,16 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
    private Date endTime; //结束时间
    @Column(name = "status")
    private int status;//状态（1代表有效，0代表无效,-1代表过期）
    private Integer status;//状态（1代表有效，0代表无效,-1代表过期）
    @Column(name = "is_flag")
    private String isFlag;//标识是否有问卷（1：有，-1：没有）
    private Integer isFlag;//标识是否有问卷（1：有，-1：没有）
    @Column(name = "area")
    private String area;//区域
    @Column(name = "area_type")
    private int areaType; //区域类型
    private Integer areaType; //区域类型
    @Column(name = "remark")
    private String remark;//活动备注
@@ -146,19 +146,19 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
    }
    public int getStatus() {
    public Integer getStatus() {
        return status;
    }
    public void setStatus(int status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getIsFlag() {
    public Integer getIsFlag() {
        return isFlag;
    }
    public void setIsFlag(String isFlag) {
    public void setIsFlag(Integer isFlag) {
        this.isFlag = isFlag;
    }
@@ -188,11 +188,11 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.area = area;
    }
    public int getAreaType() {
    public Integer getAreaType() {
        return areaType;
    }
    public void setAreaType(int areaType) {
    public void setAreaType(Integer areaType) {
        this.areaType = areaType;
    }

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

@@ -40,7 +40,10 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
    private String patientId;//居民id
    @Column(name = "hospital")
    private String hospital;//社区
    private String hospital;//社区编码
    @Column(name = "hospital_name")
    private String hospitalName;//社区名称
    @Column(name = "description")
    private String description;//积分获取说明
@@ -76,6 +79,7 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
    private String unionId;
    public String getSaasId() {
        return saasId;
    }
@@ -235,4 +239,12 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
    public void setUnionId(String unionId) {
        this.unionId = unionId;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
}

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

@@ -34,13 +34,13 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
    private String transactionId; // 业务id
    @Column(name = "period")
    private int period; //周期性
    private Integer period; //周期性
    @Column(name = "task_code")
    private String taskCode ; // 标识是什么任务
    @Column(name = "status")
    private int status; //状态
    private Integer status; //状态
    @Column(name = "rule_code")
    private String ruleCode;//规则code
@@ -104,11 +104,11 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.transactionId = transactionId;
    }
    public int getPeriod() {
    public Integer getPeriod() {
        return period;
    }
    public void setPeriod(int period) {
    public void setPeriod(Integer period) {
        this.period = period;
    }
@@ -120,11 +120,11 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.taskCode = taskCode;
    }
    public int getStatus() {
    public Integer getStatus() {
        return status;
    }
    public void setStatus(int status) {
    public void setStatus(Integer status) {
        this.status = status;
    }

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

@@ -24,22 +24,22 @@ public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
    private String description;//规则描述
    @Column(name = "integrate")
    private int integrate; //积分
    private Integer integrate; //积分
    @Column(name = "trade_direction")
    private int tradeDirection;//交易方向 1增、-1减、0清零
    private Integer tradeDirection;//交易方向 1增、-1减、0清零
    @Column(name = "type")
    private String type;//规则类型：NORMAL-手动,AUTO-自动
    @Column(name = "status")
    private int status; //状态
    private Integer status; //状态
    @Column(name = "java_class_path")
    private String javaClassPath;//java反射类路径
    @Column(name = "period")
    private int period;//周期性
    private Integer period;//周期性
    public String getSaasId() {
@@ -66,19 +66,19 @@ public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
        this.description = description;
    }
    public int getIntegrate() {
    public Integer getIntegrate() {
        return integrate;
    }
    public void setIntegrate(int integrate) {
    public void setIntegrate(Integer integrate) {
        this.integrate = integrate;
    }
    public int getTradeDirection() {
    public Integer getTradeDirection() {
        return tradeDirection;
    }
    public void setTradeDirection(int tradeDirection) {
    public void setTradeDirection(Integer tradeDirection) {
        this.tradeDirection = tradeDirection;
    }
@@ -90,11 +90,11 @@ public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
        this.type = type;
    }
    public int getStatus() {
    public Integer getStatus() {
        return status;
    }
    public void setStatus(int status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
@@ -106,11 +106,11 @@ public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
        this.javaClassPath = javaClassPath;
    }
    public int getPeriod() {
    public Integer getPeriod() {
        return period;
    }
    public void setPeriod(int period) {
    public void setPeriod(Integer period) {
        this.period = period;
    }
}

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

@@ -24,6 +24,7 @@ public class HealthBankMapping {
        public static final String createTaskRule = "/createTaskRule";
        public static final String updateTaskRule = "/updateTaskRule";
        public static final String findTaskRule ="/findTaskRule";
        public static final String batchTaskRule = "/batchTaskRule";
        public static final String createTaskDict = "/createTaskDict";
        public static final String updateTaskDict = "/updateTaskDict";
        public static final String findTaskDict ="/findTaskDict";
@@ -54,10 +55,6 @@ public class HealthBankMapping {
        public static final String updateCreditsLogInfo ="/updateCreditsLogInfo";
        public static final String exchangeGoods = "/exchangeGoods";
        public static final String findExchangeGoods="/findExchangeGoods";
        public static final String updateRule = "/updateRule";
        public static final String insertRule = "/insertRule";
        public static final String deleteRule = "/deleteRule";
        public static final String findRules = "/findRules";
        public static final String createActiveRecord="/createActiveRecord";
        public static final String doctorAddIntegrate = "/doctorAddIntegrate";
        public static final String addStepIntegrate = "/addStepIntegrate";

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

@@ -2,6 +2,7 @@ package com.yihu.jw.controller;/**
 * Created by nature of king on 2018/6/8.
 */
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.entity.health.bank.TaskRuleDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
@@ -17,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
 * @author wangzhinan
 * @create 2018-06-08 16:25
@@ -100,4 +104,32 @@ public class TaskRuleController extends EnvelopRestController {
        }
    }
    /**
     * 批量删除任务规则
     *
     * @param ids []
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.batchTaskRule)
    @ApiOperation(value = "批量删除任务规则")
    public Envelop<Boolean> batchDelete(@ApiParam(name="ids",value = "id集合[]")
                                        @RequestParam(value = "ids",required = false)String ids){
        try{
            Envelop<Boolean> envelop = new Envelop<>();
            JSONArray array = JSONArray.parseArray(ids);
            List<String> taskRuleIds = new ArrayList<>();
            for (int i = 0;i<array.size();i++){
                taskRuleIds.add(array.getString(i));
            }
            service.batchDelete(taskRuleIds);
            envelop.setObj(true);
            return envelop;
        }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/dao/TaskDao.java

@@ -17,4 +17,7 @@ import java.util.List;
public interface TaskDao extends PagingAndSortingRepository<TaskDO,String>,JpaSpecificationExecutor<TaskDO> {
    @Query("select t from TaskDO t where t.transactionId = ?1 and t.type='ACTIVITY_TASK'")
    List<TaskDO> selectByActivityId(String transactionId);
    @Query("select t from TaskDO t where t.transactionId = ?1 and t.type='RULE_TASK'")
    TaskDO selectByTaskRuleId(String transactionId);
}

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

@@ -230,15 +230,21 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            List<TaskDO> taskDOList = taskDao.selectByActivityId(ids.get(i));
            for (TaskDO taskDO:taskDOList){
                taskDO.setStatus(0);
                taskDO.setCreateTime(new Date());
                taskDO.setUpdateTime(new Date());
                taskDao.save(taskDO);
            }
            List<TaskPatientDetailDO> taskPatientDetailDOS = taskPatientDetailDao.selectByActivityId(ids.get(i));
            for(TaskPatientDetailDO taskPatientDetailDO:taskPatientDetailDOS){
                taskPatientDetailDO.setStatus(-1);
                taskPatientDetailDO.setCreateTime(new Date());
                taskPatientDetailDO.setUpdateTime(new Date());
                taskPatientDetailDao.save(taskPatientDetailDO);
            }
            ActivityDO activityDO = activityDao.findOne(ids.get(i));
            activityDO.setStatus(-1);
            activityDO.setCreateTime(new Date());
            activityDO.setUpdateTime(new Date());
            activityDao.save(activityDO);
        }
        return envelop;

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

@@ -98,10 +98,16 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
        if (accountDOS == null || accountDOS.size() == 0){
            accountDO1.setTotal(0);
            accountDO1.setAccountName(creditsDetailDO.getName());
            accountDO1.setCardNumber("jw");
            accountDO1.setHospital("海沧区");
            accountDO1.setPassword("321321312321");
            accountDO1.setHospitalName("haichan");
            if(creditsDetailDO.getIdCard().length()>=4){// 判断是否长度大于等于4
                String cardNumber=creditsDetailDO.getIdCard().substring(creditsDetailDO.getIdCard().length()- 4,creditsDetailDO.getIdCard().length());//截取两个数字之间的部分
                int random = (int)((Math.random()*9+1)*100000);
                accountDO1.setCardNumber(cardNumber+Integer.toString(random));
            }
            accountDO1.setHospital(creditsDetailDO.getHospital());
            accountDO1.setPassword("123456");
            accountDO1.setHospitalName(creditsDetailDO.getHospitalName());
            accountDO1.setStatus(1);
            accountDO1.setSaasId("dev");
            accountDO1.setCreateTime(new Date());
            accountDO1.setUpdateTime(new Date());
            accountDao.save(accountDO1);
@@ -225,10 +231,15 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                    accountDO1.setPatientId(creditsDetailDO.getPatientId());
                    accountDO1.setTotal(0);
                    accountDO1.setAccountName(creditsDetailDO.getName());
                    accountDO1.setCardNumber(creditsDetailDO.getIdCard());
                    accountDO1.setHospital("350205");
                    accountDO1.setPassword("321321312321");
                    accountDO1.setHospitalName("海沧区");
                    if(creditsDetailDO.getIdCard().length()>=4){// 判断是否长度大于等于4
                        String cardNumber=creditsDetailDO.getIdCard().substring(creditsDetailDO.getIdCard().length()- 4,creditsDetailDO.getIdCard().length());//截取两个数字之间的部分
                        int random = (int)((Math.random()*9+1)*100000);
                        accountDO1.setCardNumber(cardNumber+Integer.toString(random));
                    }
                    accountDO1.setHospital(creditsDetailDO.getHospital());
                    accountDO1.setPassword("123456");
                    accountDO1.setHospitalName(creditsDetailDO.getHospitalName());
                    accountDO1.setStatus(1);
                    accountDO1.setCreateTime(new Date());
                    accountDO1.setUpdateTime(new Date());
                    accountDao.save(accountDO1);
@@ -568,6 +579,8 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            String idCard = object.getString("idcard");
            String unionId = object.getString("unionid");
            String openId = object.getString("openid");
            String hospital = object.getString("hospital");
            String hospitalName = object.getString("hospitalName");
            String taskSql = "select * from wlyy_health_bank_task bt where type = 'RULE_TASK' AND transaction_id = '"+ruleId +"'";
            List<TaskDO> taskDOList = jdbcTemplate.query(taskSql,new BeanPropertyRowMapper(TaskDO.class));
            TaskDO taskDO1 = new TaskDO();
@@ -645,8 +658,10 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                }
                CreditsDetailDO creditsDetailDO1 = new CreditsDetailDO();
                creditsDetailDO1.setStatus(1);
                creditsDetailDO1.setSaasId("dev");
                creditsDetailDO1.setAccountId(accountDOS.get(0).getId());
                creditsDetailDO1.setHospital("350205");
                creditsDetailDO1.setHospital(hospital);
                creditsDetailDO1.setHospitalName(hospitalName);
                creditsDetailDO1.setPatientId(patientId);
                creditsDetailDO1.setIntegrate(taskRuleDO.getIntegrate());
                creditsDetailDO1.setTradeDirection(taskRuleDO.getTradeDirection());
@@ -659,8 +674,10 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            }else{
                CreditsDetailDO creditsDetailDO = new CreditsDetailDO();
                creditsDetailDO.setStatus(1);
                creditsDetailDO.setSaasId("dev");
                creditsDetailDO.setAccountId(accountDOS.get(0).getId());
                creditsDetailDO.setHospital("350205");
                creditsDetailDO.setHospital(hospital);
                creditsDetailDO.setHospitalName(hospitalName);
                creditsDetailDO.setPatientId(patientId);
                creditsDetailDO.setIntegrate(taskRuleDO.getIntegrate());
                creditsDetailDO.setTradeDirection(taskRuleDO.getTradeDirection());
@@ -739,12 +756,18 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                }else {
                    AccountDO accountDO1 = new AccountDO();
                    accountDO1.setPatientId(creditsDetailDO.getPatientId());
                    accountDO1.setSaasId("dev");
                    accountDO1.setTotal(0);
                    accountDO1.setAccountName(creditsDetailDO.getName());
                    accountDO1.setCardNumber("jw");
                    accountDO1.setHospital("350205");
                    accountDO1.setPassword("321321312321");
                    accountDO1.setHospitalName("海沧区");
                    if(creditsDetailDO.getIdCard().length()>=4){// 判断是否长度大于等于4
                        String cardNumber=creditsDetailDO.getIdCard().substring(creditsDetailDO.getIdCard().length()- 4,creditsDetailDO.getIdCard().length());//截取两个数字之间的部分
                        int random = (int)((Math.random()*9+1)*100000);
                        accountDO1.setCardNumber(cardNumber+Integer.toString(random));
                    }
                    accountDO1.setHospital(creditsDetailDO.getHospital());
                    accountDO1.setPassword("123456");
                    accountDO1.setHospitalName(creditsDetailDO.getHospitalName());
                    accountDO1.setStatus(1);
                    accountDO1.setCreateTime(new Date());
                    accountDO1.setUpdateTime(new Date());
                    accountDao.save(accountDO1);
@@ -838,7 +861,8 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                    creditsDetailDO1.setSaasId("dev");
                    creditsDetailDO1.setTradeType("ACTIVITY_TASK");
                    creditsDetailDO1.setPatientId(creditsDetailDO.getPatientId());
                    creditsDetailDO1.setHospital("350205");
                    creditsDetailDO1.setHospital(creditsDetailDO.getHospital());
                    creditsDetailDO1.setHospitalName(creditsDetailDO.getHospitalName());
                    creditsDetailDO1.setAccountId(creditsDetailDO.getAccountId());
                    creditsDetailDO1.setStatus(1);
                    creditsDetailDO1.setCreateTime(new Date());

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

@@ -3,6 +3,8 @@ package com.yihu.jw.service;/**
 */
import com.yihu.base.mysql.query.BaseJpaService;
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.TaskDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
@@ -32,6 +34,10 @@ public class TaskRuleService extends BaseJpaService<TaskRuleDO,TaskRuleDao>{
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private TaskRuleDao taskRuleDao;
    @Autowired
    private TaskDao taskDao;
    @Autowired
    private TaskPatientDetailDao taskPatientDetailDao;
    /**
     * 获取任务规则列表
@@ -84,15 +90,30 @@ public class TaskRuleService extends BaseJpaService<TaskRuleDO,TaskRuleDao>{
    /**
     * 批量删除规则
     *
     * @param ids
     * @param ids []
     * @return
     */
    public Envelop<Boolean> batchDelete(List<String> ids){
        Envelop<Boolean> envelop = new Envelop<>();
        for (int i =0;i<ids.size();i++){
            TaskDO taskDO = taskDao.selectByTaskRuleId(ids.get(i));
            taskDO.setStatus(0);
            taskDO.setCreateTime(new Date());
            taskDO.setUpdateTime(new Date());
            taskDao.save(taskDO);
            List<TaskPatientDetailDO> taskPatientDetailDOS = taskPatientDetailDao.selectByTaskId(taskDO.getId());
            for (TaskPatientDetailDO taskPatientDetailDO:taskPatientDetailDOS){
                taskPatientDetailDO.setStatus(-1);
                taskPatientDetailDO.setCreateTime(new Date());
                taskPatientDetailDO.setUpdateTime(new Date());
                taskPatientDetailDao.save(taskPatientDetailDO);
            }
            TaskRuleDO taskRuleDO = taskRuleDao.findOne(ids.get(i));
            taskRuleDO.setStatus(0);
            taskRuleDO.setCreateTime(new Date());
            taskRuleDO.setUpdateTime(new Date());
            taskRuleDao.save(taskRuleDO);
        }
        return envelop;

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

@@ -95,10 +95,11 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
     * @return
     */
   public Envelop<TaskDO> selectByCondition(TaskDO taskDO,Integer page,Integer size){
       TaskDO taskDO2 = new TaskDO();
       String sql = new ISqlUtils().getSql(taskDO,page,size,"*");
       List<TaskDO> taskDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskDO.class));
       for (TaskDO taskDO1:taskDOS){
           if (taskDO1.getType().equalsIgnoreCase("ACTIVITY_TASK")){
           if (taskDO1.getType()!= null && taskDO1.getType().equalsIgnoreCase("ACTIVITY_TASK")){
               ActivityDO activityDO = activityDao.findOne(taskDO1.getTransactionId());
               taskDO1.setActivityDO(activityDO);
           }
@@ -218,10 +219,14 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
            List<TaskPatientDetailDO> taskPatientDetailDOS = taskPatientDetailDao.selectByTaskId(ids.get(i));
            for(TaskPatientDetailDO taskPatientDetailDO:taskPatientDetailDOS){
                taskPatientDetailDO.setStatus(-1);
                taskPatientDetailDO.setCreateTime(new Date());
                taskPatientDetailDO.setUpdateTime(new Date());
                taskPatientDetailDao.save(taskPatientDetailDO);
            }
            TaskDO taskDO = taskDao.findOne(ids.get(i));
            taskDO.setStatus(0);
            taskDO.setCreateTime(new Date());
            taskDO.setUpdateTime(new Date());
            taskDao.save(taskDO);
        }
        return envelop;

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

@@ -40,21 +40,26 @@ public class ISqlUtils {
                    Column mc =f.getAnnotation(Column.class);
                    String columeName =mc.name();  //字段对应数据库名字
                    String name =f.getName();       //字段名字
                    Class a= f.getType();          //字段类型
                    Object value=null;              //字段值
                    getMethodName="get"+name.substring(0,1).toUpperCase()+name.substring(1);//拼接属性的get方法
                    try {
                        Method m =c.getMethod(getMethodName);
                        value =(Object)m.invoke(object);     //拿到属性的值
                        if(value == null || "".equals(value) /*|| value.equals(Integer.parseInt("0"))*/){  //如果属性没值，不拼接sql
                        if(value == null || "".equals(value)){  //如果属性没值，不拼接sql
                            continue;
                        }
                        else if(value instanceof String){
                        else if(value instanceof String ){
                            value ="'%"+value+"%'";
                            sb.append(" and ").append(columeName +" like " ).append(value+"");
                        }else if (value instanceof Integer){
                            value = value;
                            sb.append(" and ").append(columeName +" = " ).append(value+"");
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    sb.append(" and ").append(columeName +" like " ).append(value+"");
                }
        }
        if(isFlag.equalsIgnoreCase("*")){