diff --git a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java index e6d814b..baff5f3 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java @@ -30,8 +30,6 @@ import java.util.List; * 字典表 前端控制器 *

* - * @author lengleng - * @since 2019-03-19 */ @RestController @AllArgsConstructor diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java index d1657e5..62e818e 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java @@ -49,7 +49,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private final SysRoleMenuMapper sysRoleMenuMapper; @Override - @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId", unless = "#result.isEmpty()") +// @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId", unless = "#result.isEmpty()") public List findMenuByRoleId(Long roleId) { return baseMapper.listMenusByRoleId(roleId); } diff --git a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java index 3152278..9b24c1a 100644 --- a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java @@ -47,28 +47,30 @@ public class AIMedicineServiceImpl implements AIMedicineService { query.limit(1); query.with(Sort.by(Sort.Order.desc("Time"))); List aiMedicines = template.find(query, Map.class, "fktable"); - Map medicine = new HashMap(); - for (Map map : aiMedicines) { - medicine.put("丙泊酚", map.get("rate_1")); - medicine.put("丙泊酚sum", map.get("cumu_1")); - medicine.put("舒芬太尼", map.get("rate_2")); - medicine.put("舒芬太尼sum", map.get("cumu_2")); - medicine.put("瑞芬太尼", map.get("rate_3")); - medicine.put("瑞芬太尼sum", map.get("cumu_3")); - medicine.put("顺阿曲库胺", map.get("rate_4")); - medicine.put("顺阿曲库胺sum", map.get("cumu_4")); - medicine.put("尼卡地平", map.get("rate_5")); - medicine.put("尼卡地平sum", map.get("cumu_5")); - medicine.put("艾司洛尔", map.get("rate_6")); - medicine.put("艾司洛尔sum", map.get("cumu_6")); - medicine.put("麻黄素", map.get("rate_7")); - medicine.put("麻黄素sum", map.get("cumu_7")); - medicine.put("阿托品", map.get("rate_8")); - medicine.put("阿托品sum", map.get("cumu_8")); - medicine.put("Time", map.get("Time")); + if (!aiMedicines.isEmpty()) { + Map medicine = new HashMap(); + for (Map map : aiMedicines) { + medicine.put("丙泊酚", map.get("rate_1")); + medicine.put("丙泊酚sum", map.get("cumu_1")); + medicine.put("舒芬太尼", map.get("rate_2")); + medicine.put("舒芬太尼sum", map.get("cumu_2")); + medicine.put("瑞芬太尼", map.get("rate_3")); + medicine.put("瑞芬太尼sum", map.get("cumu_3")); + medicine.put("顺阿曲库胺", map.get("rate_4")); + medicine.put("顺阿曲库胺sum", map.get("cumu_4")); + medicine.put("尼卡地平", map.get("rate_5")); + medicine.put("尼卡地平sum", map.get("cumu_5")); + medicine.put("艾司洛尔", map.get("rate_6")); + medicine.put("艾司洛尔sum", map.get("cumu_6")); + medicine.put("麻黄素", map.get("rate_7")); + medicine.put("麻黄素sum", map.get("cumu_7")); + medicine.put("阿托品", map.get("rate_8")); + medicine.put("阿托品sum", map.get("cumu_8")); + medicine.put("Time", map.get("Time")); + } + aiMedicines.remove(0); + aiMedicines.add(medicine); } - aiMedicines.remove(0); - aiMedicines.add(medicine); return aiMedicines; } diff --git a/upms/upms-biz/src/main/resources/application.yml b/upms/upms-biz/src/main/resources/application.yml index 0c2205f..830bcc5 100644 --- a/upms/upms-biz/src/main/resources/application.yml +++ b/upms/upms-biz/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: profiles: active: dev application: - name: @project.artifactId@ + name: ${project.artifactId} # 定时任务属性配置 quartz: properties: @@ -130,14 +130,14 @@ spring: type: redis data: redis: - host: 192.168.65.130 + host: localhost # 数据库相关配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root - url: jdbc:mysql://192.168.65.130:3306/rax_backend2?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3306/rax_backend2?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true server: port: 9999 @@ -148,11 +148,11 @@ vital-sign: except-database: admin,config,local information-database: information mongodb: - host: 192.168.65.130:27017 + host: localhost:27017 password: root username: root mysql: - host: 192.168.65.130:3306 + host: localhost:3306 password: root username: root \ No newline at end of file