LIVE_YE %!s(int64=2) %!d(string=hai) anos
pai
achega
0e7126a225

+ 1 - 1
ruoyi-admin/src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ spring:
             master:
                 url: jdbc:mysql://192.168.3.101:3306/qianshan_parking_lot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Boman123
+                password: YeRq#zd%MQ
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 2 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -54,7 +54,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: druid
+    #active: druid
+    active: prod
   # 文件上传
   servlet:
      multipart:

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -68,7 +68,7 @@ public class Task {
             String data = jsonObject.getString("data");
             JSONObject infieldData = JSONObject.parseObject(data);
             List<Map<String,Object>> list = (List<Map<String, Object>>) infieldData.get("list");
-            outListAll.addAll(list);
+            infieldListAll.addAll(list);
             if(list.size()<1000){
                 i=-2;
             }else{

+ 2 - 0
ruoyi-system/src/main/resources/mapper/system/RecordDataMapper.xml

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertRecordData" parameterType="RecordData">
         insert into record_data (
 			<if test="id != null and id != '' ">id,</if>
+		    <if test="parkName != null and parkName != '' ">park_name,</if>
 			<if test="parkSyscode != null and parkSyscode != '' ">park_syscode,</if>
 			<if test="entranceSyscode != null and entranceSyscode != '' ">entrance_syscode,</if>
 			<if test="entranceName != null and entranceName != '' ">entrance_name,</if>
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			create_time
         )values(
 			<if test="id != null and id != '' ">#{id},</if>
+			<if test="parkName != null and parkName != '' ">#{parkName},</if>
 			<if test="parkSyscode != null and parkSyscode != '' ">#{parkSyscode},</if>
 			<if test="entranceSyscode != null and entranceSyscode != '' ">#{entranceSyscode},</if>
 			<if test="entranceName != null and entranceName != '' ">#{entranceName},</if>