update ResultCommon 移动位置

laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java

@@ -1,4 +1,4 @@
-package com.jero.modules.laws.common.constant;
+package com.jero.common.api.vo;
 
 /**
  * @Author: liao

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java

@@ -8,7 +8,7 @@ import com.jero.modules.docking.hiwork.entity.HiworkDingDingMsg;
 import com.jero.modules.docking.hiwork.entity.HiworkSystemMsg;
 import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
 import com.jero.modules.docking.hiwork.util.HiworkPostUtil;
-import com.jero.modules.laws.common.constant.ResultCommon;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.collections4.CollectionUtils;

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java

@@ -5,7 +5,7 @@ import com.jero.modules.docking.hiwork.entity.HiworkTodoAdd;
 import com.jero.modules.docking.hiwork.service.IHiworkTodoService;
 import com.jero.modules.docking.hiwork.util.HiworkPostUtil;
 import com.jero.modules.docking.hiwork.entity.HiworkTodo;
-import com.jero.modules.laws.common.constant.ResultCommon;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import org.activiti.engine.RuntimeService;

laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/controller/LawsCommonController.java

@@ -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

@@ -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

@@ -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

@@ -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,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

@@ -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,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.common.api.vo.ResultCommon;
-import com.jero.modules.laws.common.constant.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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;