From 350a61aece17edaf8802b05cad130b05691d8af9 Mon Sep 17 00:00:00 2001 From: hujunbo <9094908@qq.com> Date: Wed, 28 Sep 2022 14:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DocInfoController.java | 16 ++ .../business/controller/ReportController.java | 1 + .../biemo/business/service/ReportService.java | 7 +- .../java/com/ruoyi/biemo/utils/MyObjects.java | 6 +- ruoyi-ui/src/api/biemo/docInfo.js | 7 + ruoyi-ui/src/views/posTagging/detail.vue | 42 ++-- ruoyi-ui/src/views/report/index.vue | 190 +++++++++++++++--- 7 files changed, 216 insertions(+), 53 deletions(-) diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java index 3b972e3..4e87dc2 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java @@ -7,6 +7,7 @@ import com.ruoyi.biemo.business.service.CategoryService; import com.ruoyi.biemo.business.service.DocInfoService; import com.ruoyi.biemo.core.page.Page; import com.ruoyi.biemo.core.page.PageFactory; +import com.ruoyi.biemo.utils.MyObjects; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -75,6 +76,21 @@ public class DocInfoController extends BaseController { return AjaxResult.success(docInfoService.selectDocInfoById(id)); } + /** + * 获取文章管理详细信息 去掉内容标签 + */ + @PreAuthorize("@ss.hasPermi('biemo:docInfo:query')") + @GetMapping(value = "/getInfoDelHtml/{id}") + public AjaxResult getInfoDelHtml(@PathVariable("id") String id) + { + DocInfo docInfo = docInfoService.selectDocInfoById(id); + String content = docInfo.getContent(); + content = MyObjects.delHTMLTag(content); + content = MyObjects.delSpace(content); + docInfo.setContent(content); + return AjaxResult.success(docInfo); + } + /** * 新增文章管理或修改文章 */ diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/ReportController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/ReportController.java index 514dde2..50192be 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/ReportController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/ReportController.java @@ -42,6 +42,7 @@ public class ReportController public Page list(Report report) { Page page = reportService.selectReportPage(report, PageFactory.defaultPage()); + //Page page = reportService.getReportList(SecurityUtils.getUsername()); return page; } diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/ReportService.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/ReportService.java index 68a34de..97012af 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/ReportService.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/ReportService.java @@ -209,7 +209,7 @@ public class ReportService extends EsService { private String uploadAttachmentUrl = "http://test.vsp.cqooc.com/open/api/v2/upload/attachment?access_token=ACCESS_TOKEN&appid=APPID&originId=ORIGINID&filename=FILENAME&title=TITLE&remarks=REMARKS"; @Value("${report.getReportListUrl}") - private String getReportListUrl = "http://test.vsp.cqooc.com/open/api/v2/query/data?appId=APPID&accessToken=ACCESS_TOKEN&signature=SIGNATURE&&originId=ORIGINID"; + private String getReportListUrl = "http://test.vsp.cqooc.com/open/api/v2/query/data?appId=APPID&accessToken=ACCESS_TOKEN&signature=SIGNATURE"; @Autowired private RedisCache redisCache; @@ -282,14 +282,17 @@ public class ReportService extends EsService { if(report==null||StringUtils.isBlank(username)){ return AjaxResult.error("参数不能为空！"); } + report.setAppId(appId); MyResponseResult myResponseResult = redisCache.getCacheObject(MyConstants.TOKEN_PREFIX+username); if(myResponseResult!=null&&myResponseResult.getAccessToken()!=null){ + //插入本地数据库 + String id = insertOrUpdateReport(report); report.setAccessToken(myResponseResult.getAccessToken()); String signature = report.getSignature(); signature = Md5Utils.hash(appId+secretKey+report.getAccessToken()).toUpperCase(); report.setSignature(signature); report.setOpenId(myResponseResult.getOpenId()); - report.setOriginId(username); + report.setOriginId(id); RestTemplate restTemplate = new RestTemplate(); ResponseEntity uploadResponseEntity = restTemplate.postForEntity(reportUploadUrl, report, Map.class); Map result = uploadResponseEntity.getBody(); diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/utils/MyObjects.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/utils/MyObjects.java index 955b6fb..906d462 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/utils/MyObjects.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/utils/MyObjects.java @@ -68,10 +68,10 @@ public class MyObjects { } public static String delSpace(String htmlStr){ - htmlStr = htmlStr.replaceAll("\t", "\n"); + htmlStr = htmlStr.replaceAll("\t", ""); htmlStr = htmlStr.replaceAll("\\u3000", ""); - htmlStr = htmlStr.replaceAll("(\\s{4})", "\n"); - htmlStr = htmlStr.replaceAll("\\s", "\n"); + htmlStr = htmlStr.replaceAll("(\\s{4})", ""); + htmlStr = htmlStr.replaceAll("\\s", ""); htmlStr = StringUtils.deleteWhitespace(htmlStr); return htmlStr.trim(); //返回文本字符串 } diff --git a/ruoyi-ui/src/api/biemo/docInfo.js b/ruoyi-ui/src/api/biemo/docInfo.js index fd1a9a8..3f9daa6 100644 --- a/ruoyi-ui/src/api/biemo/docInfo.js +++ b/ruoyi-ui/src/api/biemo/docInfo.js @@ -16,6 +16,13 @@ export function getDocInfo(id) { method: 'get' }) } +// 查询文章管理详细 +export function getInfoDelHtml(id) { + return request({ + url: '/makesoft/docInfo/getInfoDelHtml/' + id, + method: 'get' + }) +} // 新增文章管理 export function addDocInfo(data) { diff --git a/ruoyi-ui/src/views/posTagging/detail.vue b/ruoyi-ui/src/views/posTagging/detail.vue index 5c4f7f4..51fb697 100644 --- a/ruoyi-ui/src/views/posTagging/detail.vue +++ b/ruoyi-ui/src/views/posTagging/detail.vue @@ -129,32 +129,31 @@ - +