添加删除小区楼信息

Api/src/main/java/com/java110/api/listener/floor/DeleteFloorListener.java

@@ -0,0 +1,152 @@
+package com.java110.api.listener.floor;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+import com.java110.common.constant.*;
+import com.java110.common.exception.ListenerExecuteException;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.community.ICommunityInnerServiceSMO;
+import com.java110.dto.CommunityMemberDto;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+
+/**
+ * 删除小区楼信息
+ */
+@Java110Listener("editFloorListener")
+public class DeleteFloorListener extends AbstractServiceApiDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(DeleteFloorListener.class);
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_DELETE_FLOOR;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public void soService(ServiceDataFlowEvent event) {
+        logger.debug("ServiceDataFlowEvent : {}", event);
+
+        DataFlowContext dataFlowContext = event.getDataFlowContext();
+        AppService service = event.getAppService();
+
+        String paramIn = dataFlowContext.getReqData();
+
+        //校验数据
+        validate(paramIn);
+        JSONObject paramObj = JSONObject.parseObject(paramIn);
+
+        HttpHeaders header = new HttpHeaders();
+        //dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+
+        //添加小区楼
+        businesses.add(deleteFloor(paramObj));
+        businesses.add(exitCommunityMember(paramObj));
+
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(dataFlowContext, service.getServiceCode(), paramInObj);
+
+        dataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 添加小区楼信息
+     *
+     * @param paramInJson 接口调用放传入入参
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject deleteFloor(JSONObject paramInJson) {
+
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FLOOR_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessFloor = new JSONObject();
+        businessFloor.put("floorId", paramInJson.getString("floorId"));
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
+
+        return business;
+    }
+
+    /**
+     * 退出小区成员
+     *
+     * @param paramInJson 接口传入入参
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject exitCommunityMember(JSONObject paramInJson) {
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_QUIT_COMMUNITY);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessFloor = new JSONObject();
+        CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+        communityMemberDto.setMemberId(paramInJson.getString("floorId"));
+        communityMemberDto.setCommunityId(paramInJson.getString("communityId"));
+        communityMemberDto.setStatusCd(StatusConstant.STATUS_CD_VALID);
+        communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.FLOOR);
+        List<CommunityMemberDto> communityMemberDtoList = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
+
+        if (communityMemberDtoList == null || communityMemberDtoList.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "小区楼和小区存在关系存在异常，请检查");
+        }
+
+
+        businessFloor.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessFloor);
+
+        return business;
+    }
+
+    /**
+     * 校验数据
+     *
+     * @param paramIn 接口请求数据
+     */
+    private void validate(String paramIn) {
+        Assert.jsonObjectHaveKey(paramIn, "floorId", "请求报文中未包含floorId");
+        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
+        return communityInnerServiceSMOImpl;
+    }
+
+    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
+        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
+    }
+}

CommunityService/src/main/java/com/java110/community/dao/ICommunityServiceDao.java

