增加例外设置

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/job/PlanAccountJob.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.longarticle.job;
 
-import com.tzld.piaoquan.longarticle.service.local.impl.CoreServiceImpl;
+import com.tzld.piaoquan.longarticle.service.local.CoreService;
 import com.tzld.piaoquan.longarticle.utils.LarkRobotUtil;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -16,11 +16,22 @@ import static com.tzld.piaoquan.longarticle.common.constants.RedisConstant.REDIS
 public class PlanAccountJob {
 
     @Autowired
-    private CoreServiceImpl coreService;
+    private CoreService coreService;
 
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    @XxlJob("initAccountSpecialSettingsJob")
+    public ReturnT<String> initAccountSpecialSettings(String param) {
+        try {
+            coreService.initAccountSpecialSettings();
+        } catch (Exception e) {
+            LarkRobotUtil.sendMessage("例外设置异常，请及时查看，@薛一鸣");
+            log.error("initPlanAccountJob error", e);
+        }
+        return ReturnT.SUCCESS;
+    }
+
 
     @XxlJob("initPlanAccountJob")
     public ReturnT<String> initPlanAccount(String param) {

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/dto/ArticleSortRequest.java

@@ -19,4 +19,5 @@ public class ArticleSortRequest {
     private Integer pushType;
     private boolean excludeLog;
     private List<PublishArticleData> publishArticleList;
+    private List<Integer> excludeContentIndex;
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/AccountSpecialSettings.java

@@ -5,6 +5,8 @@ import java.util.Date;
 public class AccountSpecialSettings {
     private Long id;
 
+    private String specialSettingId;
+
     private String effectiveDate;
 
     private String accountId;
@@ -31,6 +33,14 @@ public class AccountSpecialSettings {
         this.id = id;
     }
 
+    public String getSpecialSettingId() {
+        return specialSettingId;
+    }
+
+    public void setSpecialSettingId(String specialSettingId) {
+        this.specialSettingId = specialSettingId;
+    }
+
     public String getEffectiveDate() {
         return effectiveDate;
     }
@@ -110,6 +120,7 @@ public class AccountSpecialSettings {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", specialSettingId=").append(specialSettingId);
         sb.append(", effectiveDate=").append(effectiveDate);
         sb.append(", accountId=").append(accountId);
         sb.append(", publishPushTime=").append(publishPushTime);

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/AccountSpecialSettingsExample.java

@@ -176,6 +176,76 @@ public class AccountSpecialSettingsExample {
             return (Criteria) this;
         }
 
+        public Criteria andSpecialSettingIdIsNull() {
+            addCriterion("special_setting_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdIsNotNull() {
+            addCriterion("special_setting_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdEqualTo(String value) {
+            addCriterion("special_setting_id =", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdNotEqualTo(String value) {
+            addCriterion("special_setting_id <>", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdGreaterThan(String value) {
+            addCriterion("special_setting_id >", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdGreaterThanOrEqualTo(String value) {
+            addCriterion("special_setting_id >=", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdLessThan(String value) {
+            addCriterion("special_setting_id <", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdLessThanOrEqualTo(String value) {
+            addCriterion("special_setting_id <=", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdLike(String value) {
+            addCriterion("special_setting_id like", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdNotLike(String value) {
+            addCriterion("special_setting_id not like", value, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdIn(List<String> values) {
+            addCriterion("special_setting_id in", values, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdNotIn(List<String> values) {
+            addCriterion("special_setting_id not in", values, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdBetween(String value1, String value2) {
+            addCriterion("special_setting_id between", value1, value2, "specialSettingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialSettingIdNotBetween(String value1, String value2) {
+            addCriterion("special_setting_id not between", value1, value2, "specialSettingId");
+            return (Criteria) this;
+        }
+
         public Criteria andEffectiveDateIsNull() {
             addCriterion("effective_date is null");
             return (Criteria) this;

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/vo/SpecialSettingAccountVO.java

@@ -0,0 +1,15 @@
+package com.tzld.piaoquan.longarticle.model.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class SpecialSettingAccountVO {
+    //账号ID")
+    private String id;
+    //账号名称")
+    private String name;
+    //公众号ID")
+    private String ghId;
+}

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/vo/SpecialSettingVO.java

@@ -0,0 +1,29 @@
+package com.tzld.piaoquan.longarticle.model.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+@Data
+@ToString
+public class SpecialSettingVO {
+    //ID，更新时需要传")
+    private String id;
+    //计划名称")
+    private String name;
+    //生效账号")
+    private List<SpecialSettingAccountVO> accountList;
+    //生效日期 yyyy-MM-dd 格式")
+    private String effectiveDate;
+    //推送时间 HH:mm:ss 格式")
+    private String pushTime;
+    //推送方式(1-手动推送)")
+    private Integer pushType;
+    //推送条数")
+    private Integer pushNum;
+    //文章排除位置")
+    private List<String> excludeArticleIndexList;
+
+}
+

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/AccountService.java

@@ -7,4 +7,6 @@ import java.util.List;
 public interface AccountService {
 
     List<AccountSpecialSettings> getAccountSpecialSettings();
+
+    void saveOrUpdateAccountSpecialSettings(AccountSpecialSettings accountSpecialSettings);
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/CoreService.java

@@ -2,6 +2,8 @@ package com.tzld.piaoquan.longarticle.service.local;
 
 public interface CoreService {
 
+    void initAccountSpecialSettings();
+
     void initPlanAccount();
 
     void matchContent() throws InterruptedException;

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/AccountServiceImpl.java

@@ -11,7 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class AccountServiceImpl implements AccountService {
@@ -28,9 +30,8 @@ public class AccountServiceImpl implements AccountService {
     }
 
     public void saveOrUpdateAccountSpecialSettings(AccountSpecialSettings accountSpecialSettings) {
-        String dateString = DateUtil.getThatDayDateString();
         AccountSpecialSettingsExample example = new AccountSpecialSettingsExample();
-        example.createCriteria().andEffectiveDateEqualTo(accountSpecialSettings.getAccountId())
+        example.createCriteria().andAccountIdEqualTo(accountSpecialSettings.getAccountId())
                 .andEffectiveDateEqualTo(accountSpecialSettings.getEffectiveDate());
         List<AccountSpecialSettings> accountSpecialSettingsList = accountSpecialSettingsMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(accountSpecialSettingsList)) {
@@ -41,4 +42,6 @@ public class AccountServiceImpl implements AccountService {
             accountSpecialSettingsMapper.updateByPrimaryKeySelective(accountSpecialSettings);
         }
     }
+
+
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/ContentServiceImpl.java

@@ -175,6 +175,12 @@ public class ContentServiceImpl implements ContentService {
         }
         articleSortRequest.setPlanId(planAccount.getPlanId());
         articleSortRequest.setPushType(planAccount.getPushType());
+        if (StringUtils.isNotEmpty(planAccount.getExcludeContentIndex())) {
+            List<Integer> excludeContentIndexList = JSONArray.parseArray(planAccount.getExcludeContentIndex(), Integer.class);
+            if (!CollectionUtils.isEmpty(excludeContentIndexList)) {
+                articleSortRequest.setExcludeContentIndex(excludeContentIndexList);
+            }
+        }
         log.info("articleSortRequest={}", JSONObject.toJSONString(articleSortRequest));
         ArticleSortResponse articleSortResponse = sortService.publishArticleSort(articleSortRequest);
 

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.longarticle.service.local.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.tzld.piaoquan.longarticle.common.constants.TimeConstant;
 import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
 import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
@@ -82,6 +83,34 @@ public class CoreServiceImpl implements CoreService {
     @Autowired
     private AccountService accountService;
 
+    public void initAccountSpecialSettings() {
+        List<SpecialSettingVO> specialSettings = aigcService.getSpecialSetting();
+        if (CollectionUtils.isEmpty(specialSettings)) {
+            return;
+        }
+        for (SpecialSettingVO specialSettingVO : specialSettings) {
+            if (CollectionUtils.isEmpty(specialSettingVO.getAccountList())) {
+                continue;
+            }
+            for (SpecialSettingAccountVO specialSettingAccountVO : specialSettingVO.getAccountList()) {
+                AccountSpecialSettings accountSpecialSettings = new AccountSpecialSettings();
+                accountSpecialSettings.setSpecialSettingId(specialSettingVO.getId());
+                accountSpecialSettings.setEffectiveDate(specialSettingVO.getEffectiveDate());
+                accountSpecialSettings.setAccountId(specialSettingAccountVO.getId());
+                accountSpecialSettings.setPublishPushTime(specialSettingVO.getPushTime());
+                accountSpecialSettings.setPushType(specialSettingVO.getPushType());
+                accountSpecialSettings.setPublishNum(specialSettingVO.getPushNum());
+                if (!CollectionUtils.isEmpty(specialSettingVO.getExcludeArticleIndexList())) {
+                    List<Integer> collect = specialSettingVO.getExcludeArticleIndexList().stream()
+                            .map(Integer::parseInt).collect(Collectors.toList());
+                    accountSpecialSettings.setExcludeContentIndex(JSON.toJSONString(collect));
+                }
+                accountService.saveOrUpdateAccountSpecialSettings(accountSpecialSettings);
+            }
+        }
+
+    }
+
     @Override
     public void initPlanAccount() {
         //例外设置查询和存储
@@ -202,9 +231,21 @@ public class CoreServiceImpl implements CoreService {
                         planAccountService.saveOrUpdatePlanAccount(planAccount);
                         continue;
                     }
-                    planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
                     planAccount.setPushType(accountSpecialSettings.getPushType());
+                    if (PublishGzhPushTypeEnum.manual_push.getVal().equals(accountSpecialSettings.getPushType())) {
+                        planAccount.setPublishWindowStart(accountSpecialSettings.getPublishPushTime());
+                    } else {
+                        planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
+                    }
+                    planAccount.setPublishPreNum(accountSpecialSettings.getPublishNum());
                     planAccount.setPublishNum(accountSpecialSettings.getPublishNum());
+                    int size = 0;
+                    if (StringUtils.isNotEmpty(accountSpecialSettings.getExcludeContentIndex())) {
+                        size = JSONArray.parseArray(accountSpecialSettings.getExcludeContentIndex(), Integer.class).size();
+                    }
+                    if (planAccount.getPublishPreMinNum() > accountSpecialSettings.getPublishNum() - size) {
+                        planAccount.setPublishPreMinNum(accountSpecialSettings.getPublishNum() - size);
+                    }
                     planAccount.setExcludeContentIndex(accountSpecialSettings.getExcludeContentIndex());
                     planAccountService.saveOrUpdatePlanAccount(planAccount);
                 }
@@ -212,18 +253,37 @@ public class CoreServiceImpl implements CoreService {
                 if (normalPlanAccounts.size() == 1) {
                     boolean upadte = false;
                     PlanAccount planAccount = normalPlanAccounts.get(0);
-                    if (!Objects.equals(planAccount.getPublishPushTime(), accountSpecialSettings.getPublishPushTime())) {
-                        planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
-                        upadte = true;
-                    }
                     if (!Objects.equals(planAccount.getPushType(), accountSpecialSettings.getPushType())) {
                         planAccount.setPushType(accountSpecialSettings.getPushType());
                         upadte = true;
                     }
+                    if (PublishGzhPushTypeEnum.manual_push.getVal().equals(accountSpecialSettings.getPushType())) {
+                        if (!Objects.equals(planAccount.getPublishWindowStart(), accountSpecialSettings.getPublishPushTime())) {
+                            planAccount.setPublishWindowStart(accountSpecialSettings.getPublishPushTime());
+                            upadte = true;
+                        }
+                    } else {
+                        if (!Objects.equals(planAccount.getPublishPushTime(), accountSpecialSettings.getPublishPushTime())) {
+                            planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
+                            upadte = true;
+                        }
+                    }
                     if (!Objects.equals(planAccount.getPublishNum(), accountSpecialSettings.getPublishNum())) {
                         planAccount.setPublishNum(accountSpecialSettings.getPublishNum());
                         upadte = true;
                     }
+                    if (!Objects.equals(planAccount.getPublishPreNum(), accountSpecialSettings.getPublishNum())) {
+                        planAccount.setPublishPreNum(accountSpecialSettings.getPublishNum());
+                        upadte = true;
+                    }
+                    int size = 0;
+                    if (StringUtils.isNotEmpty(accountSpecialSettings.getExcludeContentIndex())) {
+                        size = JSONArray.parseArray(accountSpecialSettings.getExcludeContentIndex(), Integer.class).size();
+                    }
+                    if (planAccount.getPublishPreMinNum() > accountSpecialSettings.getPublishNum() - size) {
+                        planAccount.setPublishPreMinNum(accountSpecialSettings.getPublishNum() - size);
+                        upadte = true;
+                    }
                     if (!Objects.equals(planAccount.getExcludeContentIndex(), accountSpecialSettings.getExcludeContentIndex())) {
                         planAccount.setExcludeContentIndex(accountSpecialSettings.getExcludeContentIndex());
                         upadte = true;
@@ -232,7 +292,7 @@ public class CoreServiceImpl implements CoreService {
                         planAccountService.saveOrUpdatePlanAccount(planAccount);
                     }
                 } else {
-                    LarkRobotUtil.sendMessage("存在多个生效计划，accountId=" + accountId);
+                    LarkRobotUtil.sendMessage("存在多个例外计划，accountId=" + accountId);
                     for (PlanAccount planAccount : planAccounts) {
                         planAccount.setPublishOpenFlag(0);
                         planAccountService.saveOrUpdatePlanAccount(planAccount);

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PlanAccountServiceImpl.java

@@ -149,7 +149,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
     public List<PlanAccount> getNormalPlanAccount(String accountId) {
         PlanAccountExample example = new PlanAccountExample();
         example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
-                .andStatusEqualTo(0).andIsDeleteEqualTo(0).andPublishOpenFlagEqualTo(1)
+                .andIsDeleteEqualTo(0).andPublishOpenFlagEqualTo(1)
                 .andAccountIdEqualTo(accountId);
         return planAccountMapper.selectByExample(example);
     }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/AigcService.java

@@ -25,4 +25,6 @@ public interface AigcService {
     String pushCover(String coverUrl, String publishContentId);
 
     List<PushRecordVO> getTodayPushRecords(PushRecordParam param);
+
+    List<SpecialSettingVO> getSpecialSetting();
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/AigcServiceImpl.java

@@ -211,4 +211,24 @@ public class AigcServiceImpl implements AigcService {
         return null;
     }
 
+    public List<SpecialSettingVO> getSpecialSetting() {
+        String apiUrl = "http://aigc-testapi.cybertogether.net/aigc/publish/LongArticleSystem/getSpecialSettingList";
+        try {
+            String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl);
+            JSONObject jsonObject = JSON.parseObject(res);
+            Integer code = jsonObject.getInteger("code");
+            if (code == 0) {
+                JSONArray data = jsonObject.getJSONArray("data");
+                if (CollectionUtils.isEmpty(data)) {
+                    return null;
+                }
+                return data.toJavaList(SpecialSettingVO.class);
+            }
+            return null;
+        } catch (Exception e) {
+            log.error("getSpecialSetting error", e);
+        }
+        return null;
+    }
+
 }

long-article-server/src/main/resources/mapper/AccountSpecialSettingsMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.AccountSpecialSettingsMapper">
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="special_setting_id" jdbcType="VARCHAR" property="specialSettingId" />
     <result column="effective_date" jdbcType="VARCHAR" property="effectiveDate" />
     <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <result column="publish_push_time" jdbcType="VARCHAR" property="publishPushTime" />
@@ -72,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, effective_date, account_id, publish_push_time, push_type, publish_num, exclude_content_index, 
-    is_delete, create_time, update_time
+    id, special_setting_id, effective_date, account_id, publish_push_time, push_type, 
+    publish_num, exclude_content_index, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettingsExample" resultMap="BaseResultMap">
     select
@@ -109,14 +110,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
-    insert into long_articles_account_special_settings (id, effective_date, account_id, 
-      publish_push_time, push_type, publish_num, 
-      exclude_content_index, is_delete, create_time, 
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{effectiveDate,jdbcType=VARCHAR}, #{accountId,jdbcType=VARCHAR}, 
-      #{publishPushTime,jdbcType=VARCHAR}, #{pushType,jdbcType=INTEGER}, #{publishNum,jdbcType=INTEGER}, 
-      #{excludeContentIndex,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into long_articles_account_special_settings (id, special_setting_id, effective_date, 
+      account_id, publish_push_time, push_type, 
+      publish_num, exclude_content_index, is_delete, 
+      create_time, update_time)
+    values (#{id,jdbcType=BIGINT}, #{specialSettingId,jdbcType=VARCHAR}, #{effectiveDate,jdbcType=VARCHAR}, 
+      #{accountId,jdbcType=VARCHAR}, #{publishPushTime,jdbcType=VARCHAR}, #{pushType,jdbcType=INTEGER}, 
+      #{publishNum,jdbcType=INTEGER}, #{excludeContentIndex,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
     insert into long_articles_account_special_settings
@@ -124,6 +125,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="specialSettingId != null">
+        special_setting_id,
+      </if>
       <if test="effectiveDate != null">
         effective_date,
       </if>
@@ -156,6 +160,9 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="specialSettingId != null">
+        #{specialSettingId,jdbcType=VARCHAR},
+      </if>
       <if test="effectiveDate != null">
         #{effectiveDate,jdbcType=VARCHAR},
       </if>
@@ -197,6 +204,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.specialSettingId != null">
+        special_setting_id = #{record.specialSettingId,jdbcType=VARCHAR},
+      </if>
       <if test="record.effectiveDate != null">
         effective_date = #{record.effectiveDate,jdbcType=VARCHAR},
       </if>
@@ -232,6 +242,7 @@
   <update id="updateByExample" parameterType="map">
     update long_articles_account_special_settings
     set id = #{record.id,jdbcType=BIGINT},
+      special_setting_id = #{record.specialSettingId,jdbcType=VARCHAR},
       effective_date = #{record.effectiveDate,jdbcType=VARCHAR},
       account_id = #{record.accountId,jdbcType=VARCHAR},
       publish_push_time = #{record.publishPushTime,jdbcType=VARCHAR},
@@ -248,6 +259,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
     update long_articles_account_special_settings
     <set>
+      <if test="specialSettingId != null">
+        special_setting_id = #{specialSettingId,jdbcType=VARCHAR},
+      </if>
       <if test="effectiveDate != null">
         effective_date = #{effectiveDate,jdbcType=VARCHAR},
       </if>
@@ -280,7 +294,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.AccountSpecialSettings">
     update long_articles_account_special_settings
-    set effective_date = #{effectiveDate,jdbcType=VARCHAR},
+    set special_setting_id = #{specialSettingId,jdbcType=VARCHAR},
+      effective_date = #{effectiveDate,jdbcType=VARCHAR},
       account_id = #{accountId,jdbcType=VARCHAR},
       publish_push_time = #{publishPushTime,jdbcType=VARCHAR},
       push_type = #{pushType,jdbcType=INTEGER},

long-article-server/src/main/resources/mybatis-generator-config.xml

@@ -60,7 +60,7 @@
 <!--            <columnOverride column="cover_url" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
 <!--        </table>-->
 <!--        <table tableName="long_articles_root_source_id" domainObjectName="RootSource" alias=""/>-->
-        <table tableName="long_articles_plan_account" domainObjectName="PlanAccount" alias=""/>
+        <table tableName="long_articles_account_special_settings" domainObjectName="AccountSpecialSettings" alias=""/>
 <!--            <table tableName="long_articles_plan" domainObjectName="Plan" alias=""/>-->
 
 <!--                <table tableName="long_articles_publish_content" domainObjectName="PublishContent" alias=""/>-->