Browse Source

健康银行添加活跃记录信息接口

liuwenbin 6 years ago
parent
commit
2941ff3cf9

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

@ -124,7 +124,7 @@ public class ActiveRecordDO extends IdEntity implements Serializable {
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    @Column(name = "create_time", nullable = true, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }

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

@ -53,5 +53,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";
    }
}

+ 9 - 3
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;
    }
}

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

@ -55,12 +55,12 @@ public class ActiveRecordService extends BaseJpaService<ActiveRecordDO,ActiveRec
        if(!StringUtils.isEmpty(taskId)){
            activeRecordDO.setTaskId(taskId);
            TaskDO taskDO = taskDao.findOne(taskId);
            activeRecordDO.setTaskTitle(taskDO!=null?taskDO.getTaskTitle():null);
            activeRecordDO.setTaskTitle(taskDO!=null?taskDO.getTitle():null);
        }
        if(!StringUtils.isEmpty(activityId)){
            activeRecordDO.setActivityId(activityId);
            ActivityDO activityDO = activityDao.findOne(activityId);
            activeRecordDO.setActivityTitle(activityDO!=null?activityDO.getActivityTitle():null);
            activeRecordDO.setActivityTitle(activityDO!=null?activityDO.getTitle():null);
        }
        activeRecordDO.setOriginalStatus(originalStatus);
        activeRecordDO.setCurrentStatus(currentStatus);

+ 5 - 3
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 #服务器地址
@ -50,7 +52,7 @@ spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/wlyy_health_bank?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
    url: jdbc:mysql://172.19.103.77:3306/health_bank?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
    username: root
    password: 123456
  data:

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

@ -28,8 +28,8 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
#      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
#      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring: