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

svr/svr-wlyy-health-bank/pom.xml

@@ -13,6 +13,7 @@
    <groupId>com.yihu.health.bank</groupId>
    <artifactId>svr-wlyy-health-bank</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <dependencies>
        <dependency>
@@ -51,6 +52,25 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <version>3.1.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.tomcat</groupId>
            <artifactId>tomcat-servlet-api</artifactId>
            <version>8.5.28</version>
            <scope>provided</scope>
            <!--tomcat 启动时 打开注释 end-->
        </dependency>
        <!--tomcat 启动时 注释下列配置 start-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>
        <!--tomcat 启动时 注释下列配置 end-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>

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

@@ -76,7 +76,21 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
     * @return
     */
    public Envelop<AccountDO> findByTradeDirection(CreditsDetailDO creditsDetailDO){
        AccountDO accountDO = accountDao.findOne(creditsDetailDO.getAccountId());
        AccountDO accountDO1 = new AccountDO();
        accountDO1.setPatientId(creditsDetailDO.getPatientId());
        String sql1  = ISqlUtils.getAllSql(accountDO1);
        List<AccountDO>  accountDOS = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(AccountDO.class));
        if (accountDOS == null || accountDOS.size() == 0){
            accountDO1.setTotal(0);
            accountDO1.setAccountName("jw");
            accountDO1.setCardNumber("jw");
            accountDO1.setHospital("海沧区");
            accountDO1.setPassword("321321312321");
            accountDO1.setHospitalName("haichan");
            accountDao.save(accountDO1);
        }
        List<AccountDO>  accountDOS1 = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(AccountDO.class));
        AccountDO accountDO = accountDOS1.get(0);
        String sql = "SELECT SUM(cd.integrate) as total FROM wlyy_health_bank_credits_detail cd where cd.trade_direction = "+creditsDetailDO.getTradeDirection();
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql);
        if (rstotal!= null && rstotal.size()>0){
@@ -106,14 +120,15 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
*/
    public Envelop<AccountDO> selectByRanking(List<String> patientIds, Integer page, Integer size){
        StringBuffer buffer = new StringBuffer();
        if (patientIds !=null && patientIds.size()!=0){
            buffer.append(" ba.patient_id in(");
        buffer.append(" ba.patient_id in(");
        if (patientIds == null || patientIds.size() == 0){
            buffer.append("''");
        }else {
            for (int i=0;i<patientIds.size();i++){
                buffer.append("'"+patientIds.get(i)+"'").append(",");
            }
            buffer.append(")");
            buffer.deleteCharAt(buffer.length()-2);
        }
        buffer.append(") AND");
        String sql = "SELECT" +
                " ba.patient_id AS patient_id, " +
                " ba.account_name AS account_name," +
@@ -135,7 +150,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                " cd.patient_id " +
                " ) cd1 " +
                "WHERE " + buffer +
                "AND cd1.patient_id = ba.patient_id " +
                " cd1.patient_id = ba.patient_id " +
                "ORDER BY " +
                " ba.create_time, " +
                " (ba.total + cd1.total) DESC " +
@@ -156,7 +171,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                " cd.patient_id " +
                " ) cd1 " +
                "WHERE " + buffer +
                "AND cd1.patient_id = ba.patient_id " +
                " cd1.patient_id = ba.patient_id " +
                "ORDER BY " +
                " ba.create_time, " +
                " (ba.total + cd1.total) DESC ";
@@ -175,6 +190,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
     * @return
     */
    public Envelop<CreditsDetailDO> insert(CreditsDetailDO creditsDetailDO){
        TaskDO taskDO = new TaskDO();
        taskDO.setTaskCode(creditsDetailDO.getFlag());
        taskDO.setPatientId(creditsDetailDO.getPatientId());

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

@@ -37,6 +37,7 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
    @Autowired
    private TaskDetailDao taskDetailDao;
    public Envelop<Boolean> insert(TaskDO taskDO){
        taskDao.save(taskDO);
        Envelop<Boolean> envelop = new Envelop<>();
@@ -58,6 +59,13 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
   public Envelop<TaskDO> selectByCondition(TaskDO taskDO,Integer page,Integer size){
       String sql = new ISqlUtils().getSql(taskDO,page,size,"*");
       List<TaskDO> taskDOS1 = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskDO.class));
       if (taskDOS1 == null || taskDOS1.size() ==0){
           List<TaskDO> taskDOList = getTasks(taskDO.getPatientId());
           for (TaskDO taskDO1:taskDOList){
                taskDao.save(taskDO1);
           }
       }
       List<TaskDO> taskDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskDO.class));
       List<TaskDO> taskDOList = new ArrayList<>();
       for (TaskDO taskDO1 : taskDOS){
@@ -81,4 +89,26 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
       }
       return Envelop.getSuccessListWithPage(HealthBankMapping.api_success, taskDOList,page,size,count);
   }
    public List<TaskDO> getTasks(String patientId){
       List<TaskDO> taskDOList = new ArrayList<>();
       TaskDO taskDO = new TaskDO();
       taskDO.setPatientId(patientId);
       taskDO.setTaskCode("BIND");
       taskDO.setPeriod(1);
       taskDO.setTaskTitle("首次绑定");
       taskDO.setTaskContent("（使用社区发放的已关联您身份信息的设备,登录厦门i健康绑定设备）");
       taskDO.setTradeType("activity");
       taskDO.setTransactionId("402885e96324a409016324c0a45a0006");
       taskDOList.add(taskDO);
       TaskDO taskDO1 = new TaskDO();
       taskDO1.setPatientId(patientId);
       taskDO1.setTaskCode("MEASURE");
       taskDO1.setPeriod(0);
       taskDO1.setTaskTitle("每日测量");
       taskDO1.setTaskContent("（使用社区发放的已关联您身份信息的设备，绑定后每天完成测量）");
       taskDO1.setTradeType("activity");
       taskDO1.setTransactionId("402885e96324a409016324c0a45a0006");
       taskDOList.add(taskDO1);
       return taskDOList;
    }
}

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

@@ -4,7 +4,7 @@ server:
spring:
  application:
    name:  svr-wlyy-health-bank-wzn  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  svr-wlyy-health-bank-test  #注册到发现服务的id 如果id一样 eurika会自动做负载
  datasource:
    driver-class-name: com.mysql.jdbc.Driver