Преглед изворни кода

格式化代码 优化导入

willdoge пре 5 година
родитељ
комит
1b40701a4e
90 измењених фајлова са 142 додато и 322 уклоњено
  1. 0 1
      src/main/java/com/mokamrp/privates/PrivateServerStart.java
  2. 0 8
      src/main/java/com/mokamrp/privates/config/Config.java
  3. 0 1
      src/main/java/com/mokamrp/privates/config/RequestConfig.java
  4. 0 3
      src/main/java/com/mokamrp/privates/config/XxlSsoConfig.java
  5. 8 3
      src/main/java/com/mokamrp/privates/controller/BaseController.java
  6. 1 2
      src/main/java/com/mokamrp/privates/controller/ChatToolController.java
  7. 1 6
      src/main/java/com/mokamrp/privates/controller/ConfigController.java
  8. 3 15
      src/main/java/com/mokamrp/privates/controller/CorpController.java
  9. 2 4
      src/main/java/com/mokamrp/privates/controller/GroupController.java
  10. 3 7
      src/main/java/com/mokamrp/privates/controller/GroupCorpController.java
  11. 4 1
      src/main/java/com/mokamrp/privates/controller/LoginController.java
  12. 1 8
      src/main/java/com/mokamrp/privates/controller/MenuController.java
  13. 1 1
      src/main/java/com/mokamrp/privates/controller/TagController.java
  14. 4 13
      src/main/java/com/mokamrp/privates/controller/UserController.java
  15. 0 3
      src/main/java/com/mokamrp/privates/controller/UserCorpController.java
  16. 6 23
      src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java
  17. 8 4
      src/main/java/com/mokamrp/privates/controller/WorkContactRoomController.java
  18. 5 8
      src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java
  19. 2 9
      src/main/java/com/mokamrp/privates/controller/WorkRoomController.java
  20. 0 2
      src/main/java/com/mokamrp/privates/entity/CorpIndexHandle.java
  21. 0 1
      src/main/java/com/mokamrp/privates/entity/DelHandle.java
  22. 1 1
      src/main/java/com/mokamrp/privates/entity/GetWorkRoomHandle.java
  23. 0 1
      src/main/java/com/mokamrp/privates/entity/JobRedis.java
  24. 0 2
      src/main/java/com/mokamrp/privates/entity/JobRoomJobRedis.java
  25. 0 4
      src/main/java/com/mokamrp/privates/entity/JobWorkContactEmployeeRedis.java
  26. 0 1
      src/main/java/com/mokamrp/privates/entity/LoginHandle.java
  27. 0 1
      src/main/java/com/mokamrp/privates/entity/SetGroupCorpHandle.java
  28. 0 1
      src/main/java/com/mokamrp/privates/entity/SetUserCorpsHandle.java
  29. 0 1
      src/main/java/com/mokamrp/privates/entity/UnSetGroupCorpHandle.java
  30. 1 0
      src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java
  31. 1 4
      src/main/java/com/mokamrp/privates/mapper/CorpMapper.java
  32. 1 1
      src/main/java/com/mokamrp/privates/mapper/DownfileMapper.java
  33. 1 3
      src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.java
  34. 1 3
      src/main/java/com/mokamrp/privates/mapper/GroupMapper.java
  35. 1 1
      src/main/java/com/mokamrp/privates/mapper/RoomTagMapper.java
  36. 1 1
      src/main/java/com/mokamrp/privates/mapper/TagMapper.java
  37. 1 3
      src/main/java/com/mokamrp/privates/mapper/UserCorpMapper.java
  38. 1 1
      src/main/java/com/mokamrp/privates/mapper/UserMapper.java
  39. 1 4
      src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.java
  40. 1 1
      src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.java
  41. 1 2
      src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.java
  42. 1 8
      src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.java
  43. 1 1
      src/main/java/com/mokamrp/privates/mapper/pojo/ChatTool.java
  44. 1 2
      src/main/java/com/mokamrp/privates/mapper/pojo/Corp.java
  45. 0 2
      src/main/java/com/mokamrp/privates/mapper/pojo/Downfile.java
  46. 1 2
      src/main/java/com/mokamrp/privates/mapper/pojo/Group.java
  47. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/GroupCorp.java
  48. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/RoomTag.java
  49. 1 6
      src/main/java/com/mokamrp/privates/mapper/pojo/User.java
  50. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/UserCorp.java
  51. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkContact.java
  52. 1 1
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactEmployee.java
  53. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactRoom.java
  54. 1 1
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkEmployee.java
  55. 2 1
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkRoom.java
  56. 0 1
      src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java
  57. 0 2
      src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomGroupDataVo.java
  58. 0 2
      src/main/java/com/mokamrp/privates/mapper/vo/WorkEmployeeVo.java
  59. 0 1
      src/main/java/com/mokamrp/privates/mapper/vo/WorkGroupDataVo.java
  60. 1 3
      src/main/java/com/mokamrp/privates/service/CorpService.java
  61. 1 1
      src/main/java/com/mokamrp/privates/service/DownfileService.java
  62. 1 3
      src/main/java/com/mokamrp/privates/service/GroupCorpService.java
  63. 1 2
      src/main/java/com/mokamrp/privates/service/GroupService.java
  64. 2 4
      src/main/java/com/mokamrp/privates/service/TagService.java
  65. 1 2
      src/main/java/com/mokamrp/privates/service/UserCorpService.java
  66. 1 2
      src/main/java/com/mokamrp/privates/service/UserService.java
  67. 1 6
      src/main/java/com/mokamrp/privates/service/WorkContactEmployeeService.java
  68. 1 1
      src/main/java/com/mokamrp/privates/service/WorkContactRoomService.java
  69. 1 3
      src/main/java/com/mokamrp/privates/service/WorkEmployeeService.java
  70. 1 2
      src/main/java/com/mokamrp/privates/service/WorkRoomService.java
  71. 1 1
      src/main/java/com/mokamrp/privates/service/impl/ChatToolServiceImpl.java
  72. 2 5
      src/main/java/com/mokamrp/privates/service/impl/CorpServiceImpl.java
  73. 2 2
      src/main/java/com/mokamrp/privates/service/impl/DownfileServiceImpl.java
  74. 2 4
      src/main/java/com/mokamrp/privates/service/impl/GroupCorpServiceImpl.java
  75. 3 2
      src/main/java/com/mokamrp/privates/service/impl/GroupServiceImpl.java
  76. 4 4
      src/main/java/com/mokamrp/privates/service/impl/TagServiceImpl.java
  77. 2 5
      src/main/java/com/mokamrp/privates/service/impl/UserCorpServiceImpl.java
  78. 2 4
      src/main/java/com/mokamrp/privates/service/impl/UserServiceImpl.java
  79. 2 8
      src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java
  80. 2 2
      src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java
  81. 21 25
      src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java
  82. 2 4
      src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java
  83. 0 12
      src/main/java/com/mokamrp/privates/tast/ContactJobTask.java
  84. 1 0
      src/main/java/com/mokamrp/privates/tast/ExportJobTask.java
  85. 0 8
      src/main/java/com/mokamrp/privates/utils/OssFile.java
  86. 0 6
      src/main/java/com/mokamrp/privates/utils/PageUtil.java
  87. 1 0
      src/main/java/com/mokamrp/privates/utils/RedisUtil.java
  88. 0 1
      src/main/java/com/mokamrp/privates/utils/ServletUtils.java
  89. 2 2
      src/test/java/com/mokamrp/AppTest.java
  90. 0 4
      src/test/java/com/mokamrp/AutoMP.java

