返回工具类重构

system/src/main/java/com/canvas/web/modules/utils/enums/ResponseEnum.java → common/src/main/java/com/canvas/web/enums/ResponseEnum.java

@@ -1,4 +1,4 @@
-package com.canvas.web.modules.utils.enums;
+package com.canvas.web.enums;
 
 import lombok.Getter;
 

system/src/main/java/com/canvas/web/modules/utils/Response.java → common/src/main/java/com/canvas/web/utils/Response.java

@@ -1,6 +1,6 @@
-package com.canvas.web.modules.utils;
+package com.canvas.web.utils;
 
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.enums.ResponseEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

system/src/main/java/com/canvas/web/modules/device/rest/DeviceController.java

@@ -6,9 +6,9 @@ import com.canvas.web.modules.device.domain.Device;
 import com.canvas.web.modules.device.dto.DeviceDTO;
 import com.canvas.web.modules.device.service.DeviceService;
 import com.canvas.web.modules.device.vo.DeviceVO;
-import com.canvas.web.modules.utils.Response;
 import com.canvas.web.modules.utils.ResultUtils;
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.utils.Response;
+import com.canvas.web.enums.ResponseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

system/src/main/java/com/canvas/web/modules/device/service/DeviceService.java

@@ -4,6 +4,7 @@ import com.canvas.web.modules.device.criteria.DeviceSettingCriteria;
 import com.canvas.web.modules.device.domain.Device;
 import com.canvas.web.modules.device.dto.DeviceDTO;
 import com.canvas.web.modules.device.vo.DeviceVO;
+
 import com.canvas.web.modules.utils.ResultUtils;
 import org.springframework.data.domain.Pageable;
 

system/src/main/java/com/canvas/web/modules/device/service/impl/DeviceServiceImpl.java

@@ -9,6 +9,7 @@ import com.canvas.web.modules.device.vo.DeviceVO;
 import com.canvas.web.modules.utils.MapUtil;
 import com.canvas.web.modules.utils.PageSort;
 import com.canvas.web.modules.utils.ResultUtils;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

system/src/main/java/com/canvas/web/modules/material/rest/MaterialController.java

@@ -8,9 +8,9 @@ import com.canvas.web.modules.material.service.MaterialService;
 import com.canvas.web.modules.material.vo.AlbumVO;
 import com.canvas.web.modules.material.vo.MyMaterialVO;
 import com.canvas.web.modules.material.vo.ThemeVO;
-import com.canvas.web.modules.utils.Response;
 import com.canvas.web.modules.utils.ResultUtils;
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.utils.Response;
+import com.canvas.web.enums.ResponseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

system/src/main/java/com/canvas/web/modules/material/rest/ThemeClassController.java

@@ -1,11 +1,9 @@
 package com.canvas.web.modules.material.rest;
 
-import com.canvas.web.modules.device.dto.DeviceDTO;
-import com.canvas.web.modules.material.domain.ThemeClass;
 import com.canvas.web.modules.material.dto.ThemeClassDTO;
 import com.canvas.web.modules.material.service.ThemeClassService;
-import com.canvas.web.modules.utils.Response;
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.utils.Response;
+import com.canvas.web.enums.ResponseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

system/src/main/java/com/canvas/web/modules/material/service/impl/MaterialServiceImpl.java

@@ -6,12 +6,12 @@ import com.canvas.web.modules.material.dto.MaterialDTO;
 import com.canvas.web.modules.material.repository.*;
 import com.canvas.web.modules.material.service.MaterialService;
 import com.canvas.web.modules.material.vo.ThemeVO;
+
 import com.canvas.web.modules.utils.MapUtil;
 import com.canvas.web.modules.utils.PageSort;
 import com.canvas.web.modules.utils.ResultUtils;
 import com.canvas.web.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
-import org.apache.xmlbeans.impl.inst2xsd.SalamiSliceStrategy;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;

system/src/main/java/com/canvas/web/modules/material/vo/MyMaterialVO.java

