Merge remote-tracking branch 'origin/master'

src/main/java/com/charging/chargingparking/entity/ParkingChannelOpen.java

@@ -23,6 +23,9 @@ public class ParkingChannelOpen implements Serializable {
 
     private String showContent;
 
+    @TableField(value = "remark_")
+    private String remark;
+
     /**
      * 通道id
      */

src/main/java/com/charging/chargingparking/service/impl/ParkingChannelOpenServiceImpl.java

@@ -2,6 +2,7 @@ package com.charging.chargingparking.service.impl;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.charging.chargingparking.constant.ParkingConstant;
@@ -45,7 +46,9 @@ public class ParkingChannelOpenServiceImpl extends ServiceImpl<ParkingChannelOpe
 
             //有要处理的开门任务
             if (parkingChannelOpen != null){
-                list =  stringUtils.getSerialData(parkingChannelOpen.getShowContent(),null,parkingChannelOpen.getChannelId(),true,false,10L);
+                if (StrUtil.isNotBlank(parkingChannelOpen.getShowContent())){
+                    list =  stringUtils.getSerialData(parkingChannelOpen.getShowContent(),null,parkingChannelOpen.getChannelId(),true,false,10L);
+                }
 
                 //修改记录
                 parkingChannelOpen.setOpenFlag(true);

src/main/resources/mapper/ParkingChannelOpenMapper.xml

@@ -7,6 +7,7 @@
     <resultMap id="BaseResultMap" type="com.charging.chargingparking.entity.ParkingChannelOpen">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="showContent" column="show_content" jdbcType="VARCHAR"/>
+            <result property="remark" column="remark_" jdbcType="VARCHAR"/>
             <result property="channelId" column="channel_id" jdbcType="VARCHAR"/>
             <result property="openFlag" column="open_flag" jdbcType="BIT"/>
             <result property="openTime" column="open_time" jdbcType="TIMESTAMP"/>
@@ -18,7 +19,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,show_content,channel_id,open_flag,
+        id,show_content,remark,channel_id,open_flag,
         open_time,create_by,create_time,
         update_by,update_time,del_flag
     </sql>