feat: 大屏样式优化

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/admin/AdminDocHelpController.java

@@ -47,8 +47,8 @@ public class AdminDocHelpController {
      * @return
      */
     @GetMapping("/admin/list")
-    public JsonResult<PageVO<HelpArticleVO>> getAdminDocList(HttpServletRequest request, String searchWord, String webSite) {
-        return getHelpDocList(request, ArticleConst.ADMIN_CATEGORY, searchWord,webSite);
+    public JsonResult<PageVO<HelpArticleVO>> getAdminDocList(HttpServletRequest request, String searchWord) {
+        return getHelpDocList(request, ArticleConst.ADMIN_CATEGORY, searchWord);
     }
 
     /**
@@ -58,8 +58,8 @@ public class AdminDocHelpController {
      * @return
      */
     @GetMapping("/seller/list")
-    public JsonResult<PageVO<HelpArticleVO>> getSellerDocList(HttpServletRequest request, String searchWord, String webSite) {
-        return getHelpDocList(request, ArticleConst.SELLER_CATEGORY, searchWord, webSite);
+    public JsonResult<PageVO<HelpArticleVO>> getSellerDocList(HttpServletRequest request, String searchWord) {
+        return getHelpDocList(request, ArticleConst.SELLER_CATEGORY, searchWord);
     }
 
     /**
@@ -67,13 +67,12 @@ public class AdminDocHelpController {
      * @param categoryId
      * @return
      */
-    private JsonResult<PageVO<HelpArticleVO>> getHelpDocList(HttpServletRequest request, Integer categoryId,String searchWord,String webSite) {
+    private JsonResult<PageVO<HelpArticleVO>> getHelpDocList(HttpServletRequest request, Integer categoryId, String searchWord) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         HelpArticleExample example = new HelpArticleExample();
         example.setCategoryId(categoryId);
         example.setState(ArticleConst.STATE_YES);
         example.setSearchWord(searchWord);
-        example.setWebSite(webSite);
         List<StoreCmsArticle> list = helpArticleModel.getArticleList(example, null);
         List<HelpArticleVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/admin/AdminHelpArticleController.java

@@ -54,7 +54,7 @@ public class AdminHelpArticleController {
     public JsonResult<PageVO<HelpArticleVO>> getList(HttpServletRequest request,String webSite, String title, String content) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         HelpArticleExample example = new HelpArticleExample();
-        example.setWebSite(webSite);
+        example.setWebSite("1");
         example.setTitleLike(title);
         example.setContentLike(content);
         List<StoreCmsArticle> list = helpArticleModel.getArticleList(example, pager);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/cms/HelpArticleModel.java

@@ -56,7 +56,7 @@ public class HelpArticleModel {
     public Integer saveArticle(ArticleAddDTO articleAddDTO, Admin admin) throws Exception {
         //根据文章标题查重
         HelpArticleExample articleExample = new HelpArticleExample();
-        articleExample.setWebSite(articleAddDTO.getWebSite());
+        articleExample.setWebSite("1");
         articleExample.setTitle(articleAddDTO.getTitle());
         List<StoreCmsArticle> list = helpArticleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {
@@ -64,6 +64,7 @@ public class HelpArticleModel {
         }
         StoreCmsArticle articleInsert = new StoreCmsArticle();
         PropertyUtils.copyProperties(articleInsert, articleAddDTO);
+        articleInsert.setWebSite("1");
         articleInsert.setCreateTime(new Date());
         articleInsert.setCreateId(admin.getAdminId());
         int count = helpArticleWriteMapper.insert(articleInsert);
@@ -140,7 +141,7 @@ public class HelpArticleModel {
         //根据文章标题查重
         HelpArticleExample articleExample = new HelpArticleExample();
         articleExample.setArticleIdNotEquals(articleUpdateDTO.getArticleId());
-        articleExample.setWebSite(articleUpdateDTO.getWebSite());
+        articleExample.setWebSite("1");
         articleExample.setTitle(articleUpdateDTO.getTitle());
         List<StoreCmsArticle> list = helpArticleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {
@@ -148,6 +149,7 @@ public class HelpArticleModel {
         }
         StoreCmsArticle articleUpdate = new StoreCmsArticle();
         PropertyUtils.copyProperties(articleUpdate, articleUpdateDTO);
+        articleUpdate.setWebSite("1");
         articleUpdate.setUpdateTime(new Date());
         int count = helpArticleWriteMapper.updateByPrimaryKeySelective(articleUpdate);
         if (count == 0) {

xinkeaboard-server/doc/DDL/update.sql

@@ -363,10 +363,21 @@ update sys_setting set `value`='1' where name = 'verification_code_check_is_enab
 
 ALTER TABLE sys_pc_navigation ADD COLUMN create_time DATETIME NOT NULL DEFAULT NOW() COMMENT '创建时间' AFTER data;
 
+---大屏
 ALTER TABLE member ADD COLUMN  latitude  DECIMAL(10, 6) NULL  COMMENT '纬度' AFTER city;
 
 ALTER TABLE member ADD COLUMN  longitude  DECIMAL(10, 6) NULL  COMMENT '经度' AFTER latitude;
 
+DELETE FROM sys_agreement WEHRE agreement_code IN ('business_residence_agreement_2','seller_privacy_policy_2','seller_register_agreement_2');
+
+DELETE FROM store_cms_article_category WHERE category_name IN ('国外站门户', '国内站门户');
+
+DELETE FROM store_cms_article WHERE category_id IN (9,10,11);
+
+UPDATE  store_cms_article set web_site = 1;
+
+
+