@@ -20,14 +20,14 @@ public interface ICommunityServiceDao {
      * @param businessCommunityInfo 小区信息 封装
      * @throws DAOException 操作数据库异常
      */
-    public void saveBusinessCommunityInfo(Map businessCommunityInfo) throws DAOException;
+     void saveBusinessCommunityInfo(Map businessCommunityInfo) throws DAOException;
 
     /**
      * 保存小区属性
      * @param businessCommunityAttr 小区属性信息封装
      * @throws DAOException 操作数据库异常
      */
-    public void saveBusinessCommunityAttr(Map businessCommunityAttr) throws DAOException;
+     void saveBusinessCommunityAttr(Map businessCommunityAttr) throws DAOException;
 
 
     /**
@@ -35,14 +35,14 @@ public interface ICommunityServiceDao {
      * @param businessCommunityPhoto 小区照片
      * @throws DAOException 操作数据库异常
      */
-    public void saveBusinessCommunityPhoto(Map businessCommunityPhoto) throws DAOException;
+     void saveBusinessCommunityPhoto(Map businessCommunityPhoto) throws DAOException;
 
     /**
      * 保存小区证件信息
      * @param businessCommunityCerdentials 小区证件
      * @throws DAOException 操作数据库异常
      */
-    public void saveBusinessCommunityCerdentials(Map businessCommunityCerdentials) throws DAOException;
+     void saveBusinessCommunityCerdentials(Map businessCommunityCerdentials) throws DAOException;
 
     /**
      * 查询小区信息（business过程）
@@ -51,7 +51,7 @@ public interface ICommunityServiceDao {
      * @return 小区信息
      * @throws DAOException
      */
-    public Map getBusinessCommunityInfo(Map info) throws DAOException;
+     Map getBusinessCommunityInfo(Map info) throws DAOException;
 
 
     /**
@@ -60,7 +60,7 @@ public interface ICommunityServiceDao {
      * @return 小区属性
      * @throws DAOException
      */
-    public List<Map> getBusinessCommunityAttrs(Map info) throws DAOException;
+     List<Map> getBusinessCommunityAttrs(Map info) throws DAOException;
 
 
     /**
@@ -69,7 +69,7 @@ public interface ICommunityServiceDao {
      * @return 小区照片
      * @throws DAOException
      */
-    public List<Map> getBusinessCommunityPhoto(Map info) throws DAOException;
+     List<Map> getBusinessCommunityPhoto(Map info) throws DAOException;
 
 
     /**
@@ -78,14 +78,14 @@ public interface ICommunityServiceDao {
      * @return 小区照片
      * @throws DAOException
      */
-    public List<Map> getBusinessCommunityCerdentials(Map info) throws DAOException;
+     List<Map> getBusinessCommunityCerdentials(Map info) throws DAOException;
 
     /**
      * 保存 小区信息 Business数据到 Instance中
      * @param info
      * @throws DAOException
      */
-    public void saveCommunityInfoInstance(Map info) throws DAOException;
+     void saveCommunityInfoInstance(Map info) throws DAOException;
 
 
     /**
@@ -93,14 +93,14 @@ public interface ICommunityServiceDao {
      * @param info
      * @throws DAOException
      */
-    public void saveCommunityAttrsInstance(Map info) throws DAOException;
+     void saveCommunityAttrsInstance(Map info) throws DAOException;
 
     /**
      * 保存 小区照片信息 Business数据到 Instance中
      * @param info
      * @throws DAOException
      */
-    public void saveCommunityPhotoInstance(Map info) throws DAOException;
+     void saveCommunityPhotoInstance(Map info) throws DAOException;
 
 
 
@@ -114,7 +114,7 @@ public interface ICommunityServiceDao {
      * @return 小区信息
      * @throws DAOException
      */
-    public Map getCommunityInfo(Map info) throws DAOException;
+     Map getCommunityInfo(Map info) throws DAOException;
 
 
     /**
@@ -123,7 +123,7 @@ public interface ICommunityServiceDao {
      * @return 小区属性
      * @throws DAOException
      */
-    public List<Map> getCommunityAttrs(Map info) throws DAOException;
+     List<Map> getCommunityAttrs(Map info) throws DAOException;
 
 
     /**
@@ -132,7 +132,7 @@ public interface ICommunityServiceDao {
      * @return 小区照片
      * @throws DAOException
      */
-    public List<Map> getCommunityPhoto(Map info) throws DAOException;
+     List<Map> getCommunityPhoto(Map info) throws DAOException;
 
 
 
@@ -141,7 +141,7 @@ public interface ICommunityServiceDao {
      * @param info 修改信息
      * @throws DAOException
      */
-    public void updateCommunityInfoInstance(Map info) throws DAOException;
+     void updateCommunityInfoInstance(Map info) throws DAOException;
 
 
     /**
@@ -149,7 +149,7 @@ public interface ICommunityServiceDao {
      * @param info 修改信息
      * @throws DAOException
      */
-    public void updateCommunityAttrInstance(Map info) throws DAOException;
+     void updateCommunityAttrInstance(Map info) throws DAOException;
 
 
     /**
@@ -157,7 +157,7 @@ public interface ICommunityServiceDao {
      * @param info 修改信息
      * @throws DAOException
      */
-    public void updateCommunityPhotoInstance(Map info) throws DAOException;
+     void updateCommunityPhotoInstance(Map info) throws DAOException;
 
     
 
@@ -167,14 +167,14 @@ public interface ICommunityServiceDao {
      * @param businessCommunityMember 小区成员信息 封装
      * @throws DAOException 操作数据库异常
      */
-    public void saveBusinessCommunityMember(Map businessCommunityMember) throws DAOException;
+     void saveBusinessCommunityMember(Map businessCommunityMember) throws DAOException;
 
     /**
      * 成员加入 保存信息至instance
      * @param info
      * @throws DAOException
      */
-    public void saveCommunityMemberInstance(Map info) throws DAOException;
+     void saveCommunityMemberInstance(Map info) throws DAOException;
 
     /**
      * 查询小区成员加入信息（business过程）
@@ -183,7 +183,7 @@ public interface ICommunityServiceDao {
      * @return 小区信息
      * @throws DAOException
      */
-    public Map getBusinessCommunityMember(Map info) throws DAOException;
+     Map getBusinessCommunityMember(Map info) throws DAOException;
 
     /**
      * 查询小区成员加入信息（instance过程）
@@ -192,13 +192,22 @@ public interface ICommunityServiceDao {
      * @return 小区信息
      * @throws DAOException
      */
-    public Map getCommunityMember(Map info) throws DAOException;
+     Map getCommunityMember(Map info) throws DAOException;
 
     /**
      * 修改小区成员加入信息
      * @param info 修改信息
      * @throws DAOException
      */
-    public void updateCommunityMemberInstance(Map info) throws DAOException;
+     void updateCommunityMemberInstance(Map info) throws DAOException;
+
+    /**
+     * 查询小区成员加入信息（instance过程）
+     * 根据bId 查询小区信息
+     * @param info bId 信息
+     * @return 小区信息
+     * @throws DAOException
+     */
+     List<Map> getCommunityMembers(Map info) throws DAOException;
 
 }

CommunityService/src/main/java/com/java110/community/dao/impl/CommunityServiceDaoImpl.java

@@ -21,7 +21,7 @@ import java.util.Map;
 //@Transactional
 public class CommunityServiceDaoImpl extends BaseServiceDao implements ICommunityServiceDao {
 
-    private final static Logger logger = LoggerFactory.getLogger(CommunityServiceDaoImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(CommunityServiceDaoImpl.class);
 
     /**
      * 小区信息封装
@@ -406,4 +406,19 @@ public class CommunityServiceDaoImpl extends BaseServiceDao implements ICommunit
             throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改小区成员加入信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
+
+    /**
+     *
+     * @param info bId 信息
+     * @return
+     * @throws DAOException
+     */
+    @Override
+    public List<Map> getCommunityMembers(Map info) throws DAOException {
+        logger.debug("查询小区成员加入信息 入参 info : {}", info);
+
+        List<Map> memberCommunitys = sqlSessionTemplate.selectList("communityServiceDaoImpl.getCommunityMember", info);
+
+        return memberCommunitys;
+    }
 }

CommunityService/src/main/java/com/java110/community/listener/floor/DeleteFloorInfoListener.java

@@ -22,7 +22,7 @@ import java.util.Map;
 
 /**
  * 删除小区楼信息 侦听
- *
+ * <p>
  * 处理节点
  * 1、businessFloor:{} 小区楼基本信息节点
  * 2、businessFloorAttr:[{}] 小区楼属性信息节点
@@ -35,7 +35,7 @@ import java.util.Map;
 @Transactional
 public class DeleteFloorInfoListener extends AbstractFloorBusinessServiceDataFlowListener {
 
-    private final static Logger logger = LoggerFactory.getLogger(DeleteFloorInfoListener.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteFloorInfoListener.class);
     @Autowired
     IFloorServiceDao floorServiceDaoImpl;
 
@@ -51,32 +51,33 @@ public class DeleteFloorInfoListener extends AbstractFloorBusinessServiceDataFlo
 
     /**
      * 根据删除信息 查出Instance表中数据 保存至business表 （状态写DEL） 方便撤单时直接更新回去
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
         JSONObject data = business.getDatas();
 
-        Assert.notEmpty(data,"没有datas 节点，或没有子节点需要处理");
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
 
         //处理 businessFloor 节点
-        if(data.containsKey("businessFloor")){
+        if (data.containsKey("businessFloor")) {
             //处理 businessFloor 节点
-            if(data.containsKey("businessFloor")){
+            if (data.containsKey("businessFloor")) {
                 Object _obj = data.get("businessFloor");
                 JSONArray businessFloors = null;
-                if(_obj instanceof JSONObject){
+                if (_obj instanceof JSONObject) {
                     businessFloors = new JSONArray();
                     businessFloors.add(_obj);
-                }else {
-                    businessFloors = (JSONArray)_obj;
+                } else {
+                    businessFloors = (JSONArray) _obj;
                 }
                 //JSONObject businessFloor = data.getJSONObject("businessFloor");
-                for (int _floorIndex = 0; _floorIndex < businessFloors.size();_floorIndex++) {
+                for (int _floorIndex = 0; _floorIndex < businessFloors.size(); _floorIndex++) {
                     JSONObject businessFloor = businessFloors.getJSONObject(_floorIndex);
                     doBusinessFloor(business, businessFloor);
-                    if(_obj instanceof JSONObject) {
+                    if (_obj instanceof JSONObject) {
                         dataFlowContext.addParamOut("floorId", businessFloor.getString("floorId"));
                     }
                 }
@@ -88,8 +89,9 @@ public class DeleteFloorInfoListener extends AbstractFloorBusinessServiceDataFlo
 
     /**
      * 删除 instance数据
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -98,17 +100,17 @@ public class DeleteFloorInfoListener extends AbstractFloorBusinessServiceDataFlo
 
         //小区楼信息
         Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_DEL);
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_DEL);
 
         //小区楼信息
         List<Map> businessFloorInfos = floorServiceDaoImpl.getBusinessFloorInfo(info);
-        if( businessFloorInfos != null && businessFloorInfos.size() >0) {
-            for (int _floorIndex = 0; _floorIndex < businessFloorInfos.size();_floorIndex++) {
+        if (businessFloorInfos != null && businessFloorInfos.size() > 0) {
+            for (int _floorIndex = 0; _floorIndex < businessFloorInfos.size(); _floorIndex++) {
                 Map businessFloorInfo = businessFloorInfos.get(_floorIndex);
-                flushBusinessFloorInfo(businessFloorInfo,StatusConstant.STATUS_CD_INVALID);
+                flushBusinessFloorInfo(businessFloorInfo, StatusConstant.STATUS_CD_INVALID);
                 floorServiceDaoImpl.updateFloorInfoInstance(businessFloorInfo);
-                dataFlowContext.addParamOut("floorId",businessFloorInfo.get("floor_id"));
+                dataFlowContext.addParamOut("floorId", businessFloorInfo.get("floor_id"));
             }
         }
 
@@ -117,54 +119,55 @@ public class DeleteFloorInfoListener extends AbstractFloorBusinessServiceDataFlo
     /**
      * 撤单
      * 从business表中查询到DEL的数据 将instance中的数据更新回来
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doRecover(DataFlowContext dataFlowContext, Business business) {
         String bId = business.getbId();
         //Assert.hasLength(bId,"请求报文中没有包含 bId");
         Map info = new HashMap();
-        info.put("bId",bId);
-        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
+        info.put("bId", bId);
+        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
 
         Map delInfo = new HashMap();
-        delInfo.put("bId",business.getbId());
-        delInfo.put("operate",StatusConstant.OPERATE_DEL);
+        delInfo.put("bId", business.getbId());
+        delInfo.put("operate", StatusConstant.OPERATE_DEL);
         //小区楼信息
         List<Map> floorInfo = floorServiceDaoImpl.getFloorInfo(info);
-        if(floorInfo != null && floorInfo.size() > 0){
+        if (floorInfo != null && floorInfo.size() > 0) {
 
             //小区楼信息
             List<Map> businessFloorInfos = floorServiceDaoImpl.getBusinessFloorInfo(delInfo);
             //除非程序出错了，这里不会为空
-            if(businessFloorInfos == null ||  businessFloorInfos.size() == 0){
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败（floor），程序内部异常,请检查！ "+delInfo);
+            if (businessFloorInfos == null || businessFloorInfos.size() == 0) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败（floor），程序内部异常,请检查！ " + delInfo);
             }
-            for (int _floorIndex = 0; _floorIndex < businessFloorInfos.size();_floorIndex++) {
+            for (int _floorIndex = 0; _floorIndex < businessFloorInfos.size(); _floorIndex++) {
                 Map businessFloorInfo = businessFloorInfos.get(_floorIndex);
-                flushBusinessFloorInfo(businessFloorInfo,StatusConstant.STATUS_CD_VALID);
+                flushBusinessFloorInfo(businessFloorInfo, StatusConstant.STATUS_CD_VALID);
                 floorServiceDaoImpl.updateFloorInfoInstance(businessFloorInfo);
             }
         }
     }
 
 
-
     /**
      * 处理 businessFloor 节点
-     * @param business 总的数据节点
+     *
+     * @param business      总的数据节点
      * @param businessFloor 小区楼节点
      */
-    private void doBusinessFloor(Business business,JSONObject businessFloor){
+    private void doBusinessFloor(Business business, JSONObject businessFloor) {
 
-        Assert.jsonObjectHaveKey(businessFloor,"floorId","businessFloor 节点下没有包含 floorId 节点");
+        Assert.jsonObjectHaveKey(businessFloor, "floorId", "businessFloor 节点下没有包含 floorId 节点");
 
-        if(businessFloor.getString("floorId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"floorId 错误，不能自动生成（必须已经存在的floorId）"+businessFloor);
+        if (businessFloor.getString("floorId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "floorId 错误，不能自动生成（必须已经存在的floorId）" + businessFloor);
         }
         //自动插入DEL
-        autoSaveDelBusinessFloor(business,businessFloor);
+        autoSaveDelBusinessFloor(business, businessFloor);
     }
 
     public IFloorServiceDao getFloorServiceDaoImpl() {

CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java

@@ -0,0 +1,37 @@
+package com.java110.community.smo.impl;
+
+import com.java110.common.util.BeanConvertUtil;
+import com.java110.community.dao.ICommunityServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.community.ICommunityInnerServiceSMO;
+import com.java110.dto.CommunityMemberDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区服务内部类
+ */
+@RestController
+public class CommunityInnerServiceSMOImpl extends BaseServiceSMO implements ICommunityInnerServiceSMO {
+
+    @Autowired
+    private ICommunityServiceDao communityServiceDaoImpl;
+
+
+    @Override
+    public List<CommunityMemberDto> getCommunityMembers(CommunityMemberDto communityMemberDto) {
+        List<Map> communityMembers = communityServiceDaoImpl.getCommunityMembers(BeanConvertUtil.covertBean(communityMemberDto, Map.class));
+        return BeanConvertUtil.covertBeanList(communityMembers, CommunityMemberDto.class);
+    }
+
+    public ICommunityServiceDao getCommunityServiceDaoImpl() {
+        return communityServiceDaoImpl;
+    }
+
+    public void setCommunityServiceDaoImpl(ICommunityServiceDao communityServiceDaoImpl) {
+        this.communityServiceDaoImpl = communityServiceDaoImpl;
+    }
+}

CommunityService/src/main/java/com/java110/community/smo/impl/CommunityServiceSMOImpl.java

@@ -33,78 +33,80 @@ import java.util.List;
 @Transactional
 public class CommunityServiceSMOImpl extends BaseServiceSMO implements ICommunityServiceSMO {
 
-    private final static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
 
-        @Override
-        public JSONObject service(BusinessServiceDataFlow businessServiceDataFlow) throws SMOException {
-            try {
-                Assert.hasLength(businessServiceDataFlow.getbId(),"bId 不能为空");
+    @Override
+    public JSONObject service(BusinessServiceDataFlow businessServiceDataFlow) throws SMOException {
+        try {
+            Assert.hasLength(businessServiceDataFlow.getbId(), "bId 不能为空");
 
-                BusinessServiceDataFlowEventPublishing.multicastEvent(businessServiceDataFlow);
-                Assert.notEmpty(businessServiceDataFlow.getResJson(),"用户服务["+businessServiceDataFlow.getCurrentBusiness().getServiceCode()+"]没有返回内容");
-            } catch (Exception e) {
-                logger.error("用户信息处理异常",e);
-                throw new SMOException(ResponseConstant.RESULT_PARAM_ERROR,"用户信息处理异常"+e.getMessage());
-            }finally {
-                if(businessServiceDataFlow == null){
-                    return null;
-                }
+            BusinessServiceDataFlowEventPublishing.multicastEvent(businessServiceDataFlow);
+            Assert.notEmpty(businessServiceDataFlow.getResJson(), "用户服务[" + businessServiceDataFlow.getCurrentBusiness().getServiceCode() + "]没有返回内容");
+        } catch (Exception e) {
+            logger.error("用户信息处理异常", e);
+            throw new SMOException(ResponseConstant.RESULT_PARAM_ERROR, "用户信息处理异常" + e.getMessage());
+        } finally {
+            if (businessServiceDataFlow == null) {
+                return null;
+            }
 
-                //这里记录日志
-                Date endDate = DateUtil.getCurrentDate();
+            //这里记录日志
+            Date endDate = DateUtil.getCurrentDate();
 
-                businessServiceDataFlow.setEndDate(endDate);
-                //添加耗时
-                DataFlowFactory.addCostTime(businessServiceDataFlow, "service", "业务处理总耗时",
-                        businessServiceDataFlow.getStartDate(), businessServiceDataFlow.getEndDate());
-                //保存耗时
-                saveCostTimeLogMessage(businessServiceDataFlow);
-                //保存日志
-                saveLogMessage(businessServiceDataFlow);
-            }
-            return businessServiceDataFlow.getResJson();
+            businessServiceDataFlow.setEndDate(endDate);
+            //添加耗时
+            DataFlowFactory.addCostTime(businessServiceDataFlow, "service", "业务处理总耗时",
+                    businessServiceDataFlow.getStartDate(), businessServiceDataFlow.getEndDate());
+            //保存耗时
+            saveCostTimeLogMessage(businessServiceDataFlow);
+            //保存日志
+            saveLogMessage(businessServiceDataFlow);
+        }
+        return businessServiceDataFlow.getResJson();
     }
 
     /**
      * 保存日志信息
+     *
      * @param businessServiceDataFlow
      */
-    private void saveLogMessage(BusinessServiceDataFlow businessServiceDataFlow){
+    private void saveLogMessage(BusinessServiceDataFlow businessServiceDataFlow) {
 
-        try{
-            if(MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_LOG_ON_OFF))){
-                for(DataFlowLog dataFlowLog :businessServiceDataFlow.getLogDatas()) {
+        try {
+            if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_LOG_ON_OFF))) {
+                for (DataFlowLog dataFlowLog : businessServiceDataFlow.getLogDatas()) {
                     KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_LOG_NAME, "", JSONObject.toJSONString(dataFlowLog));
                 }
             }
-        }catch (Exception e){
-            logger.error("报错日志出错了，",e);
+        } catch (Exception e) {
+            logger.error("报错日志出错了，", e);
         }
     }
 
     /**
      * 保存耗时信息
+     *
      * @param businessServiceDataFlow
      */
-    private void saveCostTimeLogMessage(BusinessServiceDataFlow businessServiceDataFlow){
-        try{
-            if(MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))){
+    private void saveCostTimeLogMessage(BusinessServiceDataFlow businessServiceDataFlow) {
+        try {
+            if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
                 List<DataFlowLinksCost> dataFlowLinksCosts = businessServiceDataFlow.getLinksCostDates();
                 JSONObject costDate = new JSONObject();
                 JSONArray costDates = new JSONArray();
                 JSONObject newObj = null;
-                for(DataFlowLinksCost dataFlowLinksCost : dataFlowLinksCosts){
+                for (DataFlowLinksCost dataFlowLinksCost : dataFlowLinksCosts) {
                     newObj = JSONObject.parseObject(JSONObject.toJSONString(dataFlowLinksCost));
-                    newObj.put("dataFlowId",businessServiceDataFlow.getDataFlowId());
-                    newObj.put("transactionId",businessServiceDataFlow.getTransactionId());
+                    newObj.put("dataFlowId", businessServiceDataFlow.getDataFlowId());
+                    newObj.put("transactionId", businessServiceDataFlow.getTransactionId());
                     costDates.add(newObj);
                 }
-                costDate.put("costDates",costDates);
+                costDate.put("costDates", costDates);
 
-                KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_COST_TIME_LOG_NAME,"",costDate.toJSONString());
+                KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_COST_TIME_LOG_NAME, "", costDate.toJSONString());
             }
-        }catch (Exception e){
-            logger.error("报错日志出错了，",e);
+        } catch (Exception e) {
+            logger.error("报错日志出错了，", e);
         }
     }
 }

CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java

@@ -44,13 +44,13 @@ public class FloorInnerServiceSMOImpl extends BaseServiceSMO implements IFloorIn
     @Override
     public List<FloorDto> queryFloors(@RequestParam("page") int page, @RequestParam("row") int row, @RequestParam("communityId") String communityId) {
         Map<String, Object> floorInfo = new HashMap<String, Object>();
-        floorInfo.put("page", (page-1)*row);
-        floorInfo.put("row", row*page);
+        floorInfo.put("page", (page - 1) * row);
+        floorInfo.put("row", row * page);
         floorInfo.put("communityId", communityId);
         List<FloorDto> floors = BeanConvertUtil.covertBeanList(floorServiceDaoImpl.queryFloors(floorInfo), FloorDto.class);
 
 
-        if(floors == null || floors.size() == 0){
+        if (floors == null || floors.size() == 0) {
             return floors;
         }
 
@@ -101,7 +101,7 @@ public class FloorInnerServiceSMOImpl extends BaseServiceSMO implements IFloorIn
             userIds.add(floor.getUserId());
         }
 
-        return  userIds.toArray(new String[userIds.size()]);
+        return userIds.toArray(new String[userIds.size()]);
     }
 
     public IFloorServiceDao getFloorServiceDaoImpl() {

WebService/src/main/java/com/java110/web/components/floor/DeleteFloorComponent.java

@@ -0,0 +1,36 @@
+package com.java110.web.components.floor;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IFloorServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 删除小区楼信息
+ */
+@Component("deleteFloor")
+public class DeleteFloorComponent {
+
+    @Autowired
+    private IFloorServiceSMO floorServiceSMOImpl;
+
+    /**
+     * 删除小区楼
+     *
+     * @param pd 页面数据封装
+     * @return 对象ResponseEntity
+     */
+    public ResponseEntity<String> delete(IPageData pd) {
+        return floorServiceSMOImpl.deleteFloor(pd);
+    }
+
+
+    public IFloorServiceSMO getFloorServiceSMOImpl() {
+        return floorServiceSMOImpl;
+    }
+
+    public void setFloorServiceSMOImpl(IFloorServiceSMO floorServiceSMOImpl) {
+        this.floorServiceSMOImpl = floorServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/IFloorServiceSMO.java

@@ -31,4 +31,12 @@ public interface IFloorServiceSMO {
      * @return 返回 ResponseEntity对象包含 http状态 信息 body信息
      */
     ResponseEntity<String> editFloor(IPageData pd);
+
+    /**
+     * 删除小区楼
+     *
+     * @param pd 页面数据封装对象
+     * @return 返回 ResponseEntity对象包含 http状态 信息 body信息
+     */
+    ResponseEntity<String> deleteFloor(IPageData pd);
 }

WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java

@@ -145,6 +145,44 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> deleteFloor(IPageData pd) {
+        validateDeleteFloor(pd);
+        //校验员工是否有权限操作
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        String communityId = paramIn.getString("communityId");
+        ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "根据用户ID查询商户ID失败，未包含storeId节点");
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "根据用户ID查询商户类型失败，未包含storeTypeCd节点");
+
+        String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+        //数据校验是否 商户是否入驻该小区
+        super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/floor.deleteFloor",
+                HttpMethod.POST);
+
+        return responseEntity;
+    }
+
+    /**
+     * 删除小区楼 校验
+     *
+     * @param pd 页面数据封装
+     */
+    private void validateDeleteFloor(IPageData pd) {
+
+        Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "未包含小区楼ID");
+
+    }
+
     /**
      * 校验保存小区楼 信息
      *
@@ -152,6 +190,7 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
      */
     private void validateEditFloor(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "未包含小区楼ID");
         Assert.jsonObjectHaveKey(pd.getReqData(), "floorName", "未包含小区楼名称");
         Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "未包含小区楼编码");
         Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");

WebService/src/main/resources/components/delete-floor/deleteFloor.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="deleteFloorModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确认是否删除!</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" >点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteFloor()">确认删除</button>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/delete-floor/deleteFloor.js

@@ -0,0 +1,42 @@
+(function(vc){
+    vc.extends({
+        data:{
+            deleteFloorInfo:{}
+        },
+        _initEvent:function(){
+             vc.on('deleteFloor','openFloorModel',function(_floorInfo){
+                    vc.component.deleteFloorInfo = _floorInfo;
+                    $('#deleteFloorModel').modal('show');
+                });
+        },
+        methods:{
+            closeDeleteFloorModel:function(){
+                $('#deleteFloorModel').modal('hide');
+            },
+            deleteFloor:function(){
+                vc.http.post(
+                    'deleteFloor',
+                    'delete',
+                    JSON.stringify(vc.component.deleteFloorInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#deleteFloorModel').modal('hide');
+                            vc.component.$emit('deleteFloor_reload_event',{});
+                            return ;
+                        }
+                        vc.component.deleteFloornfo.errorInfo = json;
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.component.deleteFloornfo.errorInfo = errInfo;
+                     });
+            }
+        }
+    });
+})(window.vc);

WebService/src/main/resources/components/floor/listFloor.html

@@ -69,5 +69,6 @@
 
     <vc:create name="addFloor"></vc:create>
     <vc:create name="editFloor"></vc:create>
+    <vc:create name="deleteFloor"></vc:create>
 
 </div>

WebService/src/main/resources/components/floor/listFloor.js

@@ -46,7 +46,7 @@
                 vc.emit('addFloor','openAddFloorModal',{});
             },
             _openDelFloorModel:function(_floor){ // 打开删除对话框
-
+                vc.emit('deleteFloor','openFloorModel',_floor);
             },
             _openEditFloorModel:function(_floor){
                 vc.emit('editFloor','openEditFloorModal',_floor);

docs/_sidebar.md

@@ -21,6 +21,7 @@
   * [查询小区楼信息](api/floor/queryFloors.md)
   * [添加小区楼信息](api/floor/saveFloor.md)
   * [编辑小区楼信息](api/floor/editFloor.md)
+  * [编辑小区楼信息](api/floor/deleteFloor.md)
 
 * 服务端接口协议
 

docs/api/floor/deleteFloor.md

@@ -0,0 +1,60 @@
+
+
+**1\. 删除小区楼信息**
+###### 接口功能
+> 用户通过web端或APP添加小区楼信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/floor.deleteFloor](http://api.java110.com:8008/api/floor.deleteFloor)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|floorId|1|String|30|楼ID|-|
+|communityId|1|String|30|小区ID|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/floor.deleteFloor](http://api.java110.com:8008/api/floor.deleteFloor)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+{
+
+    "floorId": "123123",
+    "communityId":"小区ID"
+
+}
+
+返回报文：
+
+
+```

docs/api/floor/saveFloor.md

@@ -51,9 +51,6 @@ REQ_TIME:20181113225612
 SIGN:aabdncdhdbd878sbdudn898
 请求报文：
 
-无
-
-返回报文：
 {
 
     "name": "3号楼01",
@@ -64,4 +61,7 @@ SIGN:aabdncdhdbd878sbdudn898
 
 }
 
+
+返回报文：
+
 ```

docs/services/floor/DeleteFloorInfo.md

@@ -43,8 +43,8 @@
 |-|business|?|Array|-|业务节点|-|
 |business|businessTypeCd|1|String|12|业务类型编码|500100030002|
 |business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
-|datas|businessFloorInfo|1|Object|-|小区成员|小区成员|
-|businessFloorInfo|floorId|1|String|30|-|-|
+|datas|businessFloor|1|Object|-|小区成员|小区成员|
+|businessFloor|floorId|1|String|30|-|-|
 
 
 ###### 返回协议
@@ -86,7 +86,7 @@ Content-Type:application/json
     "bId":"1234567892",
     "remark": "备注",
     "datas": {
-      "businessFloorInfo": {
+      "businessFloor": {
                 "floorId":"填写存在的值"
       }
     },

java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java

@@ -0,0 +1,69 @@
+package com.java110.dto;
+
+import java.io.Serializable;
+
+/**
+ * 小区成员dto
+ */
+public class CommunityMemberDto implements Serializable {
+
+    private String communityMemberId;
+
+    private String communityId;
+
+    private String memberId;
+
+    private String memberTypeCd;
+
+    private String auditStatusCd;
+
+    private String statusCd;
+
+    public String getCommunityMemberId() {
+        return communityMemberId;
+    }
+
+    public void setCommunityMemberId(String communityMemberId) {
+        this.communityMemberId = communityMemberId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberTypeCd() {
+        return memberTypeCd;
+    }
+
+    public void setMemberTypeCd(String memberTypeCd) {
+        this.memberTypeCd = memberTypeCd;
+    }
+
+    public String getAuditStatusCd() {
+        return auditStatusCd;
+    }
+
+    public void setAuditStatusCd(String auditStatusCd) {
+        this.auditStatusCd = auditStatusCd;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

@@ -363,4 +363,7 @@ public class ServiceCodeConstant {
 
     // 编辑小区楼信息
     public static final String SERVICE_CODE_EDIT_FLOOR = "floor.editFloor";
+
+    //删除小区楼信息
+    public static final String SERVICE_CODE_DELETE_FLOOR = "floor.deleteFloor";
 }

java110-config/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -280,6 +280,15 @@
         <if test="communityMemberId != null and communityMemberId !=''">
             and ms.community_member_id = #{communityMemberId}
         </if>
+        <if test="memberId != null and memberId != ''">
+            and ms.member_id = #{memberId}
+        </if>
+        <if test="memberTypeCd != null and memberTypeCd != ''">
+            and ms.member_type_cd = #{memberTypeCd}
+        </if>
+        <if test="auditStatusCd != null and auditStatusCd != ''">
+            and ms.audit_status_cd = #{auditStatusCd}
+        </if>
     </select>
 
     <!-- 修改小区成员 add by wuxw 2018-07-03 -->

java110-core/src/main/java/com/java110/core/smo/community/ICommunityInnerServiceSMO.java

@@ -0,0 +1,36 @@
+package com.java110.core.smo.community;
+
+
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.CommunityMemberDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IFloorInnerServiceSMO
+ * @Description 小区楼接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/communityApi")
+public interface ICommunityInnerServiceSMO {
+
+
+
+    /**
+     * 查询小区成员表
+     *
+     * @param communityMemberDto 小区成员数据封装
+     * @return CommunityMemberDto 数据
+     */
+    @RequestMapping(value = "/getCommunityMembers", method = RequestMethod.POST)
+    List<CommunityMemberDto> getCommunityMembers(@RequestBody CommunityMemberDto communityMemberDto);
+}