+ 0 - 1
src/main/java/com/mokamrp/privates/PrivateServerStart.java

@@ -3,7 +3,6 @@ package com.mokamrp.privates;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

+ 0 - 8
src/main/java/com/mokamrp/privates/config/Config.java

@@ -1,14 +1,6 @@
 package com.mokamrp.privates.config;
 
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-
-import java.util.ArrayList;
-import java.util.List;
 
 
 @Configuration

+ 0 - 1
src/main/java/com/mokamrp/privates/config/RequestConfig.java

@@ -5,7 +5,6 @@ import com.mokamrp.privates.interceptor.AuthIntercepotor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

+ 0 - 3
src/main/java/com/mokamrp/privates/config/XxlSsoConfig.java

@@ -9,9 +9,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author xuxueli 2018-11-15
  */

+ 8 - 3
src/main/java/com/mokamrp/privates/controller/BaseController.java

@@ -11,14 +11,19 @@ import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.EditHandle;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pojo.*;
 import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * 一个粗糙的鸡肋

+ 1 - 2
src/main/java/com/mokamrp/privates/controller/ChatToolController.java

@@ -1,9 +1,8 @@
 package com.mokamrp.privates.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>

+ 1 - 6
src/main/java/com/mokamrp/privates/controller/ConfigController.java

