Skip to content

A
api
Commit 6923b82a by java-李谡
Options

修改条件评估论证bug

parent 68dc1ed8
Showing with 68 additions and 335 deletions
resources/mapper/modules/verify/CondationDao.xml
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
from foc_verify_condition from foc_verify_condition
where depart_id=#{departId} where depart_id=#{departId}
and verif_id=#{verifId} and verif_id=#{verifId}
and `condition` is not null
</select> </select>
<select id="getConditionVerifyDetails" resultType="com.ejweb.modules.verify.data.ConditionVerifyDetailData"> <select id="getConditionVerifyDetails" resultType="com.ejweb.modules.verify.data.ConditionVerifyDetailData">
...@@ -135,6 +136,7 @@ ...@@ -135,6 +136,7 @@
left join foc_condition_feedback f on v.id=f.condition_id left join foc_condition_feedback f on v.id=f.condition_id
where v.depart_id=#{departId} where v.depart_id=#{departId}
and v.verif_id=#{verifId} and v.verif_id=#{verifId}
and v.`condition` is not null
group by v.id group by v.id
</select> </select>
......
src/com/ejweb/modules/im/api/ImGroupController.java
...@@ -117,60 +117,10 @@ public class ImGroupController { ...@@ -117,60 +117,10 @@ public class ImGroupController {
imGroupService.addGroupUser(groupUserList);// 添加群成员信息 imGroupService.addGroupUser(groupUserList);// 添加群成员信息
} }
} }
// List<String> avatarList = new ArrayList<String>();
// List<String> userIdList = new ArrayList<String>();
// 获取群成员列表 // 获取群成员列表
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
// if(groupUserList != null && groupUserList.size()>0){
// for(GroupUserListEntity groupUser : groupUserList){
//
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// if(isAddUser && StringUtils.isNotBlank(groupUser.getPhoto())){// 有新增人员
//
// avatarList.add(GConstants.FILE_UPLOAD_DIR+groupUser.getPhoto());
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
// group.setUserCount(groupUserList.size());
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(group, groupUserList, true, isAddUser); this.updateGroupUserInfo(group, groupUserList, true, isAddUser);
// List<String> avatarList = this.updateGroupUserInfo(group, groupUserList, isAddUser);
// if(isAddUser){// 如果有添加用户则修改用户头像
//
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
//
// userIdList.add(groupUser.getUserId());
// }
// Collections.sort(userIdList);
// StringBuilder builder = new StringBuilder();
// for(String userId:userIdList){
// builder.append(userId+">");
// }
// group.setUserMd5(DigestUtils.md5Hex(builder.toString()));
//
// imGroupService.updateGroupUserCount(group.getId(), groupUserList.size(), group.getUserMd5());
//
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
// }
Map<String, Object> map = new HashMap<String, Object>(2); Map<String, Object> map = new HashMap<String, Object>(2);
map.put("group", group); map.put("group", group);
if(groupUserList != null)// 存在用户成员 if(groupUserList != null)// 存在用户成员
...@@ -282,64 +232,12 @@ public class ImGroupController { ...@@ -282,64 +232,12 @@ public class ImGroupController {
// 获取群成员列表 // 获取群成员列表
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
if(groupUserList != null && groupUserList.size()>0){ if (groupUserList != null && groupUserList.size() > 0) {
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// if(StringUtils.isNotBlank(groupUser.getPhoto())){// 有新增人员
//
// avatarList.add(GConstants.FILE_UPLOAD_DIR+groupUser.getPhoto());
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
this.updateGroupUserInfo(group, groupUserList, true, isAddUser); this.updateGroupUserInfo(group, groupUserList, true, isAddUser);
// List<String> avatarList = this.updateGroupUserInfo(group, groupUserList, isAddUser);
// if(isAddUser){ // 如果有添加用户则修改用户头像
//
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
// userIdList.add(groupUser.getUserId());
// }
// Collections.sort(userIdList);
// StringBuilder builder = new StringBuilder();
// for(String userId:userIdList){
//
// builder.append(userId+">");
// }
// group.setUserMd5(DigestUtils.md5Hex(builder.toString()));
//
// imGroupService.updateGroupUserCount(group.getId(), groupUserList.size(), group.getUserMd5());
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
// }
group.setUserCount(groupUserList.size()); group.setUserCount(groupUserList.size());
// this.updateGroupUserState(groupUserList, userIdList); }
} if (StringUtils.isNotEmpty(bean.getFlightNo())
// if(isAddUser){// 如果有添加用户则修改用户头像 && StringUtils.isNotEmpty(bean.getFlightDate())) {// 航班群
//
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
// }
if(StringUtils.isNotEmpty(bean.getFlightNo())
&& StringUtils.isNotEmpty(bean.getFlightDate())){// 航班群
FlightGroupBean flightGroupBean = new FlightGroupBean(); FlightGroupBean flightGroupBean = new FlightGroupBean();
flightGroupBean.setAcNo(bean.getAcNo()); flightGroupBean.setAcNo(bean.getAcNo());
flightGroupBean.setFlightDate(bean.getFlightDate()); flightGroupBean.setFlightDate(bean.getFlightDate());
...@@ -348,7 +246,7 @@ public class ImGroupController { ...@@ -348,7 +246,7 @@ public class ImGroupController {
flightGroupBean.setArrStn(bean.getArrStn()); flightGroupBean.setArrStn(bean.getArrStn());
flightGroupBean.setGroupType(bean.getGroupType()); flightGroupBean.setGroupType(bean.getGroupType());
GroupEntity flightGroup = imGroupService.findGroupByFlight(flightGroupBean); GroupEntity flightGroup = imGroupService.findGroupByFlight(flightGroupBean);
if(flightGroup == null){// 航班的群对照信息还不存在，添加对照信息 if (flightGroup == null) {// 航班的群对照信息还不存在，添加对照信息
flightGroupBean.setGroupId(group.getId()); flightGroupBean.setGroupId(group.getId());
imGroupService.addFlightToGroup(flightGroupBean); imGroupService.addFlightToGroup(flightGroupBean);
...@@ -395,20 +293,8 @@ public class ImGroupController { ...@@ -395,20 +293,8 @@ public class ImGroupController {
return responseBean; return responseBean;
} }
if(GConstants.YES.equals(bean.getIsShowFirst())){// 需要查询第一个群的群成员列表 if(GConstants.YES.equals(bean.getIsShowFirst())){// 需要查询第一个群的群成员列表
// List<String> userIdList = new ArrayList<String>();
// 获取第一个群的群成员列表 // 获取第一个群的群成员列表
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(groupList.get(0).getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(groupList.get(0).getId());
// if(groupUserList != null && groupUserList.size()>0){
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
// userIdList.add(groupUser.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(groupList.get(0), groupUserList, true, true); this.updateGroupUserInfo(groupList.get(0), groupUserList, true, true);
// groupList.get(0).setGroupUserList(groupUserList); // groupList.get(0).setGroupUserList(groupUserList);
} }
...@@ -418,27 +304,7 @@ public class ImGroupController { ...@@ -418,27 +304,7 @@ public class ImGroupController {
if(GConstants.NO.equals(bean.getIsShowFirst())){// 需要展示默认查询所有用户列表 if(GConstants.NO.equals(bean.getIsShowFirst())){// 需要展示默认查询所有用户列表
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
// if(groupUserList != null && groupUserList.size()>0){
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(group, groupUserList, false, false);// 不查询华为在线状态，也不不更新头像或者数量 this.updateGroupUserInfo(group, groupUserList, false, false);// 不查询华为在线状态，也不不更新头像或者数量
// group.setGroupUserList(groupUserList);
} }
} }
Map<String, Object> map = new HashMap<String, Object>(1); Map<String, Object> map = new HashMap<String, Object>(1);
...@@ -512,28 +378,8 @@ public class ImGroupController { ...@@ -512,28 +378,8 @@ public class ImGroupController {
return responseBean; return responseBean;
} }
// List<String> avatarList = new ArrayList<String>();
group.setGroupAvatar(Util.getAbsoluteUrl(group.getGroupAvatar())); group.setGroupAvatar(Util.getAbsoluteUrl(group.getGroupAvatar()));
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
// if(groupUserList != null && groupUserList.size()>0){
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(group.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(group, groupUserList, true, false); this.updateGroupUserInfo(group, groupUserList, true, false);
// group.setGroupUserList(groupUserList); // group.setGroupUserList(groupUserList);
responseBean.setData(group); responseBean.setData(group);
...@@ -555,81 +401,57 @@ public class ImGroupController { ...@@ -555,81 +401,57 @@ public class ImGroupController {
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "/delete/user") @RequestMapping(value = "/delete/user")
public ResponseBean deleteGroupUser(RequestBean requestBean){ public ResponseBean deleteGroupUser(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
GroupUserBean bean = requestBean.getObjectBean(GroupUserBean.class); GroupUserBean bean = requestBean.getObjectBean(GroupUserBean.class);
String message = imGroupService.validate(bean); String message = imGroupService.validate(bean);
if(message == null){ // 校验通过 // 校验通过
if (message == null) {
GroupEntity group = imGroupService.findGroupByCode(bean.getGroupId()); GroupEntity group = imGroupService.findGroupByCode(bean.getGroupId());
if (group != null) { if (group != null) {
// if(bean.getUserId().equals(group.getCreateBy())){ // 如果是自己的群则可以删除
List<GroupUserListBean> userList = bean.getGroupUserList(); List<GroupUserListBean> userList = bean.getGroupUserList();
if(userList != null && userList.size()>0){ if (userList != null && userList.size() > 0) {
for(GroupUserListBean user:bean.getGroupUserList()){// 循环删除用户 // 循环删除用户
for (GroupUserListBean user : bean.getGroupUserList()) {
imGroupService.deleteGroupUser(group.getId(), user.getUserId()); imGroupService.deleteGroupUser(group.getId(), user.getUserId());
chatRecordsService.deleteGroupChatUser(group.getId(), user.getUserId());// 某人退群后删除强制消息记录 // 某人退群后删除强制消息记录
chatRecordsService.deleteGroupChatUser(group.getId(), user.getUserId());
} }
} }
// } // 获取群成员列表
// List<String> avatarList = new ArrayList<String>(); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());// 获取群成员列表
this.updateGroupUserInfo(group, groupUserList, true, true); this.updateGroupUserInfo(group, groupUserList, true, true);
if(group.getUserCount() <= 1){// 只有一个用户的时候解散群组 // 只有一个用户的时候解散群组
if (group.getUserCount() <= 1) {
this.updateGroupUserInfo(group, groupUserList, false, true);// 更新群数量和群头像 // 更新群数量和群头像
imGroupService.deleteGroupByCode(group.getId(), group.getUserId());// 解散群组 this.updateGroupUserInfo(group, groupUserList, false, true);
if(groupUserList != null && groupUserList.get(0) != null){// 删除此人的群组强制聊天信息 // 解散群组
imGroupService.deleteGroupByCode(group.getId(), group.getUserId());
chatRecordsService.deleteGroupChatUser(group.getId(), groupUserList.get(0).getUserId());// 某人退群后删除强制消息记录 // 删除此人的群组强制聊天信息
if (groupUserList != null && groupUserList.get(0) != null) {
// 某人退群后删除强制消息记录
chatRecordsService.deleteGroupChatUser(group.getId(), groupUserList.get(0).getUserId());
} }
Map<String, Object> map = new HashMap<String, Object>(2); Map<String, Object> map = new HashMap<String, Object>(2);
map.put("group", group);// 用户成员列表 // 用户成员列表
map.put("groupUserList", new ArrayList<GroupUserListEntity>(1));// 用户成员列表 map.put("group", group);
// 用户成员列表
map.put("groupUserList", new ArrayList<GroupUserListEntity>(1));
responseBean.setData(map); responseBean.setData(map);
responseBean.setMessage(GConstants.OK); responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000); responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean; return responseBean;
} }
// if(groupUserList != null && groupUserList.size()>0){
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// if(StringUtils.isNotBlank(groupUser.getPhoto())){
//
// avatarList.add(GConstants.FILE_UPLOAD_DIR+groupUser.getPhoto());
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
// this.updateGroupUserInfo(group, groupUserList, true, true);
// List<String> avatarList = this.updateGroupUserInfo(group, groupUserList, true);
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
Map<String, Object> map = new HashMap<String, Object>(2); Map<String, Object> map = new HashMap<String, Object>(2);
map.put("group", group);// 用户成员列表 // 用户成员列表
map.put("groupUserList", groupUserList);// 用户成员列表 map.put("group", group);
// 用户成员列表
map.put("groupUserList", groupUserList);
responseBean.setData(map); responseBean.setData(map);
responseBean.setMessage(GConstants.OK); responseBean.setMessage(GConstants.OK);
...@@ -663,7 +485,6 @@ public class ImGroupController { ...@@ -663,7 +485,6 @@ public class ImGroupController {
GroupEntity group = imGroupService.findGroupByCode(bean.getGroupId()); GroupEntity group = imGroupService.findGroupByCode(bean.getGroupId());
if (group != null) { if (group != null) {
// if(bean.getUserId().equals(group.getCreateBy())){ // 如果是自己的群则可以删除
List<GroupUserListBean> userList = bean.getGroupUserList(); List<GroupUserListBean> userList = bean.getGroupUserList();
if(userList != null && userList.size()>0){ if(userList != null && userList.size()>0){
for(GroupUserListBean user:bean.getGroupUserList()){// 循环删除用户 for(GroupUserListBean user:bean.getGroupUserList()){// 循环删除用户
...@@ -672,40 +493,9 @@ public class ImGroupController { ...@@ -672,40 +493,9 @@ public class ImGroupController {
} }
} }
// } // }
// List<String> avatarList = new ArrayList<String>();
// 获取群成员列表 // 获取群成员列表
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
// if(groupUserList != null && groupUserList.size()>0){
// List<String> userIdList = new ArrayList<String>();
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// if(StringUtils.isNotBlank(groupUser.getPhoto())){
//
// avatarList.add(GConstants.FILE_UPLOAD_DIR+groupUser.getPhoto());
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(group, groupUserList, true, false); this.updateGroupUserInfo(group, groupUserList, true, false);
// List<String> avatarList = this.updateGroupUserInfo(group, groupUserList, false);
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
Map<String, Object> map = new HashMap<String, Object>(2); Map<String, Object> map = new HashMap<String, Object>(2);
map.put("group", group);// 用户成员列表 map.put("group", group);// 用户成员列表
...@@ -738,19 +528,21 @@ public class ImGroupController { ...@@ -738,19 +528,21 @@ public class ImGroupController {
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "/check") @RequestMapping(value = "/check")
public ResponseBean check(RequestBean requestBean){ public ResponseBean check(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
GroupUserCheckBean bean = requestBean.getObjectBean(GroupUserCheckBean.class); GroupUserCheckBean bean = requestBean.getObjectBean(GroupUserCheckBean.class);
String message = imGroupService.validate(bean); String message = imGroupService.validate(bean);
if(message == null){ // 校验通过 // 校验通过
if(true){// 去掉这限制 if (message == null) {
// 去掉这限制
if (true) {
responseBean.setMessage("没有群成员信息！"); responseBean.setMessage("没有群成员信息！");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
List<GroupUserListBean> userList = bean.getGroupUserList(); List<GroupUserListBean> userList = bean.getGroupUserList();
if(userList == null || userList.size()<1){ if (userList == null || userList.size() < 1) {
responseBean.setMessage("没有群成员信息！"); responseBean.setMessage("没有群成员信息！");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
...@@ -764,19 +556,21 @@ public class ImGroupController { ...@@ -764,19 +556,21 @@ public class ImGroupController {
} }
Collections.sort(userIdList); Collections.sort(userIdList);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for(String userId:userIdList){ for (String userId : userIdList) {
builder.append(userId+">"); builder.append(userId + ">");
} }
String userMd5 = DigestUtils.md5Hex(builder.toString()); String userMd5 = DigestUtils.md5Hex(builder.toString());
GroupEntity group = imGroupService.findGroupByUserMd5(bean.getUserId(), userMd5); GroupEntity group = imGroupService.findGroupByUserMd5(bean.getUserId(), userMd5);
if(group == null){ // 可以创建群 // 可以创建群
if (group == null) {
responseBean.setMessage("群不存在"); responseBean.setMessage("群不存在");
responseBean.setStatus(ErrorCode.STATUS_CODE_4202); responseBean.setStatus(ErrorCode.STATUS_CODE_4202);
return responseBean; return responseBean;
} }
if ("1".equals(group.getDelFlag())) { // 群组已经删除 // 群组已经删除
if ("1".equals(group.getDelFlag())) {
responseBean.setMessage("群组已经删除"); responseBean.setMessage("群组已经删除");
responseBean.setStatus(ErrorCode.STATUS_CODE_4203); responseBean.setStatus(ErrorCode.STATUS_CODE_4203);
...@@ -785,27 +579,7 @@ public class ImGroupController { ...@@ -785,27 +579,7 @@ public class ImGroupController {
group.setGroupAvatar(Util.getAbsoluteUrl(group.getGroupAvatar())); group.setGroupAvatar(Util.getAbsoluteUrl(group.getGroupAvatar()));
List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId()); List<GroupUserListEntity> groupUserList = imGroupService.findGroupUserList(group.getId());
// if(groupUserList != null && groupUserList.size()>0){
// userIdList.clear();
// for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType()) && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// groupUser.setShowPhone(groupUser.getPhone());
// groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
//
// groupUser.setSeatShowPhone(groupUser.getSeatPhone());
// groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
//
// groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto()));// 添加用户头像绝对地址
//
// userIdList.add(groupUser.getUserId());
// }
// this.updateGroupUserState(groupUserList, userIdList);
// }
this.updateGroupUserInfo(group, groupUserList, true, false); this.updateGroupUserInfo(group, groupUserList, true, false);
// group.setGroupUserList(groupUserList);
responseBean.setData(group); responseBean.setData(group);
responseBean.setMessage(GConstants.OK); responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000); responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
...@@ -836,7 +610,6 @@ public class ImGroupController { ...@@ -836,7 +610,6 @@ public class ImGroupController {
} }
} }
if ("SEAT".equals(entityTmp.getUserType())){ if ("SEAT".equals(entityTmp.getUserType())){
// entityTmp.setState("1");
if(StringUtils.isNotEmpty(entityTmp.getLoginId())){ if(StringUtils.isNotEmpty(entityTmp.getLoginId())){
entityTmp.setState("1"); entityTmp.setState("1");
} else{ } else{
...@@ -844,19 +617,6 @@ public class ImGroupController { ...@@ -844,19 +617,6 @@ public class ImGroupController {
entityTmp.setPhoto(Util.getAbsoluteUrl(GConstants.DEFAULT_SEAT_PHOTO)); entityTmp.setPhoto(Util.getAbsoluteUrl(GConstants.DEFAULT_SEAT_PHOTO));
} }
} }
// if ("SEAT".equals(entityTmp.getUserType())
// && (Util.isInValue(entityTmp.getState(), "1", "3", "4") == false)) {// 席位不在线
//
// entityTmp.setPhoto(Util.getAbsoluteUrl(GConstants.DEFAULT_SEAT_PHOTO));
// entityTmp.setUserId("");
// entityTmp.setName("");
// entityTmp.setPhone("");
// entityTmp.setShowPhone("");
// entityTmp.setMobile("");
// entityTmp.setMobileNubmer("");
// entityTmp.setSeatMobile("");
// entityTmp.setSeatMobileNumber("");
// }
} }
} }
} }
...@@ -873,69 +633,48 @@ public class ImGroupController { ...@@ -873,69 +633,48 @@ public class ImGroupController {
private void updateGroupUserInfo(GroupEntity group, List<GroupUserListEntity> groupUserList, private void updateGroupUserInfo(GroupEntity group, List<GroupUserListEntity> groupUserList,
boolean huaweiState, boolean isModified){ boolean huaweiState, boolean isModified){
if(groupUserList == null || groupUserList.size() <= 1){ if(groupUserList == null || groupUserList.size() <= 1) {
// 解散群组
imGroupService.deleteGroupByCode(group.getId(), group.getUserId());// 解散群组 imGroupService.deleteGroupByCode(group.getId(), group.getUserId());
imGroupService.updateGroupUserCount(group.getId(), 0, "");// 不在 // 不在
imGroupService.updateGroupUserCount(group.getId(), 0, "");
group.setUserCount(0); group.setUserCount(0);
return ; return;
} }
group.setGroupUserList(groupUserList); group.setGroupUserList(groupUserList);
group.setUserCount(groupUserList.size()); group.setUserCount(groupUserList.size());
List<String> userIdList = new ArrayList<String>(); List<String> userIdList = new ArrayList<String>();
// List<String> avatarList = new ArrayList<String>(); for(GroupUserListEntity groupUser : groupUserList) {
for(GroupUserListEntity groupUser : groupUserList){
// if("SEAT".equals(groupUser.getUserType())
// && StringUtils.isBlank(groupUser.getPhoto())){// 席位需要添加默认头像
//
// groupUser.setPhoto(GConstants.DEFAULT_SEAT_PHOTO);
// }
// if(StringUtils.isNotBlank(groupUser.getPhoto())){// 有新增人员
//
// avatarList.add(GConstants.FILE_UPLOAD_DIR+groupUser.getPhoto());
// }
groupUser.setShowPhone(groupUser.getPhone()); groupUser.setShowPhone(groupUser.getPhone());
groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone())); groupUser.setPhone(Util.formatedWorkPhone(groupUser.getPhone()));
groupUser.setSeatShowPhone(groupUser.getSeatPhone()); groupUser.setSeatShowPhone(groupUser.getSeatPhone());
groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone())); groupUser.setSeatShowPhone(Util.formatedWorkPhone(groupUser.getSeatPhone()));
// 添加用户头像绝对地址
groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto(), GConstants.DEFAULT_SEAT_PHOTO));// 添加用户头像绝对地址 groupUser.setPhoto(Util.getAbsoluteUrl(groupUser.getPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
userIdList.add(groupUser.getUserId()); userIdList.add(groupUser.getUserId());
} }
if(isModified){// 如果有添加或者删除用户则修改用户头像 // 如果有添加或者删除用户则修改用户头像
if (isModified) {
// Collections.sort(userIdList);
// StringBuilder builder = new StringBuilder();
// for(String userId:userIdList){
// builder.append(userId+">");
// }
// group.setUserMd5(DigestUtils.md5Hex(builder.toString()));
//
// imGroupService.updateGroupUserCount(group.getId(), groupUserList.size(), group.getUserMd5());
// String groupAvatar = ImageUtil.combineHighQuality(avatarList);
// if(StringUtils.isNotBlank(groupAvatar)){
//
// imGroupService.updateGroupAvatar(group.getId(), groupAvatar);
// group.setGroupAvatar(Util.getAbsoluteUrl(groupAvatar));
// }
GroupEntity newGroup = Util.updateGroupAvatar(group.getId(), group.getCreateBy()); GroupEntity newGroup = Util.updateGroupAvatar(group.getId(), group.getCreateBy());
if(newGroup == null){// 如果未获取到信息则再次获取一次 // 如果未获取到信息则再次获取一次
if (newGroup == null) {
newGroup = Util.updateGroupAvatar(group.getId(), group.getCreateBy()); newGroup = Util.updateGroupAvatar(group.getId(), group.getCreateBy());
} }
if(newGroup != null){// 此群更新成功 // 此群更新成功
if (newGroup != null) {
group.setGroupAvatar(newGroup.getGroupAvatar()); group.setGroupAvatar(newGroup.getGroupAvatar());
group.setUserMd5(newGroup.getUserMd5()); group.setUserMd5(newGroup.getUserMd5());
} }
} }
if(huaweiState){// 需要查询成员的在线、离线状态 // 需要查询成员的在线、离线状态
if (huaweiState) {
this.updateGroupUserState(groupUserList, userIdList);// 修改群成员的在线状态 // 修改群成员的在线状态
this.updateGroupUserState(groupUserList, userIdList);
} }
// return avatarList;
} }
/** /**
* 更新群头像 * 更新群头像
......
src/com/ejweb/modules/route/api/RouteVerifyController.java
...@@ -291,14 +291,10 @@ public class RouteVerifyController { ...@@ -291,14 +291,10 @@ public class RouteVerifyController {
@ResponseBody @ResponseBody
@RequestMapping(value = "/export") @RequestMapping(value = "/export")
public void export(RequestBean requestBean, HttpServletResponse response) { public void export(RequestBean requestBean, HttpServletResponse response) {
/* PageEntity<AirlineVerifyEntity> list = null;*/
AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class); AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
String message = airlineVerifyService.validate(bean); String message = airlineVerifyService.validate(bean);
if (message == null) {// 通过参数校验 if (message == null) {
/* list = airlineVerifyService.getRiskAssessmentListForExcel(bean); // 通过参数校验
List<AirlineVerifyEntity> list1= list.getList();
if(list1==null)list1=new ArrayList<AirlineVerifyEntity>();*/
bean.setPageNo(1); bean.setPageNo(1);
bean.setPageSize(10000); bean.setPageSize(10000);
PageEntity<AirlineVerifyEntity> page = airlineVerifyService.getRiskAssessmentList(bean); PageEntity<AirlineVerifyEntity> page = airlineVerifyService.getRiskAssessmentList(bean);
...@@ -310,12 +306,8 @@ public class RouteVerifyController { ...@@ -310,12 +306,8 @@ public class RouteVerifyController {
new ExportExcel("待论证航线列表", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose(); new ExportExcel("待论证航线列表", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
/*return ;*/
} }
/* return ;*/
} }
} }
/* return ;*/
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment