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

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

@@ -0,0 +1,135 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by 刘文彬 on 2018/6/12.
 */
@Entity
@Table(name = "wlyy_health_bank_active_record")
@EntityListeners(AuditingEntityListener.class)
public class ActiveRecordDO extends IdEntity implements Serializable {
    private String saasId; //saasId
    private String taskId;  //wlyy_health_bank_task任务表的id
    private String taskTitle;//任务标题
    private String activityId;//wlyy_health_bank_activity表的id
    private String activityTitle;//活动标题
    private Integer originalStatus;//原先状态
    private Integer currentStatus;//当前状态
    private String patientId;//居民code
    private String patientName;//居民名称
    private Integer teamId;//wlyy_admin_team医生行政团队的id
    private Date createTime;
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "task_id")
    public String getTaskId() {
        return taskId;
    }
    public void setTaskId(String taskId) {
        this.taskId = taskId;
    }
    @Column(name = "task_title")
    public String getTaskTitle() {
        return taskTitle;
    }
    public void setTaskTitle(String taskTitle) {
        this.taskTitle = taskTitle;
    }
    @Column(name = "activity_id")
    public String getActivityId() {
        return activityId;
    }
    public void setActivityId(String activityId) {
        this.activityId = activityId;
    }
    @Column(name = "activity_title")
    public String getActivityTitle() {
        return activityTitle;
    }
    public void setActivityTitle(String activityTitle) {
        this.activityTitle = activityTitle;
    }
    @Column(name = "original_status")
    public Integer getOriginalStatus() {
        return originalStatus;
    }
    public void setOriginalStatus(Integer originalStatus) {
        this.originalStatus = originalStatus;
    }
    @Column(name = "current_status")
    public Integer getCurrentStatus() {
        return currentStatus;
    }
    public void setCurrentStatus(Integer currentStatus) {
        this.currentStatus = currentStatus;
    }
    @Column(name = "patient_id")
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    @Column(name = "team_id")
    public Integer getTeamId() {
        return teamId;
    }
    public void setTeamId(Integer teamId) {
        this.teamId = teamId;
    }
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = true, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -55,5 +55,6 @@ public class HealthBankMapping {
        public static final String insertRule = "/insertRule";
        public static final String deleteRule = "/deleteRule";
        public static final String findRules = "/findRules";
        public static final String createActiveRecord="/createActiveRecord";
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/config/jpa/HibernateProperties.java

@@ -16,14 +16,20 @@ public class HibernateProperties {
    private String dialect;
    @Value("${hibernate.show_sql}")
    private String show_sql;
    @Value("${hibernate.ejb.naming_strategy}")
    private String naming_strategy;
//    @Value("${hibernate.ejb.naming_strategy}")
//    private String naming_strategy;
    @Value("${hibernate.physical_naming_strategy}")
    private String physical_naming_strategy;
    @Value("${hibernate.implicit_naming_strategy}")
    private String implicit_naming_strategy;
    public  Properties hibProperties() {
        Properties properties = new Properties();
        properties.put("hibernate.dialect",dialect);
        properties.put("hibernate.show_sql", show_sql);
        properties.put("hibernate.ejb.naming_strategy", naming_strategy);
//        properties.put("hibernate.ejb.naming_strategy", naming_strategy);
        properties.put("hibernate.physical_naming_strategy", physical_naming_strategy);
        properties.put("hibernate.implicit_naming_strategy", implicit_naming_strategy);
        return properties;
    }
}

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

@@ -0,0 +1,46 @@
package com.yihu.jw.controller;
import com.yihu.jw.entity.health.bank.ActiveRecordDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.service.ActiveRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by 刘文彬 on 2018/6/12.
 */
@RestController
@RequestMapping(HealthBankMapping.api_health_bank_common)
@Api(tags = "健康银行活动活跃记录",description = "健康银行活动活跃记录")
public class ActiveRecordController extends EnvelopRestController {
    @Autowired
    private ActiveRecordService activeRecordService;
    @PostMapping(value = HealthBankMapping.healthBank.createActiveRecord)
    @ApiOperation(value = "添加健康银行活动活跃记录")
    public Envelop<ActiveRecordDO> addActiveRecord(@ApiParam(name = "saasId",value = "saasId")@RequestParam(value = "saasId",required = true)String saasId,
                                                   @ApiParam(name = "taskId",value = "任务id")@RequestParam(value = "taskId",required = false)String taskId,
                                                   @ApiParam(name = "activityId",value = "账户JSON")@RequestParam(value = "activityId",required = false)String activityId,
                                                   @ApiParam(name = "originalStatus",value = "原有状态")@RequestParam(value = "originalStatus",required = true)Integer originalStatus,
                                                   @ApiParam(name = "currentStatus",value = "当前状态")@RequestParam(value = "currentStatus",required = true)Integer currentStatus,
                                                   @ApiParam(name = "patientId",value = "居民code")@RequestParam(value = "patientId",required = true)String patientId){
        try{
            ActiveRecordDO activeRecordDO = activeRecordService.insert(saasId,taskId,activityId,originalStatus,currentStatus,patientId);
            if(activeRecordDO!=null){
                return Envelop.getSuccess("添加成功",activeRecordDO);
            }else{
                return Envelop.getError("添加失败");
            }
        }catch (Exception e){
            return Envelop.getError("添加失败");
        }
    }
}

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

@@ -0,0 +1,16 @@
package com.yihu.jw.dao;/**
 * Created by nature of king on 2018/5/10.
 */
import com.yihu.jw.entity.health.bank.ActiveRecordDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:15
 * @desc health bank account dao
 **/
public interface ActiveRecordDao extends PagingAndSortingRepository<ActiveRecordDO,String>,JpaSpecificationExecutor<ActiveRecordDO> {
}

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

@@ -0,0 +1,82 @@
package com.yihu.jw.service;/**
 * Created by nature of king on 2018/5/10.
 */
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.dao.AccountDao;
import com.yihu.jw.dao.ActiveRecordDao;
import com.yihu.jw.dao.ActivityDao;
import com.yihu.jw.dao.TaskDao;
import com.yihu.jw.entity.health.bank.AccountDO;
import com.yihu.jw.entity.health.bank.ActiveRecordDO;
import com.yihu.jw.entity.health.bank.ActivityDO;
import com.yihu.jw.entity.health.bank.TaskDO;
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 org.springframework.util.StringUtils;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:26
 * @desc account service
 **/
@Service
@Transactional
public class ActiveRecordService extends BaseJpaService<ActiveRecordDO,ActiveRecordDO> {
    @Autowired
    private TaskDao taskDao;
    @Autowired
    private ActivityDao activityDao;
    @Autowired
    private ActiveRecordDao activeRecordDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 添加健康银行活动活跃记录
     *
     * @return
     */
    public ActiveRecordDO insert(String saasId,String taskId,String activityId,Integer originalStatus,Integer currentStatus,
    String patientId) throws Exception{
        ActiveRecordDO activeRecordDO = new ActiveRecordDO();
        activeRecordDO.setSaasId(saasId);
        if(!StringUtils.isEmpty(taskId)){
            activeRecordDO.setTaskId(taskId);
            TaskDO taskDO = taskDao.findOne(taskId);
            activeRecordDO.setTaskTitle(taskDO!=null?taskDO.getTitle():null);
        }
        if(!StringUtils.isEmpty(activityId)){
            activeRecordDO.setActivityId(activityId);
            ActivityDO activityDO = activityDao.findOne(activityId);
            activeRecordDO.setActivityTitle(activityDO!=null?activityDO.getTitle():null);
        }
        activeRecordDO.setOriginalStatus(originalStatus);
        activeRecordDO.setCurrentStatus(currentStatus);
        String sql = " select * from wlyy.wlyy_patient where code='"+patientId+"' and status=1 ";
        Map<String,Object> result = jdbcTemplate.queryForMap(sql);
        activeRecordDO.setPatientId(patientId);
        if(result!=null){
            activeRecordDO.setPatientName(result.get("name")+"");
        }
        String sql2 = "select f.* from wlyy.wlyy_sign_family f where f.patient='"+patientId+"' and f.status=1 and f.expenses_status=1";
        Map<String,Object> result2 = jdbcTemplate.queryForMap(sql2);
        if(result2!=null){
            activeRecordDO.setTeamId(result2.get("admin_team_code")!=null?(Integer)result2.get("admin_team_code"):null);;
        }
        return activeRecordDao.save(activeRecordDO);
    }
}

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

@@ -28,8 +28,10 @@ spring:
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
#  ejb:
#    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
  physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy #springJPA使用驼峰式(hibernate5以上使用)
  implicit_naming_strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址

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

@@ -28,7 +28,7 @@ spring:
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
#      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---