浏览代码

修改配置文件,

zhujinghui 4 年之前
父节点
当前提交
c49f2f975f

+ 1 - 2
fcb-project-application/src/test/java/fcb/project/manager/feignApi/PanoFeignTest.java

@@ -25,8 +25,7 @@ public class PanoFeignTest {
     @Test
     @Test
     @SneakyThrows
     @SneakyThrows
     public void test() {
     public void test() {
-        String a = null;
-        Assert.assertTrue("a为空",a != null);
+
     }
     }
 
 
 }
 }

+ 6 - 2
fcb-project-application/src/test/java/fcb/project/manager/feignApi/SceneFeignTest.java

@@ -1,6 +1,8 @@
 package fcb.project.manager.feignApi;
 package fcb.project.manager.feignApi;
 
 
 import fcb.project.manager.FcbProjectManagerApplication;
 import fcb.project.manager.FcbProjectManagerApplication;
+import fcb.project.manager.core.feignInterfaces.SceneFeign;
+import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import org.junit.Assert;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.Test;
@@ -12,8 +14,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = FcbProjectManagerApplication.class)
 @SpringBootTest(classes = FcbProjectManagerApplication.class)
 @AutoConfigureMockMvc
 @AutoConfigureMockMvc
+@RequiredArgsConstructor
 public class SceneFeignTest {
 public class SceneFeignTest {
 
 
+    private final SceneFeign sceneFeign;
+
 
 
     /**
     /**
      * 单元测试
      * 单元测试
@@ -21,8 +26,7 @@ public class SceneFeignTest {
     @Test
     @Test
     @SneakyThrows
     @SneakyThrows
     public void test() {
     public void test() {
-        String a = null;
-        Assert.assertTrue("a为空",a != null);
+
     }
     }
 
 
 }
 }

+ 89 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/BeanUtils.java

@@ -0,0 +1,89 @@
+package fcb.project.manager.base.utils;
+
+import org.springframework.cglib.beans.BeanMap;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+public class BeanUtils extends org.springframework.beans.BeanUtils {
+    public BeanUtils() {
+    }
+
+    /**
+     * 实例化对象:传入类对类进行实例化对象
+     *
+     * @param clazz 类
+     * @return 对象
+     * @author Lius
+     * @date 2018/10/26 13:49
+     */
+    public static <T> T newInstance(Class<?> clazz) {
+        return (T) instantiateClass(clazz);
+    }
+
+    /**
+     * 实例化对象,传入类名对该类进行实例化对象
+     *
+     * @param clazzStr 类名,传入是必须传入全路径,com...
+     * @return 对象
+     * @author Lius
+     * @date 2018/10/26 13:54
+     */
+    public static <T> T newInstance(String clazzStr) {
+        try {
+            Class<?> clazz = Class.forName(clazzStr);
+            return newInstance(clazz);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException();
+        }
+    }
+
+    /**
+     * 把对象封装成Map形式
+     *
+     * @param src 需要封装的实体对象
+     * @author Lius
+     * @date 2018/10/26 14:08
+     */
+    public static Map toMap(Object src) {
+        return BeanMap.create(src);
+    }
+
+    /**
+     * 把Map转换成bean对象
+     *
+     * @author Lius
+     * @date 2018/10/26 14:09
+     */
+    public static <T> T toBean(Map<String, Object> beanMap, Class<T> valueType) {
+        // 对象实例化
+        T bean = BeanUtils.newInstance(valueType);
+        PropertyDescriptor[] propertyDescriptors = getPropertyDescriptors(valueType);
+        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            String properName = propertyDescriptor.getName();
+            // 过滤class属性
+            if ("class".equals(properName)) {
+                continue;
+            }
+            if (beanMap.containsKey(properName)) {
+                Method writeMethod = propertyDescriptor.getWriteMethod();
+                if (null == writeMethod) {
+                    continue;
+                }
+                Object value = beanMap.get(properName);
+                if (!writeMethod.isAccessible()) {
+                    writeMethod.setAccessible(true);
+                }
+                try {
+                    writeMethod.invoke(bean, value);
+                } catch (Throwable throwable) {
+                    throw new RuntimeException("Could not set property '" + properName + " ' to bean" + throwable);
+                }
+            }
+        }
+        return bean;
+    }
+
+
+}

+ 2 - 2
fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -531,8 +531,8 @@ public class HouseManagerController extends BaseController{
     public ViewResult deleteHouse(@ApiParam(name="estateId", value = "楼盘id")
     public ViewResult deleteHouse(@ApiParam(name="estateId", value = "楼盘id")
                                       @NotBlank(message = "楼盘id不能为空")
                                       @NotBlank(message = "楼盘id不能为空")
                                       @RequestParam("estateId") String estateId){
                                       @RequestParam("estateId") String estateId){
-        String msg = tmEstateService.delete(estateId, getContextUserInfo(), getToken());
-        return ViewResult.success(msg);
+        ViewResult rs = tmEstateService.delete(estateId, getContextUserInfo(), getToken());
+        return rs;
     }
     }