From 7a5024966dcce9811f4c1faf694b6b9bf0c2983e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 13 Dec 2017 12:01:35 +0800
Subject: [PATCH] api程序更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 2 +-
src/main/java/com/moral/common/util/WebUtils.java | 4 ++--
src/main/java/com/moral/service/impl/UserServiceImpl.java | 2 +-
src/main/resources/mapper/DeviceMapper.xml | 2 +-
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 1 -
src/main/resources/application.yml | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/common/util/WebUtils.java b/src/main/java/com/moral/common/util/WebUtils.java
index fc167c0..01651a2 100644
--- a/src/main/java/com/moral/common/util/WebUtils.java
+++ b/src/main/java/com/moral/common/util/WebUtils.java
@@ -6,8 +6,8 @@
import javax.servlet.ServletRequest;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
public class WebUtils extends org.springframework.web.util.WebUtils {
public static Map<String, Object> getParametersStartingWith(ServletRequest request, String prefix) {
@@ -29,7 +29,7 @@
params.put(unprefixed, values);
}
else {
- if (StringUtils.isNotBlank(values[0])) {
+ if (!ObjectUtils.isEmpty(values[0])) {
params.put(unprefixed, values[0]);
}
}
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 9c7eba0..fada657 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -73,7 +73,7 @@
Integer orgId = account.getOrganizationId();
// ���������������������������������������������������������������
- if (!(-1 == orgId || getValue("orgId").equals(orgId))) {
+ if (!(-1 == orgId || getValue("orgId").equals(orgId+""))) {
Set<Integer> orgIds = organizationService.getChildOrganizationIds(orgId);
parameters.put("orgIds", orgIds);
}
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 1d9d8c9..c9b2192 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -11,7 +11,6 @@
import org.springframework.stereotype.Service;
-import com.moral.common.exception.ValidateException;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Organization;
import com.moral.entity.OrganizationRelation;
diff --git a/src/main/java/com/moral/service/impl/UserServiceImpl.java b/src/main/java/com/moral/service/impl/UserServiceImpl.java
index 1655652..e6a32cb 100644
--- a/src/main/java/com/moral/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/UserServiceImpl.java
@@ -12,7 +12,7 @@
@Service
public class UserServiceImpl implements UserService {
- //@Autowired
+ @Autowired
private UserMapper userMapper;
@Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 39a5b8b..1aa99b6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
redis:
- host: 101.37.22.173
+ host: 47.96.19.115
port: 6379
password: redis_pass
database: 0
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 03f9da8..cb82be4 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -12,7 +12,7 @@
WHERE
d.monitor_point_id = mp.id
AND mp.organization_id IN
- <foreach close=")" collection="orgIds" item="listItem" open="(" separator=",">
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
#{listItem}
</foreach>
</if>
--
Gitblit v1.8.0