From e755357cd61a96727e051df6238a6bed42aa2868 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 19 Apr 2022 15:09:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=86=E5=88=86-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrCheckController.java | 3 + .../ocr/controller/OcrRecordEOController.java | 1 + .../ocr/controller/PageOfficeController.java | 82 ------------------- .../FileSplitItemsEOController.java | 33 ++++++++ .../SarFileSplitInfoController.java | 33 ++++++++ .../src/main/resources/templates/index.html | 13 --- .../src/main/resources/templates/word.html | 70 ---------------- 7 files changed, 70 insertions(+), 165 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/PageOfficeController.java delete mode 100644 jero-boot/jero-boot-modules/src/main/resources/templates/index.html delete mode 100644 jero-boot/jero-boot-modules/src/main/resources/templates/word.html diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrCheckController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrCheckController.java index 3d2992248..13be99064 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrCheckController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrCheckController.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -93,6 +94,7 @@ public class OcrCheckController { @ApiOperation(value = "验证文档是否被锁定") @GetMapping("/verifyCheckFlag") + @RequiresPermissions("ocr:ocrCheck:editor") public Result verifyCheckFlag(String id) { if(StringUtils.isBlank(id)){ return Result.error("参数不能为空"); @@ -111,6 +113,7 @@ public class OcrCheckController { @ApiOperation(value = "编辑文件") @RequestMapping("/editorFile") + @RequiresPermissions("ocr:ocrCheck:editor") public ModelAndView index(HttpServletRequest request, HttpServletResponse response, Model model) throws Exception { String fileName = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java index b34da628d..aa911028d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -141,6 +141,7 @@ public class OcrRecordEOController extends JeroController>> getForm(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = ocrRecordService.getForm(flag, cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/PageOfficeController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/PageOfficeController.java deleted file mode 100644 index 38e99e079..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/PageOfficeController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.jero.modules.ocr.controller; - -import com.jero.common.aspect.annotation.AutoLog; -import com.zhuozhengsoft.pageoffice.FileSaver; -import com.zhuozhengsoft.pageoffice.OpenModeType; -import com.zhuozhengsoft.pageoffice.PageOfficeCtrl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -/** - * @Description: - * @Author: yangxuenan - * date: 2019/12/30 10:53 - */ -@RestController -@RequestMapping("/ocr/pageOffice") -@Api(tags="pageoffice接口") -@Slf4j -public class PageOfficeController { - - @AutoLog(value = "pageoffice-主页") - @ApiOperation(value="pageoffice-主页", notes="pageoffice-主页") - @RequestMapping(value="/index", method= RequestMethod.GET) - public ModelAndView showIndex(){ - ModelAndView mv = new ModelAndView("index"); - return mv; - } - - /** - * office online打开 - * - * @param request - * @param map - * @return - */ - @AutoLog(value = "pageoffice-在线编辑") - @ApiOperation(value="pageoffice-在线编辑", notes="pageoffice-在线编辑") - @RequestMapping(value="/word", method=RequestMethod.GET) - public ModelAndView showWord(HttpServletRequest request, Map map){ - - //--- PageOffice的调用代码 开始 ----- - PageOfficeCtrl poCtrl=new PageOfficeCtrl(request); - poCtrl.setServerPage("/poserver.zz");//设置授权程序servlet - poCtrl.addCustomToolButton("保存","Save()",1); //添加自定义按钮 - poCtrl.addCustomToolButton("打印", "PrintFile()", 6); - poCtrl.addCustomToolButton("全屏/还原", "IsFullScreen()", 4); - poCtrl.addCustomToolButton("关闭", "CloseFile()", 21); - poCtrl.setSaveFilePage("/save");//设置保存的action - poCtrl.webOpen("D:\\test.docx", OpenModeType.docAdmin,"张三"); - poCtrl.setCaption("信息平台"); - map.put("pageoffice",poCtrl.getHtmlCode("PageOfficeCtrl1")); - //--- PageOffice的调用代码 结束 ----- - ModelAndView mv = new ModelAndView("word"); - return mv; - } - - /** - * 保存office - * - * @param request - * @param response - */ - @RequestMapping("/save") - public void saveFile(HttpServletRequest request, HttpServletResponse response){ - FileSaver fs = new FileSaver(request, response); - //保存文件 - fs.saveToFile("D:\\test.docx"); - fs.close(); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 810c86f2b..c51ca5b84 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.lanswitch.service.ILanguageSwitchService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; @@ -43,6 +44,9 @@ public class FileSplitItemsEOController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = languageSwitchService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "查询条件中英文切换") + @ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换") + @GetMapping(value = "/queryCondition") + @RequiresPermissions("split:sarFileSplitItems:page") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = languageSwitchService.queryCondition(flag, cut); + return Result.OK(list); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index 6609f7fc7..b31d4322b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.lanswitch.service.ILanguageSwitchService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.page.SarFileSplitInfoEOPage; import com.jero.modules.split.service.ISarFileSplitInfoService; @@ -44,6 +45,9 @@ public class SarFileSplitInfoController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = languageSwitchService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "查询条件中英文切换") + @ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换") + @GetMapping(value = "/queryCondition") + @RequiresPermissions("split:sarFileSplitInfo:page") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = languageSwitchService.queryCondition(flag, cut); + return Result.OK(list); + } } diff --git a/jero-boot/jero-boot-modules/src/main/resources/templates/index.html b/jero-boot/jero-boot-modules/src/main/resources/templates/index.html deleted file mode 100644 index f3e728254..000000000 --- a/jero-boot/jero-boot-modules/src/main/resources/templates/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Title - - - - - -打开文件 - - diff --git a/jero-boot/jero-boot-modules/src/main/resources/templates/word.html b/jero-boot/jero-boot-modules/src/main/resources/templates/word.html deleted file mode 100644 index af702b72b..000000000 --- a/jero-boot/jero-boot-modules/src/main/resources/templates/word.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - Title - - - - - - - -
- - - From e4df5670f3420425675bdfad4921af2afcced908 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 19 Apr 2022 15:45:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[uodate]=20=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/splitting/index.vue | 4 ++-- .../views/documentManage/splitting/modules/SplitDetail.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index e3c7ef46f..3cfe77f89 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -118,8 +118,8 @@ } //删除 ], url:{ - tableHeader: 'language/switch/getHeader', //表格头部字段 - seachList: 'language/switch/queryCondition', //搜索字段 + tableHeader: 'split/sarFileSplitInfo/getHeader', //表格头部字段 + seachList: 'split/sarFileSplitInfo/queryCondition', //搜索字段 tableList: 'split/sarFileSplitInfo/page', //表格数据 // getAddForm: 'ocr/ocrRecord/getForm', // 表单的字段 // addInfo: 'ocr/OcrRestful/addOcrRecord', //新增 diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index f43dcd7a2..0ee03a315 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -258,10 +258,10 @@ } //删除 ], url:{ - tableHeader: 'language/switch/getHeader', //表格头部字段 - seachList: 'language/switch/queryCondition', //搜索字段 + tableHeader: 'split/sarFileSplitItems/getHeader', //表格头部字段 + seachList: 'split/sarFileSplitItems/queryCondition', //搜索字段 tableList: 'split/sarFileSplitItems/getSplitItemsByPage', //表格数据 - getAddForm: 'language/switch/getForm', // 表单的字段 + getAddForm: 'split/sarFileSplitItems/getForm', // 表单的字段 addInfo: '/jero-boot/split/sarFileSplitItems/addSplitItems', //新增 updateInfo:'/jero-boot/split/sarFileSplitItems/updateSplitItems', //编辑 getDocumentInfo:'split/sarFileSplitItems/getSplitItemsById',