增加小区楼信息开发中

WebService/src/main/java/com/java110/web/components/floor/AddFloorComponent.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("addFloor")
+public class AddFloorComponent {
+
+    @Autowired
+    private IFloorServiceSMO floorServiceSMOImpl;
+
+    /**
+     * 查询小区楼信息
+     * @param pd 页面封装对象 包含页面请求数据
+     * @return ResponseEntity对象返回给页面
+     */
+    public ResponseEntity<String> saveFloor(IPageData pd) {
+
+        return floorServiceSMOImpl.saveFloor(pd);
+    }
+
+
+    public IFloorServiceSMO getFloorServiceSMOImpl() {
+        return floorServiceSMOImpl;
+    }
+
+    public void setFloorServiceSMOImpl(IFloorServiceSMO floorServiceSMOImpl) {
+        this.floorServiceSMOImpl = floorServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/controller/CallComponentController.java

@@ -16,6 +16,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 
@@ -62,7 +63,16 @@ public class CallComponentController extends BaseController {
             headers.add("code",e.getResult().getCode());
             responseEntity = new ResponseEntity<>(e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
         }catch (Exception e){
-            responseEntity = new ResponseEntity<>(e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+            String msg = "";
+            if (e instanceof InvocationTargetException) {
+                Throwable targetEx =((InvocationTargetException)e).getTargetException();
+                if (targetEx != null) {
+                    msg = targetEx.getMessage();
+                }
+            } else {
+                msg = e.getMessage();
+            }
+            responseEntity = new ResponseEntity<>(msg,HttpStatus.INTERNAL_SERVER_ERROR);
         }finally {
             logger.debug("组件调用返回信息为{}",responseEntity);
             return responseEntity;

WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java

@@ -1,7 +1,10 @@
 package com.java110.web.core;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.cache.MappingCache;
 import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.MappingConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.exception.SMOException;
 import com.java110.common.factory.ApplicationContextFactory;
@@ -23,24 +26,25 @@ import java.lang.reflect.Method;
  */
 public class BaseComponentSMO extends BaseServiceSMO {
 
-    private final static Logger logger = LoggerFactory.getLogger(BaseComponentSMO.class);
+    private static Logger logger = LoggerFactory.getLogger(BaseComponentSMO.class);
 
     /**
      * 调用组件
-     * @param componentCode 组件编码
+     *
+     * @param componentCode   组件编码
      * @param componentMethod 组件方法
      * @param pd
      * @return
      */
-    protected ResponseEntity<String> invokeComponent(String componentCode,String componentMethod,IPageData pd){
+    protected ResponseEntity<String> invokeComponent(String componentCode, String componentMethod, IPageData pd) {
 
-        logger.debug("开始调用组件：{}",pd.toString());
+        logger.debug("开始调用组件：{}", pd.toString());
 
         ResponseEntity<String> responseEntity = null;
 
         Object componentInstance = ApplicationContextFactory.getBean(componentCode);
 
-        Assert.notNull(componentInstance,"未找到组件对应的处理类，请确认 "+componentCode);
+        Assert.notNull(componentInstance, "未找到组件对应的处理类，请确认 " + componentCode);
         try {
 
             Method cMethod = componentInstance.getClass().getDeclaredMethod(componentMethod, IPageData.class);
@@ -50,11 +54,11 @@ public class BaseComponentSMO extends BaseServiceSMO {
             logger.debug("组件编码{}，组件方法{}，pd 为{}", componentCode, componentMethod, pd.toString());
 
             responseEntity = (ResponseEntity<String>) cMethod.invoke(componentInstance, pd);
-        }catch (Exception e){
-            logger.error("调用组件失败：",e);
-            responseEntity = new ResponseEntity<String>("调用组件"+componentCode+",组件方法"+componentMethod+"失败："+e.getMessage(),
+        } catch (Exception e) {
+            logger.error("调用组件失败：", e);
+            responseEntity = new ResponseEntity<String>("调用组件" + componentCode + ",组件方法" + componentMethod + "失败：" + e.getMessage(),
                     HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
@@ -62,14 +66,15 @@ public class BaseComponentSMO extends BaseServiceSMO {
 
     /**
      * 获取用户信息
+     *
      * @param pd
      * @param restTemplate
      * @return
      */
-    protected ResponseEntity<String> getUserInfo(IPageData pd, RestTemplate restTemplate){
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+    protected ResponseEntity<String> getUserInfo(IPageData pd, RestTemplate restTemplate) {
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
         ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/query.user.userInfo?userId="+pd.getUserId(), HttpMethod.GET);
+        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/query.user.userInfo?userId=" + pd.getUserId(), HttpMethod.GET);
         // 过滤返回报文中的字段，只返回name字段
         //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"","localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1","response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
 
@@ -79,27 +84,72 @@ public class BaseComponentSMO extends BaseServiceSMO {
 
     /**
      * 查询商户信息
+     *
      * @return
      */
-    protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate){
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+    protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
         ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/query.store.byuser?userId="+pd.getUserId(), HttpMethod.GET);
+        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/query.store.byuser?userId=" + pd.getUserId(), HttpMethod.GET);
 
         return responseEntity;
     }
 
+    /**
+     * 查询商户信息
+     *
+     * @return
+     */
+    protected void checkStoreEnterCommunity(IPageData pd, String storeId, String storeTypeCd, String communityId, RestTemplate restTemplate) {
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
+        ResponseEntity<String> responseEntity = null;
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.myCommunity.byMember?memberId=" + storeId + "&memberTypeCd="
+                        + MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE,storeTypeCd), HttpMethod.GET);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException(1999, "还未入驻小区，请先入驻小区");
+        }
+
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "communitys", "还未入驻小区，请先入驻小区");
+
+        JSONObject community = JSONObject.parseObject(responseEntity.getBody().toString());
+
+        JSONArray communitys = community.getJSONArray("communitys");
+
+        if (communitys == null || communitys.size() == 0) {
+            throw new SMOException(1999, "还未入驻小区，请先入驻小区");
+        }
+
+        JSONObject currentCommunity = getCurrentCommunity(communitys,communityId);
+
+        if(currentCommunity == null){
+            throw new SMOException(1999, "传入小区ID非法，请正常操作");
+        }
+
+    }
+
+    private JSONObject getCurrentCommunity(JSONArray communitys,String communityId){
+        for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
+            if(communityId.equals(communitys.getJSONObject(communityIndex).getString("communityId"))){
+                return communitys.getJSONObject(communityIndex);
+            }
+        }
+
+        return null;
+    }
+
     /**
      * 检查用户是否有权限
+     *
      * @param pd
      * @param restTemplate
      * @param privilegeCode
      */
-    protected void checkUserHasPrivilege(IPageData pd,RestTemplate restTemplate,String privilegeCode){
+    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate, String privilegeCode) {
         ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/check.user.hasPrivilege?userId="+pd.getUserId()+"&pId="+privilegeCode, HttpMethod.GET);
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            throw new SMOException(1999,"用户没有权限操作权限"+privilegeCode);
+        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/check.user.hasPrivilege?userId=" + pd.getUserId() + "&pId=" + privilegeCode, HttpMethod.GET);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException(1999, "用户没有权限操作权限" + privilegeCode);
         }
     }
 }

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

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

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

@@ -1,6 +1,7 @@
 package com.java110.web.smo.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.exception.SMOException;
 import com.java110.common.util.Assert;
@@ -45,22 +46,27 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         int page = Integer.parseInt(paramIn.getString("page"));
         int rows = Integer.parseInt(paramIn.getString("rows"));
-        String floorName = paramIn.getString("floorName");
-        page = (page - 1) * rows;
+        String communityId = paramIn.getString("communityId");
+
+
+        //校验用户是否有权限
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+
         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");
-        if (StringUtil.isEmpty(floorName)) {
-            responseEntity = this.callCenterService(restTemplate, pd, "",
-                    ServiceConstant.SERVICE_API_URL + "/api/query.staff.infos?rows=" + rows + "&page=" + page + "&storeId=" + storeId, HttpMethod.GET);
-        } else {
-            responseEntity = this.callCenterService(restTemplate, pd, "",
-                    ServiceConstant.SERVICE_API_URL + "/api/query.staff.byName?rows=" + rows + "&page=" + page + "&storeId=" + storeId + "&name=" + floorName, HttpMethod.GET);
-        }
+        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+        //数据校验是否 商户是否入驻该小区
+        super.checkStoreEnterCommunity(pd,storeId,storeTypeCd,communityId,restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                    ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId=" + communityId , HttpMethod.GET);
+
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
         }
@@ -71,6 +77,41 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> saveFloor(IPageData pd) {
+
+        validateSaveFloor(pd);
+
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        String communityId = paramIn.getString("paramIn");
+        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);
+
+
+
+        return null;
+    }
+
+    /**
+     * 校验保存小区楼 信息
+     * @param pd
+     */
+    private void validateSaveFloor(IPageData pd){
+        Assert.jsonObjectHaveKey(pd.getReqData(),"communityId","未包含小区ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(),"name","未包含小区名称");
+        Assert.jsonObjectHaveKey(pd.getReqData(),"floorNum","未包含小区编码");
+        Assert.jsonObjectHaveKey(pd.getReqData(),"remark","未包含小区备注");
+    }
+
     /**
      * 校验查询小区楼信息
      *
@@ -79,11 +120,15 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
     private void validateListFloor(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "page", "请求报文中未包含page节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "rows", "请求报文中未包含rows节点");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "请求报文中未包含communityId节点");
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         Assert.isInteger(paramIn.getString("page"), "page不是数字");
         Assert.isInteger(paramIn.getString("rows"), "rows不是数字");
+        Assert.hasLength(paramIn.getString("communityId"),"小区ID不能为空");
         int rows = Integer.parseInt(paramIn.getString("rows"));
 
+
+
         if (rows > 50) {
             throw new SMOException(1999, "rows 数量不能大于50");
         }

WebService/src/main/resources/components/add-floor/addFloor.html

@@ -0,0 +1,32 @@
+<div id = "addFloorModel" vc-data="addFloorComponent" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">添加小区楼</h3>
+                <div class="ibox-content">
+                    <div>
+                        <p style="color:red;">{{addFloorInfo.errorInfo}}</p>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼名称</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼编号</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
+                            </div>
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveFloorInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/add-floor/addFloor.js

@@ -0,0 +1,104 @@
+(function(vc){
+
+    vc.extends({
+        data:{
+            addFloorInfo:{
+                name:'',
+                floorNum:'',
+                remark:'',
+                errorInfo:''
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+            vc.on('addFloor','openAddFloorModal',function(){
+                $('#addFloorModel').modal('show');
+            });
+        },
+        methods:{
+            addFloorValidate(){
+                return vc.validate.validate({
+                    addFloorInfo:vc.component.addFloorInfo
+                },{
+                    'addFloorInfo.name':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"楼名称不能为空"
+                        },
+                        {
+                            limit:"maxin",
+                            param:"2,10",
+                            errInfo:"楼名称长度必须在2位至10位"
+                        },
+                    ],
+                    'addFloorInfo.floorNum':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"楼编号不能为空"
+                        },
+                        {
+                            limit:"num",
+                            param:"",
+                            errInfo:"不是有效的数字"
+                        },
+                    ],
+                    'addFloorInfo.remark':[
+
+                        {
+                            limit:"maxLength",
+                            param:"200",
+                            errInfo:"备注长度不能超过200位"
+                        }
+                    ]
+
+                });
+            },
+            saveFloorInfo:function(){
+                if(!vc.component.addFloorValidate()){
+                    vc.component.addFloorInfo.errorInfo = vc.validate.errInfo;
+                    return ;
+                }
+
+                vc.component.addFloorInfo.errorInfo = "";
+
+                vc.component.addFloorInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'addFloor',
+                    'saveFloor',
+                    JSON.stringify(vc.component.addFloorInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#addFloorModel').modal('hide');
+                            vc.component.clearAddFloorInfo();
+                            vc.component.$emit('addFloor_reload_event',{});
+                            return ;
+                        }
+                        vc.component.addFloorInfo.errorInfo = json;
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.component.addFloorInfo.errorInfo = errInfo;
+                     });
+            },
+            clearAddFloorInfo:function(){
+                vc.component.addFloorInfo = {
+                                            name:'',
+                                            floorNum:'',
+                                            remark:'',
+                                            errorInfo:''
+                                        };
+            }
+        }
+    });
+
+})(window.vc);

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

@@ -21,7 +21,6 @@
                             <th data-hide="phone">编号</th>
                             <th data-hide="phone">创建员工</th>
                             <th data-hide="phone">备注</th>
-                            <th data-hide="phone">创建时间</th>
                             <th class="text-right">操作</th>
 
                         </tr>
@@ -31,17 +30,18 @@
                             <td>
                                 {{floor.floorId}}
                             </td>
+
                             <td>
-                                {{floor.name}}
+                                {{floor.floorName}}
                             </td>
                             <td>
-                                {{floor.userName}}
+                                {{floor.floorNum}}
                             </td>
                             <td>
-                                {{floor.remark}}
+                                {{floor.userName}}
                             </td>
                             <td>
-                                {{vc.dateFormat(floor.createTime)}}
+                                {{floor.remark}}
                             </td>
                             <td class="text-right">
                                 <div class="btn-group">
@@ -64,4 +64,6 @@
         </div>
     </div>
 
+    <vc:create name="addFloor"></vc:create>
+
 </div>

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

@@ -5,6 +5,7 @@
         data:{
             listFloorInfo:{
                 floors:[],
+                total:0,
                 errorInfo:""
             }
         },
@@ -29,7 +30,10 @@
                             'list',
                              param,
                              function(json,res){
-                                vc.component.listFloorInfo.floors=JSON.parse(json);
+                                var listFloorData =JSON.parse(json);
+
+                                vc.component.listFloorInfo.total = listFloorData.total;
+                                vc.component.listFloorInfo.floors = listFloorData.apiFloorDataVoList;
                              },function(errInfo,error){
                                 console.log('请求失败处理');
                              }
@@ -37,7 +41,7 @@
 
             },
             _openAddFloorModal:function(){ //打开添加框
-
+                vc.emit('addFloor','openAddFloorModal',{});
             },
             _openDelFloorModel:function(_floor){ // 打开删除对话框
 

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

@@ -8,4 +8,8 @@ public class PrivilegeCodeConstant {
 
     //入驻小区
     public static final  String PRIVILEGE_ENTER_COMMUNITY = "500201904008";
+
+
+    //初始化楼
+    public static final String PRIVILEGE_FLOOR = "500201904011";
 }