楼栋资料库 完成!

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -20,6 +20,9 @@ public class UserElement implements Serializable {
     /** 用户唯一标识符 **/
     private Integer id;
 
+    /** 小区id **/
+    private Integer communityId;
+
     /** 用户名 **/
     private String userName;
 

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

@@ -2,6 +2,7 @@ package com.community.huiju.common.base;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
 
 import javax.servlet.http.HttpSession;
 
@@ -11,8 +12,17 @@ import javax.servlet.http.HttpSession;
  */
 public class BaseController {
 
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
     protected UserElement getUserElement(HttpSession session){
-        session.getAttribute(Constant.)
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_PROPERTY_USER_SESSION);
+        if (null == userElement) {
+            throw new WisdomException("用户凭证不存在!");
+        }
+        return userElement;
     }
 
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
@@ -15,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -56,9 +59,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
-    public ResponseBean update(@RequestBody String parameter){
+    public ResponseBean update(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.update(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.update(parameter,userElement.getId());
         return responseBean;
     }
 
@@ -71,21 +75,47 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/add", method = RequestMethod.POST)
-    public ResponseBean add(String parameter){
+    public ResponseBean add(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.add(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.add(parameter,userElement.getId());
         return responseBean;
     }
 
     @ApiOperation(value = "批量删除楼栋业主信息", notes = "批量删除楼栋业主信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids",value = "id集合"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
-    public ResponseBean delete(@RequestBody List<Integer> ids){
+    public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.deleteByIdDatch(ids);
+        UserElement userElement = getUserElement(session);
+        List<BuildingOwnerInfo> infoList = ids.stream().map(e->{
+            BuildingOwnerInfo buildingOwnerInfo = new BuildingOwnerInfo();
+            buildingOwnerInfo.setId(e);
+            buildingOwnerInfo.setVerifyStatus("2");
+            buildingOwnerInfo.setUpdateUser(userElement.getId());
+            return buildingOwnerInfo;
+        }).collect(Collectors.toList());
+        boolean result = iBuildingOwnerInfoService.updateBatchById(infoList);
+        if (result) {
+            responseBean.addSuccess("操作成功!");
+        }else {
+            responseBean.addError("操作失败!");
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询 楼栋/单元/楼层/户号", notes = "查询 楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building楼层;" +
+                    "unit单元;level楼层;roomNo户号")
+    })
+    @RequestMapping(value = "/building/info",method = RequestMethod.POST)
+    public ResponseBean buildingUnitNumber(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+
         return responseBean;
     }
 

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

@@ -0,0 +1,58 @@
+package com.community.huiju.exception;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
+        return response;
+    }
+
+
+    @ExceptionHandler(WisdomException.class)
+    public ResponseBean handleException(WisdomException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.community.huiju.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class WisdomException extends RuntimeException {
+
+
+    public WisdomException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public WisdomException(String msg) {
+        super(msg);
+    }
+
+    public WisdomException(String msg, Object ...args) {
+        this(String.format(msg, args));
+    }
+
+
+}

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

@@ -26,22 +26,27 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
     /**
      * 修改 楼栋业主信息
      * @param parameter
+     * @param userId
      * @return
      */
-    ResponseBean update(String parameter);
+    ResponseBean update(String parameter, Integer userId);
 
     /**
      * 添加 楼栋业主信息
      * @param parameter
+     * @param userId
      * @return
      */
-    ResponseBean add(String parameter);
+    ResponseBean add(String parameter, Integer userId);
 
     /**
-     * 根据Id 批量删除
-     * @param ids
+     * 查询 楼栋/单元/楼层/号
+     *
+     *  楼栋是根据 小区ID查询
+     *
+     * @param parameter
      * @return
      */
-    ResponseBean deleteByIdDatch(List<Integer> ids);
+    ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
 
 }

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

@@ -1,19 +1,25 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.EmptyWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 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.exception.WisdomException;
 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 lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.session.SqlSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -31,6 +38,7 @@ import java.util.Map;
  * @since 2018-12-18
  */
 @Service("iBuildingOwnerInfoService")
+@Slf4j
 public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoMapper, BuildingOwnerInfo> implements IBuildingOwnerInfoService {
 
     @Autowired
@@ -62,6 +70,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
         queryWrapper.like(buildingOwnerInfo.getOwnerName() != null,"owner_name",buildingOwnerInfo.getOwnerName());
+
         // 分页查询
         IPage<BuildingOwnerInfo> infoIPage = buildingOwnerInfoMapper.selectPage(page, queryWrapper);
 
@@ -83,25 +92,23 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean update(String parameter) {
+    public ResponseBean update(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
         BuildingOwnerInfo oldBuildingOwnerInfo = buildingOwnerInfoMapper.selectById(buildingOwnerInfo.getId());
         if (null == oldBuildingOwnerInfo) {
-            responseBean.addError("数据不存在!");
-            return responseBean;
+            throw new WisdomException("%s 数据不存在!", buildingOwnerInfo.getId());
         }
 
         BeanTools.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
 
         oldBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        // 用户
-        // oldBuildingOwnerInfo.setUpdateUser();
+        oldBuildingOwnerInfo.setUpdateUser(userId);
 
         int row = buildingOwnerInfoMapper.updateById(oldBuildingOwnerInfo);
         if (row <= 0) {
-            responseBean.addError("操作失败!");
+            throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
         }
@@ -110,15 +117,20 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean add(String parameter) {
+    public ResponseBean add(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        // 主键是自增的, 所以设置为 null
         buildingOwnerInfo.setId(null);
+        buildingOwnerInfo.setUpdateUser(userId);
+        buildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        buildingOwnerInfo.setCreateDate(LocalDateTime.now());
+        buildingOwnerInfo.setCreateUser(userId);
 
         int row = buildingOwnerInfoMapper.insert(buildingOwnerInfo);
         if (row <= 0) {
-            responseBean.addError("操作失败!");
+            throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
         }
@@ -127,16 +139,56 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResponseBean deleteByIdDatch(List<Integer> ids) {
-        
+    public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
+
         ResponseBean responseBean = new ResponseBean();
-        int row = buildingOwnerInfoMapper.deleteBatchIds(ids);
-        if (row <= 0) {
-            responseBean.addError("操作失败!");
-        } else {
-            responseBean.addSuccess("操作成功!");
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
-        return null;
+
+        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+
+        Map<String, Object> map = Maps.newHashMap();
+
+        // 小区
+        map.put("community_id", communityId);
+        // 栋
+        map.put("building",buildingOwnerInfo.getBuilding());
+        // 单元
+        map.put("unit",buildingOwnerInfo.getUnit());
+        // 楼层
+        map.put("level",buildingOwnerInfo.getLevel());
+
+        QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.allEq(map, false);
+
+        /**
+         * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
+         * 2.如果 楼栋存在表示查询单元
+         * 3.如果 单元存在表示查询楼层
+         * 4.如果 楼层存在表示查询户号
+         *
+         * 查询户号, 依赖于前面的查询条件成立!
+         *
+         * 这里的查询都依赖于, 前面的查询条件成立! 比如 要使用条件2, 那么条件1 必须成立!
+         *
+         */
+
+        String column = null;
+        if (null == buildingOwnerInfo.getBuilding()) {
+            column = "building";
+        } else if (null == buildingOwnerInfo.getUnit()) {
+            column = "unit";
+        } else if (null == buildingOwnerInfo.getLevel()){
+            column = "level";
+        } else if (null == buildingOwnerInfo.getRoomNo()) {
+            column = "room_no";
+        }
+        queryWrapper.groupBy(column);
+        List<BuildingOwnerInfo> selectList = buildingOwnerInfoMapper.selectList(queryWrapper);
+
+        responseBean.addSuccess(selectList);
+
+        return responseBean;
     }
 }

CODE/smart-community/property-api/src/main/resources/log4j.properties

@@ -0,0 +1,31 @@
+log4j.rootLogger=info,A1,R
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.Target=System.out
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p%x [%t] %d - %c %m%n  
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.File=../logs/resold_admin_.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.Append = true
+log4j.appender.R.ImmediateFlush = true
+log4j.appender.R.DatePattern = '.' yyyy - MM - dd '.txt'
+log4j.appender.R.layout.ConversionPattern=%-5p%x [%t] %d -%c %m%n
+
+#log4j.logger.com.ibatis=DEBUG
+log4j.logger.org.springframework.transaction.support.TransactionSynchronizationManager = INFO
+log4j.logger.java.sql.Connection=DEBUG
+log4j.logger.java.sql.Statement=DEBUG
+log4j.logger.java.sql.PreparedStatement=DEBUG
+
+###############Log4j 4 SQL Output start################# #DEBUG
+log4j.logger.com.**.dao=INFO
+log4j.logger.com.springframework=DEBUG
+log4j.logger.com.ibatis=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=DEBUG  
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+log4j.logger.org.apache.ibatis.logging.commons.JakartaCommonsLoggingImpl=DEBUG
+log4j.logger.java.sql=DEBUG,CONSOLE 
+###############Log4j 4 SQL Output end###################