QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88386):双语提示

Browse Source
This commit is contained in:
yjz
2024-08-13 10:13:30 +08:00
parent 15a55ca3c3
commit 8f957cee33
11 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+8
View File
@@ -842,7 +842,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
String standardInterpretId = request.getParameter("standardInterpretId"); String standardInterpretId = request.getParameter("standardInterpretId");
String standardId = request.getParameter("standardId"); String standardId = request.getParameter("standardId");
String splitInfoId = request.getParameter("splitInfoId"); String splitInfoId = request.getParameter("splitInfoId");
int total = Integer.parseInt(request.getParameter("total"));
LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(standardId); 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++) { for (int i = 0; i < list.size(); i++) {
list.get(i).setStandardInterpretId(standardInterpretId); list.get(i).setStandardInterpretId(standardInterpretId);
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+6 -6
View File
@@ -204,7 +204,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
public Result<?> add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { public Result<?> add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) {
sarFileCompareInfoService.add(sarFileCompareInfo); sarFileCompareInfoService.add(sarFileCompareInfo);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -219,7 +219,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
public Result<?> edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { public Result<?> edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) {
sarFileCompareInfoService.editById(sarFileCompareInfo); sarFileCompareInfoService.editById(sarFileCompareInfo);
return Result.OK("编辑成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK));
} }
/** /**
@@ -234,7 +234,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
// 水平越权 // 水平越权
sarFileCompareInfoService.isHorizontalOverstep(mapBody.getId()); sarFileCompareInfoService.isHorizontalOverstep(mapBody.getId());
sarFileCompareInfoService.deleteById(mapBody.getId()); sarFileCompareInfoService.deleteById(mapBody.getId());
return Result.OK("删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
} }
/** /**
@@ -249,7 +249,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
// 水平越权 // 水平越权
sarFileCompareInfoService.isHorizontalOverstep(mapBody.getIds()); sarFileCompareInfoService.isHorizontalOverstep(mapBody.getIds());
this.sarFileCompareInfoService.deleteByIds(Arrays.asList(mapBody.getIds().split(","))); this.sarFileCompareInfoService.deleteByIds(Arrays.asList(mapBody.getIds().split(",")));
return Result.OK("批量删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
} }
/** /**
@@ -265,7 +265,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id); SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id);
if (sarFileCompareInfo == null) { if (sarFileCompareInfo == null) {
return Result.error("未找到对应数据"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
return Result.OK(sarFileCompareInfo); return Result.OK(sarFileCompareInfo);
} }
@@ -321,7 +321,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
return r; return r;
} catch (Exception ex) { } catch (Exception ex) {
log.error("发起文档对比失败：" + ex.getMessage()); log.error("发起文档对比失败：" + ex.getMessage());
return Result.error("发起文档对比失败!" + ex.getMessage()); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)+ "!" + ex.getMessage());
} }
} }
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
+8 -6
View File
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; 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.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils;
import com.jero.modules.compare.entity.SarFileCompareItemComment; import com.jero.modules.compare.entity.SarFileCompareItemComment;
import com.jero.modules.compare.entity.SarFileCompareResultVO; import com.jero.modules.compare.entity.SarFileCompareResultVO;
import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareInfoService;
@@ -95,7 +97,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { public Result<?> add(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) {
sarFileCompareItemCommentService.add(sarFileCompareItemComment); sarFileCompareItemCommentService.add(sarFileCompareItemComment);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -108,7 +110,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
@PostMapping(value = "/consensusAssessment") @PostMapping(value = "/consensusAssessment")
public Result<?> consensusAssessment(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { public Result<?> consensusAssessment(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) {
sarFileCompareItemCommentService.consensusAssessment(sarFileCompareItemComment); sarFileCompareItemCommentService.consensusAssessment(sarFileCompareItemComment);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -123,7 +125,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { public Result<?> edit(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) {
sarFileCompareItemCommentService.editById(sarFileCompareItemComment); sarFileCompareItemCommentService.editById(sarFileCompareItemComment);
return Result.OK("编辑成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK));
} }
/** /**
@@ -138,7 +140,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.getById(mapBody.getId()); SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.getById(mapBody.getId());
sarFileCompareInfoService.isHorizontalOverstep(sarFileCompareItemComment.getInfoId()); sarFileCompareInfoService.isHorizontalOverstep(sarFileCompareItemComment.getInfoId());
sarFileCompareItemCommentService.deleteById(mapBody.getId()); sarFileCompareItemCommentService.deleteById(mapBody.getId());
return Result.OK("删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
} }
/** /**
@@ -154,7 +156,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
String infoIds = sarFileCompareItemComments.stream().map(SarFileCompareItemComment::getInfoId).collect(Collectors.joining(",")); String infoIds = sarFileCompareItemComments.stream().map(SarFileCompareItemComment::getInfoId).collect(Collectors.joining(","));
sarFileCompareInfoService.isHorizontalOverstep(infoIds); sarFileCompareInfoService.isHorizontalOverstep(infoIds);
this.sarFileCompareItemCommentService.deleteByIds(list); this.sarFileCompareItemCommentService.deleteByIds(list);
return Result.OK("批量删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
} }
/** /**
@@ -169,7 +171,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id); SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id);
if (sarFileCompareItemComment == null) { if (sarFileCompareItemComment == null) {
return Result.error("未找到对应数据"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
return Result.OK(sarFileCompareItemComment); return Result.OK(sarFileCompareItemComment);
} }
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java
+7 -5
View File
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; 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.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; 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.entity.SarFileCompareItem;
import com.jero.modules.compare.service.ISarFileCompareItemService; import com.jero.modules.compare.service.ISarFileCompareItemService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -85,7 +87,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { public Result<?> add(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) {
sarFileCompareItemService.add(sarFileCompareItem); sarFileCompareItemService.add(sarFileCompareItem);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -99,7 +101,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { public Result<?> edit(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) {
sarFileCompareItemService.editById(sarFileCompareItem); sarFileCompareItemService.editById(sarFileCompareItem);
return Result.OK("编辑成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK));
} }
/** /**
@@ -113,7 +115,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
sarFileCompareItemService.deleteById(id); sarFileCompareItemService.deleteById(id);
return Result.OK("删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
} }
/** /**
@@ -127,7 +129,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) {
this.sarFileCompareItemService.deleteByIds(Arrays.asList(ids.split(","))); 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<SarFileCompareI
public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id); SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id);
if(sarFileCompareItem==null) { if(sarFileCompareItem==null) {
return Result.error("未找到对应数据"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
return Result.OK(sarFileCompareItem); return Result.OK(sarFileCompareItem);
} }
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java
+7 -5
View File
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; 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.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; 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.entity.SarFileCompareMenu;
import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.service.ISarFileCompareMenuService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -84,7 +86,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { public Result<?> add(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) {
sarFileCompareMenuService.add(sarFileCompareMenu); sarFileCompareMenuService.add(sarFileCompareMenu);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -98,7 +100,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { public Result<?> edit(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) {
sarFileCompareMenuService.editById(sarFileCompareMenu); sarFileCompareMenuService.editById(sarFileCompareMenu);
return Result.OK("编辑成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK));
} }
/** /**
@@ -112,7 +114,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
sarFileCompareMenuService.deleteById(id); sarFileCompareMenuService.deleteById(id);
return Result.OK("删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
} }
/** /**
@@ -126,7 +128,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) {
this.sarFileCompareMenuService.deleteByIds(Arrays.asList(ids.split(","))); 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<SarFileCompareM
public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id); SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id);
if(sarFileCompareMenu==null) { if(sarFileCompareMenu==null) {
return Result.error("未找到对应数据"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
return Result.OK(sarFileCompareMenu); return Result.OK(sarFileCompareMenu);
} }
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java
+7 -5
View File
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; 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.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; 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.SarFileCompareResComVO;
import com.jero.modules.compare.entity.SarFileCompareResComment; import com.jero.modules.compare.entity.SarFileCompareResComment;
import com.jero.modules.compare.service.ISarFileCompareResCommentService; import com.jero.modules.compare.service.ISarFileCompareResCommentService;
@@ -87,7 +89,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
@RequiresPermissions("docComparison:result:comment") @RequiresPermissions("docComparison:result:comment")
public Result<?> add(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { public Result<?> add(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) {
sarFileCompareResCommentService.add(sarFileCompareResComment); sarFileCompareResCommentService.add(sarFileCompareResComment);
return Result.OK("添加成功！"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -101,7 +103,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { public Result<?> edit(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) {
sarFileCompareResCommentService.editById(sarFileCompareResComment); sarFileCompareResCommentService.editById(sarFileCompareResComment);
return Result.OK("编辑成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK));
} }
/** /**
@@ -115,7 +117,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<?> delete(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { public Result<?> delete(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
sarFileCompareResCommentService.deleteById(id); sarFileCompareResCommentService.deleteById(id);
return Result.OK("删除成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
} }
/** /**
@@ -129,7 +131,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name = "ids", required = true) String ids) {
this.sarFileCompareResCommentService.deleteByIds(Arrays.asList(ids.split(","))); 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<SarFileCo
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id); SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id);
if (sarFileCompareResComment == null) { if (sarFileCompareResComment == null) {
return Result.error("未找到对应数据"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
return Result.OK(sarFileCompareResComment); return Result.OK(sarFileCompareResComment);
} }
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+1
View File
@@ -376,6 +376,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
String applicableComponents = (String) map.get("part_name"); String applicableComponents = (String) map.get("part_name");
List<PartName> partNames = IPartNameService.queryEcho(applicableComponents); List<PartName> partNames = IPartNameService.queryEcho(applicableComponents);
map.put("part_name_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); 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")){ if (map.containsKey("property_tag")){
laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java
+6 -4
View File
@@ -1,6 +1,8 @@
package com.jero.modules.laws.ocr.controller; package com.jero.modules.laws.ocr.controller;
import com.alibaba.fastjson.JSON; 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.MinioUtil;
import com.jero.common.util.obs.ObsBootUtil; import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.laws.ocr.MD5Util; import com.jero.modules.laws.ocr.MD5Util;
@@ -142,7 +144,7 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile); ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile);
return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add"); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add");
} else { } else {
return Result.error("0","无法找到该文件",null); return Result.error("0", MessageUtils.getMessage(ResultCommon.ERROR),null);
} }
} }
@@ -165,7 +167,7 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile); ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile);
return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update"); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update");
} else { } else {
return Result.error("0","无法找到该文件",null); return Result.error("0",MessageUtils.getMessage(ResultCommon.ERROR),null);
} }
} }
} }
@@ -177,9 +179,9 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
String[] idArr = ids.split(","); String[] idArr = ids.split(",");
List<String> idList = Arrays.asList(idArr); List<String> idList = Arrays.asList(idArr);
int i = ocrRecordEOService.deleteByIds(idList); int i = ocrRecordEOService.deleteByIds(idList);
return Result.success("0","删除成功",i); return Result.success("0",MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED),i);
} else { } else {
return Result.error("删除数据不能为空"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
} }
laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java
+2 -2
View File
@@ -162,7 +162,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
logger.info("保存文件"); logger.info("保存文件");
if(wordFile!=null && !wordFile.isEmpty()){ if(wordFile!=null && !wordFile.isEmpty()){
// String wordUrl = MinioUtil.upload(wordFile, "/temp"); // String wordUrl = MinioUtil.upload(wordFile, "/temp");
String wordUrl = ObsBootUtil.upload(wordFile, "/temp"); String wordUrl = ObsBootUtil.upload(wordFile, "temp");
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(wordFile.getOriginalFilename()); ossFile.setFileName(wordFile.getOriginalFilename());
@@ -173,7 +173,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
} }
if(jsonFile!=null && !jsonFile.isEmpty()){ if(jsonFile!=null && !jsonFile.isEmpty()){
// String jsonUrl = MinioUtil.upload(jsonFile, "/temp"); // String jsonUrl = MinioUtil.upload(jsonFile, "/temp");
String jsonUrl = ObsBootUtil.upload(wordFile, "/temp"); String jsonUrl = ObsBootUtil.upload(wordFile, "temp");
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(jsonFile.getOriginalFilename()); ossFile.setFileName(jsonFile.getOriginalFilename());
laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+2 -2
View File
@@ -82,9 +82,9 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
} }
int resultCount = fileSplitItemsEOService.addItemContent(parameter); int resultCount = fileSplitItemsEOService.addItemContent(parameter);
if (resultCount > 0) { if (resultCount > 0) {
return Result.OK("新增成功", parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK), parameter);
} else { } else {
return Result.error("新增失败"); return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
} }
} }
laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+3 -3
View File
@@ -57,7 +57,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
@RequiresPermissions("split:sarFileSplitMenu:add") @RequiresPermissions("split:sarFileSplitMenu:add")
public Result<SarFileSplitMenuEO> create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { public Result<SarFileSplitMenuEO> create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO); sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO);
return Result.OK("新增成功",sarFileSplitMenuEO); return Result.OK(MessageUtils.getMessage(ResultCommon.OK),sarFileSplitMenuEO);
} }
@ApiOperation(value = "标准拆分条款目录-修改Y") @ApiOperation(value = "标准拆分条款目录-修改Y")
@@ -65,7 +65,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
@RequiresPermissions("split:sarFileSplitMenu:update") @RequiresPermissions("split:sarFileSplitMenu:update")
public Result<SarFileSplitMenuEO> update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { public Result<SarFileSplitMenuEO> update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO); sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO);
return Result.OK("修改成功",sarFileSplitMenuEO); return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK),sarFileSplitMenuEO);
} }
@ApiOperation(value = "标准拆分条款目录-修改层级") @ApiOperation(value = "标准拆分条款目录-修改层级")
@@ -91,6 +91,6 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
SarFileSplitMenuEO sarFileSplitMenuEO = sarFileSplitMenuEOMapper.selectByPrimaryKey(id); SarFileSplitMenuEO sarFileSplitMenuEO = sarFileSplitMenuEOMapper.selectByPrimaryKey(id);
documentSplitService.isHorizontalOverstep(sarFileSplitMenuEO.getInfoId()); documentSplitService.isHorizontalOverstep(sarFileSplitMenuEO.getInfoId());
sarFileSplitMenuEOService.deleteMenu(id); sarFileSplitMenuEOService.deleteMenu(id);
return Result.OK("删除成功",null); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED),null);
} }
} }