通讯录分组管理代码拆分

skyeye-mail/src/main/java/com/skyeye/eve/controller/MailGroupController.java

+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.skyeye.eve.controller;
+
+import com.skyeye.common.object.InputObject;
+import com.skyeye.common.object.OutputObject;
+import com.skyeye.eve.service.MailGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @ClassName: MailGroupController
+ * @Description: 通讯录分组管理控制类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/10/23 12:55
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+@Controller
+public class MailGroupController {
+
+    @Autowired
+    private MailGroupService mailGroupService;
+
+    /**
+     *
+     * @Title: queryMailMationTypeList
+     * @Description: 获取我的通讯录类别列表
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/queryMailMationTypeList")
+    @ResponseBody
+    public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.queryMailMationTypeList(inputObject, outputObject);
+    }
+
+    /**
+     *
+     * @Title: insertMailMationType
+     * @Description: 新增通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/insertMailMationType")
+    @ResponseBody
+    public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.insertMailMationType(inputObject, outputObject);
+    }
+
+    /**
+     *
+     * @Title: deleteMailMationTypeById
+     * @Description: 删除通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/deleteMailMationTypeById")
+    @ResponseBody
+    public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.deleteMailMationTypeById(inputObject, outputObject);
+    }
+
+    /**
+     *
+     * @Title: queryMailMationTypeToEditById
+     * @Description: 编辑通讯录类型进行回显
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/queryMailMationTypeToEditById")
+    @ResponseBody
+    public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.queryMailMationTypeToEditById(inputObject, outputObject);
+    }
+
+    /**
+     *
+     * @Title: editMailMationTypeById
+     * @Description: 编辑通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/editMailMationTypeById")
+    @ResponseBody
+    public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.editMailMationTypeById(inputObject, outputObject);
+    }
+
+    /**
+     *
+     * @Title: queryMailMationTypeListToSelect
+     * @Description: 获取我的通讯录类型用作下拉框展示
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @RequestMapping("/post/MailGroupController/queryMailMationTypeListToSelect")
+    @ResponseBody
+    public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception{
+        mailGroupService.queryMailMationTypeListToSelect(inputObject, outputObject);
+    }
+
+
+}

skyeye-mail/src/main/java/com/skyeye/eve/controller/MailListController.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
+
 package com.skyeye.eve.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,102 +51,6 @@ public class MailListController {
 		mailListService.insertMailMation(inputObject, outputObject);
 	}
 	
-	/**
-	 * 
-	     * @Title: queryMailMationTypeList
-	     * @Description: 获取我的通讯录类别列表
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/queryMailMationTypeList")
-	@ResponseBody
-	public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.queryMailMationTypeList(inputObject, outputObject);
-	}
-	
-	/**
-	 * 
-	     * @Title: insertMailMationType
-	     * @Description: 新增通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/insertMailMationType")
-	@ResponseBody
-	public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.insertMailMationType(inputObject, outputObject);
-	}
-	
-	/**
-	 * 
-	     * @Title: deleteMailMationTypeById
-	     * @Description: 删除通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/deleteMailMationTypeById")
-	@ResponseBody
-	public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.deleteMailMationTypeById(inputObject, outputObject);
-	}
-	
-	/**
-	 * 
-	     * @Title: queryMailMationTypeToEditById
-	     * @Description: 编辑通讯录类型进行回显
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/queryMailMationTypeToEditById")
-	@ResponseBody
-	public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.queryMailMationTypeToEditById(inputObject, outputObject);
-	}
-	
-	/**
-	 * 
-	     * @Title: editMailMationTypeById
-	     * @Description: 编辑通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/editMailMationTypeById")
-	@ResponseBody
-	public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.editMailMationTypeById(inputObject, outputObject);
-	}
-	
-	/**
-	 * 
-	     * @Title: queryMailMationTypeListToSelect
-	     * @Description: 获取我的通讯录类型用作下拉框展示
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@RequestMapping("/post/MailListController/queryMailMationTypeListToSelect")
-	@ResponseBody
-	public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception{
-		mailListService.queryMailMationTypeListToSelect(inputObject, outputObject);
-	}
-	
 	/**
 	 * 
 	     * @Title: deleteMailMationById

skyeye-mail/src/main/java/com/skyeye/eve/dao/MailGroupDao.java

+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.skyeye.eve.dao;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: MailGroupDao
+ * @Description: 通讯录分组管理数据层
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/10/23 12:55
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public interface MailGroupDao {
+
+    public List<Map<String, Object>> queryMailMationTypeList(Map<String, Object> map) throws Exception;
+
+    public Map<String, Object> queryMailMationTypeByName(Map<String, Object> map) throws Exception;
+
+    public int insertMailMationType(Map<String, Object> map) throws Exception;
+
+    public Map<String, Object> queryMailMationTypeByIdAndUserId(Map<String, Object> map) throws Exception;
+
+    public int deleteMailMationTypeById(Map<String, Object> map) throws Exception;
+
+    public Map<String, Object> queryMailMationTypeToEditById(Map<String, Object> map) throws Exception;
+
+    public int editMailMationTypeById(Map<String, Object> map) throws Exception;
+
+    public List<Map<String, Object>> queryMailMationTypeListToSelect(Map<String, Object> map) throws Exception;
+
+}

skyeye-mail/src/main/java/com/skyeye/eve/dao/MailListDao.java

@@ -27,22 +27,6 @@ public interface MailListDao {
 
 	public int insertMailMation(Map<String, Object> map) throws Exception;
 
-	public List<Map<String, Object>> queryMailMationTypeList(Map<String, Object> map) throws Exception;
-
-	public Map<String, Object> queryMailMationTypeByName(Map<String, Object> map) throws Exception;
-
-	public int insertMailMationType(Map<String, Object> map) throws Exception;
-
-	public Map<String, Object> queryMailMationTypeByIdAndUserId(Map<String, Object> map) throws Exception;
-
-	public int deleteMailMationTypeById(Map<String, Object> map) throws Exception;
-
-	public Map<String, Object> queryMailMationTypeToEditById(Map<String, Object> map) throws Exception;
-
-	public int editMailMationTypeById(Map<String, Object> map) throws Exception;
-
-	public List<Map<String, Object>> queryMailMationTypeListToSelect(Map<String, Object> map) throws Exception;
-
 	public int deleteMailMationById(Map<String, Object> map) throws Exception;
 
 	public Map<String, Object> queryMailMationToEditById(Map<String, Object> map) throws Exception;

skyeye-mail/src/main/java/com/skyeye/eve/service/MailGroupService.java

+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.skyeye.eve.service;
+
+import com.skyeye.common.object.InputObject;
+import com.skyeye.common.object.OutputObject;
+
+/**
+ * @ClassName: MailGroupService
+ * @Description: 通讯录分组管理服务接口层
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/10/23 12:55
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public interface MailGroupService {
+
+    public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+    public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+    public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+    public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+    public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+    public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception;
+
+}

skyeye-mail/src/main/java/com/skyeye/eve/service/MailListService.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
+
 package com.skyeye.eve.service;
 
 import com.skyeye.common.object.InputObject;
@@ -12,18 +13,6 @@ public interface MailListService {
 
 	public void insertMailMation(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-	public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception;
-
-	public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception;
-
-	public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception;
-
-	public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception;
-
-	public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception;
-
-	public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception;
-
 	public void deleteMailMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
 	public void queryMailMationToEditById(InputObject inputObject, OutputObject outputObject) throws Exception;

skyeye-mail/src/main/java/com/skyeye/eve/service/impl/MailGroupServiceImpl.java

+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.skyeye.eve.service.impl;
+
+import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.skyeye.common.constans.Constants;
+import com.skyeye.common.object.InputObject;
+import com.skyeye.common.object.OutputObject;
+import com.skyeye.common.util.DateUtil;
+import com.skyeye.common.util.ToolUtil;
+import com.skyeye.eve.dao.MailGroupDao;
+import com.skyeye.eve.service.MailGroupService;
+import com.skyeye.jedis.JedisClientService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: MailGroupServiceImpl
+ * @Description: 通讯录分组管理服务层
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/10/23 12:56
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+@Service
+public class MailGroupServiceImpl implements MailGroupService {
+
+    @Autowired
+    private MailGroupDao mailGroupDao;
+
+    @Autowired
+    public JedisClientService jedisClient;
+
+    /**
+     *
+     * @Title: queryMailMationTypeList
+     * @Description: 获取我的通讯录类别列表
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @Override
+    public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> user = inputObject.getLogParams();
+        map.put("userId", user.get("id"));
+        // 获取当前登陆人所属公司的通讯录
+        Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
+        List<Map<String, Object>> beans = mailGroupDao.queryMailMationTypeList(map);
+        outputObject.setBeans(beans);
+        outputObject.settotal(pages.getTotal());
+    }
+
+    /**
+     *
+     * @Title: insertMailMationType
+     * @Description: 新增通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @Override
+    @Transactional(value="transactionManager")
+    public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> user = inputObject.getLogParams();
+        map.put("userId", user.get("id"));
+        Map<String, Object> bean = mailGroupDao.queryMailMationTypeByName(map);
+        if(bean == null){
+            map.put("id", ToolUtil.getSurFaceId());
+            map.put("createId", user.get("id"));
+            map.put("createTime", DateUtil.getTimeAndToString());
+            mailGroupDao.insertMailMationType(map);
+            jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
+        }else{
+            outputObject.setreturnMessage("该名称已存在，请更换。");
+        }
+    }
+
+    /**
+     *
+     * @Title: deleteMailMationTypeById
+     * @Description: 删除通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @Override
+    @Transactional(value="transactionManager")
+    public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> user = inputObject.getLogParams();
+        map.put("userId", user.get("id"));
+        Map<String, Object> bean = mailGroupDao.queryMailMationTypeByIdAndUserId(map);
+        if(bean == null){
+            outputObject.setreturnMessage("删除失败，您不具备该数据删除权限或该类别下有人员信息。");
+        }else{
+            mailGroupDao.deleteMailMationTypeById(map);
+            jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
+        }
+    }
+
+    /**
+     *
+     * @Title: queryMailMationTypeToEditById
+     * @Description: 编辑通讯录类型进行回显
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @Override
+    public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> bean = mailGroupDao.queryMailMationTypeToEditById(map);
+        outputObject.setBean(bean);
+    }
+
+    /**
+     *
+     * @Title: editMailMationTypeById
+     * @Description: 编辑通讯录类型
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @Override
+    @Transactional(value="transactionManager")
+    public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> user = inputObject.getLogParams();
+        map.put("userId", user.get("id"));
+        mailGroupDao.editMailMationTypeById(map);
+        jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
+    }
+
+    /**
+     *
+     * @Title: queryMailMationTypeListToSelect
+     * @Description: 获取我的通讯录类型用作下拉框展示
+     * @param inputObject
+     * @param outputObject
+     * @throws Exception    参数
+     * @return void    返回类型
+     * @throws
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception {
+        Map<String, Object> map = inputObject.getParams();
+        Map<String, Object> user = inputObject.getLogParams();
+        List<Map<String, Object>> beans = new ArrayList<>();
+        if(ToolUtil.isBlank(jedisClient.get(Constants.getPersonMailTypeListByUserId(user.get("id").toString())))){
+            map.put("userId", user.get("id"));
+            beans = mailGroupDao.queryMailMationTypeListToSelect(map);
+            jedisClient.set(Constants.getPersonMailTypeListByUserId(user.get("id").toString()), JSONUtil.toJsonStr(beans));
+        }else{
+            beans = JSONUtil.toList(jedisClient.get(Constants.getPersonMailTypeListByUserId(user.get("id").toString())), null);
+        }
+        if(!beans.isEmpty()){
+            outputObject.setBeans(beans);
+            outputObject.settotal(beans.size());
+        }
+    }
+    
+}

skyeye-mail/src/main/java/com/skyeye/eve/service/impl/MailListServiceImpl.java

@@ -4,17 +4,14 @@
 
 package com.skyeye.eve.service.impl;
 
-import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.skyeye.common.constans.Constants;
 import com.skyeye.common.object.InputObject;
 import com.skyeye.common.object.OutputObject;
 import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.eve.dao.MailListDao;
 import com.skyeye.eve.service.MailListService;
-import com.skyeye.jedis.JedisClientService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,9 +36,6 @@ public class MailListServiceImpl implements MailListService {
 	@Autowired
 	private MailListDao mailListDao;
 	
-	@Autowired
-	public JedisClientService jedisClient;
-
 	/**
 	 * 
 	     * @Title: queryMailMationList
@@ -116,147 +110,6 @@ public class MailListServiceImpl implements MailListService {
 		mailListDao.insertMailMation(map);
 	}
 
-	/**
-	 * 
-	     * @Title: queryMailMationTypeList
-	     * @Description: 获取我的通讯录类别列表
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@Override
-	public void queryMailMationTypeList(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> user = inputObject.getLogParams();
-		map.put("userId", user.get("id"));
-		// 获取当前登陆人所属公司的通讯录
-		Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
-		List<Map<String, Object>> beans = mailListDao.queryMailMationTypeList(map);
-		outputObject.setBeans(beans);
-		outputObject.settotal(pages.getTotal());
-	}
-
-	/**
-	 * 
-	     * @Title: insertMailMationType
-	     * @Description: 新增通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@Override
-	@Transactional(value="transactionManager")
-	public void insertMailMationType(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> user = inputObject.getLogParams();
-		map.put("userId", user.get("id"));
-		Map<String, Object> bean = mailListDao.queryMailMationTypeByName(map);
-		if(bean == null){
-			map.put("id", ToolUtil.getSurFaceId());
-			map.put("createId", user.get("id"));
-			map.put("createTime", DateUtil.getTimeAndToString());
-			mailListDao.insertMailMationType(map);
-			jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
-		}else{
-			outputObject.setreturnMessage("该名称已存在，请更换。");
-		}
-	}
-
-	/**
-	 * 
-	     * @Title: deleteMailMationTypeById
-	     * @Description: 删除通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@Override
-	@Transactional(value="transactionManager")
-	public void deleteMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> user = inputObject.getLogParams();
-		map.put("userId", user.get("id"));
-		Map<String, Object> bean = mailListDao.queryMailMationTypeByIdAndUserId(map);
-		if(bean == null){
-			outputObject.setreturnMessage("删除失败，您不具备该数据删除权限或该类别下有人员信息。");
-		}else{
-			mailListDao.deleteMailMationTypeById(map);
-			jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
-		}
-	}
-
-	/**
-	 * 
-	     * @Title: queryMailMationTypeToEditById
-	     * @Description: 编辑通讯录类型进行回显
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@Override
-	public void queryMailMationTypeToEditById(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> bean = mailListDao.queryMailMationTypeToEditById(map);
-		outputObject.setBean(bean);
-	}
-
-	/**
-	 * 
-	     * @Title: editMailMationTypeById
-	     * @Description: 编辑通讯录类型
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@Override
-	@Transactional(value="transactionManager")
-	public void editMailMationTypeById(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> user = inputObject.getLogParams();
-		map.put("userId", user.get("id"));
-		mailListDao.editMailMationTypeById(map);
-		jedisClient.del(Constants.getPersonMailTypeListByUserId(user.get("id").toString()));
-	}
-
-	/**
-	 * 
-	     * @Title: queryMailMationTypeListToSelect
-	     * @Description: 获取我的通讯录类型用作下拉框展示
-	     * @param inputObject
-	     * @param outputObject
-	     * @throws Exception    参数
-	     * @return void    返回类型
-	     * @throws
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void queryMailMationTypeListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		Map<String, Object> user = inputObject.getLogParams();
-		List<Map<String, Object>> beans = new ArrayList<>();
-		if(ToolUtil.isBlank(jedisClient.get(Constants.getPersonMailTypeListByUserId(user.get("id").toString())))){
-			map.put("userId", user.get("id"));
-			beans = mailListDao.queryMailMationTypeListToSelect(map);
-			jedisClient.set(Constants.getPersonMailTypeListByUserId(user.get("id").toString()), JSONUtil.toJsonStr(beans));
-		}else{
-			beans = JSONUtil.toList(jedisClient.get(Constants.getPersonMailTypeListByUserId(user.get("id").toString())), null);
-		}
-		if(!beans.isEmpty()){
-			outputObject.setBeans(beans);
-			outputObject.settotal(beans.size());
-		}
-	}
-
 	/**
 	 * 
 	     * @Title: deleteMailMationById

skyeye-mail/src/main/resources/mapper/mail/MailGroupMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.skyeye.eve.dao.MailGroupDao">
+
+    <select id="queryMailMationTypeList" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.`name`,
+            a.`desc`,
+            COUNT(b.id) perpleNum
+        FROM
+            sys_mail_type a
+                LEFT JOIN sys_mail_list b ON a.id = b.type_id
+        WHERE
+            a.create_id = #{userId}
+        GROUP BY a.id
+    </select>
+
+    <select id="queryMailMationTypeByName" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            a.id
+        FROM
+            sys_mail_type a
+        WHERE
+            a.create_id = #{userId}
+          AND a.`name` = #{name}
+    </select>
+
+    <insert id="insertMailMationType" parameterType="java.util.Map">
+        INSERT into sys_mail_type
+            (id, `name`, `desc`, create_id, create_time)
+        VALUES
+            (#{id}, #{name}, #{desc}, #{createId}, #{createTime})
+    </insert>
+
+    <select id="queryMailMationTypeByIdAndUserId" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            (SELECT
+                 a.id,
+                 a.`name`,
+                 a.`desc`,
+                 COUNT(b.id) perpleNum
+             FROM
+                 sys_mail_type a
+                     LEFT JOIN sys_mail_list b ON a.id = b.type_id
+             WHERE
+                 a.create_id = #{userId}
+               AND a.id = #{id}
+             GROUP BY a.id
+            ) a
+        WHERE
+            a.perpleNum = 0
+    </select>
+
+    <delete id="deleteMailMationTypeById" parameterType="java.util.Map">
+        DELETE
+        FROM
+            sys_mail_type
+        WHERE
+            id = #{id}
+          AND create_id = #{userId}
+    </delete>
+
+    <select id="queryMailMationTypeToEditById" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.`name`,
+            a.`desc`
+        FROM
+            sys_mail_type a
+        WHERE
+            a.id = #{id}
+    </select>
+
+    <update id="editMailMationTypeById" parameterType="java.util.Map">
+        UPDATE sys_mail_type
+        <set>
+            <if test="name != '' and name != null">
+                `name` = #{name},
+            </if>
+            `desc` = #{desc},
+        </set>
+        WHERE id = #{id}
+        AND create_id = #{userId}
+    </update>
+
+    <select id="queryMailMationTypeListToSelect" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.`name`
+        FROM
+            sys_mail_type a
+        WHERE
+            a.create_id = #{userId}
+    </select>
+
+</mapper>
\ No newline at end of file

skyeye-mail/src/main/resources/mapper/mail/MailListMapper.xml

@@ -72,100 +72,6 @@
 	     	#{otherEmail}, #{workAddress}, #{workCode}, #{personAddress}, #{personCode}, #{companyUrl}, #{personUrl}, #{birthday}, #{remarks}, #{createId}, #{createTime})
 	</insert>
 	
-	<select id="queryMailMationTypeList" parameterType="java.util.Map" resultType="java.util.Map">
-		SELECT
-			a.id,
-			a.`name`,
-			a.`desc`,
-			COUNT(b.id) perpleNum
-		FROM
-			sys_mail_type a
-			LEFT JOIN sys_mail_list b ON a.id = b.type_id
-		WHERE
-			a.create_id = #{userId}
-		GROUP BY a.id
-	</select>
-	
-	<select id="queryMailMationTypeByName" parameterType="java.util.Map" resultType="java.util.Map">
-		SELECT
-			a.id
-		FROM
-			sys_mail_type a
-		WHERE
-			a.create_id = #{userId}
-		AND a.`name` = #{name}
-	</select>
-	
-	<insert id="insertMailMationType" parameterType="java.util.Map">
-	     INSERT into sys_mail_type 
-	     (id, `name`, `desc`, create_id, create_time)
-	     VALUES
-	     (#{id}, #{name}, #{desc}, #{createId}, #{createTime})
-	</insert>
-	
-	<select id="queryMailMationTypeByIdAndUserId" parameterType="java.util.Map" resultType="java.util.Map">
-		SELECT
-			*
-		FROM
-			(SELECT
-				a.id,
-				a.`name`,
-				a.`desc`,
-				COUNT(b.id) perpleNum
-			FROM
-				sys_mail_type a
-			LEFT JOIN sys_mail_list b ON a.id = b.type_id
-			WHERE
-				a.create_id = #{userId}
-			AND a.id = #{id}
-			GROUP BY a.id
-			) a
-		WHERE
-			a.perpleNum = 0
-	</select>
-	
-	<delete id="deleteMailMationTypeById" parameterType="java.util.Map">
-        DELETE
-        FROM
-            sys_mail_type
-        WHERE
-            id = #{id}
-        AND create_id = #{userId}
-    </delete>
-    
-    <select id="queryMailMationTypeToEditById" parameterType="java.util.Map" resultType="java.util.Map">
-    	SELECT
-			a.id,
-			a.`name`,
-			a.`desc`
-		FROM
-			sys_mail_type a
-		WHERE
-			a.id = #{id}
-    </select>
-    
-    <update id="editMailMationTypeById" parameterType="java.util.Map">
-		UPDATE sys_mail_type
-		<set>
-			<if test="name != '' and name != null">
-				`name` = #{name},
-			</if>
-			`desc` = #{desc},
-		</set>
-		WHERE id = #{id}
-		AND create_id = #{userId}
-	</update>
-	
-	<select id="queryMailMationTypeListToSelect" parameterType="java.util.Map" resultType="java.util.Map">
-		SELECT
-			a.id,
-			a.`name`
-		FROM
-			sys_mail_type a
-		WHERE
-			a.create_id = #{userId}
-	</select>
-	
 	<delete id="deleteMailMationById" parameterType="java.util.Map">
         DELETE
         FROM

skyeye-mail/src/main/resources/reqmapping/mapping/mail.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<controller>
+<controller modelName="通讯录管理模块">
 	<!-- 
 		- allUse  是否需要登录才能使用   1是   0否  2需要登陆才能访问，但无需授权    默认为否
 	 -->
 	
-	<!-- 通讯录模块开始 -->
-	<url id="maillist001" path="/post/MailListController/queryMailMationList" val="获取通讯录列表" allUse="1">
+	<!-- 通讯录管理开始 -->
+	<url id="maillist001" path="/post/MailListController/queryMailMationList" val="获取通讯录列表" allUse="1" groupName="通讯录管理">
 		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
 	    <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
 	    <property id="checkMail" name="checkMail" ref="required,num" var="通讯录类型"/>
 	    <property id="searchCondition" name="searchCondition" ref="" var="查询条件"/>
 	</url>
-	<url id="maillist002" path="/post/MailListController/insertMailMation" val="新增通讯录(个人或者公共通讯录)" allUse="1">
+	<url id="maillist002" path="/post/MailListController/insertMailMation" val="新增通讯录(个人或者公共通讯录)" allUse="1" groupName="通讯录管理">
 		<property id="name" name="name" ref="required" var="姓名" />
 	    <property id="nameCall" name="nameCall" ref="" var="称呼"/>
 	    <property id="company" name="company" ref="" var="公司"/>
@@ -34,34 +34,13 @@
 	    <property id="readonly" name="readonly" ref="num" var="别人是否只读  1.是  2.否  当category=2时，必填"/>
 	    <property id="typeId" name="typeId" ref="" var="通讯录所属类别  当category=1时，必填"/>
 	</url>
-	<url id="maillist003" path="/post/MailListController/queryMailMationTypeList" val="获取我的通讯录类别列表" allUse="1">
-		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
-	    <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
-	</url>
-	<url id="maillist004" path="/post/MailListController/insertMailMationType" val="新增通讯录类型" allUse="2">
-		<property id="name" name="name" ref="required" var="类型名称" />
-	    <property id="desc" name="desc" ref="" var="描述"/>
-	</url>
-	<url id="maillist005" path="/post/MailListController/deleteMailMationTypeById" val="删除通讯录类型" allUse="2">
-		<property id="rowId" name="id" ref="required" var="类型id" />
-	</url>
-	<url id="maillist006" path="/post/MailListController/queryMailMationTypeToEditById" val="编辑通讯录类型进行回显" allUse="2">
-		<property id="rowId" name="id" ref="required" var="类型id" />
-	</url>
-	<url id="maillist007" path="/post/MailListController/editMailMationTypeById" val="编辑通讯录类型" allUse="2">
-		<property id="name" name="name" ref="required" var="类型名称" />
-	    <property id="desc" name="desc" ref="" var="描述"/>
-	    <property id="rowId" name="id" ref="required" var="类型id" />
-	</url>
-	<url id="maillist008" path="/post/MailListController/queryMailMationTypeListToSelect" val="获取我的通讯录类型用作下拉框展示" allUse="2">
-	</url>
-	<url id="maillist009" path="/post/MailListController/deleteMailMationById" val="删除通讯录" allUse="1">
+	<url id="maillist009" path="/post/MailListController/deleteMailMationById" val="删除通讯录" allUse="1" groupName="通讯录管理">
 		<property id="rowId" name="id" ref="required" var="通讯录id" />
 	</url>
-	<url id="maillist010" path="/post/MailListController/queryMailMationToEditById" val="编辑通讯录进行回显" allUse="2">
+	<url id="maillist010" path="/post/MailListController/queryMailMationToEditById" val="编辑通讯录进行回显" allUse="2" groupName="通讯录管理">
 		<property id="rowId" name="id" ref="required" var="通讯录id" />
 	</url>
-	<url id="maillist011" path="/post/MailListController/editMailMationById" val="编辑通讯录" allUse="1">
+	<url id="maillist011" path="/post/MailListController/editMailMationById" val="编辑通讯录" allUse="1" groupName="通讯录管理">
 		<property id="rowId" name="id" ref="required" var="通讯录id" />
 		<property id="name" name="name" ref="required" var="姓名" />
 	    <property id="nameCall" name="nameCall" ref="" var="称呼"/>
@@ -85,12 +64,36 @@
 	    <property id="readonly" name="readonly" ref="num" var="别人是否只读  1.是  2.否  当category=2时，必填"/>
 	    <property id="typeId" name="typeId" ref="" var="通讯录所属类别  当category=1时，必填"/>
 	</url>
-	<url id="maillist012" path="/post/MailListController/queryMailMationDetailsById" val="个人/公共通讯录详情" allUse="2">
+	<url id="maillist012" path="/post/MailListController/queryMailMationDetailsById" val="个人/公共通讯录详情" allUse="2" groupName="通讯录管理">
 		<property id="rowId" name="id" ref="required" var="通讯录id" />
 	</url>
-	<url id="maillist013" path="/post/MailListController/querySysMailMationDetailsById" val="单位通讯录详情" allUse="2">
+	<url id="maillist013" path="/post/MailListController/querySysMailMationDetailsById" val="单位通讯录详情" allUse="2" groupName="通讯录管理">
 		<property id="rowId" name="id" ref="required" var="通讯录id" />
 	</url>
-	<!-- 通讯录模块结束 -->
+	<!-- 通讯录管理结束 -->
+
+	<!-- 通讯录分组管理开始 -->
+	<url id="mailGroup001" path="/post/MailGroupController/queryMailMationTypeList" val="获取我的通讯录类别列表" allUse="1" groupName="通讯录分组管理">
+		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
+		<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
+	</url>
+	<url id="mailGroup002" path="/post/MailGroupController/insertMailMationType" val="新增通讯录类型" allUse="1" groupName="通讯录分组管理">
+		<property id="name" name="name" ref="required" var="类型名称" />
+		<property id="desc" name="desc" ref="" var="描述"/>
+	</url>
+	<url id="mailGroup003" path="/post/MailGroupController/deleteMailMationTypeById" val="删除通讯录类型" allUse="1" groupName="通讯录分组管理">
+		<property id="rowId" name="id" ref="required" var="类型id" />
+	</url>
+	<url id="mailGroup004" path="/post/MailGroupController/queryMailMationTypeToEditById" val="编辑通讯录类型进行回显" allUse="2" groupName="通讯录分组管理">
+		<property id="rowId" name="id" ref="required" var="类型id" />
+	</url>
+	<url id="mailGroup005" path="/post/MailGroupController/editMailMationTypeById" val="编辑通讯录类型" allUse="1" groupName="通讯录分组管理">
+		<property id="name" name="name" ref="required" var="类型名称" />
+		<property id="desc" name="desc" ref="" var="描述"/>
+		<property id="rowId" name="id" ref="required" var="类型id" />
+	</url>
+	<url id="mailGroup006" path="/post/MailGroupController/queryMailMationTypeListToSelect" val="获取我的通讯录类型用作下拉框展示" allUse="2" groupName="通讯录分组管理">
+	</url>
+	<!-- 通讯录分组管理结束 -->
 
 </controller>
\ No newline at end of file