暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -32,7 +32,7 @@ public class CommunityController {
 	@ApiOperation(value = "根据小区名获取小区列表", notes = "根据小区名获取小区列表")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "String", name = "communityName", value = "小区名字") })
 	@RequestMapping(value = "/communitys",method = RequestMethod.GET)
-	public ResponseBean getCommunitys(@RequestParam String communityName){
+	public ResponseBean getCommunitys(@RequestParam(required = false) String communityName){
 		ResponseBean responseBean = new ResponseBean();
 		List<ToCommunities> communitiesList = communityService.getCommunitys(communityName);
 		responseBean.addSuccess(communitiesList);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/CommunityServiceI.java

@@ -5,6 +5,7 @@ import com.community.huiju.model.ToCommunities;
 import java.util.List;
 
 public interface CommunityServiceI {
+
 	List<ToCommunities> getCommunitys(String communityName);
 
 	/**

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/BeanTools.java

@@ -3,11 +3,14 @@ package com.community.commom.utils;
 import jodd.bean.BeanCopy;
 import jodd.typeconverter.TypeConverterManager;
 import org.apache.commons.collections.BeanMap;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.util.Assert;
 
+import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 @SuppressWarnings("deprecation")
 public final class BeanTools {
@@ -112,4 +115,24 @@ public final class BeanTools {
         }
         return map;
     }
+
+    public static String[] getNullPropertyNames (Object source) {
+        final BeanWrapper src = new BeanWrapperImpl(source);
+        java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors();
+
+        Set<String> emptyNames = new HashSet<String>();
+        for(java.beans.PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue == null) {
+                emptyNames.add(pd.getName());
+            }
+        }
+        String[] result = new String[emptyNames.size()];
+        return emptyNames.toArray(result);
+    }
+
+    public static void copyProperties(Object src, Object target) {
+        BeanUtils.copyProperties(src, target, getNullPropertyNames(src));
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/PropertyApplication.java

@@ -5,10 +5,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients
+@EnableTransactionManagement
 public class PropertyApplication {
 
 	public static void main(String[] args) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -1,8 +1,18 @@
 package com.community.huiju.common.base;
 
+import com.community.commom.constant.Constant;
+import com.community.commom.session.UserElement;
+
+import javax.servlet.http.HttpSession;
+
 /**
  * @author FXF
  * @date 2018-12-18
  */
 public class BaseController {
+
+//    protected UserElement getUserElement(HttpSession session){
+//        //session.getAttribute(Constant.)
+//    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -3,6 +3,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 楼栋业主资料信息表 前端控制器
@@ -46,13 +49,43 @@ public class BuildingOwnerInfoController extends BaseController {
 
     @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "building栋;" +
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "id编号;building栋;" +
                     "unit单元;level楼层;roomNo户号;" +
                     "ownerName业主姓名;" +
-                    "ownerTel业主手机号")
+                    "ownerTel业主手机号"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
+    @RequestMapping(value = "update", method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.update(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加楼栋业务信息", notes = "添加楼栋业务信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id编号;building栋;" +
+                    "unit单元;level楼层;roomNo户号;" +
+                    "ownerName业主姓名;" +
+                    "ownerTel业主手机号"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "add", method = RequestMethod.POST)
+    public ResponseBean add(String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.add(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "批量删除楼栋业主信息", notes = "批量删除楼栋业主信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "delete", method = RequestMethod.DELETE)
+    public ResponseBean delete(@RequestBody List<Integer> ids){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.deleteByIdDatch(ids);
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -30,4 +30,18 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
      */
     ResponseBean update(String parameter);
 
+    /**
+     * 添加 楼栋业主信息
+     * @param parameter
+     * @return
+     */
+    ResponseBean add(String parameter);
+
+    /**
+     * 根据Id 批量删除
+     * @param ids
+     * @return
+     */
+    ResponseBean deleteByIdDatch(List<Integer> ids);
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -8,15 +8,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.BuildingOwnerInfoMapper;
 import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -80,6 +82,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean update(String parameter) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -90,13 +93,50 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
             return responseBean;
         }
 
-        BeanUtils.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
-        int row = buildingOwnerInfoMapper.updateById(buildingOwnerInfo);
+        BeanTools.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
+
+        oldBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        // 用户
+        // oldBuildingOwnerInfo.setUpdateUser();
+
+        int row = buildingOwnerInfoMapper.updateById(oldBuildingOwnerInfo);
         if (row <= 0) {
-            responseBean.addError("更新失败!");
+            responseBean.addError("操作失败!");
         } else {
-            responseBean.addSuccess("更新成功!");
+            responseBean.addSuccess("操作成功!");
         }
         return responseBean;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean add(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        buildingOwnerInfo.setId(null);
+
+        int row = buildingOwnerInfoMapper.insert(buildingOwnerInfo);
+        if (row <= 0) {
+            responseBean.addError("操作失败!");
+        } else {
+            responseBean.addSuccess("操作成功!");
+        }
+
+        return responseBean;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean deleteByIdDatch(List<Integer> ids) {
+        
+        ResponseBean responseBean = new ResponseBean();
+        int row = buildingOwnerInfoMapper.deleteBatchIds(ids);
+        if (row <= 0) {
+            responseBean.addError("操作失败!");
+        } else {
+            responseBean.addSuccess("操作成功!");
+        }
+        return null;
+    }
 }