1、新闻，资讯信息 添加草稿功能

2、公告通知，修复图片上传功能

zhbsq-admin/src/main/java/com/hjy/modlue/news/CbNewsController.java

@@ -84,7 +84,7 @@ public class CbNewsController extends BaseController {
 
     @ApiOperation("网站新闻确认")
     @PreAuthorize("@ss.hasPermi('business:NEWS:confirm')")
-    @Log(title = "网站新闻确认", businessType = BusinessType.INSERT)
+    @Log(title = "网站新闻确认", businessType = BusinessType.UPDATE)
     @PostMapping("confirm/{id}")
     public AjaxResult confirm(@PathVariable String id) {
         CbNews cbNews = cbNewsService.getById(id);

zhbsq-admin/src/main/java/com/hjy/modlue/portal/CbCounselingMessageController.java

@@ -81,7 +81,7 @@ public class CbCounselingMessageController extends BaseController {
 
     @ApiOperation("资讯信息确认")
     @PreAuthorize("@ss.hasPermi('business:COUNSELINGMESSAGE:confirm')")
-    @Log(title = "资讯信息确认", businessType = BusinessType.INSERT)
+    @Log(title = "资讯信息确认", businessType = BusinessType.UPDATE)
     @PostMapping("confirm/{id}")
     public AjaxResult confirm(@PathVariable String id) {
         CbCounselingMessage counselingMessage = cbCounselingMessageService.getById(id);

zhbsq-admin/src/main/java/com/hjy/web/controller/system/SysNoticeController.java

@@ -1,12 +1,17 @@
 package com.hjy.web.controller.system;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.hjy.common.annotation.Log;
 import com.hjy.common.core.controller.BaseController;
 import com.hjy.common.core.domain.AjaxResult;
 import com.hjy.common.core.page.TableDataInfo;
 import com.hjy.common.enums.BusinessType;
+import com.hjy.common.utils.StringUtils;
 import com.hjy.system.domain.SysNotice;
 import com.hjy.system.service.ISysNoticeService;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -51,8 +56,9 @@ public class SysNoticeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping("add")
-    public AjaxResult add(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult add(@Validated @RequestBody SysNotice notice,@RequestParam("noticeContent") String noticeContent) {
         notice.setCreateBy(getUsername());
+        notice.setNoticeContent(StringUtils.htmlstr(noticeContent));
         return toAjax(noticeService.insertNotice(notice));
     }
 
@@ -62,8 +68,9 @@ public class SysNoticeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PostMapping("edit")
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice,@RequestParam("noticeContent") String noticeContent) {
         notice.setUpdateBy(getUsername());
+        notice.setNoticeContent(StringUtils.htmlstr(noticeContent));
         return toAjax(noticeService.updateNotice(notice));
     }
 

zhbsq-common/pom.xml

@@ -118,6 +118,12 @@
             <artifactId>jedis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.11.3</version>
+        </dependency>
+
         <!-- aop -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

zhbsq-common/src/main/java/com/hjy/common/utils/StringUtils.java

@@ -3,6 +3,8 @@ package com.hjy.common.utils;
 import com.hjy.common.constant.Constants;
 import com.hjy.common.core.text.Convert;
 import com.hjy.common.core.text.StrFormatter;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 import org.springframework.util.AntPathMatcher;
 
 import java.util.*;
@@ -530,6 +532,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return "0"+str;
     }
 
+    public static String htmlstr(String htmlStr){
+        final Document document = Jsoup.parse(htmlStr);
+        return document.body().children().toString();
+    }
+
     public static void main(String[] args) {
         System.out.println(appendStr("1"));
     }

zhbsq-modlue/src/main/java/com/hjy/module/domain/news/CbNews.java

@@ -83,7 +83,7 @@ public class CbNews extends BaseEntity {
     /**
      * 状态(0.草稿，1.下架，2.审核中，3.审核驳回，4.已发布，5.已上报)
      */
-    @Excel(name = "状态(0.草稿，1.下架，2.审核中，3.审核驳回，4.已发布，5.已上报)")
+    @Excel(name = "状态(0.草稿，1.下架，2.审核中，3.审核驳回，4.已发布，5.已上报，7=已确认)")
     private String status;
 
     /**

zhbsq-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+        select notice_id, notice_title, notice_type, notice_content as notice_content, status, create_by, create_time, update_by, update_time, remark
 		from sys_notice
     </sql>