From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java
index e592305..5e6a95a 100644
--- a/src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java
@@ -1,8 +1,9 @@
package com.moral.service.impl;
-import java.util.Date;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
@@ -12,10 +13,10 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
-import com.moral.common.util.Crypto;
-import com.moral.common.util.ResourceUtil;
import com.moral.entity.AlarmUser;
+import com.moral.entity.Organization;
import com.moral.mapper.AlarmUserMapper;
+import com.moral.mapper.OrganizationMapper;
import com.moral.service.AlarmUserService;
import tk.mybatis.mapper.entity.Example;
@@ -27,12 +28,15 @@
@Resource
private AlarmUserMapper alarmUserMapper;
+ @Resource
+ private OrganizationMapper organizationMapper;
+
@Override
public PageBean<AlarmUser> getalarmUserList(Map<String, Object> parameters) {
Example example = new Example(AlarmUser.class);
Criteria criteria = example.createCriteria();
- if (parameters.containsKey("alarmUserName")) {
- criteria.andLike("alarmUserName", "%" + (String) parameters.get("alarmUserName") + "%");
+ if (parameters.containsKey("name")) {
+ criteria.andLike("name", "%" + (String) parameters.get("name") + "%");
}
if (parameters.containsKey("mobile")) {
criteria.andLike("mobile", "%" + (String) parameters.get("mobile") + "%");
@@ -45,25 +49,36 @@
}
PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
List<AlarmUser> alarmUsers = alarmUserMapper.selectByExample(example);
+ Set<Integer> organizationIds = new HashSet<Integer>();
+ for (AlarmUser alarmUser : alarmUsers) {
+ if (!ObjectUtils.isEmpty(alarmUser.getOrganizationId())) {
+ organizationIds.add(alarmUser.getOrganizationId());
+ }
+ }
+ if (!ObjectUtils.isEmpty(organizationIds)) {
+ example = new Example(Organization.class);
+ example.or().andIn("id", organizationIds);
+ List<Organization> organizations = organizationMapper.selectByExample(example);
+ for (AlarmUser alarmUser : alarmUsers) {
+ for (Organization organization : organizations) {
+ if (alarmUser.getOrganizationId() == organization.getId()) {
+ alarmUser.setOrganization(organization);
+ break;
+ }
+ }
+ }
+ }
+
return new PageBean<AlarmUser>(alarmUsers);
}
@Override
public Integer saveOrUpdatealarmUser(AlarmUser alarmUser) {
if (ObjectUtils.isEmpty(alarmUser.getId())) {
- alarmUser.setIsDelete(Constants.IS_DELETE_FALSE);
- alarmUser.setCreateTime(new Date());
- alarmUser.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
return alarmUserMapper.insertSelective(alarmUser);
} else {
return alarmUserMapper.updateByPrimaryKeySelective(alarmUser);
}
- }
-
- @Override
- public Integer deletealarmUserByLogic(AlarmUser alarmUser) {
- alarmUser.setIsDelete(Constants.IS_DELETE_TRUE);
- return alarmUserMapper.updateByPrimaryKeySelective(alarmUser);
}
@Override
--
Gitblit v1.8.0