ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加英文返回值

Browse Source
This commit is contained in:
caozhen
2023-09-11 14:03:43 +08:00
parent 3c09c52e6b
commit 6fb3ff6f17
2 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
+13 -6
View File
@@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.service.ILawsWorkingGroupService;
import lombok.extern.slf4j.Slf4j;
@@ -57,7 +59,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
public Result<LawsWorkingGroup> queryById(@RequestParam(name="id",required=true) String id) {
LawsWorkingGroup lawsWorkingGroup = lawsWorkingGroupService.queryById(id);
if(lawsWorkingGroup==null) {
return Result.error("未找到对应数据");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "No corresponding data found" : "未找到对应数据");
}
// 通过递归查找所有子节点数据
List<LawsWorkingGroup> list = lawsWorkingGroupService.realList();
@@ -82,7 +84,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
}
lawsWorkingGroup.setDelFlag("0");
lawsWorkingGroupService.add(lawsWorkingGroup);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -93,7 +95,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
@PostMapping(value = "/edit")
public Result<T> edit(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) {
lawsWorkingGroupService.editById(lawsWorkingGroup);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -104,9 +106,14 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
}
List<String> ids = new ArrayList<>();
//不能删除根节点
LawsWorkingGroup group = lawsWorkingGroupService.getById(map.get("id"));
if (StringUtils.isBlank(group.getPid())){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "The top-level group cannot be deleted!" : "最高级组别不能删除!");
}
List<String> ids = new ArrayList<>();
List<LawsWorkingGroup> list = lawsWorkingGroupService.realList();
ids = lawsWorkingGroupService.allChildIdById(list, map.get("id"), ids);
if (ids.size() > 0){
@@ -115,7 +122,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
wrapper.set(LawsWorkingGroup::getDelFlag, "1");
lawsWorkingGroupService.update(wrapper);
}
return Result.OK("删除成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+32 -19
View File
@@ -15,6 +15,8 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.service.ILawsWorkingGroupUserService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -90,20 +92,31 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@PostMapping(value = "/add")
public Result<T> add(@Validated @RequestBody LawsWorkingGroupUser lawsWorkingGroupUser) {
if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())){
return Result.error("请选择人员和工作组!");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select personnel and workgroup" : "请选择人员和工作组!");
}
String userId = lawsWorkingGroupUser.getUserId();
List<String> asList = Arrays.asList(userId.split(","));
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.eq(LawsWorkingGroupUser::getUserId, lawsWorkingGroupUser.getUserId());
wrapper.in(LawsWorkingGroupUser::getUserId, asList);
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId());
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list();
if (list.size() > 0){
String workNo = list.get(0).getUserWorkNo();
return Result.error("工号" + workNo + "已存在!");
String workNo;
List<String> collect = list.stream().map(LawsWorkingGroupUser::getUserId).distinct().collect(Collectors.toList());
StringJoiner joiner = new StringJoiner(",");
for (String id : collect) {
SysUser sysUser = sysUserService.getById(id);
if (sysUser != null && StringUtils.isNotBlank(sysUser.getWorkNo())) {
joiner.add(sysUser.getWorkNo());
}
}
workNo = joiner.toString();
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Job number" + workNo + "already exists!" : "工号" + workNo + "已存在!");
}
lawsWorkingGroupUser.setDelFlag("0");
lawsWorkingGroupUserService.add(lawsWorkingGroupUser);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -114,12 +127,12 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
}
LawsWorkingGroupUser groupUser = lawsWorkingGroupUserService.getById(map.get("id"));
groupUser.setDelFlag("1");
lawsWorkingGroupUserService.updateById(groupUser);
return Result.OK("删除成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
@@ -133,14 +146,14 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
String fileName = file.getOriginalFilename();
// 上传文件为空
if (StringUtils.isEmpty(fileName)) {
return Result.error("没有导入文件");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "No files imported" : "没有导入文件");
}
if (StringUtils.isBlank(workingGroupId)) {
return Result.error("请选择工作组进行导入！");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select a workgroup to import!" : "请选择工作组进行导入！");
}
// 上传文件名格式不正确
if (fileName.lastIndexOf(".") != -1 && !".xlsx".equals(fileName.substring(fileName.lastIndexOf(".")))) {
return Result.error("文件名格式不正确, 请使用后缀名为.xlsx的文件");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "The file name format is incorrect. Please use a file with the suffix .xlsx" : "文件名格式不正确, 请使用后缀名为.xlsx的文件");
}
InputStream inputStream = file.getInputStream();
List<LawsWorkingGroupUser> all;
@@ -148,15 +161,15 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
ExcelReader excelReader = ExcelUtil.getReader(inputStream, "sheet1");
List<Map<String, Object>> maps = excelReader.readAll();
if (maps.size() < 1) {
return Result.error("导入数据不能为空！");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import data cannot be empty!" : "导入数据不能为空！");
}
// 校验表头，同时映射对象字段
if (!validateHeader(excelReader)) {
return Result.error("导入失败，表头与模板不一致");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import failed, header inconsistent with template" : "导入失败，表头与模板不一致");
}
all = excelReader.readAll(LawsWorkingGroupUser.class);
} catch (Exception e) {
return Result.error("导入失败，数据格式未按照示例规范导入！");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import failed, data format not imported according to sample specifications!" : "导入失败，数据格式未按照示例规范导入！");
}
//校验导入正确性，msg是错误信息
String msg = importExcelCheck(all);
@@ -171,7 +184,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
groupUser.setDelFlag("0");
}
lawsWorkingGroupUserService.saveBatch(all);
return Result.OK("导入成功！");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -183,10 +196,10 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
public Result<?> template(@RequestBody LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletResponse response) {
String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
if (StringUtils.isBlank(workingGroupId)) {
return Result.error("请选择工作组进行导出！");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select a workgroup for export" : "请选择工作组进行导出！");
}
String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
String outFileName = MessageUtils.getLanguage().equals("EN") ? "Internal Work Group Personnel Table" + System.currentTimeMillis() + ".xlsx" : "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
String ENCODING = "UTF-8";
ExcelWriter writer = ExcelUtil.getWriter(true);
@@ -282,13 +295,13 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
LawsWorkingGroupUser lawsWorkingGroupUser = all.get(i);
String userWorkNo = lawsWorkingGroupUser.getUserWorkNo();
if (userWorkNo == null || userWorkNo.trim().isEmpty()) {
return "第" + index + "行,工号不能为空";
return MessageUtils.getLanguage().equals("EN") ? "The" + index + "line,job number cannot be empty" : "第" + index + "行,工号不能为空";
}
if (!isValidWorkNo(userWorkNo)) {
return "第" + index + "行," + userWorkNo + "工号不存在";
return MessageUtils.getLanguage().equals("EN") ? "The" + index + "line,the job number does not exist" : "第" + index + "行," + userWorkNo + "工号不存在";
}
if (!existingWorkNos.add(userWorkNo)) {
return "第" + index + "行,工号重复";
return MessageUtils.getLanguage().equals("EN") ? "Line" + index + ",duplicate job number" : "第" + index + "行,工号重复";
}
return null;
}).filter(error -> error != null).collect(Collectors.toList());