Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

* 'master' of http://git.mokasz.com/marketing/moka-private:
  代码缩进调整
  增加客服标签相关接口

# Conflicts:
#	src/main/java/com/mokamrp/privates/controller/WorkContactRoomController.java
#	src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.java
#	src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml
#	src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

src/main/java/com/mokamrp/privates/Result/ReturnT.java

@@ -5,8 +5,8 @@ import java.io.Serializable;
 /**
  * common return
  *
- * @author xuxueli 2015-12-4 16:32:31
  * @param <T>
+ * @author xuxueli 2015-12-4 16:32:31
  */
 public class ReturnT<T> implements Serializable {
     public static final long serialVersionUID = 42L;
@@ -24,6 +24,7 @@ public class ReturnT<T> implements Serializable {
         this.code = code;
         this.msg = msg;
     }
+
     public ReturnT(T data) {
         this.code = SUCCESS_CODE;
         this.data = data;
@@ -32,18 +33,23 @@ public class ReturnT<T> implements Serializable {
     public int getCode() {
         return code;
     }
+
     public void setCode(int code) {
         this.code = code;
     }
+
     public String getMsg() {
         return msg;
     }
+
     public void setMsg(String msg) {
         this.msg = msg;
     }
+
     public T getData() {
         return data;
     }
+
     public void setData(T data) {
         this.data = data;
     }

src/main/java/com/mokamrp/privates/cache/RedisCache.java

@@ -15,12 +15,10 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * spring redis 工具类
- *
  **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
-public class RedisCache
-{
+public class RedisCache {
     @Autowired
     public RedisTemplate redisTemplate;
 
@@ -30,53 +28,49 @@ public class RedisCache
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key   缓存的键值
      * @param value 缓存的值
      */
-    public <T> void setCacheObject(final String key, final T value)
-    {
+    public <T> void setCacheObject(final String key, final T value) {
         redisTemplate.opsForValue().set(key, value);
     }
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     * @param timeout 时间
+     * @param key      缓存的键值
+     * @param value    缓存的值
+     * @param timeout  时间
      * @param timeUnit 时间颗粒度
      */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
-    {
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout)
-    {
+    public boolean expire(final String key, final long timeout) {
         return expire(key, timeout, TimeUnit.SECONDS);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
-     * @param unit 时间单位
+     * @param unit    时间单位
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
-    {
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
         return redisTemplate.expire(key, timeout, unit);
     }
 
-    public String getString(final String key){
+    public String getString(final String key) {
         return stringRedisTemplate.opsForValue().get(key);
     }
 
@@ -86,8 +80,7 @@ public class RedisCache
      * @param key 缓存键值
      * @return 缓存键值对应的数据
      */
-    public <T> T getCacheObject(final String key)
-    {
+    public <T> T getCacheObject(final String key) {
         ValueOperations<String, T> operation = redisTemplate.opsForValue();
         return operation.get(key);
     }
@@ -97,8 +90,7 @@ public class RedisCache
      *
      * @param key
      */
-    public boolean deleteObject(final String key)
-    {
+    public boolean deleteObject(final String key) {
         return redisTemplate.delete(key);
     }
 
@@ -108,20 +100,18 @@ public class RedisCache
      * @param collection 多个对象
      * @return
      */
-    public long deleteObject(final Collection collection)
-    {
+    public long deleteObject(final Collection collection) {
         return redisTemplate.delete(collection);
     }
 
     /**
      * 缓存List数据
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
      * @param dataList 待缓存的List数据
      * @return 缓存的对象
      */
-    public <T> long setCacheList(final String key, final List<T> dataList)
-    {
+    public <T> long setCacheList(final String key, final List<T> dataList) {
         Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
         return count == null ? 0 : count;
     }
@@ -132,20 +122,18 @@ public class RedisCache
      * @param key 缓存的键值
      * @return 缓存键值对应的数据
      */
-    public <T> List<T> getCacheList(final String key)
-    {
+    public <T> List<T> getCacheList(final String key) {
         return redisTemplate.opsForList().range(key, 0, -1);
     }
 
     /**
      * 缓存Set
      *
-     * @param key 缓存键值
+     * @param key     缓存键值
      * @param dataSet 缓存的数据
      * @return 缓存数据的对象
      */
-    public <T> long setCacheSet(final String key, final Set<T> dataSet)
-    {
+    public <T> long setCacheSet(final String key, final Set<T> dataSet) {
         Long count = redisTemplate.opsForSet().add(key, dataSet);
         return count == null ? 0 : count;
     }
@@ -156,8 +144,7 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Set<T> getCacheSet(final String key)
-    {
+    public <T> Set<T> getCacheSet(final String key) {
         return redisTemplate.opsForSet().members(key);
     }
 
@@ -167,8 +154,7 @@ public class RedisCache
      * @param key
      * @param dataMap
      */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
-    {
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
         if (dataMap != null) {
             redisTemplate.opsForHash().putAll(key, dataMap);
         }
@@ -180,20 +166,18 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Map<String, T> getCacheMap(final String key)
-    {
+    public <T> Map<String, T> getCacheMap(final String key) {
         return redisTemplate.opsForHash().entries(key);
     }
 
     /**
      * 往Hash中存入数据
      *
-     * @param key Redis键
-     * @param hKey Hash键
+     * @param key   Redis键
+     * @param hKey  Hash键
      * @param value 值
      */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
-    {
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
         redisTemplate.opsForHash().put(key, hKey, value);
 
     }
@@ -201,12 +185,11 @@ public class RedisCache
     /**
      * 获取Hash中的数据
      *
-     * @param key Redis键
+     * @param key  Redis键
      * @param hKey Hash键
      * @return Hash中的对象
      */
-    public <T> T getCacheMapValue(final String key, final String hKey)
-    {
+    public <T> T getCacheMapValue(final String key, final String hKey) {
         HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
         return opsForHash.get(key, hKey);
     }
@@ -214,12 +197,11 @@ public class RedisCache
     /**
      * 获取多个Hash中的数据
      *
-     * @param key Redis键
+     * @param key   Redis键
      * @param hKeys Hash键集合
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
-    {
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
 
@@ -229,8 +211,7 @@ public class RedisCache
      * @param pattern 字符串前缀
      * @return 对象列表
      */
-    public Collection<String> keys(final String pattern)
-    {
+    public Collection<String> keys(final String pattern) {
         return redisTemplate.keys(pattern);
     }
 }

src/main/java/com/mokamrp/privates/config/CrossOriginFilter.java

@@ -11,25 +11,25 @@ import java.io.IOException;
 @Order(1)
 public class CrossOriginFilter implements Filter {
 
-	@Override
-	public void init(FilterConfig filterConfig) {
-	}
-
-	@Override
-	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-			throws IOException, ServletException {
-		HttpServletResponse response = (HttpServletResponse) servletResponse;
-		response.setHeader("Access-Control-Allow-Origin", "*");
-		response.setHeader("Access-Control-Max-Age", "3600");
-		response.setHeader("Access-Control-Allow-Methods", "*");
-		response.setHeader("Access-Control-Allow-Headers",
-				"Origin,Content-Type,XFILENAME,XFILECATEGORY,XFILESIZE,X-URL-PATH,Authorization,X-Requested-With, Content-Type, Accept");
-		filterChain.doFilter(servletRequest, servletResponse);
-	}
-
-	@Override
-	public void destroy() {
-
-	}
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+            throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Allow-Headers",
+                "Origin,Content-Type,XFILENAME,XFILECATEGORY,XFILESIZE,X-URL-PATH,Authorization,X-Requested-With, Content-Type, Accept");
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
 
 }

src/main/java/com/mokamrp/privates/config/RequestConfig.java

@@ -12,16 +12,15 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import java.util.List;
 
 @Configuration
-public class RequestConfig implements WebMvcConfigurer
-{
+public class RequestConfig implements WebMvcConfigurer {
     @Autowired
     private AuthIntercepotor authIntercepotor;
+
     /**
      * 自定义拦截规则
      */
     @Override
-    public void addInterceptors(InterceptorRegistry registry)
-    {
+    public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(authIntercepotor).addPathPatterns("/**");
     }
 

src/main/java/com/mokamrp/privates/constant/Constants.java

@@ -2,11 +2,10 @@ package com.mokamrp.privates.constant;
 
 /**
  * 通用常量信息
- * 
+ *
  * @author ruoyi
  */
-public class Constants
-{
+public class Constants {
     /**
      * UTF-8 字符集
      */
@@ -62,13 +61,10 @@ public class Constants
      */
     public static final Integer TOKEN_EXPIRATION = 18000;
 
-    /**完成待办*/
-    public static final String HANDLE_SUCCESS="1";
-
-
-
-
-
+    /**
+     * 完成待办
+     */
+    public static final String HANDLE_SUCCESS = "1";
 
 
 }

src/main/java/com/mokamrp/privates/constant/HttpStatus.java

@@ -2,11 +2,10 @@ package com.mokamrp.privates.constant;
 
 /**
  * 返回状态码
- * 
+ *
  * @author ruoyi
  */
-public class HttpStatus
-{
+public class HttpStatus {
     /**
      * 操作成功
      */

src/main/java/com/mokamrp/privates/constant/UserConstants.java

@@ -2,59 +2,88 @@ package com.mokamrp.privates.constant;
 
 /**
  * 用户常量信息
- * 
+ *
  * @author ruoyi
  */
-public class UserConstants
-{
+public class UserConstants {
     /**
      * 平台内系统用户的唯一标志
      */
     public static final String SYS_USER = "SYS_USER";
 
-    /** 正常状态 */
+    /**
+     * 正常状态
+     */
     public static final String NORMAL = "0";
 
-    /** 异常状态 */
+    /**
+     * 异常状态
+     */
     public static final String EXCEPTION = "1";
 
-    /** 用户封禁状态 */
+    /**
+     * 用户封禁状态
+     */
     public static final String USER_DISABLE = "1";
 
-    /** 角色封禁状态 */
+    /**
+     * 角色封禁状态
+     */
     public static final String ROLE_DISABLE = "1";
 
-    /** 部门正常状态 */
+    /**
+     * 部门正常状态
+     */
     public static final String DEPT_NORMAL = "0";
 
-    /** 部门停用状态 */
+    /**
+     * 部门停用状态
+     */
     public static final String DEPT_DISABLE = "1";
 
-    /** 字典正常状态 */
+    /**
+     * 字典正常状态
+     */
     public static final String DICT_NORMAL = "0";
 
-    /** 是否为系统默认（是） */
+    /**
+     * 是否为系统默认（是）
+     */
     public static final String YES = "Y";
 
-    /** 是否菜单外链（是） */
+    /**
+     * 是否菜单外链（是）
+     */
     public static final String YES_FRAME = "0";
 
-    /** 是否菜单外链（否） */
+    /**
+     * 是否菜单外链（否）
+     */
     public static final String NO_FRAME = "1";
 
-    /** 菜单类型（目录） */
+    /**
+     * 菜单类型（目录）
+     */
     public static final String TYPE_DIR = "M";
 
-    /** 菜单类型（菜单） */
+    /**
+     * 菜单类型（菜单）
+     */
     public static final String TYPE_MENU = "C";
 
-    /** 菜单类型（按钮） */
+    /**
+     * 菜单类型（按钮）
+     */
     public static final String TYPE_BUTTON = "F";
 
-    /** Layout组件标识 */
+    /**
+     * Layout组件标识
+     */
     public final static String LAYOUT = "Layout";
 
-    /** 校验返回结果码 */
+    /**
+     * 校验返回结果码
+     */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";
 }

src/main/java/com/mokamrp/privates/controller/BaseController.java

@@ -34,87 +34,87 @@ public class BaseController<T> {
     public IService<T> service;
 
     @PostMapping("/del")
-    public Object delete(@Valid @RequestBody DelHandle<T> delHandle, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object delete(@Valid @RequestBody DelHandle<T> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         EntityWrapper<T> entityWrapper = new EntityWrapper<>();
-        entityWrapper.in("id",delHandle.getIds());
+        entityWrapper.in("id", delHandle.getIds());
         boolean res = service.delete(entityWrapper);
-        if(!res){
+        if (!res) {
             return AjaxResult.error("删除失败");
         }
-        return AjaxResult.success("success",res);
+        return AjaxResult.success("success", res);
     }
 
     @PostMapping("/add")
-    public Object add(@Valid @RequestBody AddHandle<T> addHandle, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object add(@Valid @RequestBody AddHandle<T> addHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         Date date = new Date();
         Boolean res = service.insert(addHandle.getRaw());
-        if (res){
-            return AjaxResult.success("success",res);
-        }else{
-            return AjaxResult.error("新增失败",res);
+        if (res) {
+            return AjaxResult.success("success", res);
+        } else {
+            return AjaxResult.error("新增失败", res);
         }
     }
 
     @PostMapping("/edit")
-    public Object edit(@Valid @RequestBody EditHandle<T> editHandle, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object edit(@Valid @RequestBody EditHandle<T> editHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        service.update(editHandle.getRaw(),new EntityWrapper<T>().in("id",editHandle.getIds()));
-        return AjaxResult.success("success",true);
+        service.update(editHandle.getRaw(), new EntityWrapper<T>().in("id", editHandle.getIds()));
+        return AjaxResult.success("success", true);
     }
 
     @PostMapping("/index")
-    public Object index(@Valid @RequestBody IndexHandle indexHandle, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object index(@Valid @RequestBody IndexHandle indexHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         Iterator fileterIt = indexHandle.getFilter().entrySet().iterator();
         Wrapper<T> warpper = new EntityWrapper<T>();
         //.@leon where like,=,<>
-        while (fileterIt.hasNext()){
+        while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
             Object key = entray.getKey();
             Object value = entray.getValue();
-            Map<String,String> op = indexHandle.getOp();
+            Map<String, String> op = indexHandle.getOp();
             //.这里sql字段需要驼峰转下划线
-            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
-                warpper = warpper.eq(StringUtils.humpToLine2(key.toString()),value.toString());
-            }else if (op.get(key).toString().equals("like")){
-                warpper = warpper.like(StringUtils.humpToLine2(key.toString()),"%"+value.toString()+"%");
-            }else if (op.get(key).toString().equals("<>")){
-                warpper = warpper.ne(StringUtils.humpToLine2(key.toString()),value.toString());
+            if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
+                warpper = warpper.eq(StringUtils.humpToLine2(key.toString()), value.toString());
+            } else if (op.get(key).toString().equals("like")) {
+                warpper = warpper.like(StringUtils.humpToLine2(key.toString()), "%" + value.toString() + "%");
+            } else if (op.get(key).toString().equals("<>")) {
+                warpper = warpper.ne(StringUtils.humpToLine2(key.toString()), value.toString());
             }
         }
         //.统计数量
         Integer total = service.selectCount(warpper);
         //.@leon order
-        if (indexHandle.getOrder() != null && indexHandle.getSort() != null){
+        if (indexHandle.getOrder() != null && indexHandle.getSort() != null) {
             String order = indexHandle.getOrder();
             String sort = indexHandle.getSort();
-            if (!order.isEmpty() && !sort.isEmpty()){
-                if (order.equals("asc")){
-                    warpper = warpper.orderBy(sort,true);
-                }else if(order.equals("desc")){
-                    warpper = warpper.orderBy(sort,false);
+            if (!order.isEmpty() && !sort.isEmpty()) {
+                if (order.equals("asc")) {
+                    warpper = warpper.orderBy(sort, true);
+                } else if (order.equals("desc")) {
+                    warpper = warpper.orderBy(sort, false);
                 }
             }
         }
 
         //.@leon offset limit
         Page<T> page = service.selectPage(
-                new Page<T>(indexHandle.getOffset(),indexHandle.getLimit()),warpper
+                new Page<T>(indexHandle.getOffset(), indexHandle.getLimit()), warpper
         );
 
-        Map<String, Object> resMap = new HashMap<String,Object>();
-        resMap.put("list",page.getRecords());
-        resMap.put("total",total);
+        Map<String, Object> resMap = new HashMap<String, Object>();
+        resMap.put("list", page.getRecords());
+        resMap.put("total", total);
         return AjaxResult.success(resMap);
     }
 

src/main/java/com/mokamrp/privates/controller/CorpController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 
 import org.springframework.web.bind.annotation.RestController;
+
 import javax.validation.Valid;
 import java.util.List;
 
@@ -32,13 +33,14 @@ public class CorpController {
 
     /**
      * 基础查询方法
+     *
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
     @PostMapping("/index")
-    public Object index(@Valid @RequestBody IndexHandle indexHandle){
+    public Object index(@Valid @RequestBody IndexHandle indexHandle) {
         IndexBaseRes<Corp> res = corpService.base(indexHandle);
-        return AjaxResult.success("success",res);
+        return AjaxResult.success("success", res);
     }
 }
 

src/main/java/com/mokamrp/privates/controller/GroupCorpController.java

@@ -43,26 +43,26 @@ public class GroupCorpController extends BaseController<GroupCorp> {
      */
 
     @GetMapping("/getGroupCorp")
-    public Object getGroupCorp(){
-        List<Map<String,Object>> res = groupCorpService.selectGroupCorp();
-        return AjaxResult.success("success",res);
+    public Object getGroupCorp() {
+        List<Map<String, Object>> res = groupCorpService.selectGroupCorp();
+        return AjaxResult.success("success", res);
     }
 
     @GetMapping("/getCorpsByGroupId")
-    public Object getCorpsByGroupId(@RequestParam String groupId){
-        if (groupId == null || groupId.isEmpty()){
+    public Object getCorpsByGroupId(@RequestParam String groupId) {
+        if (groupId == null || groupId.isEmpty()) {
             return AjaxResult.error("groupId 不可为空");
         }
-        List<GroupCorp> corps = groupCorpService.selectList(new EntityWrapper<GroupCorp>().eq("group_id",groupId));
-        if (corps == null || corps.size() == 0){
+        List<GroupCorp> corps = groupCorpService.selectList(new EntityWrapper<GroupCorp>().eq("group_id", groupId));
+        if (corps == null || corps.size() == 0) {
             return AjaxResult.success("success", new ArrayList<>());
         }
         List<Integer> corpIds = new ArrayList<Integer>();
-        for(GroupCorp corp : corps){
+        for (GroupCorp corp : corps) {
             corpIds.add(corp.getCorpId());
         }
-        List<Corp> corpInfos = corpService.selectList(new EntityWrapper<Corp>().in("id",corpIds));
-        return AjaxResult.success("success",corpInfos);
+        List<Corp> corpInfos = corpService.selectList(new EntityWrapper<Corp>().in("id", corpIds));
+        return AjaxResult.success("success", corpInfos);
     }
 
 }

src/main/java/com/mokamrp/privates/controller/LoginController.java

@@ -24,19 +24,20 @@ import java.util.Map;
 public class LoginController {
     @Autowired
     public LoginService loginService;
+
     @PostMapping("/login")
-    public Object login(@Valid @RequestBody LoginHandle loginHandle, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.LOGIN_ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object login(@Valid @RequestBody LoginHandle loginHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String,Object> res = loginService.doLogin(loginHandle.getPhone(),loginHandle.getPassword());
+        Map<String, Object> res = loginService.doLogin(loginHandle.getPhone(), loginHandle.getPassword());
         String loginStatus = res.get("loginStatus").toString();
-        if (loginStatus.equals("phoneNull")){
-            return AjaxResult.error(HttpStatus.LOGIN_ERROR,"账户不存在");
-        }else if (loginStatus.equals("passwordErr")){
-            return AjaxResult.error(HttpStatus.LOGIN_ERROR,"密码错误，请检查后再次尝试登录");
+        if (loginStatus.equals("phoneNull")) {
+            return AjaxResult.error(HttpStatus.LOGIN_ERROR, "账户不存在");
+        } else if (loginStatus.equals("passwordErr")) {
+            return AjaxResult.error(HttpStatus.LOGIN_ERROR, "密码错误，请检查后再次尝试登录");
         }
-        return AjaxResult.success("登录成功",res);
+        return AjaxResult.success("登录成功", res);
     }
 }
 

src/main/java/com/mokamrp/privates/controller/TagController.java

@@ -1,9 +1,17 @@
 package com.mokamrp.privates.controller;
 
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
+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;
+
 /**
  * <p>
  * 标签 前端控制器
@@ -14,7 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/tag")
-public class TagController extends BaseController<Tag>{
+public class TagController extends BaseController<Tag> {
+    @Autowired
+    public TagService tagService;
 
+    @PostMapping("/getEmployeeTag")
+    public Object getEmployeeTag(@Valid @RequestBody GetEmployeeTagHandle getEmployeeTagHandle, BindingResult bindingResult) {
+        Object res = tagService.selectEmployeeTag(getEmployeeTagHandle);
+        return res;
+    }
 }
 

src/main/java/com/mokamrp/privates/controller/UserCorpController.java

@@ -33,11 +33,11 @@ public class UserCorpController {
     public UserCorpService userCorpService;
 
     @GetMapping("/getusercorps")
-    public Object getUserCorps(@AuthUser User authUser){
+    public Object getUserCorps(@AuthUser User authUser) {
         System.out.println(authUser.getId());
-        List<Map<String,Object>> userCorps = userCorpService.selectMaps(new EntityWrapper<UserCorp>()
-                .eq("user_id",authUser.getId())
-                .orderBy("seq",true)
+        List<Map<String, Object>> userCorps = userCorpService.selectMaps(new EntityWrapper<UserCorp>()
+                .eq("user_id", authUser.getId())
+                .orderBy("seq", true)
                 .setSqlSelect("corp_id"));
         return AjaxResult.success(userCorps);
     }

src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.help.AjaxResult;
 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.WorkContactEmployeeService;
 import com.mokamrp.privates.utils.OssFile;
@@ -43,26 +44,21 @@ import java.util.*;
 @RestController
 @RequestMapping("/workContactEmployee")
 @EnableAsync
-public class WorkContactEmployeeController {
+public class WorkContactEmployeeController extends BaseController<WorkContactEmployee>{
 
     @Autowired
     private WorkContactEmployeeService WorkContactEmployeeService;
 
-    @Autowired
-    private OSS ossClient;
-
-    @Autowired
-    private OSSConfiguration ossConfiguration;
 
-    @RequestMapping("/index")
+    @RequestMapping("/listt")
     @ResponseBody
     public Object getList(
             Integer gender, Integer status,
             Integer pagesize, Integer page, String name,
             Integer start_deleted_at, Integer end_deleted_at,
             Integer start_created_at, Integer end_created_at,
-            Integer group_id, Integer corp_id,@RequestParam List employee_id, @RequestParam List tag_id , Integer channel_code_id
-    ){
+            Integer group_id, Integer corp_id, @RequestParam List employee_id, @RequestParam List tag_id, Integer channel_code_id
+    ) {
 
         Map<String, Object> resMap = WorkContactEmployeeService.getPageList(gender, status,
                 pagesize, page, name,

src/main/java/com/mokamrp/privates/controller/WorkContactRoomController.java

@@ -1,42 +1,33 @@
 package com.mokamrp.privates.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.AddHandle;
-import com.mokamrp.privates.entity.IndexHandle;
-import com.mokamrp.privates.entity.WorkRoomBandTagHandle;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
+import com.mokamrp.privates.mapper.pojo.*;
 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 javax.validation.Valid;
-import java.lang.reflect.Array;
-import java.util.Arrays;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.IndexHandle;
 import java.util.Map;
 
 /**
  * <p>
- * 客户 - 客户群 关联表 前端控制器
+ * 企业分组绑定关系 前端控制器
  * </p>
  *
  * @author gy
- * @since 2021-04-21
+ * @since 2021-04-22
  */
 @RestController
 @RequestMapping("/workContactRoom")
 public class WorkContactRoomController extends BaseController<WorkContactRoom> {
 
     @Autowired
-    public WorkContactRoomService service;
+    public WorkContactRoomService workContactRoomService;
 
     @PostMapping("/search")
-    public Object index(@Valid @RequestBody IndexHandle indexHandle, BindingResult bindingResult){
-        Map<String, Object>  resMap = service.getPageList(indexHandle, bindingResult);
-        return  AjaxResult.success(resMap);
+    public Object search(@RequestBody IndexHandle indexHandle, BindingResult bindingResult) {
+        Map<String, Object> resMap = workContactRoomService.getPageList(indexHandle, bindingResult);
+        return AjaxResult.success(resMap);
     }
-
 }
 

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -51,11 +51,11 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
      */
 
     @PostMapping("/getWorkEmployeeList")
-    public Object getWorkEmployeeList(@Valid @RequestBody WorkEmployeeHandle workEmployee,@AuthUser User authUser, BindingResult bindingResult){
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.LOGIN_ERROR,bindingResult.getFieldError().getDefaultMessage());
+    public Object getWorkEmployeeList(@Valid @RequestBody WorkEmployeeHandle workEmployee, @AuthUser User authUser, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Object res = workEmployeeService.selectWorkEmployeeList(authUser.getId(),workEmployee);
+        Object res = workEmployeeService.selectWorkEmployeeList(authUser.getId(), workEmployee);
         return AjaxResult.success(res);
     }
 

src/main/java/com/mokamrp/privates/controller/WorkRoomController.java

@@ -34,16 +34,16 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @ResponseBody
     public Object getList(
             Integer pagesize, Integer page,
-            String name,  Integer corp_id,
+            String name, Integer corp_id,
             String start_create_time, String end_create_time,
-            String wx_chat_id,Integer corp_group_id,
+            String wx_chat_id, Integer corp_group_id,
             @RequestParam List owner_id, @RequestParam List tag_id
-    ){
+    ) {
 
         Map<String, Object> resMap = workRoomService.getPageList(pagesize, page, name, corp_id,
                 start_create_time, end_create_time,
                 wx_chat_id, corp_group_id,
-                owner_id, tag_id );//所有
+                owner_id, tag_id);//所有
 
         return AjaxResult.success(resMap);
     }

src/main/java/com/mokamrp/privates/entity/AddHandle.java

@@ -5,8 +5,8 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
- * @author leon 通用新增请求实体类
  * @param <T>
+ * @author leon 通用新增请求实体类
  */
 @Data
 public class AddHandle<T> {

src/main/java/com/mokamrp/privates/entity/DelHandle.java

@@ -6,8 +6,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * @author leon 通用新增请求实体类
  * @param <T>
+ * @author leon 通用新增请求实体类
  */
 @Data
 public class DelHandle<T> {

src/main/java/com/mokamrp/privates/entity/EditHandle.java

@@ -6,8 +6,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * @author leon 通用新增请求实体类
  * @param <T>
+ * @author leon 通用新增请求实体类
  */
 @Data
 public class EditHandle<T> {

src/main/java/com/mokamrp/privates/entity/GetEmployeeTagHandle.java

@@ -0,0 +1,13 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+@Data
+public class GetEmployeeTagHandle {
+
+    private String tagName;
+    private Integer tagGroupId;
+    private Integer status;
+
+
+}

src/main/java/com/mokamrp/privates/entity/IndexHandle.java

@@ -16,10 +16,10 @@ public class IndexHandle {
     private Integer limit = 10;
 
     //.@leon 条件字段
-    private Map<String,Object> filter;
+    private Map<String, Object> filter;
 
     //.@leon 条件类型 =,like
-    private Map<String,String> op;
+    private Map<String, String> op;
 
     //.@leon 排序 asc,desc
     private String order;

src/main/java/com/mokamrp/privates/help/AjaxResult.java

@@ -10,34 +10,37 @@ import java.util.HashMap;
  *
  * @author ruoyi
  */
-public class AjaxResult<T> extends HashMap<String, Object>
-{
+public class AjaxResult<T> extends HashMap<String, Object> {
     private static final long serialVersionUID = 1L;
 
-    /** 状态码 */
+    /**
+     * 状态码
+     */
     public static final String CODE_TAG = "code";
 
-    /** 返回内容 */
+    /**
+     * 返回内容
+     */
     public static final String MSG_TAG = "msg";
 
-    /** 数据对象 */
+    /**
+     * 数据对象
+     */
     public static final String DATA_TAG = "data";
 
     /**
      * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
      */
-    public AjaxResult()
-    {
+    public AjaxResult() {
     }
 
     /**
      * 初始化一个新创建的 AjaxResult 对象
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      */
-    public AjaxResult(int code, String msg)
-    {
+    public AjaxResult(int code, String msg) {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
     }
@@ -46,15 +49,13 @@ public class AjaxResult<T> extends HashMap<String, Object>
      * 初始化一个新创建的 AjaxResult 对象
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      */
-    public AjaxResult(int code, String msg, Object data)
-    {
+    public AjaxResult(int code, String msg, Object data) {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
-        {
+        if (StringUtils.isNotNull(data)) {
             super.put(DATA_TAG, data);
         }
     }
@@ -64,8 +65,7 @@ public class AjaxResult<T> extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success()
-    {
+    public static AjaxResult success() {
         return AjaxResult.success("操作成功");
     }
 
@@ -74,8 +74,7 @@ public class AjaxResult<T> extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success(Object data)
-    {
+    public static AjaxResult success(Object data) {
         return AjaxResult.success("操作成功", data);
     }
 
@@ -85,20 +84,18 @@ public class AjaxResult<T> extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 成功消息
      */
-    public static AjaxResult success(String msg)
-    {
+    public static AjaxResult success(String msg) {
         return AjaxResult.success(msg, null);
     }
 
     /**
      * 返回成功消息
      *
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      * @return 成功消息
      */
-    public static AjaxResult success(String msg, Object data)
-    {
+    public static AjaxResult success(String msg, Object data) {
         return new AjaxResult(HttpStatus.SUCCESS, msg, data);
     }
 
@@ -107,8 +104,7 @@ public class AjaxResult<T> extends HashMap<String, Object>
      *
      * @return
      */
-    public static AjaxResult error()
-    {
+    public static AjaxResult error() {
         return AjaxResult.error("操作失败");
     }
 
@@ -118,20 +114,18 @@ public class AjaxResult<T> extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(String msg)
-    {
+    public static AjaxResult error(String msg) {
         return AjaxResult.error(msg, null);
     }
 
     /**
      * 返回错误消息
      *
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      * @return 警告消息
      */
-    public static AjaxResult error(String msg, Object data)
-    {
+    public static AjaxResult error(String msg, Object data) {
         return new AjaxResult(HttpStatus.ERROR, msg, data);
     }
 
@@ -139,11 +133,10 @@ public class AjaxResult<T> extends HashMap<String, Object>
      * 返回错误消息
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(int code, String msg)
-    {
+    public static AjaxResult error(int code, String msg) {
         return new AjaxResult(code, msg, null);
     }
 }

src/main/java/com/mokamrp/privates/interceptor/ArgumentResolver.java

@@ -24,7 +24,7 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
     @Override
     public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception {
         AuthUser authUserAnnotation = methodParameter.getParameterAnnotation(AuthUser.class);
-        Object user = nativeWebRequest.getAttribute(authUserAnnotation.value(),NativeWebRequest.SCOPE_REQUEST);
+        Object user = nativeWebRequest.getAttribute(authUserAnnotation.value(), NativeWebRequest.SCOPE_REQUEST);
         return user;
     }
 

src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -19,8 +19,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author leon token认证
  */
 @Component
-public class AuthIntercepotor extends HandlerInterceptorAdapter
-{
+public class AuthIntercepotor extends HandlerInterceptorAdapter {
     @Autowired
     public RedisCache redisCache;
 
@@ -28,32 +27,30 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter
     private ObjectMapper objectMapper;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
-    {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         //.登录和健康监测 不验证token
-        String requestUrl = request.getContextPath()+request.getServletPath();
+        String requestUrl = request.getContextPath() + request.getServletPath();
         if (requestUrl.equals("/user/login") || requestUrl.equals("/ping")) {
             return true;
         }
         String token = request.getHeader("Authorization");
         //.Authorizetion 不存在token 拦截
-        if(token == null || token.isEmpty()){
-            AjaxResult ajaxResult = AjaxResult.error(450,"token nil");
+        if (token == null || token.isEmpty()) {
+            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
             ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
             return false;
         }
-        String userInfoStr = redisCache.getString(RedisKey.AuthToken+token);
+        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
         Object userObj = JSON.parse(userInfoStr);
-        if(userObj == null){
-            AjaxResult ajaxResult = AjaxResult.error(450,"token timeout");
+        if (userObj == null) {
+            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
             ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
             return false;
         }
-        User user = objectMapper.convertValue(userObj,User.class);
-        request.setAttribute("auth-user",user);
+        User user = objectMapper.convertValue(userObj, User.class);
+        request.setAttribute("auth-user", user);
         return true;
     }
 
 
-
 }

src/main/java/com/mokamrp/privates/mapper/ChatToolMapper.xml

@@ -7,18 +7,19 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.ChatTool">
-        <id column="id" property="id" />
-        <result column="page_name" property="pageName" />
-        <result column="page_flag" property="pageFlag" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
-        <result column="status" property="status" />
+        <id column="id" property="id"/>
+        <result column="page_name" property="pageName"/>
+        <result column="page_flag" property="pageFlag"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
+        <result column="status" property="status"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, page_name, page_flag, created_at, updated_at, deleted_at, status
+        id
+        , page_name, page_flag, created_at, updated_at, deleted_at, status
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/CorpMapper.xml

@@ -7,25 +7,26 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Corp">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="wx_corpid" property="wxCorpid" />
-        <result column="social_code" property="socialCode" />
-        <result column="employee_secret" property="employeeSecret" />
-        <result column="event_callback" property="eventCallback" />
-        <result column="contact_secret" property="contactSecret" />
-        <result column="token" property="token" />
-        <result column="encoding_aes_key" property="encodingAesKey" />
-        <result column="power" property="power" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="wx_corpid" property="wxCorpid"/>
+        <result column="social_code" property="socialCode"/>
+        <result column="employee_secret" property="employeeSecret"/>
+        <result column="event_callback" property="eventCallback"/>
+        <result column="contact_secret" property="contactSecret"/>
+        <result column="token" property="token"/>
+        <result column="encoding_aes_key" property="encodingAesKey"/>
+        <result column="power" property="power"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, wx_corpid, social_code, employee_secret, event_callback, contact_secret, token, encoding_aes_key, power, tenant_id, created_at, updated_at, deleted_at
+        id
+        , name, wx_corpid, social_code, employee_secret, event_callback, contact_secret, token, encoding_aes_key, power, tenant_id, created_at, updated_at, deleted_at
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.java

@@ -21,7 +21,8 @@ import java.util.Map;
 public interface GroupCorpMapper extends BaseMapper<GroupCorp> {
     /**
      * 企业分组绑定关系
+     *
      * @return
      */
-    public List<Map<String,Object>> selectGroupCorp();
+    public List<Map<String, Object>> selectGroupCorp();
 }

src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.xml

@@ -4,21 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.GroupCorp">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="corp_id" property="corpId" />
-        <result column="create_at" property="createAt" />
-        <result column="update_at" property="updateAt" />
+        <id column="id" property="id"/>
+        <result column="group_id" property="groupId"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="create_at" property="createAt"/>
+        <result column="update_at" property="updateAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, group_id, corp_id, create_at, update_at
+        id
+        , group_id, corp_id, create_at, update_at
     </sql>
     <!-- 获取企业绑定分组关系 -->
     <select id="selectGroupCorp" resultType="map">
-        SELECT A.group_name,A.id,IFNULL(B.corp_id,0) AS corp_cnt FROM private_group AS A
-        LEFT JOIN (SELECT COUNT(corp_id) AS corp_id,group_id FROM private_group_corp GROUP BY group_id) AS B ON A.id = B.group_id
+        SELECT A.group_name, A.id, IFNULL(B.corp_id, 0) AS corp_cnt
+        FROM private_group AS A
+                 LEFT JOIN (SELECT COUNT(corp_id) AS corp_id, group_id FROM private_group_corp GROUP BY group_id) AS B
+                           ON A.id = B.group_id
         WHERE A.group_type = 1
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/GroupMapper.java

@@ -17,5 +17,5 @@ import java.util.Map;
  */
 @Component
 public interface GroupMapper extends BaseMapper<Group> {
-    public List<Map<String,Object>> selectCorpAndWorkEmployeeList(String corpIds);
+    public List<Map<String, Object>> selectCorpAndWorkEmployeeList(String corpIds);
 }

src/main/java/com/mokamrp/privates/mapper/GroupMapper.xml

@@ -7,21 +7,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Group">
-        <id column="id" property="id" />
-        <result column="group_type" property="groupType" />
-        <result column="group_name" property="groupName" />
-        <result column="create_at" property="createAt" />
-        <result column="update_at" property="updateAt" />
+        <id column="id" property="id"/>
+        <result column="group_type" property="groupType"/>
+        <result column="group_name" property="groupName"/>
+        <result column="create_at" property="createAt"/>
+        <result column="update_at" property="updateAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, group_type, group_name, create_at, update_at
+        id
+        , group_type, group_name, create_at, update_at
     </sql>
 
     <select id="selectCorpAndWorkEmployeeList" resultType="map">
-        SELECT * FROM private_group_corp AS A
-        LEFT JOIN mc_corp AS B on A.corp_id = B.id
+        SELECT *
+        FROM private_group_corp AS A
+                 LEFT JOIN mc_corp AS B on A.corp_id = B.id
         WHERE A.corp_id IN (#{corpIds})
     </select>
 

src/main/java/com/mokamrp/privates/mapper/TagMapper.java

@@ -1,7 +1,12 @@
 package com.mokamrp.privates.mapper;
 
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author gy
  * @since 2021-04-20
  */
+@Component
 public interface TagMapper extends BaseMapper<Tag> {
-
+    List<Map<String, Object>> selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle);
 }

src/main/java/com/mokamrp/privates/mapper/TagMapper.xml

@@ -7,19 +7,32 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Tag">
-        <id column="id" property="id" />
-        <result column="tag_group_id" property="tagGroupId" />
-        <result column="tag_name" property="tagName" />
-        <result column="status" property="status" />
-        <result column="tag_type" property="tagType" />
-        <result column="weight" property="weight" />
-        <result column="createtime" property="createtime" />
-        <result column="updatetime" property="updatetime" />
+        <id column="id" property="id"/>
+        <result column="tag_group_id" property="tagGroupId"/>
+        <result column="tag_name" property="tagName"/>
+        <result column="status" property="status"/>
+        <result column="tag_type" property="tagType"/>
+        <result column="weight" property="weight"/>
+        <result column="createtime" property="createtime"/>
+        <result column="updatetime" property="updatetime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, tag_group_id, tag_name, status, tag_type, weight, createtime, updatetime
+        id
+        , tag_group_id, tag_name, status, tag_type, weight, createtime, updatetime
     </sql>
 
+    <select id="selectEmployeeTag" parameterType="com.mokamrp.privates.entity.GetEmployeeTagHandle" resultType="map">
+        SELECT A.tag_name,IFNULL(B.group_name,'') group_name,A.`status` FROM private_tag AS A
+        LEFT JOIN private_group AS B ON A.tag_group_id = B.id AND B.group_type = 4
+        <where>
+            and A.tag_type = 'EMP0001'
+            <if test="tagName != null">and A.tag_name like %{#tagName}%</if>
+            <if test="tagGroupId != null">and B.id = {#id}</if>
+            <if test="status != null">and A.status = {#status}</if>
+        </where>
+    </select>
+
+
 </mapper>

src/main/java/com/mokamrp/privates/mapper/UserCorpMapper.xml

@@ -7,17 +7,18 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.UserCorp">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="corp_id" property="corpId" />
-        <result column="seq" property="seq" />
-        <result column="create_at" property="createAt" />
-        <result column="update_at" property="updateAt" />
+        <id column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="seq" property="seq"/>
+        <result column="create_at" property="createAt"/>
+        <result column="update_at" property="updateAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, corp_id, seq, create_at, update_at
+        id
+        , user_id, corp_id, seq, create_at, update_at
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/UserMapper.xml

@@ -7,25 +7,26 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.User">
-        <id column="id" property="id" />
-        <result column="phone" property="phone" />
-        <result column="password" property="password" />
-        <result column="name" property="name" />
-        <result column="gender" property="gender" />
-        <result column="department" property="department" />
-        <result column="position" property="position" />
-        <result column="login_time" property="loginTime" />
-        <result column="status" property="status" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
-        <result column="isSuperAdmin" property="isSuperAdmin" />
+        <id column="id" property="id"/>
+        <result column="phone" property="phone"/>
+        <result column="password" property="password"/>
+        <result column="name" property="name"/>
+        <result column="gender" property="gender"/>
+        <result column="department" property="department"/>
+        <result column="position" property="position"/>
+        <result column="login_time" property="loginTime"/>
+        <result column="status" property="status"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
+        <result column="isSuperAdmin" property="isSuperAdmin"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, phone, password, name, gender, department, position, login_time, status, tenant_id, created_at, updated_at, deleted_at, isSuperAdmin
+        id
+        , phone, password, name, gender, department, position, login_time, status, tenant_id, created_at, updated_at, deleted_at, isSuperAdmin
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.java

@@ -19,8 +19,9 @@ import java.util.List;
  * @since 2021-04-17
  */
 public interface WorkContactEmployeeMapper extends BaseMapper<WorkContactEmployee> {
+
     List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
     List<WorkContactEmployeeVo> getAllVoList(@Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
-
     Integer getVoListTotal(@Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
+
 }

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml

@@ -7,90 +7,83 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkContactEmployee">
-        <id column="id" property="id" />
-        <result column="employee_id" property="employeeId" />
-        <result column="contact_id" property="contactId" />
-        <result column="remark" property="remark" />
-        <result column="description" property="description" />
-        <result column="remark_corp_name" property="remarkCorpName" />
-        <result column="remark_mobiles" property="remarkMobiles" />
-        <result column="add_way" property="addWay" />
-        <result column="oper_userid" property="operUserid" />
-        <result column="state" property="state" />
-        <result column="corp_id" property="corpId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
+        <id column="id" property="id"/>
+        <result column="employee_id" property="employeeId"/>
+        <result column="contact_id" property="contactId"/>
+        <result column="remark" property="remark"/>
+        <result column="description" property="description"/>
+        <result column="remark_corp_name" property="remarkCorpName"/>
+        <result column="remark_mobiles" property="remarkMobiles"/>
+        <result column="add_way" property="addWay"/>
+        <result column="oper_userid" property="operUserid"/>
+        <result column="state" property="state"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, employee_id, contact_id, remark, description, remark_corp_name, remark_mobiles, add_way, oper_userid, state, corp_id, status, create_time, created_at, updated_at, deleted_at
+        id
+        , employee_id, contact_id, remark, description, remark_corp_name, remark_mobiles, add_way, oper_userid, state, corp_id, status, create_time, created_at, updated_at, deleted_at
     </sql>
 
-    <select id="getVoList"  resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
-        SELECT
-            a.id,
-            c.`name` AS client_name ,
-            c.gender AS client_gender ,
-            a.`status` AS client_status ,
-            a.channel_code_id as channel_code_id,
-            a.deleted_at AS client_deleted_at ,
-            c.created_at AS client_created_at ,
-            c.unionid AS client_unionid ,
-            e.`name` AS employee_name,
-            p.`name` as company_name,
-            l.`name` as channel_code_name,
-            a.state,
-            a.remark
-        FROM
-            mc_work_contact_employee AS a
-            LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
-            LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
-            LEFT JOIN mc_corp AS p ON p.id = a.corp_id
-            LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1=1 ${ew.sqlSegment}
-
+    <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
+        SELECT a.id,
+               c.`name`          AS client_name,
+               c.gender          AS client_gender,
+               a.`status`        AS client_status,
+               a.channel_code_id as channel_code_id,
+               c.deleted_at      AS client_deleted_at,
+               c.created_at      AS client_created_at,
+               c.unionid         AS client_unionid,
+               e.`name`          AS employee_name,
+               p.`name`          as company_name,
+               l.`name`          as channel_code_name,
+               a.state,
+               a.remark
+        FROM mc_work_contact_employee AS a
+                 LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
+                 LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
+                 LEFT JOIN mc_corp AS p ON p.id = a.corp_id
+                 LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+        where 1 = 1 ${ew.sqlSegment}
     </select>
 
-    <select id="getAllVoList"  resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
-        SELECT
-            a.id,
-            c.`name` AS client_name ,
-            c.gender AS client_gender ,
-            a.`status` AS client_status ,
-            a.channel_code_id as channel_code_id,
-            a.deleted_at AS client_deleted_at ,
-            c.created_at AS client_created_at ,
-            c.unionid AS client_unionid ,
-            e.`name` AS employee_name,
-            p.`name` as company_name,
-            l.`name` as channel_code_name,
-            a.state,
-            a.remark
-        FROM
-            mc_work_contact_employee AS a
-            LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
-            LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
-            LEFT JOIN mc_corp AS p ON p.id = a.corp_id
-            LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1=1 ${ew.sqlSegment}
 
+    <select id="getVoListTotal" resultType="Integer">
+        SELECT count(*)
+        FROM mc_work_contact_employee AS a
+                 LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
+                 LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
+                 LEFT JOIN mc_corp AS p ON p.id = a.corp_id
+                 LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+        where 1 = 1 ${ew.sqlSegment}
     </select>
 
-
-    <select id="getVoListTotal"  resultType="Integer">
-        SELECT
-         count(*)
-        FROM
-            mc_work_contact_employee AS a
-            LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
-            LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
-            LEFT JOIN mc_corp AS p ON p.id = a.corp_id
-            LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1=1 ${ew.sqlSegment}
+    <select id="getAllVoList" resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
+        SELECT a.id,
+               c.`name`          AS client_name,
+               c.gender          AS client_gender,
+               a.`status`        AS client_status,
+               a.channel_code_id as channel_code_id,
+               c.deleted_at      AS client_deleted_at,
+               c.created_at      AS client_created_at,
+               c.unionid         AS client_unionid,
+               e.`name`          AS employee_name,
+               p.`name`          as company_name,
+               l.`name`          as channel_code_name,
+               a.state,
+               a.remark
+        FROM mc_work_contact_employee AS a
+                 LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
+                 LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
+                 LEFT JOIN mc_corp AS p ON p.id = a.corp_id
+                 LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+        where 1 = 1 ${ew.sqlSegment}
     </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
  */
 public interface WorkContactRoomMapper extends BaseMapper<WorkContactRoom> {
     List<WorkContactRoomGroupDataVo> getNum(@Param("ew") EntityWrapper<WorkContactRoom> queryWrapper);
+
     List<WorkContactRoomByRoomIdVo> getListByRoomId(Page<WorkContactRoomByRoomIdVo> page, @Param("ew") EntityWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
+
     Integer getListByRoomIdTotal(@Param("ew") EntityWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
 }

src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.xml

@@ -7,64 +7,65 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkContactRoom">
-        <id column="id" property="id" />
-        <result column="wx_user_id" property="wxUserId" />
-        <result column="contact_id" property="contactId" />
-        <result column="employee_id" property="employeeId" />
-        <result column="unionid" property="unionid" />
-        <result column="room_id" property="roomId" />
-        <result column="join_scene" property="joinScene" />
-        <result column="type" property="type" />
-        <result column="status" property="status" />
-        <result column="join_time" property="joinTime" />
-        <result column="out_time" property="outTime" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
+        <id column="id" property="id"/>
+        <result column="wx_user_id" property="wxUserId"/>
+        <result column="contact_id" property="contactId"/>
+        <result column="employee_id" property="employeeId"/>
+        <result column="unionid" property="unionid"/>
+        <result column="room_id" property="roomId"/>
+        <result column="join_scene" property="joinScene"/>
+        <result column="type" property="type"/>
+        <result column="status" property="status"/>
+        <result column="join_time" property="joinTime"/>
+        <result column="out_time" property="outTime"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, wx_user_id, contact_id, employee_id, unionid, room_id, join_scene, type, status, join_time, out_time, created_at, updated_at, deleted_at
+        id
+        , wx_user_id, contact_id, employee_id, unionid, room_id, join_scene, type, status, join_time, out_time, created_at, updated_at, deleted_at
     </sql>
 
-    <select id="getNum"  resultType="com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo">
+    <select id="getNum" resultType="com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo">
         SELECT
-            count(*) as num,room_id
+        count(*) as num,room_id
         FROM
-            mc_work_contact_room
+        mc_work_contact_room
         <where>
             ${ew.sqlSegment}
         </where>
-            group by room_id
+        group by room_id
     </select>
 
-    <select id="getListByRoomId"  resultType="com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo">
+    <select id="getListByRoomId" resultType="com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo">
         SELECT
-            a.id,
-            a.wx_user_id,
-            a.contact_id,
-            a.employee_id,
-            a.unionid,
-            a.room_id,
-            a.join_scene,
-            a.type,
-            a.status,
-            a.join_time,
-            a.out_time,
-            b.`name` as nick_name,
-            b.avatar
+        a.id,
+        a.wx_user_id,
+        a.contact_id,
+        a.employee_id,
+        a.unionid,
+        a.room_id,
+        a.join_scene,
+        a.type,
+        a.status,
+        a.join_time,
+        a.out_time,
+        b.`name` as nick_name,
+        b.avatar
         FROM
-            mc_work_contact_room AS a
+        mc_work_contact_room AS a
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
-    <select id="getListByRoomIdTotal"  resultType="Integer">
+    <select id="getListByRoomIdTotal" resultType="Integer">
         SELECT
-            count(*)
+        count(*)
         FROM
         mc_work_contact_room AS a
         LEFT JOIN mc_work_contact AS b ON b.id = a.contact_id

src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.xml

@@ -7,37 +7,38 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkEmployee">
-        <id column="id" property="id" />
-        <result column="wx_user_id" property="wxUserId" />
-        <result column="corp_id" property="corpId" />
-        <result column="name" property="name" />
-        <result column="mobile" property="mobile" />
-        <result column="position" property="position" />
-        <result column="gender" property="gender" />
-        <result column="email" property="email" />
-        <result column="avatar" property="avatar" />
-        <result column="thumb_avatar" property="thumbAvatar" />
-        <result column="telephone" property="telephone" />
-        <result column="alias" property="alias" />
-        <result column="extattr" property="extattr" />
-        <result column="status" property="status" />
-        <result column="qr_code" property="qrCode" />
-        <result column="external_profile" property="externalProfile" />
-        <result column="external_position" property="externalPosition" />
-        <result column="address" property="address" />
-        <result column="open_user_id" property="openUserId" />
-        <result column="wx_main_department_id" property="wxMainDepartmentId" />
-        <result column="main_department_id" property="mainDepartmentId" />
-        <result column="log_user_id" property="logUserId" />
-        <result column="contact_auth" property="contactAuth" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
+        <id column="id" property="id"/>
+        <result column="wx_user_id" property="wxUserId"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="name" property="name"/>
+        <result column="mobile" property="mobile"/>
+        <result column="position" property="position"/>
+        <result column="gender" property="gender"/>
+        <result column="email" property="email"/>
+        <result column="avatar" property="avatar"/>
+        <result column="thumb_avatar" property="thumbAvatar"/>
+        <result column="telephone" property="telephone"/>
+        <result column="alias" property="alias"/>
+        <result column="extattr" property="extattr"/>
+        <result column="status" property="status"/>
+        <result column="qr_code" property="qrCode"/>
+        <result column="external_profile" property="externalProfile"/>
+        <result column="external_position" property="externalPosition"/>
+        <result column="address" property="address"/>
+        <result column="open_user_id" property="openUserId"/>
+        <result column="wx_main_department_id" property="wxMainDepartmentId"/>
+        <result column="main_department_id" property="mainDepartmentId"/>
+        <result column="log_user_id" property="logUserId"/>
+        <result column="contact_auth" property="contactAuth"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth, created_at, updated_at, deleted_at
+        id
+        , wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth, created_at, updated_at, deleted_at
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.java

@@ -21,5 +21,6 @@ import java.util.List;
  */
 public interface WorkRoomMapper extends BaseMapper<WorkRoom> {
     List<WorkRoomVo> getVoList(Page<WorkRoom> page, @Param("ew") EntityWrapper<WorkRoom> queryWrapper);
+
     Integer getVoListTotal(@Param("ew") EntityWrapper<WorkRoom> queryWrapper);
 }

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.xml

@@ -7,27 +7,28 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkRoom">
-        <id column="id" property="id" />
-        <result column="corp_id" property="corpId" />
-        <result column="wx_chat_id" property="wxChatId" />
-        <result column="name" property="name" />
-        <result column="owner_id" property="ownerId" />
-        <result column="notice" property="notice" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="room_max" property="roomMax" />
-        <result column="room_group_id" property="roomGroupId" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
+        <id column="id" property="id"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="wx_chat_id" property="wxChatId"/>
+        <result column="name" property="name"/>
+        <result column="owner_id" property="ownerId"/>
+        <result column="notice" property="notice"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="room_max" property="roomMax"/>
+        <result column="room_group_id" property="roomGroupId"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="updated_at" property="updatedAt"/>
+        <result column="deleted_at" property="deletedAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, corp_id, wx_chat_id, name, owner_id, notice, status, create_time, room_max, room_group_id, created_at, updated_at, deleted_at
+        id
+        , corp_id, wx_chat_id, name, owner_id, notice, status, create_time, room_max, room_group_id, created_at, updated_at, deleted_at
     </sql>
 
-    <select id="getVoList"  resultType="com.mokamrp.privates.mapper.vo.WorkRoomVo">
+    <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkRoomVo">
         SELECT
         a.*,
         c.group_id AS company_group_id,
@@ -49,7 +50,7 @@
         GROUP BY a.id
     </select>
 
-    <select id="getVoListTotal"  resultType="Integer">
+    <select id="getVoListTotal" resultType="Integer">
         SELECT
         count(distinct (a.id))
         FROM
@@ -66,5 +67,4 @@
     </select>
 
 
-
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pojo/ChatTool.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -105,13 +108,13 @@ public class ChatTool extends Model<ChatTool> {
     @Override
     public String toString() {
         return "ChatTool{" +
-        ", id=" + id +
-        ", pageName=" + pageName +
-        ", pageFlag=" + pageFlag +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        ", status=" + status +
-        "}";
+                ", id=" + id +
+                ", pageName=" + pageName +
+                ", pageFlag=" + pageFlag +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                ", status=" + status +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/Corp.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -189,20 +192,20 @@ public class Corp extends Model<Corp> {
     @Override
     public String toString() {
         return "Corp{" +
-        ", id=" + id +
-        ", name=" + name +
-        ", wxCorpid=" + wxCorpid +
-        ", socialCode=" + socialCode +
-        ", employeeSecret=" + employeeSecret +
-        ", eventCallback=" + eventCallback +
-        ", contactSecret=" + contactSecret +
-        ", token=" + token +
-        ", encodingAesKey=" + encodingAesKey +
-        ", power=" + power +
-        ", tenantId=" + tenantId +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", name=" + name +
+                ", wxCorpid=" + wxCorpid +
+                ", socialCode=" + socialCode +
+                ", employeeSecret=" + employeeSecret +
+                ", eventCallback=" + eventCallback +
+                ", contactSecret=" + contactSecret +
+                ", token=" + token +
+                ", encodingAesKey=" + encodingAesKey +
+                ", power=" + power +
+                ", tenantId=" + tenantId +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/Group.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -90,11 +93,11 @@ public class Group extends Model<Group> {
     @Override
     public String toString() {
         return "Group{" +
-        ", id=" + id +
-        ", groupType=" + groupType +
-        ", groupName=" + groupName +
-        ", createAt=" + createAt +
-        ", updateAt=" + updateAt +
-        "}";
+                ", id=" + id +
+                ", groupType=" + groupType +
+                ", groupName=" + groupName +
+                ", createAt=" + createAt +
+                ", updateAt=" + updateAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/GroupCorp.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -93,11 +96,11 @@ public class GroupCorp extends Model<GroupCorp> {
     @Override
     public String toString() {
         return "GroupCorp{" +
-        ", id=" + id +
-        ", groupId=" + groupId +
-        ", corpId=" + corpId +
-        ", createAt=" + createAt +
-        ", updateAt=" + updateAt +
-        "}";
+                ", id=" + id +
+                ", groupId=" + groupId +
+                ", corpId=" + corpId +
+                ", createAt=" + createAt +
+                ", updateAt=" + updateAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/IndexBaseRes.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 /**
  * 基础查询方法 实体类
+ *
  * @author leon
  * @since 1949-10-01
  */

src/main/java/com/mokamrp/privates/mapper/pojo/Tag.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -113,14 +114,14 @@ public class Tag extends Model<Tag> {
     @Override
     public String toString() {
         return "Tag{" +
-        ", id=" + id +
-        ", tagGroupId=" + tagGroupId +
-        ", tagName=" + tagName +
-        ", status=" + status +
-        ", tagType=" + tagType +
-        ", weight=" + weight +
-        ", createtime=" + createtime +
-        ", updatetime=" + updatetime +
-        "}";
+                ", id=" + id +
+                ", tagGroupId=" + tagGroupId +
+                ", tagName=" + tagName +
+                ", status=" + status +
+                ", tagType=" + tagType +
+                ", weight=" + weight +
+                ", createtime=" + createtime +
+                ", updatetime=" + updatetime +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/User.java

@@ -1,13 +1,16 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -191,20 +194,20 @@ public class User extends Model<User> {
     @Override
     public String toString() {
         return "User{" +
-        ", id=" + id +
-        ", phone=" + phone +
-        ", password=" + password +
-        ", name=" + name +
-        ", gender=" + gender +
-        ", department=" + department +
-        ", position=" + position +
-        ", loginTime=" + loginTime +
-        ", status=" + status +
-        ", tenantId=" + tenantId +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        ", isSuperAdmin=" + isSuperAdmin +
-        "}";
+                ", id=" + id +
+                ", phone=" + phone +
+                ", password=" + password +
+                ", name=" + name +
+                ", gender=" + gender +
+                ", department=" + department +
+                ", position=" + position +
+                ", loginTime=" + loginTime +
+                ", status=" + status +
+                ", tenantId=" + tenantId +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                ", isSuperAdmin=" + isSuperAdmin +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/UserCorp.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -105,12 +108,12 @@ public class UserCorp extends Model<UserCorp> {
     @Override
     public String toString() {
         return "UserCorp{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", corpId=" + corpId +
-        ", seq=" + seq +
-        ", createAt=" + createAt +
-        ", updateAt=" + updateAt +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", corpId=" + corpId +
+                ", seq=" + seq +
+                ", createAt=" + createAt +
+                ", updateAt=" + updateAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/WorkContact.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -62,12 +65,10 @@ public class WorkContact extends Model<WorkContact> {
     private String unionid;
     /**
      * 外部联系人的职位，如果外部企业或用户选择隐藏职位，则不返回，仅当联系人类型是企业微信用户时有此字段
-
      */
     private String position;
     /**
      * 外部联系人所在企业的简称，仅当联系人类型是企业微信用户时有此字段
-
      */
     private String corpName;
     /**
@@ -239,24 +240,24 @@ public class WorkContact extends Model<WorkContact> {
     @Override
     public String toString() {
         return "WorkContact{" +
-        ", id=" + id +
-        ", corpId=" + corpId +
-        ", wxExternalUserid=" + wxExternalUserid +
-        ", name=" + name +
-        ", nickName=" + nickName +
-        ", avatar=" + avatar +
-        ", followUpStatus=" + followUpStatus +
-        ", type=" + type +
-        ", gender=" + gender +
-        ", unionid=" + unionid +
-        ", position=" + position +
-        ", corpName=" + corpName +
-        ", corpFullName=" + corpFullName +
-        ", externalProfile=" + externalProfile +
-        ", businessNo=" + businessNo +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", corpId=" + corpId +
+                ", wxExternalUserid=" + wxExternalUserid +
+                ", name=" + name +
+                ", nickName=" + nickName +
+                ", avatar=" + avatar +
+                ", followUpStatus=" + followUpStatus +
+                ", type=" + type +
+                ", gender=" + gender +
+                ", unionid=" + unionid +
+                ", position=" + position +
+                ", corpName=" + corpName +
+                ", corpFullName=" + corpFullName +
+                ", externalProfile=" + externalProfile +
+                ", businessNo=" + businessNo +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactEmployee.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -50,41 +53,38 @@ public class WorkContactEmployee extends Model<WorkContactEmployee> {
     private String remarkMobiles;
     /**
      * 表示添加客户的来源
-0
-未知来源
-1
-扫描二维码
-2
-搜索手机号
-3
-名片分享
-4
-群聊
-5
-手机通讯录
-6
-微信联系人
-7
-来自微信的添加好友申请
-8
-安装第三方应用时自动添加的客服人员
-9
-搜索邮箱
-201
-内部成员共享
-202
-管理员/负责人分配
-
+     * 0
+     * 未知来源
+     * 1
+     * 扫描二维码
+     * 2
+     * 搜索手机号
+     * 3
+     * 名片分享
+     * 4
+     * 群聊
+     * 5
+     * 手机通讯录
+     * 6
+     * 微信联系人
+     * 7
+     * 来自微信的添加好友申请
+     * 8
+     * 安装第三方应用时自动添加的客服人员
+     * 9
+     * 搜索邮箱
+     * 201
+     * 内部成员共享
+     * 202
+     * 管理员/负责人分配
      */
     private Integer addWay;
     /**
      * 发起添加的userid，如果成员主动添加，为成员的userid；如果是客户主动添加，则为客户的外部联系人userid；如果是内部成员共享/管理员分配，则为对应的成员/管理员userid
-
      */
     private String operUserid;
     /**
      * 企业自定义的state参数，用于区分客户具体是通过哪个「联系我」添加，由企业通过创建「联系我」方式指定
-
      */
     private String state;
     /**
@@ -240,22 +240,22 @@ public class WorkContactEmployee extends Model<WorkContactEmployee> {
     @Override
     public String toString() {
         return "WorkContactEmployee{" +
-        ", id=" + id +
-        ", employeeId=" + employeeId +
-        ", contactId=" + contactId +
-        ", remark=" + remark +
-        ", description=" + description +
-        ", remarkCorpName=" + remarkCorpName +
-        ", remarkMobiles=" + remarkMobiles +
-        ", addWay=" + addWay +
-        ", operUserid=" + operUserid +
-        ", state=" + state +
-        ", corpId=" + corpId +
-        ", status=" + status +
-        ", createTime=" + createTime +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", employeeId=" + employeeId +
+                ", contactId=" + contactId +
+                ", remark=" + remark +
+                ", description=" + description +
+                ", remarkCorpName=" + remarkCorpName +
+                ", remarkMobiles=" + remarkMobiles +
+                ", addWay=" + addWay +
+                ", operUserid=" + operUserid +
+                ", state=" + state +
+                ", corpId=" + corpId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/WorkContactRoom.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -43,15 +46,15 @@ public class WorkContactRoom extends Model<WorkContactRoom> {
     private Integer roomId;
     /**
      * 入群方式1 - 由成员邀请入群（直接邀请入群）2 - 由成员邀请入群（通过邀请链接入群）3 - 通过扫描群二维码入群
-1 - 由成员邀请入群（直接邀请入群）
-2 - 由成员邀请入群（通过邀请链接入群）
-3 - 通过扫描群二维码入群
+     * 1 - 由成员邀请入群（直接邀请入群）
+     * 2 - 由成员邀请入群（通过邀请链接入群）
+     * 3 - 通过扫描群二维码入群
      */
     private Integer joinScene;
     /**
      * 成员类型（1 - 企业成员 2 - 外部联系人）
-1 - 企业成员
-2 - 外部联系人
+     * 1 - 企业成员
+     * 2 - 外部联系人
      */
     private Integer type;
     /**
@@ -191,20 +194,20 @@ public class WorkContactRoom extends Model<WorkContactRoom> {
     @Override
     public String toString() {
         return "WorkContactRoom{" +
-        ", id=" + id +
-        ", wxUserId=" + wxUserId +
-        ", contactId=" + contactId +
-        ", employeeId=" + employeeId +
-        ", unionid=" + unionid +
-        ", roomId=" + roomId +
-        ", joinScene=" + joinScene +
-        ", type=" + type +
-        ", status=" + status +
-        ", joinTime=" + joinTime +
-        ", outTime=" + outTime +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", wxUserId=" + wxUserId +
+                ", contactId=" + contactId +
+                ", employeeId=" + employeeId +
+                ", unionid=" + unionid +
+                ", roomId=" + roomId +
+                ", joinScene=" + joinScene +
+                ", type=" + type +
+                ", status=" + status +
+                ", joinTime=" + joinTime +
+                ", outTime=" + outTime +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/WorkEmployee.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -333,32 +336,32 @@ public class WorkEmployee extends Model<WorkEmployee> {
     @Override
     public String toString() {
         return "WorkEmployee{" +
-        ", id=" + id +
-        ", wxUserId=" + wxUserId +
-        ", corpId=" + corpId +
-        ", name=" + name +
-        ", mobile=" + mobile +
-        ", position=" + position +
-        ", gender=" + gender +
-        ", email=" + email +
-        ", avatar=" + avatar +
-        ", thumbAvatar=" + thumbAvatar +
-        ", telephone=" + telephone +
-        ", alias=" + alias +
-        ", extattr=" + extattr +
-        ", status=" + status +
-        ", qrCode=" + qrCode +
-        ", externalProfile=" + externalProfile +
-        ", externalPosition=" + externalPosition +
-        ", address=" + address +
-        ", openUserId=" + openUserId +
-        ", wxMainDepartmentId=" + wxMainDepartmentId +
-        ", mainDepartmentId=" + mainDepartmentId +
-        ", logUserId=" + logUserId +
-        ", contactAuth=" + contactAuth +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", wxUserId=" + wxUserId +
+                ", corpId=" + corpId +
+                ", name=" + name +
+                ", mobile=" + mobile +
+                ", position=" + position +
+                ", gender=" + gender +
+                ", email=" + email +
+                ", avatar=" + avatar +
+                ", thumbAvatar=" + thumbAvatar +
+                ", telephone=" + telephone +
+                ", alias=" + alias +
+                ", extattr=" + extattr +
+                ", status=" + status +
+                ", qrCode=" + qrCode +
+                ", externalProfile=" + externalProfile +
+                ", externalPosition=" + externalPosition +
+                ", address=" + address +
+                ", openUserId=" + openUserId +
+                ", wxMainDepartmentId=" + wxMainDepartmentId +
+                ", mainDepartmentId=" + mainDepartmentId +
+                ", logUserId=" + logUserId +
+                ", contactAuth=" + contactAuth +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/pojo/WorkRoom.java

@@ -1,12 +1,15 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -177,19 +180,19 @@ public class WorkRoom extends Model<WorkRoom> {
     @Override
     public String toString() {
         return "WorkRoom{" +
-        ", id=" + id +
-        ", corpId=" + corpId +
-        ", wxChatId=" + wxChatId +
-        ", name=" + name +
-        ", ownerId=" + ownerId +
-        ", notice=" + notice +
-        ", status=" + status +
-        ", createTime=" + createTime +
-        ", roomMax=" + roomMax +
-        ", roomGroupId=" + roomGroupId +
-        ", createdAt=" + createdAt +
-        ", updatedAt=" + updatedAt +
-        ", deletedAt=" + deletedAt +
-        "}";
+                ", id=" + id +
+                ", corpId=" + corpId +
+                ", wxChatId=" + wxChatId +
+                ", name=" + name +
+                ", ownerId=" + ownerId +
+                ", notice=" + notice +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", roomMax=" + roomMax +
+                ", roomGroupId=" + roomGroupId +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * @author gengyang
  * @since 2021-04-17
  */
-public class WorkContactEmployeeVo{
+public class WorkContactEmployeeVo {
 
     private Integer id;
     private String clientName;

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomByRoomIdVo.java

@@ -11,103 +11,106 @@ package com.mokamrp.privates.mapper.vo;
 public class WorkContactRoomByRoomIdVo {
 
     private Integer id;
-    private String wx_user_id;
-    private Integer contact_id;
-    private Integer employee_id;
+    private String wxUserId;
+    private Integer contactId;
+    private Integer employeeId;
     private String unionid;
-    private Integer room_id;
-    private Integer join_scene;
+    private Integer roomId;
+    private Integer joinScene;
     private Integer type;
     private Integer status;
-    private String join_time;
-    private String out_time;
+    private String joinTime;
 
-    public Integer getId() {
-        return id;
+    public String getWxUserId() {
+        return wxUserId;
     }
 
-    public void setId(Integer id) {
-        this.id = id;
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId;
     }
 
-    public String getWx_user_id() {
-        return wx_user_id;
+    public Integer getContactId() {
+        return contactId;
     }
 
-    public void setWx_user_id(String wx_user_id) {
-        this.wx_user_id = wx_user_id;
+    public void setContactId(Integer contactId) {
+        this.contactId = contactId;
     }
 
-    public Integer getContact_id() {
-        return contact_id;
+    public Integer getEmployeeId() {
+        return employeeId;
     }
 
-    public void setContact_id(Integer contact_id) {
-        this.contact_id = contact_id;
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
     }
 
-    public Integer getEmployee_id() {
-        return employee_id;
+    public Integer getRoomId() {
+        return roomId;
     }
 
-    public void setEmployee_id(Integer employee_id) {
-        this.employee_id = employee_id;
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
     }
 
-    public String getUnionid() {
-        return unionid;
+    public Integer getJoinScene() {
+        return joinScene;
     }
 
-    public void setUnionid(String unionid) {
-        this.unionid = unionid;
+    public void setJoinScene(Integer joinScene) {
+        this.joinScene = joinScene;
     }
 
-    public Integer getRoom_id() {
-        return room_id;
+    public String getJoinTime() {
+        return joinTime;
     }
 
-    public void setRoom_id(Integer room_id) {
-        this.room_id = room_id;
+    public void setJoinTime(String joinTime) {
+        this.joinTime = joinTime;
     }
 
-    public Integer getJoin_scene() {
-        return join_scene;
+    public String getOutTime() {
+        return outTime;
     }
 
-    public void setJoin_scene(Integer join_scene) {
-        this.join_scene = join_scene;
+    public void setOutTime(String outTime) {
+        this.outTime = outTime;
     }
 
-    public Integer getType() {
-        return type;
+    private String outTime;
+    private String nick_name;
+    private String avatar;
+
+    public Integer getId() {
+        return id;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
-    public Integer getStatus() {
-        return status;
+    public String getUnionid() {
+        return unionid;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
     }
 
-    public String getJoin_time() {
-        return join_time;
+    public Integer getType() {
+        return type;
     }
 
-    public void setJoin_time(String join_time) {
-        this.join_time = join_time;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
-    public String getOut_time() {
-        return out_time;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setOut_time(String out_time) {
-        this.out_time = out_time;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
     public String getNick_name() {
@@ -126,8 +129,4 @@ public class WorkContactRoomByRoomIdVo {
         this.avatar = avatar;
     }
 
-    private String nick_name;
-    private String avatar;
-
-
 }

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactRoomGroupDataVo.java

@@ -10,7 +10,7 @@ import java.util.Date;
  * @author gengyang
  * @since 2021-04-17
  */
-public class WorkContactRoomGroupDataVo{
+public class WorkContactRoomGroupDataVo {
 
     private Integer num;
     private Integer room_id;

src/main/java/com/mokamrp/privates/mapper/vo/WorkRoomVo.java

@@ -170,5 +170,4 @@ public class WorkRoomVo {
     }
 
 
-
 }

src/main/java/com/mokamrp/privates/service/CorpService.java

@@ -4,6 +4,7 @@ import com.mokamrp.privates.mapper.pojo.Corp;
 import com.baomidou.mybatisplus.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
 import java.util.List;
 
 /**
@@ -17,6 +18,7 @@ import java.util.List;
 public interface CorpService extends IService<Corp> {
     /**
      * 基础sql操作方法
+     *
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */

src/main/java/com/mokamrp/privates/service/GroupCorpService.java

@@ -4,6 +4,7 @@ import com.mokamrp.privates.mapper.pojo.GroupCorp;
 import com.baomidou.mybatisplus.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
 import java.util.List;
 import java.util.Map;
 
@@ -18,7 +19,8 @@ import java.util.Map;
 public interface GroupCorpService extends IService<GroupCorp> {
     /**
      * 查询企业分组绑定关系
+     *
      * @return
      */
-    public List<Map<String,Object>> selectGroupCorp();
+    public List<Map<String, Object>> selectGroupCorp();
 }

src/main/java/com/mokamrp/privates/service/TagService.java

@@ -1,9 +1,11 @@
 package com.mokamrp.privates.service;
 
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
 import com.baomidou.mybatisplus.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
 import java.util.List;
 
 /**
@@ -17,8 +19,11 @@ import java.util.List;
 public interface TagService extends IService<Tag> {
     /**
      * 基础sql操作方法
+     *
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
     public IndexBaseRes<Tag> base(IndexHandle indexhandle);
+
+    public Object selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle);
 }

src/main/java/com/mokamrp/privates/service/WorkContactEmployeeService.java

@@ -27,7 +27,7 @@ public interface WorkContactEmployeeService extends IService<WorkContactEmployee
                                     Integer start_deleted_at, Integer end_deleted_at,
                                     Integer start_created_at, Integer end_created_at,
                                     Integer group_id,
-                                    Integer corp_id, List employee_id,List tag_id , Integer channel_code_id);
+                                    Integer corp_id, List employee_id, List tag_id, Integer channel_code_id);
 
     void export(Integer gender, Integer status, String name,
                                     Integer start_deleted_at, Integer end_deleted_at,

src/main/java/com/mokamrp/privates/service/WorkContactRoomService.java

@@ -4,6 +4,7 @@ import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.baomidou.mybatisplus.service.IService;
 import org.springframework.validation.BindingResult;
+
 import java.util.Map;
 
 /**

src/main/java/com/mokamrp/privates/service/WorkRoomService.java

@@ -15,14 +15,14 @@ import java.util.Map;
  * @since 2021-04-21
  */
 public interface WorkRoomService extends IService<WorkRoom> {
-   public Map<String, Object> getPageList(Integer pagesize, Integer page,
-                                          String name, Integer corp_id,
-                                          String start_create_time, String end_create_time,
-                                          String wx_chat_id, Integer corp_group_id,
-                                          List owner_id, List tag_id );
+    public Map<String, Object> getPageList(Integer pagesize, Integer page,
+                                           String name, Integer corp_id,
+                                           String start_create_time, String end_create_time,
+                                           String wx_chat_id, Integer corp_group_id,
+                                           List owner_id, List tag_id);
 
 
-   public Object bangTagIds(Integer[] ids,Integer[] tagIds);
+    public Object bangTagIds(Integer[] ids, Integer[] tagIds);
 
-   public Object leftTagIds(Integer[] ids,Integer[] tagIds);
+    public Object leftTagIds(Integer[] ids, Integer[] tagIds);
 }

src/main/java/com/mokamrp/privates/service/impl/CorpServiceImpl.java

@@ -26,42 +26,43 @@ import java.util.Map;
 public class CorpServiceImpl extends ServiceImpl<CorpMapper, Corp> implements CorpService {
     /**
      * 基础sql操作方法
+     *
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
-    public IndexBaseRes<Corp> base(IndexHandle indexhandle){
+    public IndexBaseRes<Corp> base(IndexHandle indexhandle) {
         Integer total = this.selectCount(new EntityWrapper<Corp>());
         Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
         Wrapper<Corp> warpper = new EntityWrapper<Corp>();
         //.@leon where like,=,<>
-        while (fileterIt.hasNext()){
+        while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
             Object key = entray.getKey();
             Object value = entray.getValue();
-            Map<String,String> op = indexhandle.getOp();
-            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
-                warpper = warpper.eq(key.toString(),value.toString());
-            }else if (op.get(key).toString().equals("like")){
-                warpper = warpper.like(key.toString(),"%"+value.toString()+"%");
-            }else if (op.get(key).toString().equals("<>")){
-                warpper = warpper.ne(key.toString(),value.toString());
+            Map<String, String> op = indexhandle.getOp();
+            if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
+                warpper = warpper.eq(key.toString(), value.toString());
+            } else if (op.get(key).toString().equals("like")) {
+                warpper = warpper.like(key.toString(), "%" + value.toString() + "%");
+            } else if (op.get(key).toString().equals("<>")) {
+                warpper = warpper.ne(key.toString(), value.toString());
             }
         }
         //.@leon order
-        if (indexhandle.getOrder() != null && indexhandle.getSort() != null){
+        if (indexhandle.getOrder() != null && indexhandle.getSort() != null) {
             String order = indexhandle.getOrder();
             String sort = indexhandle.getSort();
-            if (!order.isEmpty() && !sort.isEmpty()){
-                if (order.equals("asc")){
-                    warpper = warpper.orderBy(sort,true);
-                }else if(order.equals("desc")){
-                    warpper = warpper.orderBy(sort,false);
+            if (!order.isEmpty() && !sort.isEmpty()) {
+                if (order.equals("asc")) {
+                    warpper = warpper.orderBy(sort, true);
+                } else if (order.equals("desc")) {
+                    warpper = warpper.orderBy(sort, false);
                 }
             }
         }
         //.@leon offset limit
         Page<Corp> page = this.selectPage(
-            new Page<Corp>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
+                new Page<Corp>(indexhandle.getOffset(), indexhandle.getLimit()), warpper
         );
         IndexBaseRes<Corp> result = new IndexBaseRes<Corp>();
         result.setList(page.getRecords());

src/main/java/com/mokamrp/privates/service/impl/GroupCorpServiceImpl.java

@@ -32,11 +32,12 @@ public class GroupCorpServiceImpl extends ServiceImpl<GroupCorpMapper, GroupCorp
 
     /**
      * 查询企业分组绑定关系
+     *
      * @return
      */
     @Override
-    public List<Map<String,Object>> selectGroupCorp(){
-        List<Map<String,Object>> res = groupCorpMapper.selectGroupCorp();
+    public List<Map<String, Object>> selectGroupCorp() {
+        List<Map<String, Object>> res = groupCorpMapper.selectGroupCorp();
         return res;
     }
 }

src/main/java/com/mokamrp/privates/service/impl/LoginServiceImpl.java

@@ -37,27 +37,27 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
     @Autowired
     public StringRedisTemplate redis;
 
-    public Map<String, Object> doLogin(String phone,String password){
-        Map<String,Object> res = selectMap(new EntityWrapper<User>().eq("phone",phone));
+    public Map<String, Object> doLogin(String phone, String password) {
+        Map<String, Object> res = selectMap(new EntityWrapper<User>().eq("phone", phone));
         //.验证账户名和密码
-        if (res.isEmpty()){
-            res.put("loginStatus","phoneNull");
+        if (res.isEmpty()) {
+            res.put("loginStatus", "phoneNull");
             return res;
         }
         Object nowPass = res.get("password");
-        if (!nowPass.toString().equals(password)){
-            res.put("loginStatus","passwordErr");
+        if (!nowPass.toString().equals(password)) {
+            res.put("loginStatus", "passwordErr");
             return res;
         }
         //.登录信息缓存到redis，过期时间5小时
         String userMd5 = Md5Utils.hash(phone);
-        String token = userMd5+"_"+ StringUtils.getRandomString(10);
+        String token = userMd5 + "_" + StringUtils.getRandomString(10);
         res.remove("password");
         String userInfoStr = JSON.toJSONString(res);
-        redis.opsForValue().set(RedisKey.AuthToken+token,userInfoStr);
-        redis.expire(RedisKey.AuthToken+token,Constants.TOKEN_EXPIRATION, TimeUnit.SECONDS);
-        res.put("token",token);
-        res.put("loginStatus","loginSuccess");
+        redis.opsForValue().set(RedisKey.AuthToken + token, userInfoStr);
+        redis.expire(RedisKey.AuthToken + token, Constants.TOKEN_EXPIRATION, TimeUnit.SECONDS);
+        res.put("token", token);
+        res.put("loginStatus", "loginSuccess");
         return res;
     }
 }

src/main/java/com/mokamrp/privates/service/impl/TagServiceImpl.java

@@ -3,10 +3,12 @@ package com.mokamrp.privates.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
 import com.mokamrp.privates.mapper.TagMapper;
 import com.mokamrp.privates.service.TagService;
 import com.baomidou.mybatisplus.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;
@@ -24,48 +26,58 @@ import java.util.Map;
  */
 @Service
 public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
+
+    @Autowired
+    public TagMapper tagMapper;
+
     /**
      * 基础sql操作方法
+     *
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
-    public IndexBaseRes<Tag> base(IndexHandle indexhandle){
+    public IndexBaseRes<Tag> base(IndexHandle indexhandle) {
         Integer total = this.selectCount(new EntityWrapper<Tag>());
         Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
         Wrapper<Tag> warpper = new EntityWrapper<Tag>();
         //.@leon where like,=,<>
-        while (fileterIt.hasNext()){
+        while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
             Object key = entray.getKey();
             Object value = entray.getValue();
-            Map<String,String> op = indexhandle.getOp();
-            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
-                warpper = warpper.eq(key.toString(),value.toString());
-            }else if (op.get(key).toString().equals("like")){
-                warpper = warpper.like(key.toString(),"%"+value.toString()+"%");
-            }else if (op.get(key).toString().equals("<>")){
-                warpper = warpper.ne(key.toString(),value.toString());
+            Map<String, String> op = indexhandle.getOp();
+            if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
+                warpper = warpper.eq(key.toString(), value.toString());
+            } else if (op.get(key).toString().equals("like")) {
+                warpper = warpper.like(key.toString(), "%" + value.toString() + "%");
+            } else if (op.get(key).toString().equals("<>")) {
+                warpper = warpper.ne(key.toString(), value.toString());
             }
         }
         //.@leon order
-        if (indexhandle.getOrder() != null && indexhandle.getSort() != null){
+        if (indexhandle.getOrder() != null && indexhandle.getSort() != null) {
             String order = indexhandle.getOrder();
             String sort = indexhandle.getSort();
-            if (!order.isEmpty() && !sort.isEmpty()){
-                if (order.equals("asc")){
-                    warpper = warpper.orderBy(sort,true);
-                }else if(order.equals("desc")){
-                    warpper = warpper.orderBy(sort,false);
+            if (!order.isEmpty() && !sort.isEmpty()) {
+                if (order.equals("asc")) {
+                    warpper = warpper.orderBy(sort, true);
+                } else if (order.equals("desc")) {
+                    warpper = warpper.orderBy(sort, false);
                 }
             }
         }
         //.@leon offset limit
         Page<Tag> page = this.selectPage(
-            new Page<Tag>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
+                new Page<Tag>(indexhandle.getOffset(), indexhandle.getLimit()), warpper
         );
         IndexBaseRes<Tag> result = new IndexBaseRes<Tag>();
         result.setList(page.getRecords());
         result.setTotal(total);
         return result;
     }
+
+    public Object selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle) {
+        Object res = tagMapper.selectEmployeeTag(getEmployeeTagHandle);
+        return res;
+    }
 }

src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -50,61 +50,62 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
 
     @Override
     public Map<String, Object> getPageList(Integer gender, Integer status,
-                                    Integer pagesize, Integer page, String name,
-                                    Integer start_deleted_at, Integer end_deleted_at,
-                                    Integer start_created_at, Integer end_created_at,
-                                    Integer group_id,
-                                    Integer corp_id, List employee_id, List tag_id , Integer channel_code_id){
+                                           Integer pagesize, Integer page, String name,
+                                           Integer start_deleted_at, Integer end_deleted_at,
+                                           Integer start_created_at, Integer end_created_at,
+                                           Integer group_id,
+                                           Integer corp_id, List employee_id, List tag_id, Integer channel_code_id) {
 
         Page<WorkContactEmployeeVo> pageObj = new Page<>(page, pagesize);
         EntityWrapper<WorkContactEmployee> obj = new EntityWrapper<WorkContactEmployee>();
 
-        if(name != ""){
-            obj.like("c.name",name);
+
+        if(name != null && !name.equals("")){
+            obj.like("c.name", name);
         }
 
-        if(gender != null){
-            obj.eq("c.gender",gender);
+        if (gender != null) {
+            obj.eq("c.gender", gender);
         }
 
-        if(status != null) {
+        if (status != null) {
             obj.eq("a.`status`", status);
         }
 
-        if(channel_code_id != null) {
+        if (channel_code_id != null) {
             obj.eq("a.channel_code_id", channel_code_id);
         }
 
-        if(start_deleted_at != null) {
+        if (start_deleted_at != null) {
             obj.ge("c.deleted_at", start_deleted_at);
         }
 
-        if(end_created_at != null) {
+        if (end_created_at != null) {
             obj.le("c.deleted_at", end_deleted_at);
         }
 
-        if(start_created_at != null) {
+        if (start_created_at != null) {
             obj.ge("c.created_at", start_created_at);
         }
 
-        if(end_created_at != null) {
+        if (end_created_at != null) {
             obj.le("c.created_at", end_created_at);
         }
-        if(corp_id != null) {
+        if (corp_id != null) {
             obj.eq("a.corp_id", corp_id);
         }
-        if(employee_id !=null) {
+        if (employee_id != null) {
             obj.in("a.employee_id", employee_id);
         }
 
-        List<WorkContactEmployeeVo> list = mapperObj.getVoList(pageObj,obj);
+        List<WorkContactEmployeeVo> list = mapperObj.getVoList(pageObj, obj);
 
         Integer total = mapperObj.getVoListTotal(obj);
 
-        Map<String, Object> resMap = new HashMap<String,Object>();
+        Map<String, Object> resMap = new HashMap<String, Object>();
 
-        resMap.put("list",list);
-        resMap.put("total",total);
+        resMap.put("list", list);
+        resMap.put("total", total);
 
         return resMap;
     }
@@ -119,7 +120,7 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
 
         EntityWrapper<WorkContactEmployee> obj = new EntityWrapper<WorkContactEmployee>();
 
-        if(name != ""){
+        if(name != null && !name.equals("")){
             obj.like("c.name",name);
         }
 

src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java

@@ -35,51 +35,51 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
     private WorkContactRoomMapper mapperObj;
 
     @Override
-    public Map<String, Object> getPageList(IndexHandle indexHandle, BindingResult bindingResult){
+    public Map<String, Object> getPageList(IndexHandle indexHandle, BindingResult bindingResult) {
 
-        if(bindingResult.hasErrors()){
-            return AjaxResult.error(HttpStatus.ERROR,bindingResult.getFieldError().getDefaultMessage());
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
         Iterator fileterIt = indexHandle.getFilter().entrySet().iterator();
         EntityWrapper<WorkContactRoomByRoomIdVo> warpper = new EntityWrapper<WorkContactRoomByRoomIdVo>();
         //.@leon where like,=,<>
-        while (fileterIt.hasNext()){
+        while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
             Object key = entray.getKey();
             Object value = entray.getValue();
-            Map<String,String> op = indexHandle.getOp();
+            Map<String, String> op = indexHandle.getOp();
             //.这里sql字段需要驼峰转下划线
-            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
-                warpper.eq(StringUtils.humpToLine2(key.toString()),value.toString());
-            }else if (op.get(key).toString().equals("like")){
-                warpper.like(StringUtils.humpToLine2(key.toString()),"%"+value.toString()+"%");
-            }else if (op.get(key).toString().equals("<>")){
-                warpper.ne(StringUtils.humpToLine2(key.toString()),value.toString());
+            if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
+                warpper.eq(StringUtils.humpToLine2(key.toString()), value.toString());
+            } else if (op.get(key).toString().equals("like")) {
+                warpper.like(StringUtils.humpToLine2(key.toString()), "%" + value.toString() + "%");
+            } else if (op.get(key).toString().equals("<>")) {
+                warpper.ne(StringUtils.humpToLine2(key.toString()), value.toString());
             }
         }
 
         //.统计数量
         Integer total = mapperObj.getListByRoomIdTotal(warpper);
-        if (indexHandle.getOrder() != null && indexHandle.getSort() != null){
+        if (indexHandle.getOrder() != null && indexHandle.getSort() != null) {
             String order = indexHandle.getOrder();
             String sort = indexHandle.getSort();
-            if (!order.isEmpty() && !sort.isEmpty()){
-                if (order.equals("asc")){
-                    warpper.orderBy(sort,true);
-                }else if(order.equals("desc")){
-                    warpper.orderBy(sort,false);
+            if (!order.isEmpty() && !sort.isEmpty()) {
+                if (order.equals("asc")) {
+                    warpper.orderBy(sort, true);
+                } else if (order.equals("desc")) {
+                    warpper.orderBy(sort, false);
                 }
             }
         }
 
         List<WorkContactRoomByRoomIdVo> page = mapperObj.getListByRoomId(
-                new Page<WorkContactRoomByRoomIdVo>(indexHandle.getOffset(),indexHandle.getLimit()),warpper
+                new Page<WorkContactRoomByRoomIdVo>(indexHandle.getOffset(), indexHandle.getLimit()), warpper
         );
 
-        Map<String, Object> resMap = new HashMap<String,Object>();
-        resMap.put("list",page);
-        resMap.put("total",total);
+        Map<String, Object> resMap = new HashMap<String, Object>();
+        resMap.put("list", page);
+        resMap.put("total", total);
 
         return resMap;
     }

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -34,19 +34,19 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     @Autowired
     private GroupMapper groupMapper;
 
-    public Object selectWorkEmployeeList(Integer authUserId, WorkEmployeeHandle workEmployee){
-        List<UserCorp> userCorps = userCorpService.selectList(new EntityWrapper<UserCorp>().eq("id",authUserId));
+    public Object selectWorkEmployeeList(Integer authUserId, WorkEmployeeHandle workEmployee) {
+        List<UserCorp> userCorps = userCorpService.selectList(new EntityWrapper<UserCorp>().eq("user_id", authUserId));
         //.先用户当前的企业查询企业
         List<Integer> corpIds = new ArrayList<Integer>();
-        if (workEmployee.getCorpId() == null){
-            for(UserCorp userCorp : userCorps){
+        if (workEmployee.getCorpId() == null) {
+            for (UserCorp userCorp : userCorps) {
                 corpIds.add(userCorp.getCorpId());
             }
-        }else{
+        } else {
             corpIds.add(workEmployee.getCorpId());
         }
         String corpIdStr = StringUtils.join(corpIds, ",");
-        List<Map<String,Object>> res = groupMapper.selectCorpAndWorkEmployeeList(corpIdStr);
+        List<Map<String, Object>> res = groupMapper.selectCorpAndWorkEmployeeList(corpIdStr);
         return res;
     }
 }

src/main/java/com/mokamrp/privates/utils/Arith.java

@@ -5,28 +5,30 @@ import java.math.RoundingMode;
 
 /**
  * 精确的浮点数运算
- * 
+ *
  * @author ruoyi
  */
-public class Arith
-{
+public class Arith {
 
-    /** 默认除法运算精度 */
+    /**
+     * 默认除法运算精度
+     */
     private static final int DEF_DIV_SCALE = 10;
 
-    /** 这个类不能实例化 */
-    private Arith()
-    {
+    /**
+     * 这个类不能实例化
+     */
+    private Arith() {
     }
 
     /**
      * 提供精确的加法运算。
+     *
      * @param v1 被加数
      * @param v2 加数
      * @return 两个参数的和
      */
-    public static double add(double v1, double v2)
-    {
+    public static double add(double v1, double v2) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.add(b2).doubleValue();
@@ -34,12 +36,12 @@ public class Arith
 
     /**
      * 提供精确的减法运算。
+     *
      * @param v1 被减数
      * @param v2 减数
      * @return 两个参数的差
      */
-    public static double sub(double v1, double v2)
-    {
+    public static double sub(double v1, double v2) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.subtract(b2).doubleValue();
@@ -47,12 +49,12 @@ public class Arith
 
     /**
      * 提供精确的乘法运算。
+     *
      * @param v1 被乘数
      * @param v2 乘数
      * @return 两个参数的积
      */
-    public static double mul(double v1, double v2)
-    {
+    public static double mul(double v1, double v2) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.multiply(b2).doubleValue();
@@ -61,34 +63,32 @@ public class Arith
     /**
      * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到
      * 小数点以后10位，以后的数字四舍五入。
+     *
      * @param v1 被除数
      * @param v2 除数
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2)
-    {
+    public static double div(double v1, double v2) {
         return div(v1, v2, DEF_DIV_SCALE);
     }
 
     /**
      * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指
      * 定精度，以后的数字四舍五入。
-     * @param v1 被除数
-     * @param v2 除数
+     *
+     * @param v1    被除数
+     * @param v2    除数
      * @param scale 表示表示需要精确到小数点以后几位。
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2, int scale)
-    {
-        if (scale < 0)
-        {
+    public static double div(double v1, double v2, int scale) {
+        if (scale < 0) {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
-        if (b1.compareTo(BigDecimal.ZERO) == 0)
-        {
+        if (b1.compareTo(BigDecimal.ZERO) == 0) {
             return BigDecimal.ZERO.doubleValue();
         }
         return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
@@ -96,14 +96,13 @@ public class Arith
 
     /**
      * 提供精确的小数位四舍五入处理。
-     * @param v 需要四舍五入的数字
+     *
+     * @param v     需要四舍五入的数字
      * @param scale 小数点后保留几位
      * @return 四舍五入后的结果
      */
-    public static double round(double v, int scale)
-    {
-        if (scale < 0)
-        {
+    public static double round(double v, int scale) {
+        if (scale < 0) {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }

src/main/java/com/mokamrp/privates/utils/CharsetKit.java

@@ -5,71 +5,76 @@ import java.nio.charset.StandardCharsets;
 
 /**
  * 字符集工具类
- * 
+ *
  * @author ruoyi
  */
-public class CharsetKit
-{
-    /** ISO-8859-1 */
+public class CharsetKit {
+    /**
+     * ISO-8859-1
+     */
     public static final String ISO_8859_1 = "ISO-8859-1";
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final String UTF_8 = "UTF-8";
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final String GBK = "GBK";
 
-    /** ISO-8859-1 */
+    /**
+     * ISO-8859-1
+     */
     public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final Charset CHARSET_GBK = Charset.forName(GBK);
 
     /**
      * 转换为Charset对象
-     * 
+     *
      * @param charset 字符集，为空则返回默认字符集
      * @return Charset
      */
-    public static Charset charset(String charset)
-    {
+    public static Charset charset(String charset) {
         return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
     }
 
     /**
      * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, String srcCharset, String destCharset)
-    {
+    public static String convert(String source, String srcCharset, String destCharset) {
         return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
     }
 
     /**
      * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, Charset srcCharset, Charset destCharset)
-    {
-        if (null == srcCharset)
-        {
+    public static String convert(String source, Charset srcCharset, Charset destCharset) {
+        if (null == srcCharset) {
             srcCharset = StandardCharsets.ISO_8859_1;
         }
 
-        if (null == destCharset)
-        {
+        if (null == destCharset) {
             srcCharset = StandardCharsets.UTF_8;
         }
 
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
-        {
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
             return source;
         }
         return new String(source.getBytes(srcCharset), destCharset);
@@ -78,8 +83,7 @@ public class CharsetKit
     /**
      * @return 系统字符集编码
      */
-    public static String systemCharset()
-    {
+    public static String systemCharset() {
         return Charset.defaultCharset().name();
     }
 }

src/main/java/com/mokamrp/privates/utils/DateUtils.java

@@ -15,8 +15,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -37,8 +36,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
 
@@ -47,44 +45,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -92,8 +80,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -101,8 +88,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -110,18 +96,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -129,8 +110,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -138,8 +118,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个时间差
      */
-    public static String getDatePoor(Date endDate, Date nowDate)
-    {
+    public static String getDatePoor(Date endDate, Date nowDate) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -160,18 +139,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个时间差
      */
-    public static long diffTime(Date endDate, Date nowDate){
-      return endDate.getTime() - nowDate.getTime();
+    public static long diffTime(Date endDate, Date nowDate) {
+        return endDate.getTime() - nowDate.getTime();
     }
 
     /**
      * 获取时间段内所有日期
+     *
      * @param dBegin
      * @param dEnd
      * @return
      */
-    public static List<Date> findDates(Date dBegin, Date dEnd)
-    {
+    public static List<Date> findDates(Date dBegin, Date dEnd) {
         List lDate = new ArrayList();
         lDate.add(dBegin);
         Calendar calBegin = Calendar.getInstance();
@@ -181,8 +160,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // 使用给定的 Date 设置此 Calendar 的时间
         calEnd.setTime(dEnd);
         // 测试此日期是否在指定日期之后
-        while (dEnd.after(calBegin.getTime()))
-        {
+        while (dEnd.after(calBegin.getTime())) {
             // 根据日历的规则，为给定的日历字段添加或减去指定的时间量
             calBegin.add(Calendar.DAY_OF_MONTH, 1);
             lDate.add(calBegin.getTime());
@@ -197,8 +175,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
 
-
-    public static  int getAge(Date birthDay) throws Exception {
+    public static int getAge(Date birthDay) throws Exception {
         Calendar cal = Calendar.getInstance();
         if (cal.before(birthDay)) { //出生日期晚于当前时间，无法计算
             throw new IllegalArgumentException(
@@ -215,13 +192,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         if (monthNow <= monthBirth) {
             if (monthNow == monthBirth) {
                 if (dayOfMonthNow < dayOfMonthBirth) age--;//当前日期在生日之前，年龄减一
-            }else{
+            } else {
                 age--;//当前月份在生日之前，年龄减一
-            } }
+            }
+        }
         return age;
 
     }
 
 
-
 }

src/main/java/com/mokamrp/privates/utils/ExceptionUtil.java

@@ -10,30 +10,25 @@ import java.io.StringWriter;
  *
  * @author ruoyi
  */
-public class ExceptionUtil
-{
+public class ExceptionUtil {
     /**
      * 获取exception的详细错误信息。
      */
-    public static String getExceptionMessage(Throwable e)
-    {
+    public static String getExceptionMessage(Throwable e) {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw, true));
         String str = sw.toString();
         return str;
     }
 
-    public static String getRootErrorMseeage(Exception e)
-    {
+    public static String getRootErrorMseeage(Exception e) {
         Throwable root = ExceptionUtils.getRootCause(e);
         root = (root == null ? e : root);
-        if (root == null)
-        {
+        if (root == null) {
             return "";
         }
         String msg = root.getMessage();
-        if (msg == null)
-        {
+        if (msg == null) {
             return "null";
         }
         return com.mokamrp.privates.utils.StringUtils.defaultString(msg);

src/main/java/com/mokamrp/privates/utils/LogUtils.java

@@ -2,15 +2,12 @@ package com.mokamrp.privates.utils;
 
 /**
  * 处理并记录日志文件
- * 
+ *
  * @author ruoyi
  */
-public class LogUtils
-{
-    public static String getBlock(Object msg)
-    {
-        if (msg == null)
-        {
+public class LogUtils {
+    public static String getBlock(Object msg) {
+        if (msg == null) {
             msg = "";
         }
         return "[" + msg.toString() + "]";

src/main/java/com/mokamrp/privates/utils/MessageUtils.java

@@ -6,11 +6,10 @@ import org.springframework.context.i18n.LocaleContextHolder;
 
 /**
  * 获取i18n资源文件
- * 
+ *
  * @author ruoyi
  */
-public class MessageUtils
-{
+public class MessageUtils {
     /**
      * 根据消息键和参数 获取消息 委托给spring messageSource
      *
@@ -18,8 +17,7 @@ public class MessageUtils
      * @param args 参数
      * @return 获取国际化翻译值
      */
-    public static String message(String code, Object... args)
-    {
+    public static String message(String code, Object... args) {
         MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
         return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
     }

src/main/java/com/mokamrp/privates/utils/ServletUtils.java

@@ -12,91 +12,78 @@ import java.io.IOException;
 
 /**
  * 客户端工具类
- * 
+ *
  * @author ruoyi
  */
-public class ServletUtils
-{
+public class ServletUtils {
     /**
      * 获取String参数
      */
-    public static String getParameter(String name)
-    {
+    public static String getParameter(String name) {
         return getRequest().getParameter(name);
     }
 
     /**
      * 获取String参数
      */
-    public static String getParameter(String name, String defaultValue)
-    {
+    public static String getParameter(String name, String defaultValue) {
         return Convert.toStr(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name)
-    {
+    public static Integer getParameterToInt(String name) {
         return Convert.toInt(getRequest().getParameter(name));
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name, Integer defaultValue)
-    {
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
         return Convert.toInt(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取request
      */
-    public static HttpServletRequest getRequest()
-    {
+    public static HttpServletRequest getRequest() {
         return getRequestAttributes().getRequest();
     }
 
     /**
      * 获取response
      */
-    public static HttpServletResponse getResponse()
-    {
+    public static HttpServletResponse getResponse() {
         return getRequestAttributes().getResponse();
     }
 
     /**
      * 获取session
      */
-    public static HttpSession getSession()
-    {
+    public static HttpSession getSession() {
         return getRequest().getSession();
     }
 
-    public static ServletRequestAttributes getRequestAttributes()
-    {
+    public static ServletRequestAttributes getRequestAttributes() {
         RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         return (ServletRequestAttributes) attributes;
     }
 
     /**
      * 将字符串渲染到客户端
-     * 
+     *
      * @param response 渲染对象
-     * @param string 待渲染的字符串
+     * @param string   待渲染的字符串
      * @return null
      */
-    public static String renderString(HttpServletResponse response, String string)
-    {
-        try
-        {
+    public static String renderString(HttpServletResponse response, String string) {
+        try {
             response.setStatus(200);
             response.setContentType("application/json");
             response.setCharacterEncoding("utf-8");
             response.getWriter().print(string);
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return null;
@@ -104,32 +91,27 @@ public class ServletUtils
 
     /**
      * 是否是Ajax异步请求
-     * 
+     *
      * @param request
      */
-    public static boolean isAjaxRequest(HttpServletRequest request)
-    {
+    public static boolean isAjaxRequest(HttpServletRequest request) {
         String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1)
-        {
+        if (accept != null && accept.indexOf("application/json") != -1) {
             return true;
         }
 
         String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
-        {
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
             return true;
         }
 
         String uri = request.getRequestURI();
-        if (com.mokamrp.privates.utils.StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
-        {
+        if (com.mokamrp.privates.utils.StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
             return true;
         }
 
         String ajax = request.getParameter("__ajax");
-        if (com.mokamrp.privates.utils.StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
-        {
+        if (com.mokamrp.privates.utils.StringUtils.inStringIgnoreCase(ajax, "json", "xml")) {
             return true;
         }
         return false;

src/main/java/com/mokamrp/privates/utils/StrFormatter.java

@@ -2,11 +2,10 @@ package com.mokamrp.privates.utils;
 
 /**
  * 字符串格式化
- * 
+ *
  * @author ruoyi
  */
-public class StrFormatter
-{
+public class StrFormatter {
     public static final String EMPTY_JSON = "{}";
     public static final char C_BACKSLASH = '\\';
     public static final char C_DELIM_START = '{';
@@ -20,15 +19,13 @@ public class StrFormatter
      * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
      * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
+     *
      * @param strPattern 字符串模板
-     * @param argArray 参数列表
+     * @param argArray   参数列表
      * @return 结果
      */
-    public static String format(final String strPattern, final Object... argArray)
-    {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
-        {
+    public static String format(final String strPattern, final Object... argArray) {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
             return strPattern;
         }
         final int strPatternLength = strPattern.length();
@@ -38,43 +35,30 @@ public class StrFormatter
 
         int handledPosition = 0;
         int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
-        {
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
             delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1)
-            {
-                if (handledPosition == 0)
-                {
+            if (delimIndex == -1) {
+                if (handledPosition == 0) {
                     return strPattern;
-                }
-                else
-                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+                } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
                     sbuf.append(strPattern, handledPosition, strPatternLength);
                     return sbuf.toString();
                 }
-            }
-            else
-            {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
-                {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
-                    {
+            } else {
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
                         // 转义符之前还有一个转义符，占位符依旧有效
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(Convert.utf8Str(argArray[argIndex]));
                         handledPosition = delimIndex + 2;
-                    }
-                    else
-                    {
+                    } else {
                         // 占位符被转义
                         argIndex--;
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(C_DELIM_START);
                         handledPosition = delimIndex + 1;
                     }
-                }
-                else
-                {
+                } else {
                     // 正常占位符
                     sbuf.append(strPattern, handledPosition, delimIndex);
                     sbuf.append(Convert.utf8Str(argArray[argIndex]));

src/main/java/com/mokamrp/privates/utils/StringUtils.java

@@ -7,182 +7,167 @@ import java.util.regex.Pattern;
 
 /**
  * 字符串工具类
- * 
+ *
  * @author ruoyi
  */
-public class StringUtils extends org.apache.commons.lang3.StringUtils
-{
-    /** 空字符串 */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    /**
+     * 空字符串
+     */
     private static final String NULLSTR = "";
 
-    /** 下划线 */
+    /**
+     * 下划线
+     */
     private static final char SEPARATOR = '_';
 
     /**
      * 获取参数不为空值
-     * 
+     *
      * @param value defaultValue 要判断的value
      * @return value 返回值
      */
-    public static <T> T nvl(T value, T defaultValue)
-    {
+    public static <T> T nvl(T value, T defaultValue) {
         return value != null ? value : defaultValue;
     }
 
     /**
      * * 判断一个Collection是否为空， 包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Collection<?> coll)
-    {
+    public static boolean isEmpty(Collection<?> coll) {
         return isNull(coll) || coll.isEmpty();
     }
 
     /**
      * * 判断一个Collection是否非空，包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Collection<?> coll)
-    {
+    public static boolean isNotEmpty(Collection<?> coll) {
         return !isEmpty(coll);
     }
 
     /**
      * * 判断一个对象数组是否为空
-     * 
+     *
      * @param objects 要判断的对象数组
-     ** @return true：为空 false：非空
+     *                * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Object[] objects)
-    {
+    public static boolean isEmpty(Object[] objects) {
         return isNull(objects) || (objects.length == 0);
     }
 
     /**
      * * 判断一个对象数组是否非空
-     * 
+     *
      * @param objects 要判断的对象数组
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Object[] objects)
-    {
+    public static boolean isNotEmpty(Object[] objects) {
         return !isEmpty(objects);
     }
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Map<?, ?> map)
-    {
+    public static boolean isEmpty(Map<?, ?> map) {
         return isNull(map) || map.isEmpty();
     }
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Map<?, ?> map)
-    {
+    public static boolean isNotEmpty(Map<?, ?> map) {
         return !isEmpty(map);
     }
 
     /**
      * * 判断一个字符串是否为空串
-     * 
+     *
      * @param str String
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(String str)
-    {
+    public static boolean isEmpty(String str) {
         return isNull(str) || NULLSTR.equals(str.trim());
     }
 
     /**
      * * 判断一个字符串是否为非空串
-     * 
+     *
      * @param str String
      * @return true：非空串 false：空串
      */
-    public static boolean isNotEmpty(String str)
-    {
+    public static boolean isNotEmpty(String str) {
         return !isEmpty(str);
     }
 
     /**
      * * 判断一个对象是否为空
-     * 
+     *
      * @param object Object
      * @return true：为空 false：非空
      */
-    public static boolean isNull(Object object)
-    {
+    public static boolean isNull(Object object) {
         return object == null;
     }
 
     /**
      * * 判断一个对象是否非空
-     * 
+     *
      * @param object Object
      * @return true：非空 false：空
      */
-    public static boolean isNotNull(Object object)
-    {
+    public static boolean isNotNull(Object object) {
         return !isNull(object);
     }
 
     /**
      * * 判断一个对象是否是数组类型（Java基本型别的数组）
-     * 
+     *
      * @param object 对象
      * @return true：是数组 false：不是数组
      */
-    public static boolean isArray(Object object)
-    {
+    public static boolean isArray(Object object) {
         return isNotNull(object) && object.getClass().isArray();
     }
 
     /**
      * 去空格
      */
-    public static String trim(String str)
-    {
+    public static String trim(String str) {
         return (str == null ? "" : str.trim());
     }
 
     /**
      * 截取字符串
-     * 
-     * @param str 字符串
+     *
+     * @param str   字符串
      * @param start 开始
      * @return 结果
      */
-    public static String substring(final String str, int start)
-    {
-        if (str == null)
-        {
+    public static String substring(final String str, int start) {
+        if (str == null) {
             return NULLSTR;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = str.length() + start;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = 0;
         }
-        if (start > str.length())
-        {
+        if (start > str.length()) {
             return NULLSTR;
         }
 
@@ -191,44 +176,36 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 截取字符串
-     * 
-     * @param str 字符串
+     *
+     * @param str   字符串
      * @param start 开始
-     * @param end 结束
+     * @param end   结束
      * @return 结果
      */
-    public static String substring(final String str, int start, int end)
-    {
-        if (str == null)
-        {
+    public static String substring(final String str, int start, int end) {
+        if (str == null) {
             return NULLSTR;
         }
 
-        if (end < 0)
-        {
+        if (end < 0) {
             end = str.length() + end;
         }
-        if (start < 0)
-        {
+        if (start < 0) {
             start = str.length() + start;
         }
 
-        if (end > str.length())
-        {
+        if (end > str.length()) {
             end = str.length();
         }
 
-        if (start > end)
-        {
+        if (start > end) {
             return NULLSTR;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = 0;
         }
-        if (end < 0)
-        {
+        if (end < 0) {
             end = 0;
         }
 
@@ -243,15 +220,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
      * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
      * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
+     *
      * @param template 文本模板，被替换的部分用 {} 表示
-     * @param params 参数值
+     * @param params   参数值
      * @return 格式化后的文本
      */
-    public static String format(String template, Object... params)
-    {
-        if (isEmpty(params) || isEmpty(template))
-        {
+    public static String format(String template, Object... params) {
+        if (isEmpty(params) || isEmpty(template)) {
             return template;
         }
         return StrFormatter.format(template, params);
@@ -259,47 +234,40 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 字符串转set
-     * 
+     *
      * @param str 字符串
      * @param sep 分隔符
      * @return set集合
      */
-    public static final Set<String> str2Set(String str, String sep)
-    {
+    public static final Set<String> str2Set(String str, String sep) {
         return new HashSet<String>(str2List(str, sep, true, false));
     }
 
     /**
      * 字符串转list
-     * 
-     * @param str 字符串
-     * @param sep 分隔符
+     *
+     * @param str         字符串
+     * @param sep         分隔符
      * @param filterBlank 过滤纯空白
-     * @param trim 去掉首尾空白
+     * @param trim        去掉首尾空白
      * @return list集合
      */
-    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
-    {
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
         List<String> list = new ArrayList<String>();
-        if (StringUtils.isEmpty(str))
-        {
+        if (StringUtils.isEmpty(str)) {
             return list;
         }
 
         // 过滤空白字符串
-        if (filterBlank && StringUtils.isBlank(str))
-        {
+        if (filterBlank && StringUtils.isBlank(str)) {
             return list;
         }
         String[] split = str.split(sep);
-        for (String string : split)
-        {
-            if (filterBlank && StringUtils.isBlank(string))
-            {
+        for (String string : split) {
+            if (filterBlank && StringUtils.isBlank(string)) {
                 continue;
             }
-            if (trim)
-            {
+            if (trim) {
                 string = string.trim();
             }
             list.add(string);
@@ -311,10 +279,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /**
      * 下划线转驼峰命名
      */
-    public static String toUnderScoreCase(String str)
-    {
-        if (str == null)
-        {
+    public static String toUnderScoreCase(String str) {
+        if (str == null) {
             return null;
         }
         StringBuilder sb = new StringBuilder();
@@ -324,31 +290,23 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         boolean curreCharIsUpperCase = true;
         // 下一字符是否大写
         boolean nexteCharIsUpperCase = true;
-        for (int i = 0; i < str.length(); i++)
-        {
+        for (int i = 0; i < str.length(); i++) {
             char c = str.charAt(i);
-            if (i > 0)
-            {
+            if (i > 0) {
                 preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
-            }
-            else
-            {
+            } else {
                 preCharIsUpperCase = false;
             }
 
             curreCharIsUpperCase = Character.isUpperCase(c);
 
-            if (i < (str.length() - 1))
-            {
+            if (i < (str.length() - 1)) {
                 nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
             }
 
-            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
-            {
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
                 sb.append(SEPARATOR);
-            }
-            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
-            {
+            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
                 sb.append(SEPARATOR);
             }
             sb.append(Character.toLowerCase(c));
@@ -359,19 +317,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 是否包含字符串
-     * 
-     * @param str 验证字符串
+     *
+     * @param str  验证字符串
      * @param strs 字符串组
      * @return 包含返回true
      */
-    public static boolean inStringIgnoreCase(String str, String... strs)
-    {
-        if (str != null && strs != null)
-        {
-            for (String s : strs)
-            {
-                if (str.equalsIgnoreCase(trim(s)))
-                {
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        if (str != null && strs != null) {
+            for (String s : strs) {
+                if (str.equalsIgnoreCase(trim(s))) {
                     return true;
                 }
             }
@@ -381,31 +335,25 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-     * 
+     *
      * @param name 转换前的下划线大写方式命名的字符串
      * @return 转换后的驼峰式命名的字符串
      */
-    public static String convertToCamelCase(String name)
-    {
+    public static String convertToCamelCase(String name) {
         StringBuilder result = new StringBuilder();
         // 快速检查
-        if (name == null || name.isEmpty())
-        {
+        if (name == null || name.isEmpty()) {
             // 没必要转换
             return "";
-        }
-        else if (!name.contains("_"))
-        {
+        } else if (!name.contains("_")) {
             // 不含下划线，仅将首字母大写
             return name.substring(0, 1).toUpperCase() + name.substring(1);
         }
         // 用下划线将原始字符串分割
         String[] camels = name.split("_");
-        for (String camel : camels)
-        {
+        for (String camel : camels) {
             // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty())
-            {
+            if (camel.isEmpty()) {
                 continue;
             }
             // 首字母大写
@@ -418,30 +366,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /**
      * 驼峰式命名法 例如：user_name->userName
      */
-    public static String toCamelCase(String s)
-    {
-        if (s == null)
-        {
+    public static String toCamelCase(String s) {
+        if (s == null) {
             return null;
         }
         s = s.toLowerCase();
         StringBuilder sb = new StringBuilder(s.length());
         boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++)
-        {
+        for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
 
-            if (c == SEPARATOR)
-            {
+            if (c == SEPARATOR) {
                 upperCase = true;
-            }
-            else if (upperCase)
-            {
+            } else if (upperCase) {
                 sb.append(Character.toUpperCase(c));
                 upperCase = false;
-            }
-            else
-            {
+            } else {
                 sb.append(c);
             }
         }
@@ -449,8 +389,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T cast(Object obj)
-    {
+    public static <T> T cast(Object obj) {
         return (T) obj;
     }
 
@@ -489,15 +428,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 企微用户客户机器判断
+     *
      * @param str
      * @return
      */
-    public static int weCustomTypeJudgment(String str){
-        if (isNotEmpty(str)){
-            if (str.startsWith("wo") || str.startsWith("wm")){
+    public static int weCustomTypeJudgment(String str) {
+        if (isNotEmpty(str)) {
+            if (str.startsWith("wo") || str.startsWith("wm")) {
                 return 1;
             }
-            if (str.startsWith("wb")){
+            if (str.startsWith("wb")) {
                 return 2;
             }
         }
@@ -505,17 +445,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     }
 
     public static void main(String[] args) {
-        Integer[] arrays = { 1,2,3,4,5,6,7 };
+        Integer[] arrays = {1, 2, 3, 4, 5, 6, 7};
         String join = join(arrays, ",");
         System.out.println(join);// 1,2,3,4,5,6,7
     }
 
-    public static String getRandomString(int length){
-        String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        Random random=new Random();
-        StringBuffer sb=new StringBuffer();
-        for(int i=0;i<length;i++){
-            int number=random.nextInt(62);
+    public static String getRandomString(int length) {
+        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < length; i++) {
+            int number = random.nextInt(62);
             sb.append(str.charAt(number));
         }
         return sb.toString();
@@ -523,6 +463,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 驼峰转下划线
+     *
      * @param str
      * @return
      */

src/main/java/com/mokamrp/privates/utils/VerifyCodeUtils.java

@@ -12,11 +12,10 @@ import java.util.Random;
 
 /**
  * 验证码工具类
- * 
+ *
  * @author ruoyi
  */
-public class VerifyCodeUtils
-{
+public class VerifyCodeUtils {
     // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
     public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 
@@ -24,33 +23,29 @@ public class VerifyCodeUtils
 
     /**
      * 使用系统默认字符源生成验证码
-     * 
+     *
      * @param verifySize 验证码长度
      * @return
      */
-    public static String generateVerifyCode(int verifySize)
-    {
+    public static String generateVerifyCode(int verifySize) {
         return generateVerifyCode(verifySize, VERIFY_CODES);
     }
 
     /**
      * 使用指定源生成验证码
-     * 
+     *
      * @param verifySize 验证码长度
-     * @param sources 验证码字符源
+     * @param sources    验证码字符源
      * @return
      */
-    public static String generateVerifyCode(int verifySize, String sources)
-    {
-        if (sources == null || sources.length() == 0)
-        {
+    public static String generateVerifyCode(int verifySize, String sources) {
+        if (sources == null || sources.length() == 0) {
             sources = VERIFY_CODES;
         }
         int codesLen = sources.length();
         Random rand = new Random(System.currentTimeMillis());
         StringBuilder verifyCode = new StringBuilder(verifySize);
-        for (int i = 0; i < verifySize; i++)
-        {
+        for (int i = 0; i < verifySize; i++) {
             verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
         }
         return verifyCode.toString();
@@ -58,26 +53,24 @@ public class VerifyCodeUtils
 
     /**
      * 输出指定验证码图片流
-     * 
+     *
      * @param w
      * @param h
      * @param os
      * @param code
      * @throws IOException
      */
-    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException
-    {
+    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
         int verifySize = code.length();
         BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
         Random rand = new Random();
         Graphics2D g2 = image.createGraphics();
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         Color[] colors = new Color[5];
-        Color[] colorSpaces = new Color[] { Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
-                Color.ORANGE, Color.PINK, Color.YELLOW };
+        Color[] colorSpaces = new Color[]{Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
+                Color.ORANGE, Color.PINK, Color.YELLOW};
         float[] fractions = new float[colors.length];
-        for (int i = 0; i < colors.length; i++)
-        {
+        for (int i = 0; i < colors.length; i++) {
             colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
             fractions[i] = rand.nextFloat();
         }
@@ -93,8 +86,7 @@ public class VerifyCodeUtils
         // 绘制干扰线
         Random random = new Random();
         g2.setColor(getRandColor(160, 200));// 设置线条的颜色
-        for (int i = 0; i < 20; i++)
-        {
+        for (int i = 0; i < 20; i++) {
             int x = random.nextInt(w - 1);
             int y = random.nextInt(h - 1);
             int xl = random.nextInt(6) + 1;
@@ -105,8 +97,7 @@ public class VerifyCodeUtils
         // 添加噪点
         float yawpRate = 0.05f;// 噪声率
         int area = (int) (yawpRate * w * h);
-        for (int i = 0; i < area; i++)
-        {
+        for (int i = 0; i < area; i++) {
             int x = random.nextInt(w);
             int y = random.nextInt(h);
             int rgb = getRandomIntColor();
@@ -120,8 +111,7 @@ public class VerifyCodeUtils
         Font font = new Font("Algerian", Font.ITALIC, fontSize);
         g2.setFont(font);
         char[] chars = code.toCharArray();
-        for (int i = 0; i < verifySize; i++)
-        {
+        for (int i = 0; i < verifySize; i++) {
             AffineTransform affine = new AffineTransform();
             affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
                     (w / verifySize) * i + fontSize / 2, h / 2);
@@ -133,8 +123,7 @@ public class VerifyCodeUtils
         ImageIO.write(image, "jpg", os);
     }
 
-    private static Color getRandColor(int fc, int bc)
-    {
+    private static Color getRandColor(int fc, int bc) {
         if (fc > 255) {
             fc = 255;
         }
@@ -147,36 +136,30 @@ public class VerifyCodeUtils
         return new Color(r, g, b);
     }
 
-    private static int getRandomIntColor()
-    {
+    private static int getRandomIntColor() {
         int[] rgb = getRandomRgb();
         int color = 0;
-        for (int c : rgb)
-        {
+        for (int c : rgb) {
             color = color << 8;
             color = color | c;
         }
         return color;
     }
 
-    private static int[] getRandomRgb()
-    {
+    private static int[] getRandomRgb() {
         int[] rgb = new int[3];
-        for (int i = 0; i < 3; i++)
-        {
+        for (int i = 0; i < 3; i++) {
             rgb[i] = random.nextInt(255);
         }
         return rgb;
     }
 
-    private static void shear(Graphics g, int w1, int h1, Color color)
-    {
+    private static void shear(Graphics g, int w1, int h1, Color color) {
         shearX(g, w1, h1, color);
         shearY(g, w1, h1, color);
     }
 
-    private static void shearX(Graphics g, int w1, int h1, Color color)
-    {
+    private static void shearX(Graphics g, int w1, int h1, Color color) {
 
         int period = random.nextInt(2);
 
@@ -184,13 +167,11 @@ public class VerifyCodeUtils
         int frames = 1;
         int phase = random.nextInt(2);
 
-        for (int i = 0; i < h1; i++)
-        {
+        for (int i = 0; i < h1; i++) {
             double d = (double) (period >> 1)
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
             g.copyArea(0, i, w1, 1, (int) d, 0);
-            if (borderGap)
-            {
+            if (borderGap) {
                 g.setColor(color);
                 g.drawLine((int) d, i, 0, i);
                 g.drawLine((int) d + w1, i, w1, i);
@@ -199,21 +180,18 @@ public class VerifyCodeUtils
 
     }
 
-    private static void shearY(Graphics g, int w1, int h1, Color color)
-    {
+    private static void shearY(Graphics g, int w1, int h1, Color color) {
 
         int period = random.nextInt(40) + 10; // 50;
 
         boolean borderGap = true;
         int frames = 20;
         int phase = 7;
-        for (int i = 0; i < w1; i++)
-        {
+        for (int i = 0; i < w1; i++) {
             double d = (double) (period >> 1)
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
             g.copyArea(i, 0, 1, h1, 0, (int) d);
-            if (borderGap)
-            {
+            if (borderGap) {
                 g.setColor(color);
                 g.drawLine(i, (int) d, i, 0);
                 g.drawLine(i, (int) d + h1, i, h1);

src/main/java/com/mokamrp/privates/utils/http/HttpHelper.java

@@ -13,40 +13,28 @@ import java.nio.charset.Charset;
 
 /**
  * 通用http工具封装
- * 
+ *
  * @author ruoyi
  */
-public class HttpHelper
-{
+public class HttpHelper {
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
 
-    public static String getBodyString(ServletRequest request)
-    {
+    public static String getBodyString(ServletRequest request) {
         StringBuilder sb = new StringBuilder();
         BufferedReader reader = null;
-        try (InputStream inputStream = request.getInputStream())
-        {
+        try (InputStream inputStream = request.getInputStream()) {
             reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
             String line = "";
-            while ((line = reader.readLine()) != null)
-            {
+            while ((line = reader.readLine()) != null) {
                 sb.append(line);
             }
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             LOGGER.warn("getBodyString出现问题！");
-        }
-        finally
-        {
-            if (reader != null)
-            {
-                try
-                {
+        } finally {
+            if (reader != null) {
+                try {
                     reader.close();
-                }
-                catch (IOException e)
-                {
+                } catch (IOException e) {
                     LOGGER.error(ExceptionUtils.getMessage(e));
                 }
             }

src/main/java/com/mokamrp/privates/utils/http/HttpUtils.java

@@ -14,39 +14,35 @@ import java.security.cert.X509Certificate;
 
 /**
  * 通用http发送方法
- * 
+ *
  * @author ruoyi
  */
-public class HttpUtils
-{
+public class HttpUtils {
     private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
 
     /**
      * 向指定 URL 发送GET方法的请求
      *
-     * @param url 发送请求的 URL
+     * @param url   发送请求的 URL
      * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return 所代表远程资源的响应结果
      */
-    public static String sendGet(String url, String param)
-    {
+    public static String sendGet(String url, String param) {
         return sendGet(url, param, Constants.UTF8);
     }
 
     /**
      * 向指定 URL 发送GET方法的请求
      *
-     * @param url 发送请求的 URL
-     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @param url         发送请求的 URL
+     * @param param       请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @param contentType 编码类型
      * @return 所代表远程资源的响应结果
      */
-    public static String sendGet(String url, String param, String contentType)
-    {
+    public static String sendGet(String url, String param, String contentType) {
         StringBuilder result = new StringBuilder();
         BufferedReader in = null;
-        try
-        {
+        try {
             String urlNameString = url + "?" + param;
             log.info("sendGet - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
@@ -57,39 +53,24 @@ public class HttpUtils
             connection.connect();
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
             String line;
-            while ((line = in.readLine()) != null)
-            {
+            while ((line = in.readLine()) != null) {
                 result.append(line);
             }
             log.info("recv - {}", result);
-        }
-        catch (ConnectException e)
-        {
+        } catch (ConnectException e) {
             log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
-        }
-        catch (SocketTimeoutException e)
-        {
+        } catch (SocketTimeoutException e) {
             log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
-        }
-        finally
-        {
-            try
-            {
-                if (in != null)
-                {
+        } finally {
+            try {
+                if (in != null) {
                     in.close();
                 }
-            }
-            catch (Exception ex)
-            {
+            } catch (Exception ex) {
                 log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
             }
         }
@@ -99,17 +80,15 @@ public class HttpUtils
     /**
      * 向指定 URL 发送POST方法的请求
      *
-     * @param url 发送请求的 URL
+     * @param url   发送请求的 URL
      * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return 所代表远程资源的响应结果
      */
-    public static String sendPost(String url, String param)
-    {
+    public static String sendPost(String url, String param) {
         PrintWriter out = null;
         BufferedReader in = null;
         StringBuilder result = new StringBuilder();
-        try
-        {
+        try {
             String urlNameString = url;
             log.info("sendPost - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
@@ -126,58 +105,40 @@ public class HttpUtils
             out.flush();
             in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
             String line;
-            while ((line = in.readLine()) != null)
-            {
+            while ((line = in.readLine()) != null) {
                 result.append(line);
             }
             log.info("recv - {}", result);
-        }
-        catch (ConnectException e)
-        {
+        } catch (ConnectException e) {
             log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
-        }
-        catch (SocketTimeoutException e)
-        {
+        } catch (SocketTimeoutException e) {
             log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
-        }
-        finally
-        {
-            try
-            {
-                if (out != null)
-                {
+        } finally {
+            try {
+                if (out != null) {
                     out.close();
                 }
-                if (in != null)
-                {
+                if (in != null) {
                     in.close();
                 }
-            }
-            catch (IOException ex)
-            {
+            } catch (IOException ex) {
                 log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
             }
         }
         return result.toString();
     }
 
-    public static String sendSSLPost(String url, String param)
-    {
+    public static String sendSSLPost(String url, String param) {
         StringBuilder result = new StringBuilder();
         String urlNameString = url + "?" + param;
-        try
-        {
+        try {
             log.info("sendSSLPost - {}", urlNameString);
             SSLContext sc = SSLContext.getInstance("SSL");
-            sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom());
+            sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom());
             URL console = new URL(urlNameString);
             HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
             conn.setRequestProperty("accept", "*/*");
@@ -194,60 +155,44 @@ public class HttpUtils
             InputStream is = conn.getInputStream();
             BufferedReader br = new BufferedReader(new InputStreamReader(is));
             String ret = "";
-            while ((ret = br.readLine()) != null)
-            {
-                if (ret != null && !"".equals(ret.trim()))
-                {
+            while ((ret = br.readLine()) != null) {
+                if (ret != null && !"".equals(ret.trim())) {
                     result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                 }
             }
             log.info("recv - {}", result);
             conn.disconnect();
             br.close();
-        }
-        catch (ConnectException e)
-        {
+        } catch (ConnectException e) {
             log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
-        }
-        catch (SocketTimeoutException e)
-        {
+        } catch (SocketTimeoutException e) {
             log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
         }
         return result.toString();
     }
 
-    private static class TrustAnyTrustManager implements X509TrustManager
-    {
+    private static class TrustAnyTrustManager implements X509TrustManager {
         @Override
-        public void checkClientTrusted(X509Certificate[] chain, String authType)
-        {
+        public void checkClientTrusted(X509Certificate[] chain, String authType) {
         }
 
         @Override
-        public void checkServerTrusted(X509Certificate[] chain, String authType)
-        {
+        public void checkServerTrusted(X509Certificate[] chain, String authType) {
         }
 
         @Override
-        public X509Certificate[] getAcceptedIssuers()
-        {
-            return new X509Certificate[] {};
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[]{};
         }
     }
 
-    private static class TrustAnyHostnameVerifier implements HostnameVerifier
-    {
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier {
         @Override
-        public boolean verify(String hostname, SSLSession session)
-        {
+        public boolean verify(String hostname, SSLSession session) {
             return true;
         }
     }

src/main/java/com/mokamrp/privates/utils/img/ImageUtils.java

@@ -19,8 +19,6 @@ public class ImageUtils {
     private final static JLabel J_LABEL = new JLabel();
 
 
-
-
     public static byte[] changeImageSize(InputStream inputStream, Integer size) {
         try {
             BufferedImage oldBufferedImage = ImageIO.read(inputStream);
@@ -150,7 +148,7 @@ public class ImageUtils {
                 }
                 int directionSurplus = width % directionValue;
                 if (directionSurplus > 0) {
-                    byte[]  bytes = cropImage(bufferedImage, height - directionSurplus, 0, directionSurplus, height);
+                    byte[] bytes = cropImage(bufferedImage, height - directionSurplus, 0, directionSurplus, height);
                     byteToFile(bytes, fileName + "-" + (i + 1), "jpg", path);
                 }
             }
@@ -189,30 +187,31 @@ public class ImageUtils {
 
     /**
      * 设置透明度
+     *
      * @param bufferedImage
      * @param alpha
      * @param bufferedImageType
      * @return
      */
-    public static BufferedImage setBufferedImageAlpha(BufferedImage bufferedImage,Integer alpha,Integer bufferedImageType){
-        if(alpha < 0 || alpha > 255){
+    public static BufferedImage setBufferedImageAlpha(BufferedImage bufferedImage, Integer alpha, Integer bufferedImageType) {
+        if (alpha < 0 || alpha > 255) {
             throw new RuntimeException("范围错误[0,255]");
         }
         int width = bufferedImage.getWidth();
         int height = bufferedImage.getHeight();
-        BufferedImage newBufferedImage = new BufferedImage(width,height, bufferedImageType);
+        BufferedImage newBufferedImage = new BufferedImage(width, height, bufferedImageType);
         int argb;
         int oa;
         int a;
         int rgb;
-        for(int y = 0; y < height; y++){
-            for(int x = 0; x < width; x++){
-                argb = bufferedImage.getRGB(x,y);
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                argb = bufferedImage.getRGB(x, y);
                 rgb = argb & 0x00FFFFFF;
                 oa = argb >>> 24;
-                a = oa == 0?0:alpha<<24;
-                argb = a^rgb;
-                newBufferedImage.setRGB(x,y,argb);
+                a = oa == 0 ? 0 : alpha << 24;
+                argb = a ^ rgb;
+                newBufferedImage.setRGB(x, y, argb);
             }
         }
         return newBufferedImage;
@@ -221,6 +220,7 @@ public class ImageUtils {
 
     /**
      * 放大缩小
+     *
      * @param bufferedImage
      * @param enlargementTimes
      * @return
@@ -286,7 +286,7 @@ public class ImageUtils {
         graphics2D.setColor(color);
         graphics2D.setFont(font);
         graphics2D.drawString(str, pointX, pointY);*/
-        writeFontBufferedImage(graphics2D,str,pointX,pointY,font,color);
+        writeFontBufferedImage(graphics2D, str, pointX, pointY, font, color);
         return bufferedImage;
     }
 
@@ -347,6 +347,7 @@ public class ImageUtils {
 
     /**
      * 为图片打马赛克
+     *
      * @param bufferedImage
      * @param pointX
      * @param pointY
@@ -436,18 +437,19 @@ public class ImageUtils {
 
     /**
      * 把字符串拆成行
-     * @param context 文本内容
+     *
+     * @param context        文本内容
      * @param fontMetrics
-     * @param pointX 开始点的x轴坐标
-     * @param pointY 开始点的y轴坐标
-     * @param width 文本域宽度
-     * @param height 文本域高度
-     * @param wordSpace 字间距
-     * @param lineSpace 行间距
+     * @param pointX         开始点的x轴坐标
+     * @param pointY         开始点的y轴坐标
+     * @param width          文本域宽度
+     * @param height         文本域高度
+     * @param wordSpace      字间距
+     * @param lineSpace      行间距
      * @param horizontalType 1 右对齐 2 居中 3 左对齐
      * @return
      */
-    public static List<LineText> splitContext(String context,FontMetrics fontMetrics,int pointX,int pointY,int width,int height,int wordSpace,int lineSpace,Integer horizontalType,Integer verticalType){
+    public static List<LineText> splitContext(String context, FontMetrics fontMetrics, int pointX, int pointY, int width, int height, int wordSpace, int lineSpace, Integer horizontalType, Integer verticalType) {
         context = new String(context.getBytes(StandardCharsets.UTF_8));
         Font font = fontMetrics.getFont();
         char[] chars = context.toCharArray();
@@ -460,33 +462,33 @@ public class ImageUtils {
         //字体宽度
         int charSize = 0;
         List<CharText> charTextList = new ArrayList<>();
-        for(char c:chars){
+        for (char c : chars) {
             charSize = fontMetrics.charWidth(c);
             currentLineWidth += charSize;
-            if(currentLineWidth >= width){
-                returnLineList.add(new LineText(pointX,width,currentHeight,sb.toString(),currentLineWidth - charSize - wordSpace,charTextList,horizontalType));
+            if (currentLineWidth >= width) {
+                returnLineList.add(new LineText(pointX, width, currentHeight, sb.toString(), currentLineWidth - charSize - wordSpace, charTextList, horizontalType));
                 currentHeight += font.getSize();
                 currentHeight += lineSpace;
                 currentLineWidth = charSize;
                 charTextList = new ArrayList<>();
                 sb = new StringBuilder();
             }
-            charTextList.add(new CharText(currentLineWidth - charSize,currentHeight,c));
+            charTextList.add(new CharText(currentLineWidth - charSize, currentHeight, c));
             currentLineWidth += wordSpace;
             sb.append(c);
-            if(currentHeight > height){
+            if (currentHeight > height) {
                 sb = new StringBuilder();
                 break;
             }
         }
-        if(sb.length() > 0){
-            returnLineList.add(new LineText(pointX,width,currentHeight,sb.toString(),currentLineWidth - wordSpace,charTextList,horizontalType));
+        if (sb.length() > 0) {
+            returnLineList.add(new LineText(pointX, width, currentHeight, sb.toString(), currentLineWidth - wordSpace, charTextList, horizontalType));
         }
-        if(verticalType.equals(2)){
-            int allHeight = returnLineList.size()* font.getSize() + lineSpace * returnLineList.size() - 1;
-            pointY = (height - allHeight)/2 + pointY;
-        }else if (verticalType.equals(3)){
-            int allHeight = returnLineList.size()* font.getSize() + lineSpace * returnLineList.size() - 1;
+        if (verticalType.equals(2)) {
+            int allHeight = returnLineList.size() * font.getSize() + lineSpace * returnLineList.size() - 1;
+            pointY = (height - allHeight) / 2 + pointY;
+        } else if (verticalType.equals(3)) {
+            int allHeight = returnLineList.size() * font.getSize() + lineSpace * returnLineList.size() - 1;
             pointY = pointY + height - allHeight;
         }
         int finalPointY = pointY;
@@ -502,24 +504,25 @@ public class ImageUtils {
 
     /**
      * 旋转图片
+     *
      * @param bufferedImage
      * @param angle
      * @return
      */
-    public static BufferedImage rotateImage(BufferedImage bufferedImage,double angle){
-        Rectangle rectangle = getRotateRectangle(bufferedImage.getWidth(),bufferedImage.getHeight(),angle);
-        BufferedImage image = new BufferedImage((int) rectangle.getWidth(),(int) rectangle.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+    public static BufferedImage rotateImage(BufferedImage bufferedImage, double angle) {
+        Rectangle rectangle = getRotateRectangle(bufferedImage.getWidth(), bufferedImage.getHeight(), angle);
+        BufferedImage image = new BufferedImage((int) rectangle.getWidth(), (int) rectangle.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
         Graphics2D graphics2D = image.createGraphics();
-        graphics2D.translate((rectangle.getWidth() - bufferedImage.getWidth()) / 2,(rectangle.getHeight() - bufferedImage.getHeight()) / 2);
-        graphics2D.rotate(Math.toRadians(angle), BigDecimal.valueOf(bufferedImage.getWidth()/2).doubleValue(),BigDecimal.valueOf(bufferedImage.getHeight()/2).doubleValue());
-        graphics2D.drawImage(bufferedImage,null,0,0);
+        graphics2D.translate((rectangle.getWidth() - bufferedImage.getWidth()) / 2, (rectangle.getHeight() - bufferedImage.getHeight()) / 2);
+        graphics2D.rotate(Math.toRadians(angle), BigDecimal.valueOf(bufferedImage.getWidth() / 2).doubleValue(), BigDecimal.valueOf(bufferedImage.getHeight() / 2).doubleValue());
+        graphics2D.drawImage(bufferedImage, null, 0, 0);
         return image;
     }
 
 
-    public static Rectangle getRotateRectangle(double width,double height,double angle){
+    public static Rectangle getRotateRectangle(double width, double height, double angle) {
         if (angle >= 90) {
-            if((int) angle / 90 % 2 == 1){
+            if ((int) angle / 90 % 2 == 1) {
                 double temp = height;
                 height = width;
                 width = temp;
@@ -528,43 +531,44 @@ public class ImageUtils {
         }
         double j1Angle = Math.atan(height / width);
         angle = Math.toRadians(angle);
-        double r = Math.sqrt(Math.pow(width,2)+Math.pow(height,2)) / 2;
+        double r = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2)) / 2;
         double newWidth = Math.cos(j1Angle - angle) * r * 2;
         double newHeight = Math.sin(j1Angle + angle) * r * 2;
         newHeight = Math.abs(newHeight);
         newWidth = Math.abs(newWidth);
-        return new Rectangle(0,0,(int) newWidth,(int) newHeight);
+        return new Rectangle(0, 0, (int) newWidth, (int) newHeight);
     }
 
 
     /**
      * 解析16进制颜色
+     *
      * @param value
      * @return
      */
-    public static Color getColor(String value){
-        if(!value.startsWith("#")){
+    public static Color getColor(String value) {
+        if (!value.startsWith("#")) {
             throw new RuntimeException("格式错误");
         }
-        return new Color(Integer.parseInt(value.substring(1,3),16),Integer.parseInt(value.substring(3,5),16),Integer.parseInt(value.substring(5,7),16));
+        return new Color(Integer.parseInt(value.substring(1, 3), 16), Integer.parseInt(value.substring(3, 5), 16), Integer.parseInt(value.substring(5, 7), 16));
     }
 
-    public static Color getColor(String value,Integer alpha){
-        if(alpha == null){
+    public static Color getColor(String value, Integer alpha) {
+        if (alpha == null) {
             return getColor(value);
         }
-        if(!value.startsWith("#")){
+        if (!value.startsWith("#")) {
             throw new RuntimeException("格式错误");
         }
-        return new Color(Integer.parseInt(value.substring(1,3),16),Integer.parseInt(value.substring(3,5),16),Integer.parseInt(value.substring(5,7),16),alpha);
+        return new Color(Integer.parseInt(value.substring(1, 3), 16), Integer.parseInt(value.substring(3, 5), 16), Integer.parseInt(value.substring(5, 7), 16), alpha);
     }
 
 
-    public static FontMetrics getFontMetrics(Font font){
+    public static FontMetrics getFontMetrics(Font font) {
         return J_LABEL.getFontMetrics(font);
     }
 
-    public static class LineText{
+    public static class LineText {
 
         private Integer pointX;
 
@@ -576,17 +580,17 @@ public class ImageUtils {
 
         private List<CharText> charTextList;
 
-        public LineText(Integer pointX,Integer width,Integer pointY,String text,Integer length,List<CharText> charTextList,Integer type){
+        public LineText(Integer pointX, Integer width, Integer pointY, String text, Integer length, List<CharText> charTextList, Integer type) {
             this.text = text;
             this.length = length;
             this.pointY = pointY;
-            if(type.equals(1)){
+            if (type.equals(1)) {
                 this.pointX = pointX;
-            }else if(type.equals(2)){
-                this.pointX = pointX+(width - length)/2;
-            }else if(type.equals(3)){
+            } else if (type.equals(2)) {
+                this.pointX = pointX + (width - length) / 2;
+            } else if (type.equals(3)) {
                 this.pointX = pointX + width - length;
-            }else {
+            } else {
                 throw new RuntimeException("不支持的类型");
             }
             charTextList.forEach(charText -> {
@@ -636,7 +640,7 @@ public class ImageUtils {
         }
     }
 
-    public static class CharText{
+    public static class CharText {
 
         private Integer pointX;
 
@@ -644,7 +648,7 @@ public class ImageUtils {
 
         private Character value;
 
-        public CharText(Integer pointX,Integer pointY,Character value){
+        public CharText(Integer pointX, Integer pointY, Character value) {
             this.pointX = pointX;
             this.pointY = pointY;
             this.value = value;

src/main/java/com/mokamrp/privates/utils/sign/Base64.java

@@ -2,75 +2,63 @@ package com.mokamrp.privates.utils.sign;
 
 /**
  * Base64工具类
- * 
+ *
  * @author ruoyi
  */
-public final class Base64
-{
-    static private final int     BASELENGTH           = 128;
-    static private final int     LOOKUPLENGTH         = 64;
-    static private final int     TWENTYFOURBITGROUP   = 24;
-    static private final int     EIGHTBIT             = 8;
-    static private final int     SIXTEENBIT           = 16;
-    static private final int     FOURBYTE             = 4;
-    static private final int     SIGN                 = -128;
-    static private final char    PAD                  = '=';
-    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
-    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
-    static
-    {
-        for (int i = 0; i < BASELENGTH; ++i)
-        {
+public final class Base64 {
+    static private final int BASELENGTH = 128;
+    static private final int LOOKUPLENGTH = 64;
+    static private final int TWENTYFOURBITGROUP = 24;
+    static private final int EIGHTBIT = 8;
+    static private final int SIXTEENBIT = 16;
+    static private final int FOURBYTE = 4;
+    static private final int SIGN = -128;
+    static private final char PAD = '=';
+    static final private byte[] base64Alphabet = new byte[BASELENGTH];
+    static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+
+    static {
+        for (int i = 0; i < BASELENGTH; ++i) {
             base64Alphabet[i] = -1;
         }
-        for (int i = 'Z'; i >= 'A'; i--)
-        {
+        for (int i = 'Z'; i >= 'A'; i--) {
             base64Alphabet[i] = (byte) (i - 'A');
         }
-        for (int i = 'z'; i >= 'a'; i--)
-        {
+        for (int i = 'z'; i >= 'a'; i--) {
             base64Alphabet[i] = (byte) (i - 'a' + 26);
         }
 
-        for (int i = '9'; i >= '0'; i--)
-        {
+        for (int i = '9'; i >= '0'; i--) {
             base64Alphabet[i] = (byte) (i - '0' + 52);
         }
 
         base64Alphabet['+'] = 62;
         base64Alphabet['/'] = 63;
 
-        for (int i = 0; i <= 25; i++)
-        {
+        for (int i = 0; i <= 25; i++) {
             lookUpBase64Alphabet[i] = (char) ('A' + i);
         }
 
-        for (int i = 26, j = 0; i <= 51; i++, j++)
-        {
+        for (int i = 26, j = 0; i <= 51; i++, j++) {
             lookUpBase64Alphabet[i] = (char) ('a' + j);
         }
 
-        for (int i = 52, j = 0; i <= 61; i++, j++)
-        {
+        for (int i = 52, j = 0; i <= 61; i++, j++) {
             lookUpBase64Alphabet[i] = (char) ('0' + j);
         }
         lookUpBase64Alphabet[62] = (char) '+';
         lookUpBase64Alphabet[63] = (char) '/';
     }
 
-    private static boolean isWhiteSpace(char octect)
-    {
+    private static boolean isWhiteSpace(char octect) {
         return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
     }
 
-    private static boolean isPad(char octect)
-    {
+    private static boolean isPad(char octect) {
         return (octect == PAD);
     }
 
-    private static boolean isData(char octect)
-    {
+    private static boolean isData(char octect) {
         return (octect < BASELENGTH && base64Alphabet[octect] != -1);
     }
 
@@ -80,16 +68,13 @@ public final class Base64
      * @param binaryData Array containing binaryData
      * @return Encoded Base64 array
      */
-    public static String encode(byte[] binaryData)
-    {
-        if (binaryData == null)
-        {
+    public static String encode(byte[] binaryData) {
+        if (binaryData == null) {
             return null;
         }
 
         int lengthDataBits = binaryData.length * EIGHTBIT;
-        if (lengthDataBits == 0)
-        {
+        if (lengthDataBits == 0) {
             return "";
         }
 
@@ -105,8 +90,7 @@ public final class Base64
         int encodedIndex = 0;
         int dataIndex = 0;
 
-        for (int i = 0; i < numberTriplets; i++)
-        {
+        for (int i = 0; i < numberTriplets; i++) {
             b1 = binaryData[dataIndex++];
             b2 = binaryData[dataIndex++];
             b3 = binaryData[dataIndex++];
@@ -125,8 +109,7 @@ public final class Base64
         }
 
         // form integral number of 6-bit groups
-        if (fewerThan24bits == EIGHTBIT)
-        {
+        if (fewerThan24bits == EIGHTBIT) {
             b1 = binaryData[dataIndex];
             k = (byte) (b1 & 0x03);
             byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
@@ -134,9 +117,7 @@ public final class Base64
             encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
             encodedData[encodedIndex++] = PAD;
             encodedData[encodedIndex++] = PAD;
-        }
-        else if (fewerThan24bits == SIXTEENBIT)
-        {
+        } else if (fewerThan24bits == SIXTEENBIT) {
             b1 = binaryData[dataIndex];
             b2 = binaryData[dataIndex + 1];
             l = (byte) (b2 & 0x0f);
@@ -159,10 +140,8 @@ public final class Base64
      * @param encoded string containing Base64 data
      * @return Array containind decoded data.
      */
-    public static byte[] decode(String encoded)
-    {
-        if (encoded == null)
-        {
+    public static byte[] decode(String encoded) {
+        if (encoded == null) {
             return null;
         }
 
@@ -170,15 +149,13 @@ public final class Base64
         // remove white spaces
         int len = removeWhiteSpace(base64Data);
 
-        if (len % FOURBYTE != 0)
-        {
+        if (len % FOURBYTE != 0) {
             return null;// should be divisible by four
         }
 
         int numberQuadruple = (len / FOURBYTE);
 
-        if (numberQuadruple == 0)
-        {
+        if (numberQuadruple == 0) {
             return new byte[0];
         }
 
@@ -191,12 +168,10 @@ public final class Base64
         int dataIndex = 0;
         decodedData = new byte[(numberQuadruple) * 3];
 
-        for (; i < numberQuadruple - 1; i++)
-        {
+        for (; i < numberQuadruple - 1; i++) {
 
             if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
-                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
-            {
+                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) {
                 return null;
             } // if found "no data" just return null
 
@@ -210,8 +185,7 @@ public final class Base64
             decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
         }
 
-        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
-        {
+        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) {
             return null;// if found "no data" just return null
         }
 
@@ -220,10 +194,8 @@ public final class Base64
 
         d3 = base64Data[dataIndex++];
         d4 = base64Data[dataIndex++];
-        if (!isData((d3)) || !isData((d4)))
-        {// Check if they are PAD characters
-            if (isPad(d3) && isPad(d4))
-            {
+        if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters
+            if (isPad(d3) && isPad(d4)) {
                 if ((b2 & 0xf) != 0)// last 4 bits should be zero
                 {
                     return null;
@@ -232,9 +204,7 @@ public final class Base64
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
                 tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
                 return tmp;
-            }
-            else if (!isPad(d3) && isPad(d4))
-            {
+            } else if (!isPad(d3) && isPad(d4)) {
                 b3 = base64Alphabet[d3];
                 if ((b3 & 0x3) != 0)// last 2 bits should be zero
                 {
@@ -245,14 +215,10 @@ public final class Base64
                 tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
                 tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
                 return tmp;
-            }
-            else
-            {
+            } else {
                 return null;
             }
-        }
-        else
-        { // No PAD e.g 3cQl
+        } else { // No PAD e.g 3cQl
             b3 = base64Alphabet[d3];
             b4 = base64Alphabet[d4];
             decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
@@ -269,20 +235,16 @@ public final class Base64
      * @param data the byte array of base64 data (with WS)
      * @return the new length
      */
-    private static int removeWhiteSpace(char[] data)
-    {
-        if (data == null)
-        {
+    private static int removeWhiteSpace(char[] data) {
+        if (data == null) {
             return 0;
         }
 
         // count characters that's not whitespace
         int newSize = 0;
         int len = data.length;
-        for (int i = 0; i < len; i++)
-        {
-            if (!isWhiteSpace(data[i]))
-            {
+        for (int i = 0; i < len; i++) {
+            if (!isWhiteSpace(data[i])) {
                 data[newSize++] = data[i];
             }
         }

src/main/java/com/mokamrp/privates/utils/sign/Md5Utils.java

@@ -7,44 +7,35 @@ import java.security.MessageDigest;
 
 /**
  * Md5加密方法
- * 
+ *
  * @author ruoyi
  */
-public class Md5Utils
-{
+public class Md5Utils {
     private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
 
-    private static byte[] md5(String s)
-    {
+    private static byte[] md5(String s) {
         MessageDigest algorithm;
-        try
-        {
+        try {
             algorithm = MessageDigest.getInstance("MD5");
             algorithm.reset();
             algorithm.update(s.getBytes("UTF-8"));
             byte[] messageDigest = algorithm.digest();
             return messageDigest;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("MD5 Error...", e);
         }
         return null;
     }
 
-    private static final String toHex(byte hash[])
-    {
-        if (hash == null)
-        {
+    private static final String toHex(byte hash[]) {
+        if (hash == null) {
             return null;
         }
         StringBuffer buf = new StringBuffer(hash.length * 2);
         int i;
 
-        for (i = 0; i < hash.length; i++)
-        {
-            if ((hash[i] & 0xff) < 0x10)
-            {
+        for (i = 0; i < hash.length; i++) {
+            if ((hash[i] & 0xff) < 0x10) {
                 buf.append("0");
             }
             buf.append(Long.toString(hash[i] & 0xff, 16));
@@ -52,14 +43,10 @@ public class Md5Utils
         return buf.toString();
     }
 
-    public static String hash(String s)
-    {
-        try
-        {
+    public static String hash(String s) {
+        try {
             return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("not supported charset...{}", e);
             return s;
         }

src/main/java/com/mokamrp/privates/utils/spring/SpringUtils.java

@@ -12,26 +12,25 @@ import org.springframework.stereotype.Component;
 
 /**
  * spring工具类 方便在非spring管理环境中获取bean
- * 
+ *
  * @author ruoyi
  */
 @Component
-public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware 
-{
-    /** Spring应用上下文环境 */
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
+    /**
+     * Spring应用上下文环境
+     */
     private static ConfigurableListableBeanFactory beanFactory;
 
     private static ApplicationContext applicationContext;
 
     @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException 
-    {
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
         SpringUtils.beanFactory = beanFactory;
     }
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException 
-    {
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         SpringUtils.applicationContext = applicationContext;
     }
 
@@ -41,11 +40,9 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return Object 一个以所给名字注册的bean的实例
      * @throws BeansException
-     *
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) throws BeansException
-    {
+    public static <T> T getBean(String name) throws BeansException {
         return (T) beanFactory.getBean(name);
     }
 
@@ -55,10 +52,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param clz
      * @return
      * @throws BeansException
-     *
      */
-    public static <T> T getBean(Class<T> clz) throws BeansException
-    {
+    public static <T> T getBean(Class<T> clz) throws BeansException {
         T result = (T) beanFactory.getBean(clz);
         return result;
     }
@@ -69,8 +64,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return boolean
      */
-    public static boolean containsBean(String name)
-    {
+    public static boolean containsBean(String name) {
         return beanFactory.containsBean(name);
     }
 
@@ -80,10 +74,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return boolean
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
-    {
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.isSingleton(name);
     }
 
@@ -91,10 +83,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return Class 注册对象的类型
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
-    {
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.getType(name);
     }
 
@@ -104,22 +94,19 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
-    {
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.getAliases(name);
     }
 
     /**
      * 获取aop代理对象
-     * 
+     *
      * @param invoker
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getAopProxy(T invoker)
-    {
+    public static <T> T getAopProxy(T invoker) {
         return (T) AopContext.currentProxy();
     }
 
@@ -128,8 +115,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      *
      * @return 当前的环境配置
      */
-    public static String[] getActiveProfiles()
-    {
+    public static String[] getActiveProfiles() {
         return applicationContext.getEnvironment().getActiveProfiles();
     }
 
@@ -138,8 +124,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      *
      * @return 当前的环境配置
      */
-    public static String getActiveProfile()
-    {
+    public static String getActiveProfile() {
         final String[] activeProfiles = getActiveProfiles();
         return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
     }