Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-27 d07553f8cfdc4ce407122f905b49191b8ffbc7fb

Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java

 src/main/java/com/moral/common/util/ExampleUtil.java

@@ -22,6 +22,7 @@
    public static Example generateExample(Class clzz, String params) {
        Example example = new Example(clzz);
        try {
            if(StringUtils.isNullOrEmpty(params)){ return example;}
            params = URLDecoder.decode(params, "UTF-8");
            if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
                String[] criteria = params.trim().split(OR_SPLIT);
@@ -41,10 +42,8 @@
                                    if (method != null && isPropertyOfClass(clzz, propertyName)) {
                                        List values = new ArrayList<Object>();
                                        if (conditionItems.length > 2) {
                                            //属性到类型
                                            Class<?> valutType = new PropertyDescriptor(propertyName, clzz).getPropertyType();
                                            for (int index = 2; index < conditionItems.length; index++) {
                                                values.add(StringUtils.stringToObject4Type(valutType, conditionItems[index]));
                                                values.add(conditionItems[index]);
                                            }
                                        }
                                        invokeMethod(criteriaOfExample,method,propertyName,values);

 src/main/java/com/moral/common/util/StringUtils.java

@@ -48,7 +48,6 @@
    }
    public static Object stringToObject4Type(Class<?> type,String value) throws Exception{
        Object result = value;
			
        if (type == double.class || type == Double.class) {
            result = Double.parseDouble(value);
        } else if (type == float.class || type == Float.class) {

 src/main/java/com/moral/entity/DeviceVersion.java.1

File was deleted

 src/main/java/com/moral/entity/DeviceVersion.java.2

File was deleted

 src/main/java/com/moral/entity/DeviceVersion.java.3

File was deleted

 src/main/java/com/moral/entity/DeviceVersion.java.4

File was deleted