@@ -1,16 +1,11 @@
 package com.mokamrp.privates.controller;
 
-import com.mokamrp.privates.config.XxlSsoConfig;
-import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.LoginHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
+
 import java.util.HashMap;
 import java.util.Map;
 

+ 3 - 15
src/main/java/com/mokamrp/privates/controller/CorpController.java

@@ -1,18 +1,12 @@
 package com.mokamrp.privates.controller;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.CorpIndexHandle;
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.entity.PostCorpWxLoginHandle;
-import com.mokamrp.privates.interceptor.AuthUser;
-import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
-import com.mokamrp.privates.service.GroupCorpService;
-import com.mokamrp.privates.service.UserCorpService;
-import com.mokamrp.privates.utils.RedisUtil;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pojo.Corp;
+import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.utils.StringUtils;
 import com.mokamrp.privates.utils.http.HttpUtils;
 import com.xxl.sso.core.conf.Conf;
@@ -21,13 +15,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import com.mokamrp.privates.service.CorpService;
-import com.mokamrp.privates.mapper.pojo.Corp;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.*;

+ 2 - 4
src/main/java/com/mokamrp/privates/controller/GroupController.java

@@ -2,17 +2,15 @@ package com.mokamrp.privates.controller;
 
 
 import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pojo.Group;
+import com.mokamrp.privates.service.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import com.mokamrp.privates.service.GroupService;
-import com.mokamrp.privates.mapper.pojo.Group;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * <p>

+ 3 - 7
src/main/java/com/mokamrp/privates/controller/GroupCorpController.java

@@ -5,18 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.entity.SetGroupCorpHandle;
 import com.mokamrp.privates.entity.UnSetGroupCorpHandle;
+import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.mokamrp.privates.mapper.pojo.Group;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.mokamrp.privates.service.CorpService;
+import com.mokamrp.privates.service.GroupCorpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.mokamrp.privates.service.GroupCorpService;
-import com.mokamrp.privates.mapper.pojo.GroupCorp;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

+ 4 - 1
src/main/java/com/mokamrp/privates/controller/LoginController.java

@@ -6,7 +6,10 @@ import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.Map;

+ 1 - 8
src/main/java/com/mokamrp/privates/controller/MenuController.java

@@ -8,21 +8,14 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.User;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.cookie.BasicClientCookie;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.Cookie;
+
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/controller/TagController.java

@@ -2,13 +2,13 @@ package com.mokamrp.privates.controller;
 
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pojo.Tag;
 import com.mokamrp.privates.service.TagService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.mokamrp.privates.mapper.pojo.Tag;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;

+ 4 - 13
src/main/java/com/mokamrp/privates/controller/UserController.java

@@ -1,22 +1,13 @@
 package com.mokamrp.privates.controller;
 
 
-import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
-import com.mokamrp.privates.entity.LoginHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.UserCorpService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>

+ 0 - 3
src/main/java/com/mokamrp/privates/controller/UserCorpController.java

@@ -4,13 +4,11 @@ package com.mokamrp.privates.controller;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.SetUserCorpsHandle;
-import com.mokamrp.privates.entity.UnSetGroupCorpHandle;
 import com.mokamrp.privates.entity.UnSetUserCorpHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.service.UserCorpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 6 - 23
src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -1,44 +1,27 @@
 package com.mokamrp.privates.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.model.PutObjectRequest;
