From 112c3e5ace22f26b4e69f1ee1719c4df42e0764d Mon Sep 17 00:00:00 2001
From: "feihu.wang" <wfh45678@163.com>
Date: Thu, 9 Jul 2020 00:24:49 +0800
Subject: [PATCH 1/2] opts: update mysql jdbc to 8.x feihu wang

---
 pom.xml                                         | 2 +-
 radar-admin/src/main/resources/application.yml  | 2 +-
 radar-dao/pom.xml                               | 2 +-
 radar-engine/src/main/resources/application.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24970c9..004a60d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
         <mapper.version>4.0.0</mapper.version>
         <mybatisGenerator.version>1.3.7</mybatisGenerator.version>
-        <mysql.version>5.1.47</mysql.version>
+        <mysql.version>8.0.16</mysql.version>
         <springboot.version>2.2.5.RELEASE</springboot.version>
         <tensorflow.version>1.12.0</tensorflow.version>
         <es.version>7.6.1</es.version>
diff --git a/radar-admin/src/main/resources/application.yml b/radar-admin/src/main/resources/application.yml
index d7f571c..d01cca0 100644
--- a/radar-admin/src/main/resources/application.yml
+++ b/radar-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
   profiles:
     active: @profileActive@
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 8
diff --git a/radar-dao/pom.xml b/radar-dao/pom.xml
index 2909089..fbfb9b6 100644
--- a/radar-dao/pom.xml
+++ b/radar-dao/pom.xml
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>mysql</groupId>
                         <artifactId>mysql-connector-java</artifactId>
-                        <version>5.1.47</version>
+                        <version>8.0.16</version>
                     </dependency>
                     <dependency>
                         <groupId>tk.mybatis</groupId>
diff --git a/radar-engine/src/main/resources/application.yml b/radar-engine/src/main/resources/application.yml
index d9546db..9251579 100644
--- a/radar-engine/src/main/resources/application.yml
+++ b/radar-engine/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
   profiles:
     active: @profileActive@
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 8

From d9d28ebf04683f8240194c15dfcd4ce62bb2d2f1 Mon Sep 17 00:00:00 2001
From: "feihu.wang" <wfh45678@163.com>
Date: Sat, 15 Aug 2020 10:22:55 +0800
Subject: [PATCH 2/2] opts: fix sth feihu wang

---
 .../radar/service/impl/model/DataListsServiceImpl.java       | 5 +++--
 .../pgmmers/radar/service/impl/model/ModelServiceImpl.java   | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/DataListsServiceImpl.java b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/DataListsServiceImpl.java
index d550790..601e197 100644
--- a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/DataListsServiceImpl.java
+++ b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/DataListsServiceImpl.java
@@ -137,7 +137,7 @@ public class DataListsServiceImpl implements DataListsService, SubscribeHandle {
         	}
         }
         // 移除未提交的记录
-        List<Long> listId = new ArrayList<Long>();
+        List<Long> listId = new ArrayList<>();
         listId.addAll(metaMap.keySet());
         if (listId.size() > 0) {
             deleteMeta(listId);
@@ -210,7 +210,7 @@ public class DataListsServiceImpl implements DataListsService, SubscribeHandle {
     public void onMessage(String channel, String message) {
         logger.info("data list sub:{}", message);
         DataListsVO dataListsVO = JSON.parseObject(message, DataListsVO.class);
-        Map<String, Object> listRecordMap = dataListRecordCacheMap.get(dataListsVO.getModelId());
+        Map<String, Object> listRecordMap = dataListRecordCacheMap.computeIfAbsent(dataListsVO.getModelId(), k -> new HashMap<>());
         if (dataListsVO.getOpt().equals("delete")) {
             listRecordMap.remove(dataListsVO.getName());
         } else if (dataListsVO.getOpt().equals("new")) {
@@ -273,6 +273,7 @@ public class DataListsServiceImpl implements DataListsService, SubscribeHandle {
         }).start();
     }
 
+    @Override
     public Map<String, Object> getDataListMap(Long modelId) {
         Map<String, Object> listMap = dataListRecordCacheMap.get(modelId);
         return listMap;
diff --git a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/ModelServiceImpl.java b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/ModelServiceImpl.java
index f9b045a..40e20f3 100644
--- a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/ModelServiceImpl.java
+++ b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/ModelServiceImpl.java
@@ -221,6 +221,11 @@ public class ModelServiceImpl extends BaseLocalCacheService implements ModelServ
         if (isCreated) {
             modelVO.setStatus(StatusType.INACTIVE.getKey());
             modelDal.save(modelVO);
+            int save = modelDal.save(modelVO);
+            // 通知更新
+            if (save > 0) {
+                cacheService.publishModel(modelVO);
+            }
         } else {
             result.setMsg("重建索引失败");
         }