Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1435
Star 162
Fork 130
S
Skyeye
提交 2b0c24af 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

通讯录整改完成

上级 04203d28
隐藏空白更改
内联 并排
Showing with 20 addition and 133 deletion
skyeye-mail/src/main/java/com/skyeye/eve/controller/MailListController.java
浏览文件 @ 2b0c24af
......@@ -115,20 +115,4 @@ public class MailListController {
mailListService.queryMailMationDetailsById(inputObject, outputObject);
}
/**
*
* @Title: querySysMailMationDetailsById
* @Description: 单位通讯录详情
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/MailListController/querySysMailMationDetailsById")
@ResponseBody
public void querySysMailMationDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception{
mailListService.querySysMailMationDetailsById(inputObject, outputObject);
}
}
skyeye-mail/src/main/java/com/skyeye/eve/dao/MailListDao.java
浏览文件 @ 2b0c24af
......@@ -19,11 +19,7 @@ import java.util.Map;
*/
public interface MailListDao {
public List<Map<String, Object>> queryComMailMationList(Map<String, Object> map) throws Exception;
public List<Map<String, Object>> queryCommonMailMationList(Map<String, Object> map) throws Exception;
public List<Map<String, Object>> queryPersonalMailMationList(Map<String, Object> map) throws Exception;
public List<Map<String, Object>> queryMailMationList(Map<String, Object> map) throws Exception;
public int insertMailMation(Map<String, Object> map) throws Exception;
......@@ -35,6 +31,4 @@ public interface MailListDao {
public Map<String, Object> queryMailMationDetailsById(Map<String, Object> map) throws Exception;
public Map<String, Object> querySysMailMationDetailsById(Map<String, Object> map) throws Exception;
}
skyeye-mail/src/main/java/com/skyeye/eve/service/MailListService.java
浏览文件 @ 2b0c24af
......@@ -21,6 +21,4 @@ public interface MailListService {
public void queryMailMationDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void querySysMailMationDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception;
}
skyeye-mail/src/main/java/com/skyeye/eve/service/impl/MailListServiceImpl.java
浏览文件 @ 2b0c24af
......@@ -16,7 +16,6 @@ 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;
......@@ -51,23 +50,8 @@ public class MailListServiceImpl implements MailListService {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> user = inputObject.getLogParams();
map.put("userId", user.get("id"));
//通讯录类型
String checkMail = map.get("checkMail").toString();
List<Map<String, Object>> beans = new ArrayList<>();
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
if("1".equals(checkMail)){//单位通讯录
//获取当前登陆人所属公司的通讯录
beans = mailListDao.queryComMailMationList(map);
}else if("2".equals(checkMail)){//公共通讯录
//获取公共通讯录
beans = mailListDao.queryCommonMailMationList(map);
}else if("3".equals(checkMail)){//个人通讯录
//获取当前登陆人的个人通讯录
beans = mailListDao.queryPersonalMailMationList(map);
}else{
outputObject.setreturnMessage("参数错误。");
return;
}
List<Map<String, Object>> beans = mailListDao.queryMailMationList(map);
outputObject.setBeans(beans);
outputObject.settotal(pages.getTotal());
}
......@@ -87,7 +71,7 @@ public class MailListServiceImpl implements MailListService {
public void insertMailMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> user = inputObject.getLogParams();
//通讯录类型
// 通讯录类型
String category = map.get("category").toString();
if("1".equals(category)){//个人通讯录
if(ToolUtil.isBlank(map.get("typeId").toString())){//通讯录所属类别为空
......@@ -168,15 +152,15 @@ public class MailListServiceImpl implements MailListService {
outputObject.setreturnMessage("请选择类别");
return;
}
//将他人权限制空
map.put("readonly", null);
// 将他人权限制空
map.remove("readonly");
}else if("2".equals(category)){//公共通讯录
if(ToolUtil.isBlank(map.get("readonly").toString())){//他人只读为空
outputObject.setreturnMessage("请选择他人只读权限");
return;
}
//将所属类别制空
map.put("typeId", null);
// 将所属类别制空
map.remove("typeId");
}
mailListDao.editMailMationById(map);
}
......@@ -199,22 +183,4 @@ public class MailListServiceImpl implements MailListService {
outputObject.settotal(1);
}
/**
*
* @Title: querySysMailMationDetailsById
* @Description: 单位通讯录详情
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
public void querySysMailMationDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = mailListDao.querySysMailMationDetailsById(map);
outputObject.setBean(bean);
outputObject.settotal(1);
}
}
skyeye-mail/src/main/resources/mapper/mail/MailListMapper.xml
浏览文件 @ 2b0c24af
......@@ -2,29 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.skyeye.eve.dao.MailListDao">
<select id="queryComMailMationList" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
a.id,
a.user_name userName,
a.phone,
a.home_phone telePhone,
a.email,
b.department_name unitName,
'同事' typeName
FROM
sys_eve_user_staff a
LEFT JOIN company_department b ON a.department_id = b.id,
sys_eve_user_staff c
WHERE
a.state = '1'
AND a.company_id = c.company_id
AND c.user_id = #{userId}
<if test="searchCondition != '' and searchCondition != null">
AND (a.user_name LIKE '%${searchCondition}%' OR a.phone LIKE '%${searchCondition}%' OR a.home_phone LIKE '%${searchCondition}%')
</if>
</select>
<select id="queryCommonMailMationList" parameterType="java.util.Map" resultType="java.util.Map">
<select id="queryMailMationList" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
a.id,
a.`name` userName,
......@@ -32,35 +10,21 @@
a.work_phone telePhone,
a.email,
a.company unitName,
'公共通讯录' typeName,
a.create_id createId,
#{userId} userId,
a.readonly
FROM
sys_mail_list a
WHERE a.category = '2'
<if test="searchCondition != '' and searchCondition != null">
AND (a.`name` LIKE '%${searchCondition}%' OR a.personal_phone LIKE '%${searchCondition}%' OR a.work_phone LIKE '%${searchCondition}%')
</if>
</select>
<select id="queryPersonalMailMationList" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
a.id,
a.`name` userName,
a.personal_phone phone,
a.work_phone telePhone,
a.email,
a.company unitName,
a.readonly,
b.`name` typeName
FROM
sys_mail_list a
LEFT JOIN sys_mail_type b ON a.type_id = b.id
WHERE a.category = '1'
AND a.create_id = #{userId}
WHERE a.category = #{category}
<if test="category == '1'.toString()">
AND a.create_id = #{userId}
</if>
<if test="searchCondition != '' and searchCondition != null">
AND (a.`name` LIKE '%${searchCondition}%' OR a.personal_phone LIKE '%${searchCondition}%' OR a.work_phone LIKE '%${searchCondition}%')
</if>
ORDER BY a.create_time DESC
</select>
<insert id="insertMailMation" parameterType="java.util.Map">
......@@ -171,20 +135,4 @@
WHERE a.id = #{id}
</select>
<select id="querySysMailMationDetailsById" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
a.user_name `name`,
a.email,
a.phone,
a.home_phone homePhone,
b.company_name companyName,
c.department_name departmentName
FROM
sys_eve_user_staff a
LEFT JOIN company_mation b ON a.company_id = b.id
LEFT JOIN company_department c ON a.department_id = c.id
WHERE
a.id = #{id}
</select>
</mapper>
\ No newline at end of file
skyeye-mail/src/main/resources/reqmapping/mapping/mail.xml
浏览文件 @ 2b0c24af
......@@ -8,10 +8,10 @@
<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="category" name="category" ref="required,num" var="通讯录类型 1.个人通讯录 2.公共通讯录"/>
<property id="searchCondition" name="searchCondition" ref="" var="查询条件"/>
</url>
<url id="maillist002" path="/post/MailListController/insertMailMation" val="新增通讯录(个人或者公共通讯录)" allUse="1" groupName="通讯录管理">
<url id="maillist002" path="/post/MailListController/insertMailMation" val="新增通讯录(个人或者公共通讯录)" allUse="1" method="POST" groupName="通讯录管理">
<property id="name" name="name" ref="required" var="姓名" />
<property id="nameCall" name="nameCall" ref="" var="称呼"/>
<property id="company" name="company" ref="" var="公司"/>
......@@ -34,13 +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="maillist009" path="/post/MailListController/deleteMailMationById" val="删除通讯录" allUse="1" groupName="通讯录管理">
<url id="maillist009" path="/post/MailListController/deleteMailMationById" val="删除通讯录" allUse="1" method="DELETE" groupName="通讯录管理">
<property id="rowId" name="id" ref="required" var="通讯录id" />
</url>
<url id="maillist010" path="/post/MailListController/queryMailMationToEditById" val="编辑通讯录进行回显" allUse="2" groupName="通讯录管理">
<url id="maillist010" path="/post/MailListController/queryMailMationToEditById" val="编辑通讯录进行回显" allUse="2" method="GET" groupName="通讯录管理">
<property id="rowId" name="id" ref="required" var="通讯录id" />
</url>
<url id="maillist011" path="/post/MailListController/editMailMationById" val="编辑通讯录" allUse="1" groupName="通讯录管理">
<url id="maillist011" path="/post/MailListController/editMailMationById" val="编辑通讯录" allUse="1" method="PUT" 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="称呼"/>
......@@ -67,9 +67,6 @@
<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" groupName="通讯录管理">
<property id="rowId" name="id" ref="required" var="通讯录id" />
</url>
<!-- 通讯录管理结束 -->
<!-- 通讯录分组管理开始 -->
......@@ -81,7 +78,7 @@
<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="通讯录分组管理">
<url id="mailGroup003" path="/post/MailGroupController/deleteMailMationTypeById" val="删除通讯录类型" allUse="1" method="DELETE" groupName="通讯录分组管理">
<property id="rowId" name="id" ref="required" var="类型id" />
</url>
<url id="mailGroup004" path="/post/MailGroupController/queryMailMationTypeToEditById" val="编辑通讯录类型进行回显" allUse="2" groupName="通讯录分组管理">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或