-import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.*;
+import com.mokamrp.privates.entity.GetWorkContactEmployeeHandle;
+import com.mokamrp.privates.entity.JobRedis;
+import com.mokamrp.privates.entity.JobWorkContactEmployeeRedis;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
-import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.RedisUtil;
-import com.xxl.sso.core.conf.Conf;
-import com.xxl.sso.core.user.XxlSsoUser;
-import io.netty.handler.codec.json.JsonObjectDecoder;
-import lombok.extern.flogger.Flogger;
-import org.apache.ibatis.annotations.Param;
-import org.apache.xerces.xs.datatypes.ObjectList;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import java.io.ByteArrayInputStream;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 
 /**

+ 8 - 4
src/main/java/com/mokamrp/privates/controller/WorkContactRoomController.java

@@ -1,12 +1,16 @@
 package com.mokamrp.privates.controller;
 
-import com.mokamrp.privates.mapper.pojo.*;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.service.WorkContactRoomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.entity.IndexHandle;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.Map;
 
 /**

+ 5 - 8
src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -2,26 +2,23 @@ package com.mokamrp.privates.controller;
 
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.PostWorkEmployee;
-import com.mokamrp.privates.entity.SetWorkEmployeeTagHandle;
-import com.mokamrp.privates.entity.WorkEmployeeHandle;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.interceptor.AuthUser;
-import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
-import com.mokamrp.privates.mapper.pojo.*;
+import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
+import com.mokamrp.privates.service.WorkEmployeeService;
 import com.mokamrp.privates.utils.RedisUtil;
 import com.xxl.sso.core.conf.Conf;
 import com.xxl.sso.core.user.XxlSsoUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import com.mokamrp.privates.service.WorkEmployeeService;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;

+ 2 - 9
src/main/java/com/mokamrp/privates/controller/WorkRoomController.java

@@ -1,7 +1,6 @@
 package com.mokamrp.privates.controller;
 
 
-import com.fasterxml.jackson.datatype.jdk8.Jdk8OptionalBeanPropertyWriter;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.entity.JobRedis;
@@ -12,25 +11,19 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.UserCorpService;
-import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.service.WorkRoomService;
 import com.mokamrp.privates.utils.RedisUtil;
-import com.xxl.sso.core.conf.Conf;
-import com.xxl.sso.core.user.XxlSsoUser;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

+ 0 - 2
src/main/java/com/mokamrp/privates/entity/CorpIndexHandle.java

@@ -2,8 +2,6 @@ package com.mokamrp.privates.entity;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class CorpIndexHandle {
 

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/DelHandle.java

@@ -3,7 +3,6 @@ package com.mokamrp.privates.entity;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * @param <T>

+ 1 - 1
src/main/java/com/mokamrp/privates/entity/GetWorkRoomHandle.java

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
+
 import javax.validation.constraints.Min;
 import java.util.List;
 

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/JobRedis.java

@@ -3,7 +3,6 @@ package com.mokamrp.privates.entity;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 
 import java.io.Serializable;
-import java.util.Map;
 
 public class JobRedis implements Serializable {
 

+ 0 - 2
src/main/java/com/mokamrp/privates/entity/JobRoomJobRedis.java

@@ -1,8 +1,6 @@
 package com.mokamrp.privates.entity;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 
 public class JobRoomJobRedis implements Serializable {
 

+ 0 - 4
src/main/java/com/mokamrp/privates/entity/JobWorkContactEmployeeRedis.java

@@ -1,9 +1,5 @@
 package com.mokamrp.privates.entity;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
 public class JobWorkContactEmployeeRedis{
 
     public final static String TASK_NAME = "WorkContactEmployeeService";

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/LoginHandle.java

@@ -2,7 +2,6 @@ package com.mokamrp.privates.entity;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/SetGroupCorpHandle.java

@@ -3,7 +3,6 @@ package com.mokamrp.privates.entity;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/SetUserCorpsHandle.java

@@ -2,7 +2,6 @@ package com.mokamrp.privates.entity;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data

+ 0 - 1
src/main/java/com/mokamrp/privates/entity/UnSetGroupCorpHandle.java

@@ -3,7 +3,6 @@ package com.mokamrp.privates.entity;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.List;
 @Data
 public class UnSetGroupCorpHandle {
     @NotBlank(message = "分组ID不可为空")

+ 1 - 0
src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -9,6 +9,7 @@ import com.xxl.sso.core.user.XxlSsoUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;

+ 1 - 4
src/main/java/com/mokamrp/privates/mapper/CorpMapper.java

@@ -1,15 +1,12 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.mokamrp.privates.entity.CorpIndexHandle;
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/DownfileMapper.java

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
-import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import org.springframework.stereotype.Component;
 
 /**

+ 1 - 3
src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.java

@@ -1,10 +1,8 @@
 package com.mokamrp.privates.mapper;
 
-import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 3
src/main/java/com/mokamrp/privates/mapper/GroupMapper.java

@@ -1,12 +1,10 @@
 package com.mokamrp.privates.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mokamrp.privates.mapper.pojo.Group;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/RoomTagMapper.java

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
-import com.mokamrp.privates.mapper.pojo.RoomTag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.pojo.RoomTag;
 import org.springframework.stereotype.Component;
 
 /**

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/TagMapper.java

@@ -1,8 +1,8 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

+ 1 - 3
src/main/java/com/mokamrp/privates/mapper/UserCorpMapper.java

@@ -1,13 +1,11 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/UserMapper.java

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
-import com.mokamrp.privates.mapper.pojo.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.pojo.User;
 import org.springframework.stereotype.Component;
 
 /**

+ 1 - 4
src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.java

@@ -2,12 +2,9 @@ package com.mokamrp.privates.mapper;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.mapper.pojo.Corp;
-import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.java

@@ -2,9 +2,9 @@ package com.mokamrp.privates.mapper;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo;
 import org.apache.ibatis.annotations.Param;

+ 1 - 2
src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.java

@@ -1,11 +1,10 @@
 package com.mokamrp.privates.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 

+ 1 - 8
src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.java

@@ -2,21 +2,14 @@ package com.mokamrp.privates.mapper;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
-import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
+import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/ChatTool.java

@@ -1,12 +1,12 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 1 - 2
src/main/java/com/mokamrp/privates/mapper/pojo/Corp.java

@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.mokamrp.privates.utils.StringUtils;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 0 - 2
src/main/java/com/mokamrp/privates/mapper/pojo/Downfile.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import org.apache.tomcat.util.bcel.Const;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>

+ 1 - 2
src/main/java/com/mokamrp/privates/mapper/pojo/Group.java

@@ -1,13 +1,12 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/GroupCorp.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/RoomTag.java

@@ -1,12 +1,13 @@
 package com.mokamrp.privates.mapper.pojo;
 
 
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 1 - 6
src/main/java/com/mokamrp/privates/mapper/pojo/User.java

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
-import java.util.Date;
-
-
-
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/UserCorp.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/WorkContact.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactEmployee.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactRoom.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/WorkEmployee.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pojo/WorkRoom.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

+ 0 - 1
src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java

@@ -1,7 +1,6 @@
 package com.mokamrp.privates.mapper.vo;
 
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**

+ 0 - 2
src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomGroupDataVo.java

@@ -1,7 +1,5 @@
 package com.mokamrp.privates.mapper.vo;
 
-import java.util.Date;
-
 /**
  * <p>
  * 通讯录 - 客户 中间表

+ 0 - 2
src/main/java/com/mokamrp/privates/mapper/vo/WorkEmployeeVo.java

@@ -1,7 +1,5 @@
 package com.mokamrp.privates.mapper.vo;
 
-import java.util.Date;
-
 /**
  * <p>
  * 通讯录 - 客户 中间表

+ 0 - 1
src/main/java/com/mokamrp/privates/mapper/vo/WorkGroupDataVo.java

@@ -1,6 +1,5 @@
 package com.mokamrp.privates.mapper.vo;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

+ 1 - 3
src/main/java/com/mokamrp/privates/service/CorpService.java

@@ -1,10 +1,8 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.CorpIndexHandle;
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/mokamrp/privates/service/DownfileService.java

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 
 /**
  * <p>

+ 1 - 3
src/main/java/com/mokamrp/privates/service/GroupCorpService.java

@@ -1,9 +1,7 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 2
src/main/java/com/mokamrp/privates/service/GroupService.java

@@ -1,10 +1,9 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pojo.Group;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
 import java.util.Map;
 
 /**

+ 2 - 4
src/main/java/com/mokamrp/privates/service/TagService.java

@@ -1,12 +1,10 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.entity.GetEmployeeTagHandle;
-import com.mokamrp.privates.mapper.pojo.Tag;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
-
-import java.util.List;
+import com.mokamrp.privates.mapper.pojo.Tag;
 
 /**
  * <p>

+ 1 - 2
src/main/java/com/mokamrp/privates/service/UserCorpService.java

@@ -1,11 +1,10 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

+ 1 - 2
src/main/java/com/mokamrp/privates/service/UserService.java

@@ -1,8 +1,7 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.mapper.pojo.User;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.stereotype.Service;
+import com.mokamrp.privates.mapper.pojo.User;
 
 import java.util.Map;
 

+ 1 - 6
src/main/java/com/mokamrp/privates/service/WorkContactEmployeeService.java

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.GetWorkContactEmployeeHandle;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
 import java.util.Map;
 
 /**

+ 1 - 1
src/main/java/com/mokamrp/privates/service/WorkContactRoomService.java

@@ -1,8 +1,8 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.validation.BindingResult;
 
 import java.util.Map;

+ 1 - 3
src/main/java/com/mokamrp/privates/service/WorkEmployeeService.java

@@ -1,12 +1,10 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostWorkEmployee;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.mapper.pojo.Downfile;
-import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 2
src/main/java/com/mokamrp/privates/service/WorkRoomService.java

@@ -1,11 +1,10 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
 import java.util.Map;
 
 /**

+ 1 - 1
src/main/java/com/mokamrp/privates/service/impl/ChatToolServiceImpl.java

@@ -1,8 +1,8 @@
 package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mokamrp.privates.mapper.pojo.ChatTool;
 import com.mokamrp.privates.mapper.ChatToolMapper;
+import com.mokamrp.privates.mapper.pojo.ChatTool;
 import com.mokamrp.privates.service.ChatToolService;
 import org.springframework.stereotype.Service;
 

+ 2 - 5
src/main/java/com/mokamrp/privates/service/impl/CorpServiceImpl.java

@@ -3,18 +3,15 @@ package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.CorpIndexHandle;
-import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.CorpMapper;
+import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.service.CorpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 

+ 2 - 2
src/main/java/com/mokamrp/privates/service/impl/DownfileServiceImpl.java

@@ -1,9 +1,9 @@
 package com.mokamrp.privates.service.impl;
 
-import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.mapper.DownfileMapper;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.service.DownfileService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 4
src/main/java/com/mokamrp/privates/service/impl/GroupCorpServiceImpl.java

@@ -2,12 +2,10 @@ package com.mokamrp.privates.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mokamrp.privates.mapper.pojo.Group;
-import com.mokamrp.privates.mapper.pojo.GroupCorp;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.mapper.GroupCorpMapper;
-import com.mokamrp.privates.mapper.pojo.UserCorp;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.mokamrp.privates.service.GroupCorpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 2
src/main/java/com/mokamrp/privates/service/impl/GroupServiceImpl.java

@@ -2,15 +2,16 @@ package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.mapper.GroupMapper;
 import com.mokamrp.privates.mapper.WorkRoomMapper;
 import com.mokamrp.privates.mapper.pojo.Group;
-import com.mokamrp.privates.mapper.GroupMapper;
 import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
 import com.mokamrp.privates.service.GroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

+ 4 - 4
src/main/java/com/mokamrp/privates/service/impl/TagServiceImpl.java

@@ -2,15 +2,15 @@ package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
-import com.mokamrp.privates.mapper.pojo.Tag;
+import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.TagMapper;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+import com.mokamrp.privates.mapper.pojo.Tag;
 import com.mokamrp.privates.service.TagService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
 import java.util.Iterator;
 import java.util.Map;

+ 2 - 5
src/main/java/com/mokamrp/privates/service/impl/UserCorpServiceImpl.java

@@ -1,21 +1,18 @@
 package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mokamrp.privates.mapper.DownfileMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.mapper.UserCorpMapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.mokamrp.privates.mapper.UserCorpMapper;
 import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.service.UserCorpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 2 - 4
src/main/java/com/mokamrp/privates/service/impl/UserServiceImpl.java

@@ -2,20 +2,18 @@ package com.mokamrp.privates.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.RedisKey;
-import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.UserMapper;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.StringUtils;
 import com.mokamrp.privates.utils.sign.Md5Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

+ 2 - 8
src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -2,26 +2,20 @@ package com.mokamrp.privates.service.impl;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.entity.GetWorkContactEmployeeHandle;
-import com.mokamrp.privates.mapper.CorpMapper;
 import com.mokamrp.privates.mapper.DownfileMapper;
+import com.mokamrp.privates.mapper.WorkContactEmployeeMapper;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.mokamrp.privates.mapper.WorkContactEmployeeMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.PageUtil;
-import org.apache.ibatis.annotations.Param;
-import org.apache.tomcat.util.bcel.Const;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayInputStream;

+ 2 - 2
src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java

@@ -2,14 +2,14 @@ package com.mokamrp.privates.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.mapper.WorkContactRoomMapper;
+import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
 import com.mokamrp.privates.service.WorkContactRoomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 21 - 25
src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -5,22 +5,17 @@ import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.config.OSSConfiguration;
-import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.entity.PostWorkEmployee;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.mapper.*;
 import com.mokamrp.privates.mapper.pojo.*;
 import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
-import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.UserCorpService;
-import com.mokamrp.privates.service.WorkContactRoomService;
 import com.mokamrp.privates.service.WorkEmployeeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.StringUtils;
-import jdk.nashorn.internal.objects.annotations.Where;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -93,7 +88,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
 
         Integer total = workEmployeeMapper.getVoListTotal(obj);
         resMap.put("total", total);
-        if(total <=0){
+        if (total <= 0) {
             return resMap;
         }
 
@@ -205,7 +200,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("a.private_tag_id", privateTagId);
         }
 
-        if (authCorpIds != null || authCorpIds.size()>=1) {
+        if (authCorpIds != null || authCorpIds.size() >= 1) {
             obj.in("a.corp_id", authCorpIds);
         }
 
@@ -219,21 +214,21 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         QueryWrapper<WorkRoom> roomObj = new QueryWrapper<WorkRoom>();
         List<WorkEmployeeVo> list = workEmployeeMapper.getVoList(pageObj, room);
 
-        int j =list.size();
+        int j = list.size();
 
         if (j > 0) {
             List<Object> ids = list.stream().map(WorkEmployeeVo -> WorkEmployeeVo.getId()).collect(Collectors.toList());
 
-            obj.select("count(*) as nums,employee_id").in("employee_id",ids).groupBy("employee_id");
-            List<Map<String,Object>> contactList= workContactEmployeeMapper.selectMaps(obj);
+            obj.select("count(*) as nums,employee_id").in("employee_id", ids).groupBy("employee_id");
+            List<Map<String, Object>> contactList = workContactEmployeeMapper.selectMaps(obj);
 
-            workContactRoomObj.select("count(distinct(room_id)) as nums,employee_id").in("employee_id",ids)
-                    .eq("type",1)
+            workContactRoomObj.select("count(distinct(room_id)) as nums,employee_id").in("employee_id", ids)
+                    .eq("type", 1)
                     .groupBy("employee_id");
-            List<Map<String,Object>> workContactRoomList = workContactRoomMapper.selectMaps(workContactRoomObj);
+            List<Map<String, Object>> workContactRoomList = workContactRoomMapper.selectMaps(workContactRoomObj);
 
-            roomObj.select("count(*) as nums,owner_id").in("owner_id",ids).groupBy("owner_id");
-            List<Map<String,Object>> roomList = workRoomMapper.selectMaps(roomObj);
+            roomObj.select("count(*) as nums,owner_id").in("owner_id", ids).groupBy("owner_id");
+            List<Map<String, Object>> roomList = workRoomMapper.selectMaps(roomObj);
 
             Object id;
             for (int i = 0; i < j; i++) {
@@ -241,28 +236,28 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
                 list.get(i).setRoomNum(0);
                 list.get(i).setFanNum(0);
                 list.get(i).setInGroupCnt(0);
-                for (Map<String,Object> r:roomList
+                for (Map<String, Object> r : roomList
                 ) {
-                    if(r.get("owner_id").toString().equals(id.toString())){
+                    if (r.get("owner_id").toString().equals(id.toString())) {
                         list.get(i).setRoomNum(r.get("nums"));
                     }
                 }
 
-                for (Map<String,Object> contact:contactList
+                for (Map<String, Object> contact : contactList
                 ) {
-                    if(contact.get("employee_id").toString().equals(id.toString())){
+                    if (contact.get("employee_id").toString().equals(id.toString())) {
                         list.get(i).setFanNum(contact.get("nums"));
                     }
                 }
 
-                for (Map<String,Object> workContactRoom:workContactRoomList
+                for (Map<String, Object> workContactRoom : workContactRoomList
                 ) {
-                    if(workContactRoom.get("employee_id").toString().equals(id.toString())){
+                    if (workContactRoom.get("employee_id").toString().equals(id.toString())) {
                         list.get(i).setInGroupCnt(Integer.parseInt(workContactRoom.get("nums").toString()));
                     }
                 }
 
-                list.get(i).setThumbAvatar(ossConfiguration.getHost()+list.get(i).getThumbAvatar());
+                list.get(i).setThumbAvatar(ossConfiguration.getHost() + list.get(i).getThumbAvatar());
 
             }
         }
@@ -273,14 +268,15 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
 
     /**
      * 设置客服标签
+     *
      * @param tagId
      * @param employeeIds
      * @return
      */
