翻译

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuditWorkflowSettingController.java

@@ -62,7 +62,7 @@ public class AuditWorkflowSettingController {
                 if (auditWorkflowTimeSetting.getAuditDeptId() != null) {
                     if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError(MessageUtils.message("departmentDuplicate", auditWorkflowTimeSetting.getAuditDeptName()));
+                        msg.setError(MessageUtils.message("department.duplicateError", auditWorkflowTimeSetting.getAuditDeptName()));
                         return msg;
                     } else {
                         auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuditWorkflowTimeSettingController.java

@@ -12,6 +12,7 @@ import com.management.platform.mapper.DepartmentMapper;
 import com.management.platform.mapper.ReportMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -61,7 +62,7 @@ public class AuditWorkflowTimeSettingController {
                 AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
                 if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
                     HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError("保存失败： 部门["+auditWorkflowTimeSetting.getAuditDeptName()+"]存在重复");
+                    msg.setError(MessageUtils.message("department.duplicateError",auditWorkflowTimeSetting.getAuditDeptName()));
                     return msg;
                 } else {
                     auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());
@@ -95,7 +96,7 @@ public class AuditWorkflowTimeSettingController {
             //要删除的部门节点是存在的，需要检测是否有待审核的走到这个流程点了
             long num = reportMapper.selectCount(new QueryWrapper<Report>().eq("state", 0).eq("is_dept_audit", 1).eq("audit_deptid", auditDeptId));
             if (num > 0) {
-                msg.setError("当前部门存在待审核报告，无法操作!");
+                msg.setError(MessageUtils.message("department.reviewedError"));
             }
         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -11,6 +11,7 @@ import com.management.platform.mapper.CompanyMapper;
 import com.management.platform.mapper.SysConfigMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import com.management.platform.util.UserAgentUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +82,8 @@ public class AuthRedirectController {
                 reqParam.put("userId", curUser.getId());
             } else {
                 //提示账号已停用
-                reqParam.put("errorMsg", "您的账号已停用，无法登录");
+                //reqParam.put("errorMsg", "您的账号已停用，无法登录");
+                reqParam.put("errorMsg", MessageUtils.message("user.inactive"));
             }
         }
         reqParam.put("hasTriedAutoLogin", 1);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/BustripProjectController.java

@@ -12,6 +12,7 @@ import com.management.platform.mapper.ReportExtraDegreeMapper;
 import com.management.platform.service.BusinessTripService;
 import com.management.platform.service.BustripProjectService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -49,14 +50,17 @@ public class BustripProjectController {
         BusinessTrip businessTrip = businessTripMapper.selectById(item.getBustripId());
         //检查时间段不能超出总时间段的显示
         if (item.getStartDate() == null || item.getEndDate() == null) {
-            msg.setError("开始日期和结束日期不能为空");
+            //msg.setError("开始日期和结束日期不能为空");
+            msg.setError(MessageUtils.message("date.dateNullError"));
         } else {
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             //校验比对日期
             if (item.getStartDate().isBefore(businessTrip.getStartDate())) {
-                msg.setError("开始日期不得早于"+dtf.format(businessTrip.getStartDate()));
+                //msg.setError("开始日期不得早于"+dtf.format(businessTrip.getStartDate()));
+                msg.setError(MessageUtils.message("date.startDateError",dtf.format(businessTrip.getStartDate())));
             } else if (item.getEndDate().isAfter(businessTrip.getEndDate())) {
-                msg.setError("结束日期不得晚于"+dtf.format(businessTrip.getEndDate()));
+                //msg.setError("结束日期不得晚于"+dtf.format(businessTrip.getEndDate()));
+                msg.setError(MessageUtils.message("date.endDateError",dtf.format(businessTrip.getEndDate())));
             } else {
                 if (item.getDegreeId() != null) {
                     String name = reportExtraDegreeMapper.selectById(item.getDegreeId()).getName();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/CompanyCertController.java

@@ -9,6 +9,7 @@ import com.management.platform.entity.UserCert;
 import com.management.platform.mapper.*;
 import com.management.platform.mapper.CompanyCertMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -43,7 +44,8 @@ public class CompanyCertController {
     public HttpRespMsg addOrMod(CompanyCert setting) {
         HttpRespMsg msg = new HttpRespMsg();
         if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
+            //msg.setError("名称不能为空");
+            msg.setError(MessageUtils.message("Company.nullNameError"));
             return msg;
         }
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
@@ -51,7 +53,8 @@ public class CompanyCertController {
             setting.setCompanyId(companyId);
             int count = companyCertMapper.selectCount(new QueryWrapper<CompanyCert>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("Company.nameRepeat"));
             } else {
                 companyCertMapper.insert(setting);
                 msg.data = companyCertMapper.selectList(new QueryWrapper<CompanyCert>().eq("company_id", companyId));
@@ -60,7 +63,8 @@ public class CompanyCertController {
             int count = companyCertMapper.selectCount(new QueryWrapper<CompanyCert>().eq("name", setting.getName())
                     .eq("company_id", companyId).ne("id", setting.getId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("Company.nameRepeat"));
             } else {
                 //检查名称是否有变化
                 CompanyCert oldSetting = companyCertMapper.selectById(setting.getId());
@@ -94,7 +98,8 @@ public class CompanyCertController {
         CompanyCert CompanyCert = companyCertMapper.selectById(id);
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
         if (!CompanyCert.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("Company.accessError"));
         } else {
             companyCertMapper.deleteById(id);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/CompanyController.java

@@ -12,6 +12,7 @@ import com.management.platform.service.CompanyService;
 import com.management.platform.service.DingDingService;
 import com.management.platform.service.ExpenseTypeService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import com.taobao.api.ApiException;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -75,7 +76,8 @@ public class CompanyController {
                 syncLog.put(user.getCompanyId()+"_status", 1L);
             } else {
                 if (now - syncLog.get(token) < 30*1000) {
-                    msg.setError("调用过于频繁，请稍后再试");
+                    //msg.setError("调用过于频繁，请稍后再试");
+                    msg.setError(MessageUtils.message("Company.callError"));
                     return msg;
                 } else {
                     //检查是否当前公司有同步的正在进行
@@ -88,7 +90,8 @@ public class CompanyController {
                             //更新最近同步的时间
                             syncLog.put(token, now);
                         } else {
-                            msg.setError("同步正在进行中，请稍后再试");
+                            //msg.setError("同步正在进行中，请稍后再试");
+                            msg.setError(MessageUtils.message("Company.synError"));
                             return msg;
                         }
                     }
@@ -106,7 +109,8 @@ public class CompanyController {
                     msg.data = rest;
                 }
             } else {
-                msg.setError("非钉钉企业，无法同步");
+                //msg.setError("非钉钉企业，无法同步");
+                msg.setError(MessageUtils.message("Company.sysDDError"));
             }
             return msg;
         } catch (ApiException e) {
@@ -162,7 +166,8 @@ public class CompanyController {
             expenseTypeList.add(item);
         }
         if(!expenseTypeService.saveBatch(expenseTypeList)){
-            httpRespMsg.setError("验证失败");
+            //httpRespMsg.setError("验证失败");
+            httpRespMsg.setError(MessageUtils.message("Company.validationError"));
             return httpRespMsg;
         }
         return httpRespMsg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/CompanyReportController.java

@@ -7,6 +7,7 @@ import com.management.platform.entity.ReportForm;
 import com.management.platform.service.CompanyReportService;
 import com.management.platform.service.ReportFormService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,7 +55,8 @@ public class CompanyReportController {
     public HttpRespMsg update(Integer companyId,String formIds){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         if(companyReportService.remove(new QueryWrapper<CompanyReport>().eq("company_id", companyId))){
-            httpRespMsg.setError("更新失败");
+            //httpRespMsg.setError("更新失败");
+            httpRespMsg.setError(MessageUtils.message("Company.update"));
             return httpRespMsg;
         }
         List<CompanyReport> updateList=new ArrayList<>();
@@ -68,7 +70,8 @@ public class CompanyReportController {
                 updateList.add(companyReport);
             }
             if(!companyReportService.saveBatch(updateList)){
-                httpRespMsg.setError("更新失败");
+                //httpRespMsg.setError("更新失败");
+                httpRespMsg.setError(MessageUtils.message("Company.update"));
             }
         }
         return httpRespMsg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/CustomerInfoController.java

@@ -12,6 +12,7 @@ import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.CustomerInfoService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -61,11 +62,13 @@ public class CustomerInfoController {
         });
         if (info.getId() == null) {
             if(nameList.contains(info.getCustomerName())){
-                msg.setError("客户名称已存在");
+                //msg.setError("客户名称已存在");
+                msg.setError(MessageUtils.message("customer.nameRepeat"));
                 return msg;
             }
             if(codeList.contains(info.getCustomerCode())){
-                msg.setError("客户编号已存在");
+                //msg.setError("客户编号已存在");
+                msg.setError(MessageUtils.message("customer.noRepeat"));
                 return msg;
             }
             info.setCompanyId(user.getCompanyId());
@@ -75,11 +78,13 @@ public class CustomerInfoController {
             nameList.remove(customerInfo.getCustomerName());
             codeList.remove(customerInfo.getCustomerCode());
             if(nameList.contains(info.getCustomerName())){
-                msg.setError("客户名称已存在");
+                //msg.setError("客户名称已存在");
+                msg.setError(MessageUtils.message("customer.nameRepeat"));
                 return msg;
             }
             if(codeList.contains(info.getCustomerCode())){
-                msg.setError("客户编号已存在");
+                //msg.setError("客户编号已存在");
+                msg.setError(MessageUtils.message("customer.noRepeat"));
                 return msg;
             }
             info.setCompanyId(user.getCompanyId());
@@ -99,7 +104,8 @@ public class CustomerInfoController {
         User user = userMapper.selectById(token);
         int r = customerInfoMapper.delete(new QueryWrapper<CustomerInfo>().eq("id", id).eq("company_id", user.getCompanyId()));
         if (r <= 0) {
-            msg.setError("无权删除");
+            //msg.setError("无权删除");
+            msg.setError(MessageUtils.message("customer.accessError"));
         }
         return msg;
     }
@@ -116,12 +122,14 @@ public class CustomerInfoController {
             if(projectList.size()>0){
                 List<String> collect = projectList.stream().map(pro -> pro.getCustomerName()).collect(Collectors.toList());
                 String s = String.valueOf(collect);
-                msg.setError("客户"+s+"已被使用");
+                //msg.setError("客户"+s+"已被使用");
+                msg.setError(MessageUtils.message("customer.UsedError",s));
                 return msg;
             }
             int r = customerInfoMapper.delete(new QueryWrapper<CustomerInfo>().eq("id", list.get(0)).eq("company_id", user.getCompanyId()));
             if (r <= 0) {
-                msg.setError("无权删除");
+                //msg.setError("无权删除");
+                msg.setError(MessageUtils.message("customer.accessError"));
                 return msg;
             }
             customerInfoMapper.deleteBatchIds(list);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DingDingController.java

@@ -368,13 +368,15 @@ public class DingDingController {
         CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId).isNotNull("inner_appkey"));
         HttpRespMsg msg = new HttpRespMsg();
         if (startDate.compareTo(endDate) > 0) {
-            msg.setError("开始日期不能晚于结束日期");
+            //msg.setError("开始日期不能晚于结束日期");
+            msg.setError(MessageUtils.message("DD.dateError"));
             return msg;
         }
 
         if (companyId != null) {
             if (dingding == null) {
-                msg.setError("该公司没有设置innerAppkey和innerAppSecrt");
+                //msg.setError("该公司没有设置innerAppkey和innerAppSecrt");
+                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
                 return msg;
             } else {
                 long t1 = System.currentTimeMillis();
@@ -390,7 +392,8 @@ public class DingDingController {
                     .isNotNull("inner_appkey"));
             System.out.println("==========获取钉钉内部应用的数量是:"+dingdingList.size());
             if (dingdingList.size() == 0) {
-                msg.setError("没有设置innerAppkey和innerAppSecrt的数据");
+                //msg.setError("没有设置innerAppkey和innerAppSecrt的数据");
+                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
                 return msg;
             } else {
                 long t1 = System.currentTimeMillis();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/EarningSnapshotController.java

@@ -15,6 +15,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.EarningSnapshotService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.ListUtil;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -70,7 +71,9 @@ public class EarningSnapshotController {
             }
             msg.data = list;
         } else {
-            msg.setError("无权查看");
+
+            //msg.setError("无权查看");
+            msg.setError(MessageUtils.message("access.viewError"));
         }
 
         return msg;
@@ -88,7 +91,8 @@ public class EarningSnapshotController {
             List<Integer> idArray = ListUtil.convertIntegerIdsArrayToList(ids);
             earningSnapshotService.removeByIds(idArray);
         } else {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         }
 
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseTypeController.java

@@ -9,6 +9,7 @@ import com.management.platform.mapper.ExpenseItemMapper;
 import com.management.platform.mapper.ExpenseTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -48,7 +49,8 @@ public class ExpenseTypeController {
     public HttpRespMsg addOrMod(ExpenseType setting) {
         HttpRespMsg msg = new HttpRespMsg();
         if (StringUtils.isEmpty(setting.getTypeName())) {
-            msg.setError("名称不能为空");
+            //msg.setError("名称不能为空");
+            msg.setError(MessageUtils.message("Company.nullNameError"));
             return msg;
         }
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
@@ -56,7 +58,8 @@ public class ExpenseTypeController {
             setting.setCompanyId(companyId);
             int count = expenseTypeMapper.selectCount(new QueryWrapper<ExpenseType>().eq("type_name", setting.getTypeName()).eq("company_id", setting.getCompanyId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("Company.nameRepeat"));
             } else {
                 expenseTypeMapper.insert(setting);
                 msg.data = expenseTypeMapper.selectList(new QueryWrapper<ExpenseType>().eq("company_id", companyId));
@@ -65,7 +68,8 @@ public class ExpenseTypeController {
             int count = expenseTypeMapper.selectCount(new QueryWrapper<ExpenseType>().eq("type_name", setting.getTypeName())
                     .eq("company_id", companyId).ne("id", setting.getId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("Company.nameRepeat"));
             } else {
                 //检查名称是否有变化
                 ExpenseType oldSetting = expenseTypeMapper.selectById(setting.getId());
@@ -86,11 +90,13 @@ public class ExpenseTypeController {
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
         Integer cut = expenseItemMapper.selectCount(new QueryWrapper<ExpenseItem>().eq("expense_type", expenseType.getTypeName()));
         if(cut>0){
-            msg.setError("删除失败，已绑定费用报销数据");
+            //msg.setError("删除失败，已绑定费用报销数据");
+            msg.setError(MessageUtils.message("expense.deleteError"));
             return msg;
         }
         if (!expenseType.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         } else {
             expenseTypeMapper.deleteById(id);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FinanceController.java

@@ -13,6 +13,7 @@ import com.management.platform.service.FinanceFixedcolnameService;
 import com.management.platform.service.FinanceService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import com.management.platform.util.UserNotFoundException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -73,7 +74,8 @@ public class FinanceController {
             return financeService.importData(companyId, yearMonth, syncUserCost, syncHistoryReport, file, request);
         } catch (IOException e) {
             e.printStackTrace();
-            msg.setError("文件处理出错");
+            //msg.setError("文件处理出错");
+            msg.setError(MessageUtils.message("file.error"));
             return msg;
         } catch (UserNotFoundException e) {
             e.printStackTrace();
@@ -81,11 +83,13 @@ public class FinanceController {
             return msg;
         } catch (NullPointerException e) {
             e.printStackTrace();
-            msg.setError("数据格式有误或存在空数据 导入失败");
+            //msg.setError("数据格式有误或存在空数据 导入失败");
+            msg.setError(MessageUtils.message("file.dataFormatError"));
             return msg;
         } catch (Exception e) {
             e.printStackTrace();
-            msg.setError("发生其他错误");
+            //msg.setError("发生其他错误");
+            msg.setError(MessageUtils.message("other.error"));
             return msg;
         }
     }
@@ -159,7 +163,8 @@ public class FinanceController {
         if(financeService.removeByIds(list)){
             return msg;
         }
-        msg.setError("删除失败");
+        //msg.setError("删除失败");
+        msg.setError(MessageUtils.message("file.deleteError"));
         return msg;
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FinanceImportController.java

@@ -7,6 +7,7 @@ import com.management.platform.entity.User;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.FinanceImportService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -71,7 +72,8 @@ public class FinanceImportController {
             item.setAuditorName(auditor.getName());
             financeImportService.updateById(item);
         } else {
-            msg.setError("只有待审核状态才可以操作");
+            //msg.setError("只有待审核状态才可以操作");
+            msg.setError(MessageUtils.message("finance.operationStateError"));
         }
         return msg;
     }
@@ -86,7 +88,8 @@ public class FinanceImportController {
         if (old.getState() == 1) {
             financeImportService.updateById(item);
         } else {
-            msg.setError("只有审核通过状态才可以撤销");
+            //msg.setError("只有审核通过状态才可以撤销");
+            msg.setError(MessageUtils.message("finance.revokeStateError"));
         }
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FinanceTblcuscolController.java

@@ -13,6 +13,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.FinanceCalculateService;
 import com.management.platform.service.FinanceFixedcolnameService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -143,7 +144,8 @@ public class FinanceTblcuscolController {
         if (financeTblcuscol.getCompanyId() == companyId) {
             financeTblcuscolMapper.deleteById(id);
         } else {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         }
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/PdfFileController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.PdfFile;
 import com.management.platform.service.PdfFileService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -39,7 +40,8 @@ public class PdfFileController {
         if (pdfFileList.size() > 0) {
             msg.data = pdfFileList.get(0).getPdfUrl();
         } else {
-            msg.setError("该格式不支持在线预览");
+            //msg.setError("该格式不支持在线预览");
+            msg.setError(MessageUtils.message("pdf.previewError"));
         }
 
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProfessionController.java

@@ -10,6 +10,7 @@ import com.management.platform.mapper.ProjectProfessionMapper;
 import com.management.platform.mapper.ReportProfessionProgressMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -71,11 +72,13 @@ public class ProfessionController {
         //检查，该专业是否已经被日报使用
         Integer cnt = reportProfessionProgressMapper.selectCount(new QueryWrapper<ReportProfessionProgress>().eq("profession_id", id));
         if (cnt > 0) {
-            msg.setError("该专业已经存在相关日报，无法删除");
+            //msg.setError("该专业已经存在相关日报，无法删除");
+            msg.setError(MessageUtils.message("profession.existsError"));
         } else {
             int r = professionMapper.delete(new QueryWrapper<Profession>().eq("id", id).eq("company_id", user.getCompanyId()));
             if (r <= 0) {
-                msg.setError("无权删除");
+                //msg.setError("无权删除");
+                msg.setError(MessageUtils.message("access.deleteError"));
             }
         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectBasecostSettingController.java

@@ -9,6 +9,7 @@ import com.management.platform.entity.ProjectBasecostSetting;
 import com.management.platform.entity.ProjectCurrentcost;
 import com.management.platform.mapper.*;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -47,7 +48,8 @@ public class ProjectBasecostSettingController {
     public HttpRespMsg addOrMod(ProjectBasecostSetting setting) {
         HttpRespMsg msg = new HttpRespMsg();
         if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
+            //msg.setError("名称不能为空");
+            msg.setError(MessageUtils.message("name.nullNameError"));
             return msg;
         }
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
@@ -55,7 +57,8 @@ public class ProjectBasecostSettingController {
             setting.setCompanyId(companyId);
             int count = projectBasecostSettingMapper.selectCount(new QueryWrapper<ProjectBasecostSetting>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 projectBasecostSettingMapper.insert(setting);
                 msg.data = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId));
@@ -64,7 +67,8 @@ public class ProjectBasecostSettingController {
             int count = projectBasecostSettingMapper.selectCount(new QueryWrapper<ProjectBasecostSetting>().eq("name", setting.getName())
                     .eq("company_id", companyId).ne("id", setting.getId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 //检查名称是否有变化
                 ProjectBasecostSetting oldSetting = projectBasecostSettingMapper.selectById(setting.getId());
@@ -118,7 +122,8 @@ public class ProjectBasecostSettingController {
         ProjectBasecostSetting projectBasecostSetting = projectBasecostSettingMapper.selectById(id);
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
         if (!projectBasecostSetting.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         } else {
             projectBasecostSettingMapper.deleteById(id);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectCategoryController.java

@@ -10,6 +10,7 @@ import com.management.platform.mapper.ProjectMainMapper;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,7 +47,8 @@ public class ProjectCategoryController {
     public HttpRespMsg addOrMod(ProjectCategory setting) {
         HttpRespMsg msg = new HttpRespMsg();
         if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
+            //msg.setError("名称不能为空");
+            msg.setError(MessageUtils.message("name.nullNameError"));
             return msg;
         }
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
@@ -54,7 +56,8 @@ public class ProjectCategoryController {
             setting.setCompanyId(companyId);
             int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 projectCategoryMapper.insert(setting);
                 msg.data = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
@@ -63,7 +66,8 @@ public class ProjectCategoryController {
             int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName())
                     .eq("company_id", companyId).ne("id", setting.getId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 //检查名称是否有变化
                 ProjectCategory oldSetting = projectCategoryMapper.selectById(setting.getId());
@@ -99,15 +103,18 @@ public class ProjectCategoryController {
         Integer cut = projectMapper.selectCount(new QueryWrapper<Project>().eq("category", id));
         Integer cnt = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("category_id", id));
         if(cut>0){
-            msg.setError("删除失败，已绑定项目");
+            //msg.setError("删除失败，已绑定项目");
+            msg.setError(MessageUtils.message("project.deleteErrorByProject"));
             return msg;
         }
         if(cnt>0){
-            msg.setError("删除失败，已绑定主项目");
+            //msg.setError("删除失败，已绑定主项目");
+            msg.setError(MessageUtils.message("project.deleteErrorByMaster"));
             return msg;
         }
         if (!ProjectCategory.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         } else {
             projectCategoryMapper.deleteById(id);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -7,6 +7,7 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.OperationRecordService;
 import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -330,7 +331,8 @@ public class ProjectController {
         HttpRespMsg msg = new HttpRespMsg();
         Project old = projectService.getById(id);
         if (old.getStatus() == 2) {
-            msg.setError("该项目已完成，无法撤销");
+            //msg.setError("该项目已完成，无法撤销");
+            msg.setError(MessageUtils.message("project.revokeError"));
         } else {
             Project project = new Project();
             project.setId(id);
@@ -515,7 +517,8 @@ public class ProjectController {
         Project project = projectService.getById(projectId);
         if (project == null) {
             HttpRespMsg msg = new HttpRespMsg();
-            msg.setError("该项目已不存在");
+            //msg.setError("该项目已不存在");
+            msg.setError(MessageUtils.message("project.nonExistent"));
             return msg;
         }
         String associateDegrees = project.getAssociateDegrees();
@@ -614,7 +617,8 @@ public class ProjectController {
         if(projectService.updateById(project)){
             return httpRespMsg;
         }
-        httpRespMsg.setError("更新失败");
+        //httpRespMsg.setError("更新失败");
+        httpRespMsg.setError(MessageUtils.message("other.update"));
         return httpRespMsg;
     }
     @RequestMapping("/getTemplate")
@@ -678,7 +682,8 @@ public class ProjectController {
         allList.add(heads);
         String title = company.getCompanyName()+"_项目导入模板";
         /*msg.data = ExcelUtil.exportGeneralExcelByTitleAndList(fileName, allList, path);*/
-        String result="系统提示：Excel文件导出成功！";
+        //String result="系统提示：Excel文件导出成功！";
+        String result=MessageUtils.message("file.excelScu");
         String fileName= title+".xls";
         try {
 //            response.reset();
@@ -936,7 +941,8 @@ public class ProjectController {
             os.close();
         }catch(Exception e) {
             e.printStackTrace();
-            msg.setError("已存在模板名称为["+fileName+"]的文件,请删除后重新下载");
+            //msg.setError("已存在模板名称为["+fileName+"]的文件,请删除后重新下载");
+            msg.setError(MessageUtils.message("file.duplicateTemplate",fileName));
             return msg;
         }
         msg.data= "/upload/"+fileName;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectDocumentController.java

@@ -12,10 +12,7 @@ import com.management.platform.mapper.ProjectDocfolderMapper;
 import com.management.platform.mapper.ProjectDocumentMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectDocumentService;
-import com.management.platform.util.DocumentTypeUtil;
-import com.management.platform.util.FileUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.OpenOfficeService;
+import com.management.platform.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -156,7 +153,7 @@ public class ProjectDocumentController {
                         msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
                     }
                 } else {
-                    msg.setError("文件不存在");
+                    msg.setError(MessageUtils.message("file.nonExistentError"));
                 }
             }
         }
@@ -207,7 +204,8 @@ public class ProjectDocumentController {
             deleteSubFiles(record);
         }
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data="删除成功";
+        //msg.data="删除成功";
+        msg.data=MessageUtils.message("other.deleteScu");
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectKeyNodesSettingController.java

@@ -9,6 +9,7 @@ import com.management.platform.mapper.ProjectKeyNodesMapper;
 import com.management.platform.mapper.ProjectKeyNodesSettingMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -42,7 +43,8 @@ public class ProjectKeyNodesSettingController {
     public HttpRespMsg addOrMod(ProjectKeyNodesSetting setting) {
         HttpRespMsg msg = new HttpRespMsg();
         if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
+            //msg.setError("名称不能为空");
+            msg.setError(MessageUtils.message("name.nullNameError"));
             return msg;
         }
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
@@ -50,7 +52,8 @@ public class ProjectKeyNodesSettingController {
             setting.setCompanyId(companyId);
             int count = projectKeyNodesSettingMapper.selectCount(new QueryWrapper<ProjectKeyNodesSetting>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 projectKeyNodesSettingMapper.insert(setting);
                 msg.data = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", companyId));
@@ -59,7 +62,8 @@ public class ProjectKeyNodesSettingController {
             int count = projectKeyNodesSettingMapper.selectCount(new QueryWrapper<ProjectKeyNodesSetting>().eq("name", setting.getName())
                     .eq("company_id", companyId).ne("id", setting.getId()));
             if (count > 0) {
-                msg.setError("该名称已存在");
+                //msg.setError("该名称已存在");
+                msg.setError(MessageUtils.message("name.nameRepeat"));
             } else {
                 //检查名称是否有变化
                 ProjectKeyNodesSetting oldSetting = projectKeyNodesSettingMapper.selectById(setting.getId());
@@ -97,7 +101,8 @@ public class ProjectKeyNodesSettingController {
         ProjectKeyNodesSetting projectKeyNodesSetting = projectKeyNodesSettingMapper.selectById(id);
         Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
         if (!projectKeyNodesSetting.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         } else {
             projectKeyNodesSettingMapper.deleteById(id);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectLevelController.java

@@ -10,6 +10,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectLevelService;
 import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -57,7 +58,8 @@ public class ProjectLevelController {
         if(timeType.getProjectLevelState()==1){
             int cut = projectService.count(new QueryWrapper<Project>().eq("level", id).eq("company_id",companyId));
             if(cut>0){
-                httpRespMsg.setError("已绑定项目");
+                //httpRespMsg.setError("已绑定项目");
+                httpRespMsg.setError(MessageUtils.message("project.BoundItems"));
                 return httpRespMsg;
             }
             projectLevelService.removeById(id);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectMainController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectMainService;
 import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,7 +51,8 @@ public class ProjectMainController {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         int cut = projectService.count(new QueryWrapper<Project>().eq("project_main_id", id));
         if(cut>0){
-            httpRespMsg.setError("已绑定项目");
+            //httpRespMsg.setError("已绑定项目");
+            httpRespMsg.setError(MessageUtils.message("project.BoundItems"));
             return httpRespMsg;
         }
         projectMainService.removeById(id);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectNotifyUserController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.ProjectNotifyUser;
 import com.management.platform.service.ProjectNotifyUserService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -54,7 +55,8 @@ public class ProjectNotifyUserController {
         HttpRespMsg msg = new HttpRespMsg();
         boolean success = projectNotifyUserService.removeById(id);
         if (!success) {
-            msg.setError("记录不存在，操作失败");
+            //msg.setError("记录不存在，操作失败");
+            msg.setError(MessageUtils.message("project.RecordNotExist"));
         }
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectRequirementController.java

@@ -7,6 +7,7 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.ProjectRequirementService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.CellType;
@@ -62,7 +63,8 @@ public class ProjectRequirementController {
     public HttpRespMsg addOrMod(ProjectRequirement record) {
         HttpRespMsg msg = new HttpRespMsg();
         if (record.getProjectId() == null) {
-            msg.setError("项目不能为空");
+            //msg.setError("项目不能为空");
+            msg.setError(MessageUtils.message("project.emptyError"));
             return msg;
         }
         projectRequirementService.saveOrUpdate(record);
@@ -240,7 +242,8 @@ public class ProjectRequirementController {
                         || (StringUtils.isEmpty(project.getProjectName())?"":project.getProjectName()).equals(codeCell.getStringCellValue())
                 ).collect(Collectors.toList());
                 if(list.size()<=0){
-                    msg.setError("项目编号/名称"+codeCell.getStringCellValue()+"不存在");
+                    //msg.setError("项目编号/名称"+codeCell.getStringCellValue()+"不存在");
+                    msg.setError(MessageUtils.message("project.idOrNameNoExist",codeCell.getStringCellValue()));
                     return msg;
                 }else{
                     list.forEach(li->{
@@ -271,22 +274,27 @@ public class ProjectRequirementController {
             projectRequirementService.saveOrUpdateBatch(projectRequirements);
         } catch (IOException e) {
             e.printStackTrace();
-            msg.setError("文件处理出错");
+            //msg.setError("文件处理出错");
+            msg.setError(MessageUtils.message("file.error"));
             return msg;
         } catch (NullPointerException e) {
             e.printStackTrace();
-            msg.setError("数据格式有误或存在空数据 导入失败");
+            //msg.setError("数据格式有误或存在空数据 导入失败");
+            msg.setError(MessageUtils.message("file.dataFormatError"));
             return msg;
         }catch (InvalidFormatException e) {
             e.printStackTrace();
-            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            //msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            msg.setError(MessageUtils.message("file.FormatErrorAndDecrypt"));
         }catch (EncryptedDocumentException e) {
             e.printStackTrace();
-            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            //msg.setError("文件加密状态，需要先解除加密状态再上传");
+            msg.setError(MessageUtils.message("file.encryption"));
             return msg;
         } catch (Exception e) {
             e.printStackTrace();
-            msg.setError("上传失败："+e.getMessage());
+            //msg.setError("上传失败："+e.getMessage());
+            msg.setError(MessageUtils.message("file.uploadError",e.getMessage()));
             return msg;
         } finally {
             //关闭流

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectStageController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectService;
 import com.management.platform.service.ProjectStageService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,15 +51,16 @@ public class ProjectStageController {
         if(projectStage.getId()!=null){
             int cut = projectStageService.count(new QueryWrapper<ProjectStage>().eq("project_stage_name", projectStage.getProjectStageName()).eq("company_id",companyId).ne("id",projectStage.getId()));
             if(cut>0){
-                httpRespMsg.setError("阶段名称已存在");
+                //httpRespMsg.setError("阶段名称已存在");
+                httpRespMsg.setError(MessageUtils.message("project.StageNameError"));
                 return httpRespMsg;
             }
             projectStageService.updateById(projectStage);
         }else {
             int cut = projectStageService.count(new QueryWrapper<ProjectStage>().eq("project_stage_name", projectStage.getProjectStageName()).eq("company_id", companyId));
             if(cut>0){
-                httpRespMsg.setError("阶段名称已存在");
-                return httpRespMsg;
+                //httpRespMsg.setError("阶段名称已存在");
+                httpRespMsg.setError(MessageUtils.message("project.StageNameError"));
             }
             projectStageService.save(projectStage);
         }
@@ -69,13 +71,15 @@ public class ProjectStageController {
         HttpRespMsg httpRespMsg =new HttpRespMsg();
         int cut = projectService.count(new QueryWrapper<Project>().eq("current_stage_id", id));
         if(cut>0){
-            httpRespMsg.setError("该阶段已被使用");
+            //httpRespMsg.setError("该阶段已被使用");
+            httpRespMsg.setError(MessageUtils.message("project.StageUsedError"));
             return httpRespMsg;
         }
         if(projectStageService.removeById(id)){
             return httpRespMsg;
         }
-        httpRespMsg.setError("参数异常");
+        //httpRespMsg.setError("参数异常");
+        httpRespMsg.setError(MessageUtils.message("other.parameterError"));
         return httpRespMsg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectTimerController.java

@@ -10,6 +10,7 @@ import com.management.platform.mapper.ReportMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.apache.log4j.helpers.DateTimeDateFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -86,7 +87,8 @@ public class ProjectTimerController {
         HttpRespMsg msg = new HttpRespMsg();
         ProjectTimer timer = projectTimerMapper.selectById(id);
         if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权删除");
+            //msg.setError("非创建人无权删除");
+            msg.setError(MessageUtils.message("access.createDelete"));
         } else {
             projectTimerMapper.deleteById(id);
         }
@@ -100,7 +102,8 @@ public class ProjectTimerController {
         HttpRespMsg msg = new HttpRespMsg();
         ProjectTimer timer = projectTimerMapper.selectById(id);
         if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权结束");
+            //msg.setError("非创建人无权结束");
+            msg.setError(MessageUtils.message("access.createEnd"));
         } else {
             timer.setEndTime(LocalDateTime.now());
             projectTimerMapper.updateById(timer);
@@ -116,7 +119,8 @@ public class ProjectTimerController {
         HttpRespMsg msg = new HttpRespMsg();
         ProjectTimer timer = projectTimerMapper.selectById(id);
         if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权操作");
+            //msg.setError("非创建人无权操作");
+            msg.setError(MessageUtils.message("access.createOperation"));
         } else {
             //创建日报
             DateTimeFormatter df = DateTimeFormatter.ofPattern("HH:mm");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProviderCategoryController.java

@@ -6,6 +6,7 @@ import com.management.platform.entity.ProviderCategory;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProviderCategoryService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -45,14 +46,16 @@ public class ProviderCategoryController {
         if(providerCategory.getId()!=null){
             int cut = providerCategoryService.count(new QueryWrapper<ProviderCategory>().eq("provider_category_name", providerCategory.getProviderCategoryName()).eq("company_id",companyId).ne("id",providerCategory.getId()));
             if(cut>0){
-                httpRespMsg.setError("分类名称已存在");
+                //httpRespMsg.setError("分类名称已存在");
+                httpRespMsg.setError(MessageUtils.message("name.CategoryNameRepeat"));
                 return httpRespMsg;
             }
             providerCategoryService.updateById(providerCategory);
         }else {
             int cut = providerCategoryService.count(new QueryWrapper<ProviderCategory>().eq("provider_category_name", providerCategory.getProviderCategoryName()).eq("company_id", companyId));
             if(cut>0){
-                httpRespMsg.setError("分类名称已存在");
+                //httpRespMsg.setError("分类名称已存在");
+                httpRespMsg.setError(MessageUtils.message("name.CategoryNameRepeat"));
                 return httpRespMsg;
             }
             providerCategoryService.save(providerCategory);
@@ -65,7 +68,8 @@ public class ProviderCategoryController {
         if(providerCategoryService.removeById(id)){
             return httpRespMsg;
         }
-        httpRespMsg.setError("参数异常");
+        //httpRespMsg.setError("参数异常");
+        httpRespMsg.setError(MessageUtils.message("other.parameterError"));
         return httpRespMsg;
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProviderInfoController.java

@@ -12,6 +12,7 @@ import com.management.platform.mapper.ProviderInfoMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProviderInfoService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -55,7 +56,8 @@ public class ProviderInfoController {
             if (!StringUtils.isEmpty(info.getProviderCode())) {
                 int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>().eq("company_id", user.getCompanyId()).eq("provider_code", info.getProviderCode()));
                 if (cnt > 0) {
-                    msg.setError("供货商编号已存在");
+                    //msg.setError("供货商编号已存在");
+                    msg.setError(MessageUtils.message("provider.noRepeat"));
                     return msg;
                 }
             }
@@ -63,13 +65,15 @@ public class ProviderInfoController {
                 if (info.getProviderCategoryId() != null) {
                     int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>().eq("company_id", user.getCompanyId()).eq("provider_name", info.getProviderName()).eq("provider_category_id", info.getProviderCategoryId()));
                     if (cnt > 0) {
-                        msg.setError("该分类下供货商名称已存在");
+                        //msg.setError("该分类下供货商名称已存在");
+                        msg.setError(MessageUtils.message("provider.classNameRepeat"));
                         return msg;
                     }
                 } else {
                     int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>().eq("company_id", user.getCompanyId()).eq("provider_name", info.getProviderName()));
                     if (cnt > 0) {
-                        msg.setError("该供货商名称已存在");
+                        //msg.setError("该供货商名称已存在");
+                        msg.setError(MessageUtils.message("provider.NameRepeat"));
                         return msg;
                     }
                 }
@@ -82,7 +86,8 @@ public class ProviderInfoController {
                 int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>()
                         .eq("company_id", user.getCompanyId()).eq("provider_code", info.getProviderCode()).ne("id", info.getId()));
                 if (cnt > 0) {
-                    msg.setError("供货商编号已存在");
+                    //msg.setError("供货商编号已存在");
+                    msg.setError(MessageUtils.message("provider.noRepeat"));
                     return msg;
                 }
             }
@@ -91,14 +96,16 @@ public class ProviderInfoController {
                     int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>()
                             .eq("company_id", user.getCompanyId()).eq("provider_name", info.getProviderName()).eq("provider_category_id", info.getProviderCategoryId()).ne("id", info.getId()));
                     if (cnt > 0) {
-                        msg.setError("该分类下供货商名称已存在");
+                        //msg.setError("该分类下供货商名称已存在");
+                        msg.setError(MessageUtils.message("provider.classNameRepeat"));
                         return msg;
                     }
                 } else {
                     int cnt = providerInfoMapper.selectCount(new QueryWrapper<ProviderInfo>()
                             .eq("company_id", user.getCompanyId()).eq("provider_name", info.getProviderName()).ne("id", info.getId()));
                     if (cnt > 0) {
-                        msg.setError("该分类下供货商名称已存在");
+                        //msg.setError("该分类下供货商名称已存在");
+                        msg.setError(MessageUtils.message("provider.classNameRepeat"));
                         return msg;
                     }
                 }
@@ -133,13 +140,15 @@ public class ProviderInfoController {
                 return containId;
             }).map(Project::getProjectName).collect(Collectors.joining(","));
             if (!StringUtils.isEmpty(containProjectNames)) {
-                msg.setError("无法删除，以下项目已关联此供应商："+containProjectNames);
+                //msg.setError("无法删除，以下项目已关联此供应商："+containProjectNames);
+                msg.setError(MessageUtils.message("provider.deleteError",containProjectNames));
                 return msg;
             }
         }
         int r = providerInfoMapper.delete(new QueryWrapper<ProviderInfo>().eq("id", id).eq("company_id", user.getCompanyId()));
         if (r <= 0) {
-            msg.setError("无权删除");
+            //msg.setError("无权删除");
+            msg.setError(MessageUtils.message("access.deleteError"));
         }
         return msg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -13,6 +13,7 @@ import com.management.platform.entity.vo.WorktimeItem;
 import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import com.management.platform.util.WorkDayCalculateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -183,14 +184,15 @@ public class ReportController {
         //检查当前人员账号是否停用
         if (user.getIsActive() == 0) {
             HttpRespMsg msg = new HttpRespMsg();
-            msg.setError("您的账号已停用，无法操作");
+            msg.setError(MessageUtils.message("user.AccountDeactivation"));
             return msg;
         }
         List<String> targetUidList = null;
         List<User> targetUserList = null;
         if (projectId == null) {
             HttpRespMsg msg = new HttpRespMsg();
-            msg.setError("项目不能为空");
+            //msg.setError("项目不能为空");
+            msg.setError(MessageUtils.message("project.emptyError"));
             return msg;
         }
         if (subProjectId == null) {
@@ -282,12 +284,14 @@ public class ReportController {
                 if (!createDate[i].contains("@")) {
                     if (curP.getStatus() == 2) {
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+curP.getProjectName()+"]已完成。");
+                        //msg.setError("项目["+curP.getProjectName()+"]已完成。");
+                        msg.setError(MessageUtils.message("project.complete",curP.getProjectName()));
                         return msg;
                     }
                     if (curP.getStatus() == 3) {
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+curP.getProjectName()+"]已撤销。");
+                        //msg.setError("项目["+curP.getProjectName()+"]已撤销。");
+                        msg.setError(MessageUtils.message("project.revoke",curP.getProjectName()));
                         return msg;
                     }
                 } else {
@@ -296,12 +300,14 @@ public class ReportController {
                     for (String curDate : dateArr) {
                         if (curP.getStatus() == 2) {
                             HttpRespMsg msg = new HttpRespMsg();
-                            msg.setError("项目["+curP.getProjectName()+"]已完成。");
+                            //msg.setError("项目["+curP.getProjectName()+"]已完成。");
+                            msg.setError(MessageUtils.message("project.complete",curP.getProjectName()));
                             return msg;
                         }
                         if (curP.getStatus() == 3) {
                             HttpRespMsg msg = new HttpRespMsg();
-                            msg.setError("项目["+curP.getProjectName()+"]已撤销。");
+                            //msg.setError("项目["+curP.getProjectName()+"]已撤销。");
+                            msg.setError(MessageUtils.message("project.revoke",curP.getProjectName()));
                             return msg;
                         }
                     }
@@ -430,7 +436,8 @@ public class ReportController {
                 }
                 if (isForbidden) {
                     HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError("补填日报不可早于"+dateTimeFormatter.format(targetDate)+"，请联系系统管理员代填。");
+                    //msg.setError("补填日报不可早于"+dateTimeFormatter.format(targetDate)+"，请联系系统管理员代填。");
+                    msg.setError(MessageUtils.message("profession.repairError",dateTimeFormatter.format(targetDate)));
                     return msg;
                 }
             }
@@ -475,14 +482,16 @@ public class ReportController {
                         String s = sb.toString();
                         s = s.substring(0, s.length() -1);
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("已存在填写日报: " + s+", 请重新选择日期范围");
+                        //msg.setError("已存在填写日报: " + s+", 请重新选择日期范围");
+                        msg.setError(MessageUtils.message("profession.repeatError",s));
                         return msg;
                     }
 
                     List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, comTimeType.getIncludeWeekends());
                     if (workDaysListInRange.size() == 0) {
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("工作日天数为0，无法提交。(批量填报会自动跳过节假日，请尝试填写日报或者重新选择日期范围)");
+                        //msg.setError("工作日天数为0，无法提交。(批量填报会自动跳过节假日，请尝试填写日报或者重新选择日期范围)");
+                        msg.setError(MessageUtils.message("profession.SubmitErrorByDay"));
                         return msg;
                     }
                     //获取当前填报人所在部门的自定义审核流程
@@ -661,7 +670,8 @@ public class ReportController {
                         /*后续需要加入状态*/
                         if (createDate[i] == null || projectId[i] == null) {
                             HttpRespMsg httpRespMsg = new HttpRespMsg();
-                            httpRespMsg.setError("缺少数据");
+                            //httpRespMsg.setError("缺少数据");
+                            httpRespMsg.setError(MessageUtils.message("other.MissingData"));
                             return httpRespMsg;
                         }
                     } else {
@@ -742,7 +752,8 @@ public class ReportController {
                             /*后续需要加入状态*/
                             if (createDate[i] == null || projectId[i] == null) {
                                 HttpRespMsg httpRespMsg = new HttpRespMsg();
-                                httpRespMsg.setError("缺少数据");
+                                //httpRespMsg.setError("缺少数据");
+                                httpRespMsg.setError(MessageUtils.message("other.MissingData"));
                                 return httpRespMsg;
                             }
                         }
@@ -752,25 +763,29 @@ public class ReportController {
         } catch (NullPointerException e) {
             e.printStackTrace();
             HttpRespMsg httpRespMsg = new HttpRespMsg();
-            httpRespMsg.setError("验证失败");
+            //httpRespMsg.setError("验证失败");
+            httpRespMsg.setError(MessageUtils.message("access.verificationError"));
             return httpRespMsg;
         }
         //校验工作时长
         for (Report report : reportList) {
             if (report.getWorkingTime() == null || report.getWorkingTime() <= 0.0) {
                 HttpRespMsg httpRespMsg = new HttpRespMsg();
-                httpRespMsg.setError("请填写工作时长");
+                //httpRespMsg.setError("请填写工作时长");
+                httpRespMsg.setError(MessageUtils.message("profession.duration"));
                 return httpRespMsg;
             }
 
             if (report.getIsOvertime() != null && report.getIsOvertime() == 1) {
                 if (report.getOvertimeHours() <= 0) {
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
-                    httpRespMsg.setError("加班时长必须大于0");
+                    //httpRespMsg.setError("加班时长必须大于0");
+                    httpRespMsg.setError(MessageUtils.message("profession.workDurationError"));
                     return httpRespMsg;
                 } else if (report.getOvertimeHours() > report.getWorkingTime()) {
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
-                    httpRespMsg.setError("加班时长("+report.getOvertimeHours()+"h)不能超过工作时长("+report.getWorkingTime()+"h)");
+                    //httpRespMsg.setError("加班时长("+report.getOvertimeHours()+"h)不能超过工作时长("+report.getWorkingTime()+"h)");
+                    httpRespMsg.setError(MessageUtils.message("profession.OvertimeHoursError",report.getOvertimeHours(),report.getWorkingTime()));
                     return httpRespMsg;
                 }
             }
@@ -786,7 +801,8 @@ public class ReportController {
 
                 if (dailyWorktime > comTimeType.getAllday()) {
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
-                    httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getAllday()+"小时");
+                    //httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getAllday()+"小时");
+                    httpRespMsg.setError(MessageUtils.message("profession.MaxReportTimeError",comTimeType.getAllday()));
                     return httpRespMsg;
                 }
             }
@@ -808,7 +824,8 @@ public class ReportController {
             //数据库中已经填报过的工时
             if (dailyWorktime > comTimeType.getMaxReportTime()) {
                 HttpRespMsg httpRespMsg = new HttpRespMsg();
-                httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getMaxReportTime()+"小时");
+                //httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getMaxReportTime()+"小时");
+                httpRespMsg.setError(MessageUtils.message("profession.MaxReportTimeError",comTimeType.getMaxReportTime()));
                 return httpRespMsg;
             } else {
                 //查找数据库中可能已有老的记录
@@ -821,7 +838,8 @@ public class ReportController {
                     dailyWorktime += existingWorktime;
                     if (dailyWorktime > comTimeType.getMaxReportTime()) {
                         HttpRespMsg httpRespMsg = new HttpRespMsg();
-                        httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getMaxReportTime()+"小时");
+                        //httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getMaxReportTime()+"小时");
+                        httpRespMsg.setError(MessageUtils.message("profession.MaxReportTimeError",comTimeType.getMaxReportTime()));
                         return httpRespMsg;
                     }
                 }
@@ -884,7 +902,8 @@ public class ReportController {
                         //超支了，不能填报
 //                    String name = projectList.stream().filter(p->p.getId().equals(item.getProjectId())).findFirst().get().getProjectName();
                         HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+name+"]的["+item.getBaseName()+"]预算不足，请联系管理人员下拨预算");
+                        //msg.setError("项目["+name+"]的["+item.getBaseName()+"]预算不足，请联系管理人员下拨预算");
+                        msg.setError(MessageUtils.message("project.InsufficientBudget",name,item.getBaseName()));
                         return msg;
                     }
                 }
@@ -933,7 +952,8 @@ public class ReportController {
                             double sum = allReportList.stream().filter(re -> re.getCreateDate().isEqual(date)).mapToDouble(Report::getWorkingTime).sum();
                             if (sum > allday) {
                                 HttpRespMsg msg = new HttpRespMsg();
-                                msg.setError("无法提交："+date.format(dtf)+"日合计工作时长为" + sum+"h, 超过"+allday+"h");
+                                //msg.setError("无法提交："+date.format(dtf)+"日合计工作时长为" + sum+"h, 超过"+allday+"h");
+                                msg.setError(MessageUtils.message("profession.workTimeError",date.format(dtf),sum,allday));
                                 return msg;
                             }
                         }
@@ -1208,7 +1228,8 @@ public class ReportController {
         String token = request.getHeader("TOKEN");
         if (token == null) {
             //
-            msg.setError("请求非法");
+            //msg.setError("请求非法");
+            msg.setError(MessageUtils.message("request.illegal"));
             System.err.println("==有非法请求==="+startDate);
         } else {
             User byId = userService.getById(token);
@@ -1217,9 +1238,11 @@ public class ReportController {
             now = now.plusMonths(1);
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             if (startDate.compareTo("2020-01-01") < 0 || endDate.compareTo(dtf.format(now)) > 0) {
-                msg.setError("日期不得早于2020-01-01或者超过当前一个月");
+                //msg.setError("日期不得早于2020-01-01或者超过当前一个月");
+                msg.setError(MessageUtils.message("date.dateEarly"));
             } else if (startDate.compareTo(endDate) > 0) {
-                msg.setError("开始日期不能大于结束日期");
+                //msg.setError("开始日期不能大于结束日期");
+                msg.setError(MessageUtils.message("date.startThanEnd"));
             } else {
                 DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
@@ -1228,7 +1251,8 @@ public class ReportController {
                 //时间间隔不得超过365天
                 long until = localStartDate.until(localEndDate, ChronoUnit.DAYS);
                 if (until > 365) {
-                    msg.setError("日期间隔不得超过365天");
+                    //msg.setError("日期间隔不得超过365天");
+                    msg.setError(MessageUtils.message("date.dateThan365"));
                 } else {
                     msg.data = WorkDayCalculateUtils.getWorkDaysCountInRange(startDate, endDate, timeType.getIncludeWeekends());
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportExtraDegreeController.java

@@ -13,6 +13,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectService;
 import com.management.platform.service.ReportExtraDegreeService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.apache.poi.util.StringUtil;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -69,7 +70,8 @@ public class ReportExtraDegreeController {
             info.setCompanyId(user.getCompanyId());
             int cut = reportExtraDegreeMapper.selectCount(new QueryWrapper<ReportExtraDegree>().eq("name",info.getName()).eq("company_id", user.getCompanyId()));
             if(cut>0){
-                msg.setError(timeType.getCustomDegreeName()+"名称重复");
+                //msg.setError(timeType.getCustomDegreeName()+"名称重复");
+                msg.setError(MessageUtils.message("name.nameRepeatByParam",timeType.getCustomDegreeName()));
                 return msg;
             }
             info.setCompanyId(user.getCompanyId());
@@ -77,7 +79,8 @@ public class ReportExtraDegreeController {
         } else {
             int cut = reportExtraDegreeMapper.selectCount(new QueryWrapper<ReportExtraDegree>().eq("name",info.getName()).ne("id",info.getId()).eq("company_id", user.getCompanyId()));
             if(cut>0){
-                msg.setError(timeType.getCustomDegreeName()+"名称重复");
+                //msg.setError(timeType.getCustomDegreeName()+"名称重复");
+                msg.setError(MessageUtils.message("name.nameRepeatByParam",timeType.getCustomDegreeName()));
                 return msg;
             }
             //检查名字是否发生变化
@@ -131,12 +134,14 @@ public class ReportExtraDegreeController {
                         .or().likeLeft("associate_degrees", ","+id));
         if (existsProjects.size() > 0) {
             String names = existsProjects.stream().map(Project::getProjectName).collect(Collectors.joining(","));
-            msg.setError("该数据已经被以下项目关联，无法删除："+names);
+            //msg.setError("该数据已经被以下项目关联，无法删除："+names);
+            msg.setError(MessageUtils.message("project.DateRelation",names));
             return msg;
         }
         int r = reportExtraDegreeMapper.delete(new QueryWrapper<ReportExtraDegree>().eq("id", id).eq("company_id", user.getCompanyId()));
         if (r <= 0) {
-            msg.setError("无权删除");
+            //msg.setError("无权删除");
+            msg.setError(MessageUtils.message("access.deleteError"));
         }
         return msg;
     }
@@ -160,12 +165,14 @@ public class ReportExtraDegreeController {
             List<Project> existsProjects = projectMapper.selectList(queryWrapper);
             if (existsProjects.size() > 0) {
                 String names = existsProjects.stream().map(Project::getProjectName).collect(Collectors.joining(","));
-                msg.setError("该数据已经被以下项目关联，无法删除："+names);
+                //msg.setError("该数据已经被以下项目关联，无法删除："+names);
+                msg.setError(MessageUtils.message("project.DateRelation",names));
                 return msg;
             }
             int r = reportExtraDegreeMapper.delete(new QueryWrapper<ReportExtraDegree>().eq("id", list.get(0)).eq("company_id", user.getCompanyId()));
             if (r <= 0) {
-                msg.setError("无权删除");
+                //msg.setError("无权删除");
+                msg.setError(MessageUtils.message("access.deleteError"));
                 return msg;
             }
             reportExtraDegreeMapper.deleteBatchIds(list);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.StagesService;
 import com.management.platform.service.TaskService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -70,7 +71,8 @@ public class StagesController {
             findSameName = cnt>0?true: false;
         }
         if (findSameName) {
-            msg.setError("当前分组中已存在该任务列表，无法重复添加");
+            //msg.setError("当前分组中已存在该任务列表，无法重复添加");
+            msg.setError(MessageUtils.message("Stages.RepeatInGroup"));
             return msg;
         }
         //给seq排序
@@ -131,7 +133,8 @@ public class StagesController {
         //检查，如果分组下有任务，不得删除
         int cnt = taskService.count(new QueryWrapper<Task>().eq("stages_id", item.getId()));
         if (cnt > 0) {
-            msg.setError("该任务列表下存在任务，不可删除");
+            //msg.setError("该任务列表下存在任务，不可删除");
+            msg.setError(MessageUtils.message("Stages.deleteError"));
         } else {
             //查询当前要删除的任务列表的位置排序，重新调整后面的列表排序
             Stages stages = stagesService.getById(item.getId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/SubUserCustomController.java

@@ -11,6 +11,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.SubUserCustomService;
 import com.management.platform.service.UserCustomService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -45,7 +46,8 @@ public class SubUserCustomController {
         HttpRespMsg msg=new HttpRespMsg();
         Integer cut = subUserCustomMapper.selectCount(new QueryWrapper<SubUserCustom>().eq("name", subUserCustom.getName()).eq("user_custom_id",subUserCustom.getUserCustomId()));
         if(cut>0){
-            msg.setError("名称["+subUserCustom.getName()+"]已存在");
+            //msg.setError("名称["+subUserCustom.getName()+"]已存在");
+            msg.setError(MessageUtils.message("Company.nameRepeatByParam",subUserCustom.getName()));
             return msg;
         }
         subUserCustomService.saveOrUpdate(subUserCustom);
@@ -84,7 +86,8 @@ public class SubUserCustomController {
                     break;
             }
             if(result!=null && !result.equals("") &&result.equals(subUserCustom.getName())){
-                httpRespMsg.setError("当前配置["+subUserCustom.getName()+"]已使用");
+                //httpRespMsg.setError("当前配置["+subUserCustom.getName()+"]已使用");
+                httpRespMsg.setError(MessageUtils.message("config.used",subUserCustom.getName()));
                 return httpRespMsg;
             }
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -9,6 +9,7 @@ import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.assertj.core.util.Lists;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -293,7 +294,8 @@ public class TaskController {
             subQuery.eq("parent_tid", task.getId()).eq("task_status", 0);
             int count = taskService.count(subQuery);
             if (count > 0) {
-                msg.setError("请先完成全部子任务");
+                //msg.setError("请先完成全部子任务");
+                msg.setError(MessageUtils.message("Stages.SubTasksError"));
                 return msg;
             }
         }
@@ -339,7 +341,8 @@ public class TaskController {
             taskComment.setType(4);
             taskCommentMapper.insert(taskComment);
         } else {
-            msg.setError("状态不对，无法操作");
+            //msg.setError("状态不对，无法操作");
+            msg.setError(MessageUtils.message("other.stateError"));
             return msg;
         }
 
@@ -551,9 +554,11 @@ public class TaskController {
         Task t = taskService.getById(id);
         if (t.getExecutorId() != null) {
             if (t.getExecutorId().contains(userId)) {
-                msg.setError("您已认领过该任务，请勿重复操作");
+                //msg.setError("您已认领过该任务，请勿重复操作");
+                msg.setError(MessageUtils.message("Stages.repeatedCollection"));
             } else {
-                msg.setError("该任务已被其他人认领");
+                //msg.setError("该任务已被其他人认领");
+                msg.setError(MessageUtils.message("Stages.receiveError"));
             }
         } else {
             task.setId(id);
@@ -588,7 +593,8 @@ public class TaskController {
         String userId = request.getHeader("Token");
         Task t = taskService.getById(id);
         if (t == null) {
-            msg.setError("该任务已不存在");
+            //msg.setError("该任务已不存在");
+            msg.setError(MessageUtils.message("Stages.noExist"));
             return msg;
         }
         //查询直接子任务
@@ -672,7 +678,8 @@ public class TaskController {
         Task task = taskService.getById(id);
         if (task == null) {
             HttpRespMsg msg = new HttpRespMsg();
-            msg.setError("该任务不存在,请刷新查看");
+            //msg.setError("该任务不存在,请刷新查看");
+            msg.setError(MessageUtils.message("Stages.noExistAndRefresh"));
             return msg;
         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskFilesController.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.ProjectDocumentService;
-import com.management.platform.util.DocumentTypeUtil;
-import com.management.platform.util.FileUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.OpenOfficeService;
+import com.management.platform.util.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -183,7 +180,8 @@ public class TaskFilesController {
                         msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
                     }
                 } else {
-                    msg.setError("文件不存在");
+                    //msg.setError("文件不存在");
+                    msg.setError(MessageUtils.message("file.nonExistentError"));
                 }
             }
         }
@@ -205,7 +203,7 @@ public class TaskFilesController {
         taskFilesMapper.deleteById(id);
 
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data="删除成功";
+        msg.data=MessageUtils.message("file.deleteSuc");
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -12,6 +12,7 @@ import com.management.platform.service.StagesService;
 import com.management.platform.service.TaskGroupService;
 import com.management.platform.service.TaskService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -96,7 +97,8 @@ public class TaskGroupController {
         }
         //检查是否有同名的分组
         if (hasSameName) {
-            msg.setError("分组存在重名");
+            //msg.setError("分组存在重名");
+            msg.setError(MessageUtils.message("group.RepeatName"));
         } else {
             taskGroupService.saveOrUpdate(item);
             QueryWrapper<TaskGroup> queryWrapper = new QueryWrapper<TaskGroup>();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TimeAutoExcludeController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.TimeAutoExcludeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.TimeAutoExcludeService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -50,7 +51,8 @@ public class TimeAutoExcludeController {
         if (user.getCompanyId().intValue() == timeAutoExcludeService.getById(id).getCompanyId()) {
             timeAutoExcludeService.removeById(id);
         } else {
-            msg.setError("无权操作");
+            //msg.setError("无权操作");
+            msg.setError(MessageUtils.message("access.operationError"));
         }
 
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TimeTypeController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.TimeTypeService;
 import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -52,7 +53,8 @@ public class TimeTypeController {
         Boolean success = timeTypeService.updateById(record);
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         if (!success) {
-            httpRespMsg.setError("保存失败");
+            //httpRespMsg.setError("保存失败");
+            httpRespMsg.setError(MessageUtils.message("other.saveError"));
         }
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -10,6 +10,7 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.ReportService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import com.management.platform.util.WorkDayCalculateUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -234,7 +235,8 @@ public class UserCorpwxTimeController {
         List<Map> list = (List<Map>) map.get("list");
         List<String> projects = (List) map.get("projects");
         if (projects == null) {
-            msg.setError("员工无参与的项目，请先到项目管理中进行设置项目参与人");
+           // msg.setError("员工无参与的项目，请先到项目管理中进行设置项目参与人");
+            msg.setError(MessageUtils.message("project.joinError"));
         }
         List<String> titles = new ArrayList<>();
         titles.add("工作日期");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCustomController.java

@@ -11,6 +11,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.SubUserCustomService;
 import com.management.platform.service.UserCustomService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -92,7 +93,8 @@ public class UserCustomController {
                     break;
             }
             if(result!=null && !result.equals("")){
-                httpRespMsg.setError("当前配置已被使用");
+                //httpRespMsg.setError("当前配置已被使用");
+                httpRespMsg.setError(MessageUtils.message("config.usedNoParam"));
                 return httpRespMsg;
             }
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -171,7 +171,8 @@ public class WeiXinCorpController {
                 }
             }
             if (item == null) {
-                msg.setError("jsapiTicket获取失败");
+                //msg.setError("jsapiTicket获取失败");
+                msg.setError(MessageUtils.message("wx.TicketError"));
                 return msg;
             }
             log.info("jsTicket = " + item.jsTicket);
@@ -1068,7 +1069,8 @@ public class WeiXinCorpController {
         User curUser = userMapper.selectById(userId);
         //https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=ACCESS_TOKEN&code=CODE
         if (curUser == null) {
-            msg.setError("该用户不存在,请退出重新登录");
+            //msg.setError("该用户不存在,请退出重新登录");
+            msg.setError(MessageUtils.message("user.notExists"));
             return msg;
         }
         String url = null;
@@ -1083,7 +1085,8 @@ public class WeiXinCorpController {
         JSONObject obj = JSONObject.parseObject(forObject);
         String wxUserId = obj.getString("UserId");
         if (userId == null) {
-            msg.setError("该用户企业未授权");
+            //msg.setError("该用户企业未授权");
+            msg.setError(MessageUtils.message("access.grant"));
         } else {
             curUser.setCorpwxUserid(wxUserId);
             //如果之前有用户存在该企业微信wxopenid,需要清空掉
@@ -1146,7 +1149,8 @@ public class WeiXinCorpController {
             userVO.setCompany(company);
             BeanUtils.copyProperties(curUser, userVO);
             if (userVO.getRoleId() == null || userVO.getRoleId() == 0) {
-                msg.setError("请先联系管理员为您分配角色");
+                //msg.setError("请先联系管理员为您分配角色");
+                msg.setError(MessageUtils.message("user.noRole"));
                 return msg;
             }
             //还要多返回一个公司名字
@@ -1167,7 +1171,8 @@ public class WeiXinCorpController {
             userService.setUserRoleMenu(userVO);
             msg.data = userVO;
         } else {
-            msg.setError("该用户尚未绑定企业微信，需要通过账号密码登录");
+            //msg.setError("该用户尚未绑定企业微信，需要通过账号密码登录");
+            msg.setError(MessageUtils.message("wx.bindError"));
         }
         return msg;
     }
@@ -1206,7 +1211,8 @@ public class WeiXinCorpController {
         HttpRespMsg msg = new HttpRespMsg();
         WxCorpInfo corpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
         if (corpInfo == null) {
-            msg.setError("该企业未对接企业微信");
+            //msg.setError("该企业未对接企业微信");
+            msg.setError(MessageUtils.message("wx.dockError"));
             return msg;
         }
         String url = null;
@@ -1260,7 +1266,8 @@ public class WeiXinCorpController {
         HttpRespMsg msg = new HttpRespMsg();
         WxCorpInfo corpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
         if (corpInfo == null) {
-            msg.setError("该企业未对接企业微信");
+            //msg.setError("该企业未对接企业微信");
+            msg.setError(MessageUtils.message("wx.dockError"));
             return msg;
         }
         String url = null;
@@ -1461,7 +1468,8 @@ public class WeiXinCorpController {
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectById(corpId);
         HttpRespMsg msg = new HttpRespMsg();
         if (wxCorpInfo.getContactSecret() == null) {
-            msg.setError("请先设置企业通讯录同步Secret");
+            //msg.setError("请先设置企业通讯录同步Secret");
+            msg.setError(MessageUtils.message("wx.synSecretError"));
             return msg;
         }
         Company company = companyMapper.selectById(wxCorpInfo.getCompanyId());
@@ -1470,7 +1478,8 @@ public class WeiXinCorpController {
             corpContactAccessToken = getRemoteCorpConcactAccessToken(wxCorpInfo);
         } catch (Exception exception) {
             exception.printStackTrace();
-            msg.setError("同步失败:"+exception.getMessage());
+            //msg.setError("同步失败:"+exception.getMessage());
+            msg.setError(MessageUtils.message("wx.synError",exception.getMessage()));
             return msg;
         }
 
@@ -1479,7 +1488,8 @@ public class WeiXinCorpController {
             curCorpAccessToken = getCorpAccessToken(wxCorpInfo);
         } catch (Exception exception) {
             exception.printStackTrace();
-            msg.setError("同步失败:"+exception.getMessage());
+            //msg.setError("同步失败:"+exception.getMessage());
+            msg.setError(MessageUtils.message("wx.synError",exception.getMessage()));
             return msg;
         }
         int companyId = company.getId();
@@ -1517,7 +1527,8 @@ public class WeiXinCorpController {
                     }
                 } catch (Exception exception) {
                     exception.printStackTrace();
-                    msg.setError("同步失败:"+exception.getMessage());
+                    //msg.setError("同步失败:"+exception.getMessage());
+                    msg.setError(MessageUtils.message("wx.synError",exception.getMessage()));
                     return msg;
                 }
             }
@@ -1671,7 +1682,8 @@ public class WeiXinCorpController {
                         }
                     } catch (Exception exception) {
                         exception.printStackTrace();
-                        msg.setError("同步失败:"+exception.getMessage());
+                        //msg.setError("同步失败:"+exception.getMessage());
+                        msg.setError(MessageUtils.message("wx.synError",exception.getMessage()));
                         return msg;
                     }
                 }
@@ -1849,7 +1861,8 @@ public class WeiXinCorpController {
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectById(corpId);
         HttpRespMsg msg = new HttpRespMsg();
         if (wxCorpInfo.getContactSecret() == null) {
-            msg.setError("请先设置企业通讯录同步Secret");
+            //msg.setError("请先设置企业通讯录同步Secret");
+            msg.setError(MessageUtils.message("wx.synSecretError"));
             return msg;
         }
         Company company = companyMapper.selectById(wxCorpInfo.getCompanyId());
@@ -1858,7 +1871,8 @@ public class WeiXinCorpController {
             curCorpAccessToken = getCorpConcactAccessToken(wxCorpInfo);
         } catch (Exception exception) {
             exception.printStackTrace();
-            msg.setError("同步失败:"+exception.getMessage());
+            //msg.setError("同步失败:"+exception.getMessage());
+            msg.setError(MessageUtils.message("wx.synError",exception.getMessage()));
             return msg;
         }
         int companyId = company.getId();

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -5,6 +5,123 @@ user.inactive=该账户已停用，无法登陆。请联系管理员
 user.accountExpired=账号试用已到期，请联系客服。
 user.noRole=请先联系管理员为您分配角色
 user.pwdError=密码错误
+user.AccountDeactivation=您的账号已停用，无法操作
+#权限相关
+access.operationError=无权操作
+access.viewError=无权查看
+access.deleteError=无权删除
+access.createDelete=非创建人无权删除
+access.createEnd=非创建人无权结束
+access.createOperation=非创建人无权操作
+access.verificationError=验证失败
+access.grant=该用户企业未授权
+#名称相关
+name.nullNameError=名称不能为空
+name.nameRepeat=该名称已存在
+Company.nameRepeatByParam=名称["{0}"]已存在
+name.nameRepeatByParam={0}名称重复
+name.CategoryNameRepeat=分类名称已存在
+#其他
+other.error=发生其他错误
+other.update=更新失败
+other.deleteScu=删除成功
+other.parameterError=参数异常
+other.MissingData=缺少数据
+other.stateError=状态不对，无法操作
+other.saveError=保存失败
 # 请求相关
-request.countLimit=接口访问次数超过限制,请1分钟后重试
-department.duplicateError=保存失败： 部门[{0}]存在重复
+request.countLimit=接口访问次数超过限制,请1分钟后重试。
+request.illegal=请求非法
+# 部门相关
+department.duplicateError=保存失败： 部门[{0}]存在重复。
+department.reviewedError=当前部门存在待审核报告，无法操作!
+# 日期相关
+date.dateNullError=开始日期和结束日期不能为空
+date.startDateError=开始日期不得早于{0}
+date.endDateError=结束日期不得早于{0}
+date.dateEarly=日期不得早于2020-01-01或者超过当前一个月
+date.startThanEnd=开始日期不能大于结束日期
+date.dateThan365=日期间隔不得超过365天
+# 公司相关
+Company.nullNameError=名称不能为空
+Company.nameRepeat=该名称已存在
+Company.accessError=无权操作
+Company.callError=调用过于频繁，请稍后再试
+Company.synError=同步正在进行中，请稍后再试
+Company.sysDDError=非钉钉企业，无法同步
+Company.validationError=验证失败
+Company.update=更新失败
+# 客户相关
+customer.nameRepeat=客户名称已存在
+customer.noRepeat=客户编号已存在
+customer.accessError=无权删除
+customer.UsedError=客户{0}已被使用
+DD.dateError=开始日期不能晚于结束日期
+DD.keyAndSecretError=该公司没有设置innerAppkey和innerAppSecrt
+expense.deleteError=删除失败，已绑定费用报销数据
+# 文件相关
+file.error=文件处理出错
+file.dataFormatError=数据格式有误或存在空数据 导入失败
+file.FormatErrorAndDecrypt=文件格式错误，如果安装了加密软件需要先解密再上传
+file.encryption=文件加密状态，需要先解除加密状态再上传
+file.nonExistentError=文件不存在
+file.uploadError=上传失败{0}
+file.deleteError=删除失败
+file.deleteSuc=删除成功
+file.excelScu=系统提示：Excel文件导出成功！
+file.duplicateTemplate=已存在模板名称为[{0}]的文件,请删除后重新下载。
+# 配置相关
+config.used=当前配置["{0}"]已使用
+config.usedNoParam=当前配置已被使用
+# 审核相关
+finance.operationStateError=只有待审核状态才可以操作
+finance.revokeStateError=只有审核通过状态才可以撤销
+# pdf相关
+pdf.previewError=该格式不支持在线预览
+# 日报相关
+profession.existsError=该专业已经存在相关日报，无法删除
+profession.repairError=补填日报不可早于"{0}"，请联系系统管理员代填。
+profession.repeatError=已存在填写日报: "{0}", 请重新选择日期范围
+profession.SubmitErrorByDay=工作日天数为0，无法提交。(批量填报会自动跳过节假日，请尝试填写日报或者重新选择日期范围)
+profession.duration=请填写工作时长
+profession.workDurationError=加班时长必须大于0
+profession.OvertimeHoursError=加班时长("{0}"h)不能超过工作时长("{1}"h)
+profession.MaxReportTimeError=每日工作时长不得超过"{0}"小时
+profession.workTimeError=无法提交："{0}"日合计工作时长为"{1}"h, 超过"{2}"h
+# 项目相关
+project.deleteErrorByProject=删除失败，已绑定项目
+project.deleteErrorByMaster=删除失败，已绑定主项目
+project.DateRelation=该数据已经被以下项目关联，无法删除：{0}
+project.revokeError=该项目已完成，无法撤销
+project.nonExistent=该项目已不存在
+project.BoundItems=已绑定项目
+project.RecordNotExist=记录不存在，操作失败
+project.emptyError=项目不能为空
+project.idOrNameNoExist=项目编号/名称"{0}"不存在
+project.StageNameError=阶段名称已存在
+project.StageUsedError=该阶段已被使用
+project.complete=项目["{0}"]已完成。
+project.revoke=项目["{0}"]已撤销。
+project.InsufficientBudget=项目["{0}"]的["{1}"]预算不足，请联系管理人员下拨预算
+project.joinError=员工无参与的项目，请先到项目管理中进行设置项目参与人
+# 供货相关
+provider.noRepeat=供货商编号已存在
+provider.classNameRepeat=该分类下供货商名称已存在
+provider.NameRepeat=该供货商名称已存在
+provider.deleteError=无法删除，以下项目已关联此供应商：{0}
+# 任务相关
+Stages.RepeatInGroup=当前分组中已存在该任务列表，无法重复添加
+Stages.deleteError=该任务列表下存在任务，不可删除
+Stages.SubTasksError=请先完成全部子任务
+Stages.repeatedCollection=您已认领过该任务，请勿重复操作
+Stages.receiveError=该任务已被其他人认领
+Stages.noExist=该任务已不存在
+Stages.noExistAndRefresh=该任务不存在,请刷新查看
+#分组相关
+group.RepeatName=分组存在重名
+#微信相关
+wx.TicketError=jsapiTicket获取失败
+wx.bindError=该用户尚未绑定企业微信，需要通过账号密码登录
+wx.dockError=该企业未对接企业微信
+wx.synSecretError=请先设置企业通讯录同步Secret
+wx.synError=同步失败:{0}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -1,10 +1,127 @@
 # 用户相关信息
 user.notExists=user does not exist
 user.duplicate=duplicate account
-user.inactive=该账户已停用，无法登陆。请联系管理员
-user.accountExpired=账号试用已到期，请联系客服。
-user.noRole=请先联系管理员为您分配角色
+user.inactive=The account has been disabled and cannot be logged in. Please contact the administrator.
+user.accountExpired=Account trial has expired, please contact customer service.
+user.noRole=Please contact the administrator first to assign you a role.
 user.pwdError=password error
+user.AccountDeactivation=Your account has been deactivated, unable to operate.
+#权限相关
+access.operationError=No permission to operate.
+access.viewError=No permission to view.
+access.deleteError=No permission to delete.
+access.createDelete=Non creator has no right to delete.
+access.createEnd=Non creator has no right to end.
+access.createOperation=Non creator has no right to operate.
+access.verificationError=Validation failed.
+access.grant=The user enterprise is not authorized.
+#名称相关
+name.nullNameError=Name cannot be empty.
+name.nameRepeat=The name already exists.
+Company.nameRepeatByParam=The name ['{0}'] already exists.
+name.nameRepeatByParam=Duplicate {0} name.
+name.CategoryNameRepeat=Category name already exists.
+#其他
+other.error=Other errors occurred.
+other.update=Update failed.
+other.deleteScu=Deletion succeeded.
+other.parameterError=Parameter exception
+other.MissingData=Missing data
+other.stateError=Wrong status, unable to operate
+other.saveError=Save failed
 # 请求相关
-request.countLimit=接口访问次数超过限制,请1分钟后重试
-department.duplicateError=save fail： department [{0}] already exists
+request.countLimit=The number of interface accesses exceeds the limit. Please try again in 1 minute.
+request.illegal=Illegal request
+# 部门相关
+department.duplicateError=save fail： department [{0}] already exists
+department.reviewedError=The current department has a report to be approved, unable to operate!
+# 日期相关
+date.dateNullError=Start date and end date cannot be blank.
+date.startDateError=Start date cannot be earlier than {0}.
+date.endDateError=End date cannot be earlier than {0}.
+date.dateEarly=The date cannot be earlier than January 1, 2020 or later than the current month.
+date.startThanEnd=The start date cannot be later than the end date.
+date.dateThan365=The date interval shall not exceed 365 days.
+# 公司相关
+Company.nullNameError=Name cannot be empty
+Company.nameRepeat=The name already exists.
+Company.accessError=Operation without permission.
+Company.callError=Call too frequently, please try again later.
+Company.synError=Synchronization is in progress, please try again later.
+Company.sysDDError=Non DingDing enterprises, unable to synchronize.
+Company.validationError=Validation failed.
+Company.update=Update failed.
+# 客户相关
+customer.nameRepeat=Customer name already exists.
+customer.noRepeat=Customer number already exists.
+customer.accessError=No permission to delete.
+customer.UsedError=Customer {0} has been used.
+DD.dateError=The start date cannot be later than the end date.
+DD.keyAndSecretError=The company is not set innerAppkey and innerAppSecrt
+expense.deleteError=Failed to delete. Expense reimbursement data has been bound.
+# 文件相关
+file.error=File processing error.
+file.dataFormatError=Data format error or empty data import failure.
+file.FormatErrorAndDecrypt=The file format is incorrect. If the encryption software is installed, it needs to be decrypted first and then uploaded.
+file.encryption=The file encryption status needs to be removed before uploading.
+file.nonExistentError=file does not exist.
+file.uploadError=Upload failed {0}.
+file.deleteError=Delete failed.
+file.deleteSuc=Deletion succeeded.
+file.excelScu=System prompt: Excel file exported successfully!
+file.duplicateTemplate=A file with template name [{0}] already exists. Please delete it and download it again.
+# 配置相关
+config.used=The current configuration ['{0}'] is already in use.
+config.usedNoParam=The current configuration is already in use.
+# 审核相关
+finance.operationStateError=You can only operate in the status of pending approval.
+finance.revokeStateError=Only approved status can be revoked.
+# pdf相关
+pdf.previewError=This format does not support online preview.
+# 日报相关
+profession.existsError=The major already has a daily report and cannot be deleted.
+profession.repairError=The daily report to be filled in cannot be earlier than "{0}". Please contact the system administrator to fill in.
+profession.repeatError=Daily report: "{0}" already exists, please reselect the date range.
+profession.SubmitErrorByDay=The number of working days is 0, unable to submit. (Holidays will be skipped automatically when filling in batches. Please try filling in daily reports or reselecting the date range).
+profession.duration=Please fill in the working hours.
+profession.workDurationError=Overtime duration must be greater than 0.
+profession.OvertimeHoursError=Overtime duration ("{0}" h) cannot exceed working duration ("{1}" h).
+profession.MaxReportTimeError=The daily working hours shall not exceed "{0}" hours.
+profession.workTimeError=Cannot submit: the total working hours of "{0}" day is "{1}" h, which exceeds "{2}" h.
+# 项目相关
+project.deleteErrorByProject=Failed to delete, bound item.
+project.deleteErrorByMaster=Failed to delete, the master project has been bound.
+project.DateRelation=The data has been associated with the following items and cannot be deleted: {0}.
+project.revokeError=The project has been completed and cannot be canceled.
+project.nonExistent=The item no longer exists.
+project.BoundItems=Project already bound
+project.RecordNotExist=The operation failed because the record does not exist.
+project.emptyError=Item cannot be empty.
+project.idOrNameNoExist=The project number/name "{0}" does not exist.
+project.StageNameError=Stage name already exists.
+project.StageUsedError=This stage has been used.
+project.complete=Project ['{0}'] has completed.
+project.revoke=The project ['{0}'] has been withdrawn.
+project.InsufficientBudget=The budget of ["{1}"] of project ["{0}"] is insufficient. Please contact the management personnel to allocate the budget.
+project.joinError=The employee does not participate in the project, please go to the project management to set the project participant first.
+# 供货相关
+provider.noRepeat=Vendor No. already exists.
+provider.classNameRepeat=The supplier name under this category already exists.
+provider.NameRepeat=The supplier name already exists.
+provider.deleteError=Cannot delete, the following items are already associated with this vendor: {0}.
+# 任务相关
+Stages.RepeatInGroup=The task list already exists in the current group and cannot be added repeatedly.
+Stages.deleteError=There are tasks in this task list, which cannot be deleted.
+Stages.SubTasksError=Please complete all subtasks first.
+Stages.repeatedCollection=You have claimed this task, please do not repeat the operation.
+Stages.receiveError=This task has been claimed by others.
+Stages.noExist=The task no longer exists.
+Stages.noExistAndRefresh=This task does not exist, please refresh and view.
+#分组相关
+group.RepeatName=Group has duplicate name.
+#微信相关
+wx.TicketError=jsapiTicket Get failed.
+wx.bindError=The user has not been bound to WeChat and needs to log in through the account password.
+wx.dockError=The enterprise has not connected to WeChat.
+wx.synSecretError=Please set the synchronization secret of the enterprise address book first.
+wx.synError=Synchronization failed: {0}.