api程序更新

xufenglei

2017-12-13 7a5024966dcce9811f4c1faf694b6b9bf0c2983e

api程序更新

 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]);

                    }

                }


 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);

        }


 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;


 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

 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

 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>