记录调拨用途到录入表

src/main/java/cn/fastfun/config/DataSourceConfig.java

@@ -20,16 +20,16 @@ import javax.sql.DataSource;
 public class DataSourceConfig {
 
     @Bean
-    @ConfigurationProperties(prefix = "spring.datasource")
+    @ConfigurationProperties(prefix = "spring.datasource.oss")
     public DataSource druidDataSource() {
         return new DruidDataSource();
     }
 
-//    @Bean
-//    @ConfigurationProperties(prefix = "spring.datasource.runtime")
-//    DataSource runtime() {
-//        return DruidDataSourceBuilder.create().build();
-//    }
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.runtime")
+    DataSource runtime() {
+        return DruidDataSourceBuilder.create().build();
+    }
 
     @Bean
     public ServletRegistrationBean druidServlet() {
@@ -46,8 +46,8 @@ public class DataSourceConfig {
         return filterRegistrationBean;
     }
 //
-//    @Bean
-//    JdbcTemplate jdbcTemplateRuntime(@Qualifier("runtime") DataSource base) {
-//        return new JdbcTemplate(base);
-//    }
+    @Bean
+    JdbcTemplate jdbcTemplateRuntime(@Qualifier("runtime") DataSource base) {
+        return new JdbcTemplate(base);
+    }
 }

src/main/java/cn/fastfun/service/impl/AppDeviceLogServiceImpl.java

@@ -171,6 +171,8 @@ public class AppDeviceLogServiceImpl extends JpaServiceImp<AppDeviceLog, String>
                 appDevice.setStatus(2); // 已划拨
                 appDevice.setTransferTime(time);
                 appDevice.setOwnerId(param.getCustomId()); // 设置归属
+                appDevice.setTfDescribe(param.getDescribe());
+                appDevice.setTfUsed(param.getUsed());
                 appDeviceService.save(appDevice);
 
                 AppDeviceLog appDeviceLog = new AppDeviceLog(p, appDevice.getImei()).toTransfer(param, time, batchNum, finalOperateID);

src/main/resources/application-dev.yml

@@ -2,15 +2,15 @@ server:
   port: 8082
 spring:
   datasource:
-
-    url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&tinyInt1isBit=false
-    username: root
-    password: Qx123456
-#    runtime:
-#      url: jdbc:mysql://172.16.121.236:3306/fastfun?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-#      username: readonly
-#      password: Fast1234
-#      driverClassName: com.mysql.cj.jdbc.Driver
+    oss:
+      url: jdbc:mysql://47.111.243.220:9306/pdms_oss?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&tinyInt1isBit=false
+      username: root
+      password: Qx123456
+    runtime:
+      url: jdbc:mysql://172.16.121.236:3306/fastfun?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+      username: readonly
+      password: Fast1234
+      driverClassName: com.mysql.cj.jdbc.Driver
   redis:
     host: 47.111.243.220