-    public boolean setTag(Integer tagId,List<Integer> employeeIds){
+    public boolean setTag(Integer tagId, List<Integer> employeeIds) {
         WorkEmployee workEmployee = new WorkEmployee();
         workEmployee.setPrivateTagId(tagId);
-        this.update(workEmployee,new UpdateWrapper<WorkEmployee>().in("id",employeeIds));
+        this.update(workEmployee, new UpdateWrapper<WorkEmployee>().in("id", employeeIds));
         return true;
     }
 

+ 2 - 4
src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -3,24 +3,22 @@ package com.mokamrp.privates.service.impl;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.*;
 import com.mokamrp.privates.mapper.pojo.*;
-import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.WorkRoomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.PageUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+
 import java.io.ByteArrayInputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;

+ 0 - 12
src/main/java/com/mokamrp/privates/tast/ContactJobTask.java

@@ -1,22 +1,10 @@
 package com.mokamrp.privates.tast;
 
-import com.mokamrp.privates.entity.JobRedis;
-import com.mokamrp.privates.entity.JobRoomJobRedis;
-import com.mokamrp.privates.entity.JobWorkContactEmployeeRedis;
-import com.mokamrp.privates.entity.JobWorkEmployeeJobRedis;
-import com.mokamrp.privates.mapper.pojo.Downfile;
-import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
-import com.mokamrp.privates.service.WorkEmployeeService;
-import com.mokamrp.privates.service.WorkRoomService;
-import com.mokamrp.privates.utils.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-import java.util.Date;
-
 @Component
 public class ContactJobTask {
 

+ 1 - 0
src/main/java/com/mokamrp/privates/tast/ExportJobTask.java

@@ -12,6 +12,7 @@ import com.mokamrp.privates.utils.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
 import javax.annotation.Resource;
 import java.util.Date;
 

+ 0 - 8
src/main/java/com/mokamrp/privates/utils/OssFile.java

@@ -1,13 +1,5 @@
 package com.mokamrp.privates.utils;
 
-import com.mokamrp.privates.utils.spring.SpringUtils;
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**

+ 0 - 6
src/main/java/com/mokamrp/privates/utils/PageUtil.java

@@ -1,11 +1,5 @@
 package com.mokamrp.privates.utils;
 
-import com.mokamrp.privates.entity.PostBasePageHandle;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 将list<map>转成csv模式
  *

+ 1 - 0
src/main/java/com/mokamrp/privates/utils/RedisUtil.java

@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

+ 0 - 1
src/main/java/com/mokamrp/privates/utils/ServletUtils.java

@@ -1,6 +1,5 @@
 package com.mokamrp.privates.utils;
 
-import com.mokamrp.privates.utils.Convert;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+ 2 - 2
src/test/java/com/mokamrp/AppTest.java

@@ -1,9 +1,9 @@
 package com.mokamrp;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Unit test for simple App.
  */

+ 0 - 4
src/test/java/com/mokamrp/AutoMP.java

@@ -5,14 +5,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.springframework.beans.factory.annotation.Value;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class AutoMP {