diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 0c0a68fd..e877fbd2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -842,7 +842,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe String standardInterpretId = request.getParameter("standardInterpretId"); String standardId = request.getParameter("standardId"); String splitInfoId = request.getParameter("splitInfoId"); + int total = Integer.parseInt(request.getParameter("total")); LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(standardId); + if (list.size() != total){ + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { + throw new JeroBootException("列表数量和导入数量不一致!"); + } else { + throw new JeroBootException("The number of lists is inconsistent with the number of imports!"); + } + } // 字段校验 for (int i = 0; i < list.size(); i++) { list.get(i).setStandardInterpretId(standardInterpretId); diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index c2d37430..8f89a432 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -204,7 +204,7 @@ public class SarFileCompareInfoController extends JeroController add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { sarFileCompareInfoService.add(sarFileCompareInfo); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -219,7 +219,7 @@ public class SarFileCompareInfoController extends JeroController edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { sarFileCompareInfoService.editById(sarFileCompareInfo); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK)); } /** @@ -234,7 +234,7 @@ public class SarFileCompareInfoController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id); if (sarFileCompareInfo == null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } return Result.OK(sarFileCompareInfo); } @@ -321,7 +321,7 @@ public class SarFileCompareInfoController extends JeroController add(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { sarFileCompareItemCommentService.add(sarFileCompareItemComment); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -108,7 +110,7 @@ public class SarFileCompareItemCommentController extends JeroController consensusAssessment(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { sarFileCompareItemCommentService.consensusAssessment(sarFileCompareItemComment); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -123,7 +125,7 @@ public class SarFileCompareItemCommentController extends JeroController edit(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { sarFileCompareItemCommentService.editById(sarFileCompareItemComment); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK)); } /** @@ -138,7 +140,7 @@ public class SarFileCompareItemCommentController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id); if (sarFileCompareItemComment == null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } return Result.OK(sarFileCompareItemComment); } diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java index e0972f58..cc88e410 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.MessageUtils; import com.jero.modules.compare.entity.SarFileCompareItem; import com.jero.modules.compare.service.ISarFileCompareItemService; import io.swagger.annotations.Api; @@ -38,7 +40,7 @@ import java.util.List; public class SarFileCompareItemController extends JeroController { @Autowired private ISarFileCompareItemService sarFileCompareItemService; - + /** * 分页列表查询 * @@ -85,7 +87,7 @@ public class SarFileCompareItemController extends JeroController add(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { sarFileCompareItemService.add(sarFileCompareItem); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -99,7 +101,7 @@ public class SarFileCompareItemController extends JeroController edit(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { sarFileCompareItemService.editById(sarFileCompareItem); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK)); } /** @@ -113,7 +115,7 @@ public class SarFileCompareItemController extends JeroController delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { sarFileCompareItemService.deleteById(id); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } /** @@ -127,7 +129,7 @@ public class SarFileCompareItemController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { this.sarFileCompareItemService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } /** @@ -142,7 +144,7 @@ public class SarFileCompareItemController extends JeroController queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id); if(sarFileCompareItem==null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } return Result.OK(sarFileCompareItem); } diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java index 36f92082..4edd9212 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.MessageUtils; import com.jero.modules.compare.entity.SarFileCompareMenu; import com.jero.modules.compare.service.ISarFileCompareMenuService; import io.swagger.annotations.Api; @@ -37,7 +39,7 @@ import java.util.List; public class SarFileCompareMenuController extends JeroController { @Autowired private ISarFileCompareMenuService sarFileCompareMenuService; - + /** * 分页列表查询 * @@ -84,7 +86,7 @@ public class SarFileCompareMenuController extends JeroController add(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { sarFileCompareMenuService.add(sarFileCompareMenu); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -98,7 +100,7 @@ public class SarFileCompareMenuController extends JeroController edit(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { sarFileCompareMenuService.editById(sarFileCompareMenu); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK)); } /** @@ -112,7 +114,7 @@ public class SarFileCompareMenuController extends JeroController delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { sarFileCompareMenuService.deleteById(id); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } /** @@ -126,7 +128,7 @@ public class SarFileCompareMenuController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { this.sarFileCompareMenuService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } /** @@ -141,7 +143,7 @@ public class SarFileCompareMenuController extends JeroController queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id); if(sarFileCompareMenu==null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } return Result.OK(sarFileCompareMenu); } diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java index 4ef7d928..68a6f79e 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.MessageUtils; import com.jero.modules.compare.entity.SarFileCompareResComVO; import com.jero.modules.compare.entity.SarFileCompareResComment; import com.jero.modules.compare.service.ISarFileCompareResCommentService; @@ -87,7 +89,7 @@ public class SarFileCompareResCommentController extends JeroController add(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { sarFileCompareResCommentService.add(sarFileCompareResComment); - return Result.OK("添加成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -101,7 +103,7 @@ public class SarFileCompareResCommentController extends JeroController edit(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { sarFileCompareResCommentService.editById(sarFileCompareResComment); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK)); } /** @@ -115,7 +117,7 @@ public class SarFileCompareResCommentController extends JeroController delete(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { sarFileCompareResCommentService.deleteById(id); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } /** @@ -129,7 +131,7 @@ public class SarFileCompareResCommentController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name = "ids", required = true) String ids) { this.sarFileCompareResCommentService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } /** @@ -144,7 +146,7 @@ public class SarFileCompareResCommentController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id); if (sarFileCompareResComment == null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } return Result.OK(sarFileCompareResComment); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 550582c3..bb301869 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -376,6 +376,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { String applicableComponents = (String) map.get("part_name"); List partNames = IPartNameService.queryEcho(applicableComponents); map.put("part_name_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); + map.put("part_name_dictTextEn", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); } // 属性标识翻译 if (map.containsKey("property_tag")){ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java index b90d2587..864286e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java @@ -1,6 +1,8 @@ package com.jero.modules.laws.ocr.controller; import com.alibaba.fastjson.JSON; +import com.jero.common.api.vo.ResultCommon; +import com.jero.common.util.MessageUtils; import com.jero.common.util.MinioUtil; import com.jero.common.util.obs.ObsBootUtil; import com.jero.modules.laws.ocr.MD5Util; @@ -142,7 +144,7 @@ public class OCRRestfulController extends BaseController { ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add"); } else { - return Result.error("0","无法找到该文件",null); + return Result.error("0", MessageUtils.getMessage(ResultCommon.ERROR),null); } } @@ -165,7 +167,7 @@ public class OCRRestfulController extends BaseController { ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update"); } else { - return Result.error("0","无法找到该文件",null); + return Result.error("0",MessageUtils.getMessage(ResultCommon.ERROR),null); } } } @@ -177,9 +179,9 @@ public class OCRRestfulController extends BaseController { String[] idArr = ids.split(","); List idList = Arrays.asList(idArr); int i = ocrRecordEOService.deleteByIds(idList); - return Result.success("0","删除成功",i); + return Result.success("0",MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED),i); } else { - return Result.error("删除数据不能为空"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java index 316271b9..fd22d1d6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java @@ -162,7 +162,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { logger.info("保存文件"); if(wordFile!=null && !wordFile.isEmpty()){ // String wordUrl = MinioUtil.upload(wordFile, "/temp"); - String wordUrl = ObsBootUtil.upload(wordFile, "/temp"); + String wordUrl = ObsBootUtil.upload(wordFile, "temp"); OSSFile ossFile = new OSSFile(); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setFileName(wordFile.getOriginalFilename()); @@ -173,7 +173,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { } if(jsonFile!=null && !jsonFile.isEmpty()){ // String jsonUrl = MinioUtil.upload(jsonFile, "/temp"); - String jsonUrl = ObsBootUtil.upload(wordFile, "/temp"); + String jsonUrl = ObsBootUtil.upload(wordFile, "temp"); OSSFile ossFile = new OSSFile(); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setFileName(jsonFile.getOriginalFilename()); diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 95a82a3d..30226e75 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -82,9 +82,9 @@ public class FileSplitItemsEOController extends JeroController 0) { - return Result.OK("新增成功", parameter); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), parameter); } else { - return Result.error("新增失败"); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index 0af87117..c188d838 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -57,7 +57,7 @@ public class SarFileSplitMenuEOController extends JeroController create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO); - return Result.OK("新增成功",sarFileSplitMenuEO); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK),sarFileSplitMenuEO); } @ApiOperation(value = "标准拆分条款目录-修改Y") @@ -65,7 +65,7 @@ public class SarFileSplitMenuEOController extends JeroController update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO); - return Result.OK("修改成功",sarFileSplitMenuEO); + return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK),sarFileSplitMenuEO); } @ApiOperation(value = "标准拆分条款目录-修改层级") @@ -91,6 +91,6 @@ public class SarFileSplitMenuEOController extends JeroController