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

update ResultCommon 移动位置

Browse Source
This commit is contained in:
lijiarao
2023-11-10 10:43:02 +08:00
parent f2dfe11efb
commit 07e2725429
49 changed files with 49 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
+1 -1
View File
@@ -14,7 +14,7 @@ import com.jero.modules.activiti.entity.ProcessNode;
import com.jero.modules.activiti.enums.CommitFlagEnum;
import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.service.*;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.activiti.bpmn.converter.BpmnXMLConverter;
laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java
+1 -1
View File
@@ -16,7 +16,7 @@ import com.jero.modules.activiti.service.ProcessNodeService;
import com.jero.modules.activiti.service.ProcessModelNodeService;
import com.jero.modules.activiti.util.CreatedTools;
import com.jero.modules.activiti.vo.AddTaskVO;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+1 -3
View File
@@ -10,10 +10,9 @@ import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange;
import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper;
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.util.ObjectToMapUtil;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.util.CurrentUserUtil;
@@ -21,7 +20,6 @@ import com.jero.modules.tag.entity.LawsTag;
import com.jero.modules.tag.enums.TableNameEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException;
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+1 -4
View File
@@ -6,7 +6,6 @@ import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.CommitFlagEnum;
import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
@@ -17,17 +16,15 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+1 -3
View File
@@ -11,10 +11,9 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.mapper.ProcessApprovalRecordMapper;
import com.jero.modules.activiti.vo.DelegateTaskParam;
import com.jero.modules.activiti.vo.ResolveTaskParam;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.task.Task;
@@ -22,7 +21,6 @@ import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+1 -1
View File
@@ -19,7 +19,7 @@ import com.jero.modules.compare.entity.SarFileCompareDetailVO;
import com.jero.modules.compare.entity.SarFileCompareInfo;
import com.jero.modules.compare.service.ISarFileCompareInfoService;
import com.jero.modules.compare.enums.ReleaseConditionEnum;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java
-94
View File
@@ -1,94 +0,0 @@
package com.jero.modules.laws.common.constant;
/**
* @Author: liao
* @Date: 2023/8/24 14:01
* @Description: 返回常量
*/
public class ResultCommon {
private ResultCommon() {}
// 操作成功
public static final String OK = "message.ok";
// 操作失败
public static final String ERROR = "message.error";
// 编辑成功
public static final String EDIT_OK = "edit.ok";
// 编辑失败
public static final String EDIT_ERROR = "edit.error";
// 请选择数据
public static final String PLEASE_SELECT_DATA = "please.select.data";
// 删除成功
public static final String SUCCESSFULLY_DELETED = "successfully.deleted";
// 批量删除成功
public static final String SUCCESSFULLY_DELETED_IN_BULK = "successfully.deleted.in.bulk";
// 未找到对应数据
public static final String NO_CORRESPONDING_DATA_FOUND = "no.corresponding.data.found";
public static final String EMPTY_SOURCE = "message.empty.source"; // 来源不能为空
public static final String EMPTY_STANDARD_NUMBER = "message.empty.standard.number"; // 标准编号不能为空
public static final String EMPTY_STANDARD_NAME = "message.empty.standard.name"; // 标准名称不能为空
public static final String EMPTY_COMMON = "message.empty.common"; // {0}不能为空
public static final String EXIST_STANDARD_NUMBER = "message.exists.standard.number"; // 标准编号已经存在
public static final String NOT_EXIST_PARAM = "message.no.exists.param"; // 参数{0}不存在
public static final String NO_PERMISSION = "message.no.permission"; // 没有数据操作权限
public static final String SELECT_DATA = "message.select.data"; // 请选择数据
public static final String EXIST_SUB_FOLDERS = "message.exist.sub.folders"; // 文件夹下有子文件夹 ，该文件夹不允许删除
public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条
public static final String SUCCESSFULLY_CLEARED = "successfully.cleared"; // 清除成功
public static final String CANNOT_DUPLICATE_FAVORITES = "cannot.duplicate.favorites"; // 不能重复收藏
public static final String THE_TOPLEVEL_GROUP_CANNOT_BE_DELETED = "the.toplevel.group.cannot.be.deleted"; // 最高级组别不能删除
public static final String PLEASE_SELECT_PERSONNEL_AND_WORKGROUP = "please.select.personnel.and.workgroup"; // 请选择人员和工作组
public static final String NUMBER_WORK_NO_ALREADY_EXISTS = "number.work.no.already.exists"; // 工号已存在
public static final String NO_FILES_IMPORTED = "no.files.imported"; // 没有导入文件
public static final String PLEASE_SELECT_A_WORKGROUP_TO_IMPORT = "Please.select.a.workgroup.to.import"; // 请选择工作组进行导入
public static final String PLEASE_USE_A_FILE_WITH_THE_SUFFIX_XLSX = "please.use.a.file.with.the.suffix.xlsx"; // 文件名格式不正确, 请使用后缀名为.xlsx的文件
public static final String IMPORT_DATA_CANNOT_BE_EMPTY = "import.data.cannot.be.empty"; // 导入数据不能为空
public static final String HEADER_INCONSISTENT_WITH_TEMPLATE = "header.inconsistent.with.template"; // 表头与模板不一致
public static final String PLEASE_SELECT_A_WORKGROUP_TO_EXPORT = "please.select.a.workgroup.for.export"; // 请选择工作组进行导出
public static final String THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT = "the.job.number.cannot.be.empty.export"; // 第{0}行,工号不能为空
public static final String JOB_NUMBER_DOES_NOT_EXIST_EXPORT = "job.number.does.not.exist.export"; // 第{0}行,工号不存在
public static final String DUPLICATE_JOB_NUMBER_EXPORT = "duplicate.job.number.export"; // 第{0}行,工号重复
public static final String CANNOT_CLOSE = "cannot.close"; // 不是待整改已过期的数据不能关闭
public static final String NO_CORRESPONDING_RECORD_FOUND = "no.corresponding.record.found"; // 没有找到对应的记录
public static final String PARAMETERS_CANNOT_BE_NULL = "parameters.cannot.be.null"; // 参数不能为空
public static final String ROOT_NODE_CANNOT_BE_EDITED = "root.node.cannot.be.edited"; // 根节点不能编辑
public static final String HORIZONTAL_TRANSGRESSION = "horizontal.transgression"; // 水平越权
public static final String SELECT_LEVEL_TWO_TREE_NODE = "select.level.two.tree.node"; // 请先选择二级及以下体系
public static final String EXPORT_ERROR = "export.error"; // 导出ZIP压缩包失败
public static final String IMPORT_ERROR = "import.error"; // 导入ZIP压缩包失败
public static final String PLEASE_UPLOAD_ZIP = "please.upload.zip.archive"; // 请上传Zip压缩包
public static final String TASK_HANDLER_ERROR = "task.handler.error"; // 只有处理人可以操作
public static final String NO_AUTH = "no.auth"; // 只有处理人可以操作
public static final String IMPORT_TEMPLATE_ERROR = "import.template.error"; // 导入模板错误
public static final String ZIP_CHARSET_ERROR = "zip.charset.error"; // zip压缩包编码错误
//同一所属模块下,展示区域名称不能重复！
public static final String TAG_ERROR_1 = "tag.error.1";
//该展示区域有关联数据，无法删除！
public static final String TAG_ERROR_2 = "tag.error.2";
public static final String FOLDER_ONLY_ONE = "folder.only.one";
public static final String YOU_HAVE_NOT_DATA_AUTH = "you.have.not.data.auth";
}
laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java
+1 -2
View File
@@ -7,7 +7,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.MinioUtil;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+1 -3
View File
@@ -14,7 +14,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.MinioUtil;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.util.ImportUtil;
@@ -70,7 +70,6 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
@@ -78,7 +77,6 @@ import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
/**
laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory;
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService;
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java
+1 -2
View File
@@ -1,13 +1,12 @@
package com.jero.modules.laws.dataCenter.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder;
import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService;
import lombok.extern.slf4j.Slf4j;
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+2 -5
View File
@@ -1,9 +1,8 @@
package com.jero.modules.laws.dataCenter.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.common.util.DateUtil;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
@@ -23,10 +22,8 @@ import com.jero.common.exception.JeroBootException;
import java.util.Arrays;
import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
+1 -7
View File
@@ -1,10 +1,9 @@
package com.jero.modules.laws.dataCenter.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.common.util.TreeNodeComparator;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
@@ -14,7 +13,6 @@ import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService;
import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,10 +22,6 @@ import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
-2
View File
@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java
+1 -3
View File
@@ -7,7 +7,7 @@ import com.jero.common.aspect.annotation.Translation;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
@@ -15,10 +15,8 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java
-5
View File
@@ -1,15 +1,10 @@
package com.jero.modules.laws.enterprise.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+1 -2
View File
@@ -1,14 +1,13 @@
package com.jero.modules.laws.enterprise.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+1 -1
View File
@@ -7,7 +7,7 @@ import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory;
import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService;
import io.swagger.annotations.Api;
laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java
+2 -5
View File
@@ -1,14 +1,12 @@
package com.jero.modules.laws.library.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.library.entity.LawsAnswerLibrary;
import com.jero.modules.laws.library.entity.LawsProblemLibrary;
import com.jero.modules.laws.library.service.ILawsProblemLibraryService;
@@ -19,7 +17,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java
+1 -3
View File
@@ -3,10 +3,8 @@ package com.jero.modules.laws.library.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.library.entity.LawsAnswerLibrary;
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+1 -6
View File
@@ -4,17 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.standard.entity.LawsUpdateRecord;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
import com.jero.modules.personal.entity.LawsBrowsingHistory;
import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
import com.jero.modules.personal.service.ILawsStandardCollectionService;
import com.jero.modules.personal.service.ILawsStandardSharingService;
import com.jero.modules.tag.entity.LawsTag;
@@ -28,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Author: liao
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java
+1 -1
View File
@@ -7,7 +7,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsNewsFeed;
import com.jero.modules.laws.standard.service.ILawsNewsFeedService;
import com.baomidou.mybatisplus.core.metadata.IPage;
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.standard.entity.LawsUpdateRecord;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java
+1 -1
View File
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel;
import com.jero.modules.laws.standard.entity.LawsTreeNode;
import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+1 -1
View File
@@ -7,7 +7,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.common.constant.DictCommon;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsNewsFeed;
import com.jero.modules.laws.standard.entity.LawsPushRange;
import com.jero.modules.laws.standard.mapper.LawsNewsFeedMapper;
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standardization.entity.*;
import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
import com.jero.modules.laws.standardization.vo.StandardizationVO;
laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.system.entity.LawsContactManage;
import com.jero.modules.laws.system.service.ILawsContactManageService;
import com.baomidou.mybatisplus.core.metadata.IPage;
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.personal.entity.LawsBrowsingHistory;
import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
import com.baomidou.mybatisplus.core.metadata.IPage;
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsNewsFeed;
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+1 -1
View File
@@ -15,7 +15,7 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.jero.modules.projectLibrary.controller;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.projectLibrary.entity.LawsAssessResults;
import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+1 -1
View File
@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
import com.baomidou.mybatisplus.core.metadata.IPage;
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
+1 -1
View File
@@ -13,7 +13,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.projectLibrary.entity.LawsAssess;
import com.jero.modules.projectLibrary.entity.LawsAssessResults;
import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.sys.entity.LawsFriendlyLinks;
import com.jero.modules.sys.service.ILawsFriendlyLinksService;
import lombok.extern.slf4j.Slf4j;
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsGradeController.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.sys.entity.LawsGrade;
import com.jero.modules.sys.service.ILawsGradeService;
import io.swagger.annotations.Api;
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.service.ILawsWorkingGroupService;
import lombok.extern.slf4j.Slf4j;
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+1 -2
View File
@@ -9,7 +9,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.entity.LawsWorkingGroupUserImport;
import com.jero.modules.sys.service.ILawsWorkingGroupUserService;
@@ -35,7 +35,6 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+1 -2
View File
@@ -11,7 +11,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.mapper.LawsWorkingGroupUserMapper;
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
laws-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.system.service.ISysDictItemService;
import com.jero.modules.tag.entity.LawsArea;
import com.jero.modules.tag.service.ILawsAreaService;