@@ -1,7 +1,6 @@
 package com.canvas.web.modules.material.vo;
 
 import com.canvas.web.modules.material.domain.MaterialFolder;
-import com.canvas.web.modules.material.domain.ThemeFolder;
 import com.canvas.web.modules.utils.ResultUtils;
 import lombok.Getter;
 import lombok.Setter;

system/src/main/java/com/canvas/web/modules/release/rest/ReleaseListController.java

@@ -1,16 +1,15 @@
 package com.canvas.web.modules.release.rest;
 
-import com.canvas.web.modules.material.criteria.ThemeQueryCriteria;
-import com.canvas.web.modules.release.domain.Notice;
 import com.canvas.web.modules.release.dto.NoticeDTO;
 import com.canvas.web.modules.release.dto.ReleaseDTO;
 import com.canvas.web.modules.release.service.ReleaseListService;
 import com.canvas.web.modules.release.vo.NoticeDeviceVO;
 import com.canvas.web.modules.release.vo.NoticeVO;
 import com.canvas.web.modules.release.vo.ReleaseListVO;
-import com.canvas.web.modules.utils.Response;
 import com.canvas.web.modules.utils.ResultUtils;
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.utils.Response;
+
+import com.canvas.web.enums.ResponseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

system/src/main/java/com/canvas/web/modules/release/service/ReleaseListService.java

@@ -5,6 +5,7 @@ import com.canvas.web.modules.release.dto.ReleaseDTO;
 import com.canvas.web.modules.release.vo.NoticeDeviceVO;
 import com.canvas.web.modules.release.vo.NoticeVO;
 import com.canvas.web.modules.release.vo.ReleaseListVO;
+
 import com.canvas.web.modules.utils.ResultUtils;
 import org.springframework.data.domain.Pageable;
 
@@ -12,7 +13,7 @@ import java.util.List;
 
 public interface ReleaseListService {
     //分页查询发布信息
-    ResultUtils<List<ReleaseListVO>> getReleaseList(String releaseName,String orgaId, Pageable pageable);
+    ResultUtils<List<ReleaseListVO>> getReleaseList(String releaseName, String orgaId, Pageable pageable);
     //分页查询发布历史信息
     ResultUtils<List<ReleaseListVO>> getReleaseHistoryList(String releaseName,String orgaId, Pageable pageable);
     //编辑发布内容

system/src/main/java/com/canvas/web/modules/release/service/impl/ReleaseListServiceImpl.java

@@ -14,6 +14,7 @@ import com.canvas.web.modules.release.vo.ReleaseListVO;
 import com.canvas.web.modules.utils.MapUtil;
 import com.canvas.web.modules.utils.PageSort;
 import com.canvas.web.modules.utils.ResultUtils;
+
 import com.canvas.web.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;

system/src/main/java/com/canvas/web/modules/security/controller/AuthorizationController.java

@@ -17,15 +17,14 @@ import com.canvas.web.modules.security.service.dto.MsgDto;
 import com.canvas.web.modules.system.domain.vo.UserPassVo;
 import com.canvas.web.modules.system.service.UserService;
 import com.canvas.web.modules.system.service.dto.UserDto;
-import com.canvas.web.modules.utils.Response;
-import com.canvas.web.modules.utils.enums.ResponseEnum;
+import com.canvas.web.utils.Response;
+import com.canvas.web.enums.ResponseEnum;
 import com.canvas.web.utils.*;
 import com.wf.captcha.base.Captcha;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

system/src/main/java/com/canvas/web/modules/security/msglib/base/Sender.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+
 import com.canvas.web.modules.utils.HttpDeleteUtil;
 import com.canvas.web.modules.utils.RequestEncoder;
 import net.sf.json.JSONObject;
@@ -25,13 +26,8 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 import com.canvas.web.config.SubMailMsgConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
-
-import java.io.IOException;
-import java.util.Map;
-
 public class Sender implements ISender{
 
     protected SubMailMsgConfig config = null;