Browse Source

0325.1

master
zhangye 5 years ago
parent
commit
c3ccd3b900
  1. 1
      health/src/main/java/com/ccsens/health/service/AbnormalService.java
  2. 8
      health/src/main/java/com/ccsens/health/service/UserService.java
  3. 4
      health/src/main/resources/application.yml
  4. 4
      tall/src/main/resources/application.yml

1
health/src/main/java/com/ccsens/health/service/AbnormalService.java

@ -69,6 +69,7 @@ public class AbnormalService implements IAbnormalService{
HealthAbnormal healthAbnormal = new HealthAbnormal();
healthAbnormal.setId(snowflake.nextId());
BeanUtil.copyProperties(addAbnormal,healthAbnormal);
healthAbnormal.setHealthStatus((short) addAbnormal.getHealthType());
healthAbnormalDao.insertSelective(healthAbnormal);
AbnormalVo.AbnormalStatisticsVo abnormalStatisticsVo = new AbnormalVo.AbnormalStatisticsVo();

8
health/src/main/java/com/ccsens/health/service/UserService.java

@ -66,10 +66,10 @@ public class UserService implements IUserService{
if(ObjectUtil.isNotNull(selectUser.getUserId())){
userId = selectUser.getUserId();
}else {
String id = tallFeignClient.getUserId(selectUser.getToken());
if(StrUtil.isNotEmpty(id)){
userId = Long.valueOf(id);
}
// String id = tallFeignClient.getUserId(selectUser.getToken());
// if(StrUtil.isNotEmpty(id)){
userId = params.getUserId();
// }
}
if(ObjectUtil.isNull(userId)){

4
health/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: test
include: common, util-test
active: prod
include: common, util-prod

4
tall/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: util-prod,common
active: dev
include: util-dev,common
Loading…
Cancel
Save