Commit c74ab420 by 裴大威

feat 新增分类限制可用群30个根据配置设置

parent 9af44ce4
...@@ -29,6 +29,7 @@ import com.pcloud.book.group.vo.*; ...@@ -29,6 +29,7 @@ import com.pcloud.book.group.vo.*;
import com.pcloud.book.keywords.dao.BookKeywordDao; import com.pcloud.book.keywords.dao.BookKeywordDao;
import com.pcloud.book.keywords.entity.BookKeyword; import com.pcloud.book.keywords.entity.BookKeyword;
import com.pcloud.book.util.common.ThreadPoolUtils; import com.pcloud.book.util.common.ThreadPoolUtils;
import com.pcloud.book.util.properties.BookProps;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.core.constant.SystemCode; import com.pcloud.common.core.constant.SystemCode;
import com.pcloud.common.core.enums.NotifyOriginTypeEnum; import com.pcloud.common.core.enums.NotifyOriginTypeEnum;
...@@ -120,6 +121,8 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz { ...@@ -120,6 +121,8 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
private LearningReportBrowseRecordDao learningReportBrowseRecordDao; private LearningReportBrowseRecordDao learningReportBrowseRecordDao;
@Autowired @Autowired
private LearningReportTouchRecordDao learningReportTouchRecordDao; private LearningReportTouchRecordDao learningReportTouchRecordDao;
@Autowired
private BookProps bookProps;
@Override @Override
...@@ -151,9 +154,12 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz { ...@@ -151,9 +154,12 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
bookGroupClassify.setRank(rank); bookGroupClassify.setRank(rank);
bookGroupClassifyDao.insert(bookGroupClassify); bookGroupClassifyDao.insert(bookGroupClassify);
final Long wechatGroupNum = weixinQrcodeBiz.countWechatGroup(); final Long wechatGroupNum = weixinQrcodeBiz.countWechatGroup();
if(null == wechatGroupNum || wechatGroupNum <= 30) { // 只有生产环境才有30个限制
log.info("[新增分类] : 可用微信群数量:{}个", wechatGroupNum); if ("pro".equalsIgnoreCase(bookProps.getSystemEnv())) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足,您可以明天再创建群。"); if(null == wechatGroupNum || wechatGroupNum <= 30) {
log.info("[新增分类] : 可用微信群数量:{}个", wechatGroupNum);
throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足,您可以明天再创建群。");
}
} }
WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(); WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
if (oneQrcode == null) { if (oneQrcode == null) {
......
...@@ -34,9 +34,12 @@ public class BookProps { ...@@ -34,9 +34,12 @@ public class BookProps {
*/ */
private static String jisuAppKey; private static String jisuAppKey;
@Value("group.luck.url") @Value("${group.luck.url}")
private String groupLuckUrl; private String groupLuckUrl;
@Value("${system.env}")
private String systemEnv;
public static String getJisuAppKey() { public static String getJisuAppKey() {
return jisuAppKey; return jisuAppKey;
} }
...@@ -80,4 +83,12 @@ public class BookProps { ...@@ -80,4 +83,12 @@ public class BookProps {
public void setGroupLuckUrl(String groupLuckUrl) { public void setGroupLuckUrl(String groupLuckUrl) {
this.groupLuckUrl = groupLuckUrl; this.groupLuckUrl = groupLuckUrl;
} }
public String getSystemEnv() {
return systemEnv;
}
public void setSystemEnv(String systemEnv) {
this.systemEnv = systemEnv;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment