wuxw
2019-09-14 106ed8cd3c06855147f5789a127a140cb857edb0
绑定 业主房屋关系
5个文件已删除
3 文件已重命名
5个文件已修改
6个文件已添加
722 ■■■■ 已修改文件
WebService/src/main/java/com/java110/web/components/owner/AddOwnerBindingComponent.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/components/owner/AddOwnerRoomBindingComponent.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/components/owner/ViewOwnerComponent.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/smo/addOwner/IAddOwnerRoomBindingSMO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/smo/addOwner/impl/AddOwnerRoomBindingSMOImpl.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/businessTypePackage/list_business_type/listBusinessType.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerBinding/addOwnerBinding.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerBinding/addOwnerBinding.js 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerRoomBinding/addOwnerRoomBinding.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerRoomBinding/addOwnerRoomBinding.js 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerView/addOwnerView.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/addOwnerView/addOwnerView.js 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.js 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/addOwnerRoomBindingFlow.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-common/src/main/java/com/java110/common/constant/PrivilegeCodeConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-common/src/main/java/com/java110/common/constant/ServiceCodeAddOwnerBindingConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/components/owner/AddOwnerBindingComponent.java
File was deleted
WebService/src/main/java/com/java110/web/components/owner/AddOwnerRoomBindingComponent.java
New file
@@ -0,0 +1,35 @@
package com.java110.web.components.owner;
import com.java110.core.context.IPageData;
import com.java110.web.smo.addOwner.IAddOwnerRoomBindingSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
/**
 * 添加添加业主组件
 */
@Component("addOwnerRoomBinding")
public class AddOwnerRoomBindingComponent {
    @Autowired
    private IAddOwnerRoomBindingSMO addOwnerRoomBindingSMOImpl;
    /**
     * 添加添加业主数据
     *
     * @param pd 页面数据封装
     * @return ResponseEntity 对象
     */
    public ResponseEntity<String> binding(IPageData pd) {
        return addOwnerRoomBindingSMOImpl.bindingAddOwnerRoom(pd);
    }
    public IAddOwnerRoomBindingSMO getAddOwnerRoomBindingSMOImpl() {
        return addOwnerRoomBindingSMOImpl;
    }
    public void setAddOwnerRoomBindingSMOImpl(IAddOwnerRoomBindingSMO addOwnerRoomBindingSMOImpl) {
        this.addOwnerRoomBindingSMOImpl = addOwnerRoomBindingSMOImpl;
    }
}
WebService/src/main/java/com/java110/web/components/owner/ViewOwnerComponent.java
New file
@@ -0,0 +1,37 @@
package com.java110.web.components.owner;
import com.java110.core.context.IPageData;
import com.java110.web.smo.IOwnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
/**
 * 查询楼列表组件
 */
@Component("viewOwner")
public class ViewOwnerComponent {
    @Autowired
    private IOwnerServiceSMO ownerServiceSMOImpl;
    /**
     * 查询小区楼信息
     *
     * @param pd 页面封装对象 包含页面请求数据
     * @return ResponseEntity对象返回给页面
     */
    public ResponseEntity<String> getOwner(IPageData pd) {
        return ownerServiceSMOImpl.listOwner(pd);
    }
    public IOwnerServiceSMO getOwnerServiceSMOImpl() {
        return ownerServiceSMOImpl;
    }
    public void setOwnerServiceSMOImpl(IOwnerServiceSMO ownerServiceSMOImpl) {
        this.ownerServiceSMOImpl = ownerServiceSMOImpl;
    }
}
WebService/src/main/java/com/java110/web/smo/addOwner/IAddOwnerRoomBindingSMO.java
File was renamed from WebService/src/main/java/com/java110/web/smo/addOwner/IAddOwnerBindingSMO.java
@@ -8,12 +8,12 @@
 *
 * add by wuxw 2019-06-30
 */
public interface IAddOwnerBindingSMO {
public interface IAddOwnerRoomBindingSMO {
    /**
     * 添加添加业主
     * @param pd 页面数据封装
     * @return ResponseEntity 对象
     */
    ResponseEntity<String> bindingAddOwner(IPageData pd);
    ResponseEntity<String> bindingAddOwnerRoom(IPageData pd);
}
WebService/src/main/java/com/java110/web/smo/addOwner/impl/AddOwnerRoomBindingSMOImpl.java
File was renamed from WebService/src/main/java/com/java110/web/smo/addOwner/impl/AddOwnerBindingSMOImpl.java
@@ -3,11 +3,10 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONArray;
import com.java110.common.constant.PrivilegeCodeConstant;
import com.java110.common.constant.ServiceCodeAddOwnerBindingConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.util.Assert;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.web.smo.addOwner.IAddOwnerBindingSMO;
import com.java110.web.smo.addOwner.IAddOwnerRoomBindingSMO;
import org.springframework.web.client.RestTemplate;
import com.java110.core.context.IPageData;
import com.java110.web.core.AbstractComponentSMO;
@@ -20,8 +19,8 @@
 * 添加小区服务实现类
 * add by wuxw 2019-06-30
 */
@Service("addOwnerBindingSMOImpl")
public class AddOwnerBindingSMOImpl extends AbstractComponentSMO implements IAddOwnerBindingSMO {
@Service("addOwnerRoomBindingSMOImpl")
public class AddOwnerRoomBindingSMOImpl extends AbstractComponentSMO implements IAddOwnerRoomBindingSMO {
    @Autowired
    private RestTemplate restTemplate;
@@ -39,12 +38,10 @@
        Assert.hasKeyByFlowData(infos, "viewFloorInfo", "floorId", "必填,未选择楼栋");
        Assert.hasKeyByFlowData(infos, "sellRoomSelectRoom", "roomId", "必填,未选择房屋");
        Assert.hasKeyByFlowData(infos, "addOwnerView", "name", "必填,名称不能为空");
        Assert.hasKeyByFlowData(infos, "addOwnerView", "sex", "必填,请选择性别");
        Assert.hasKeyByFlowData(infos, "addOwnerView", "age", "必填,请填写年龄");
        Assert.hasKeyByFlowData(infos, "viewOwnerInfo", "ownerId", "必填,未包含业主信息");
        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.ADD_OWNER);
        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.ADD_OWNER_ROOM);
    }
@@ -56,17 +53,17 @@
        JSONArray infos = paramIn.getJSONArray("data");
        //JSONObject viewFloorInfo = getObj(infos, "viewFloorInfo");
        JSONObject sellRoomSelectRoom = getObj(infos, "sellRoomSelectRoom");
        JSONObject addOwner = getObj(infos, "addOwnerView");
        JSONObject viewOwnerInfo = getObj(infos, "viewOwnerInfo");
        JSONObject newParamIn = new JSONObject();
        String communityId = paramIn.getString("communityId");
        addOwner.put("ownerTypeCd", "1001");
        addOwner.put("roomId", sellRoomSelectRoom.getString("roomId"));
        addOwner.put("communityId", communityId);
        addOwner.put("userId", pd.getUserId());
        addOwner.put("storeId", result.getStoreId());
        addOwner.put("state", "2002");
        responseEntity = this.callCenterService(restTemplate, pd, addOwner.toJSONString(),
                ServiceConstant.SERVICE_API_URL + "/api/owner.saveOwner",
        newParamIn.put("ownerId", viewOwnerInfo.getString("ownerId"));
        newParamIn.put("roomId", sellRoomSelectRoom.getString("roomId"));
        newParamIn.put("communityId", communityId);
        newParamIn.put("userId", pd.getUserId());
        newParamIn.put("storeId", result.getStoreId());
        newParamIn.put("state", "2002");
        responseEntity = this.callCenterService(restTemplate, pd, newParamIn.toJSONString(),
                ServiceConstant.SERVICE_API_URL + "/api/room.sellRoom",
                HttpMethod.POST);
        return responseEntity;
    }
@@ -92,7 +89,7 @@
    @Override
    public ResponseEntity<String> bindingAddOwner(IPageData pd) {
    public ResponseEntity<String> bindingAddOwnerRoom(IPageData pd) {
        return super.businessProcess(pd);
    }
WebService/src/main/resources/components/businessTypePackage/list_business_type/listBusinessType.html
@@ -64,7 +64,7 @@
    </div>
   <!-- <vc:create
            name="addOwnerBinding"
            name="addOwnerRoomBinding"
            notifyLoadDataComponentName="listOwner"
    ></vc:create>
    <vc:create
WebService/src/main/resources/components/ownerPackage/addOwnerBinding/addOwnerBinding.html
File was deleted
WebService/src/main/resources/components/ownerPackage/addOwnerBinding/addOwnerBinding.js
File was deleted
WebService/src/main/resources/components/ownerPackage/addOwnerRoomBinding/addOwnerRoomBinding.html
New file
@@ -0,0 +1,42 @@
<div id="component">
    <div class="java110_step">
        <div id="step"></div>
    </div>
    <!-- 选择 应用信息 -->
    <div v-if="addOwnerRoomBindingInfo.index == 0">
        <vc:create name="viewFloorInfo"
                   callBackListener="addOwnerRoomBinding"
                   callBackFunction="notify"
                   showAddFloorButton="false"
        ></vc:create>
    </div>
    <div v-if="addOwnerRoomBindingInfo.index == 1">
        <vc:create name="sellRoomSelectRoom"
                   callBackListener="addOwnerRoomBinding"
                   callBackFunction="notify"
        ></vc:create>
    </div>
    <div v-if="addOwnerRoomBindingInfo.index == 2">
        <vc:create name="viewOwnerInfo"
                   callBackListener="addOwnerRoomBinding"
                   callBackFunction="notify"
        ></vc:create>
    </div>
    <div class="row">
        <div class="col-md-10"></div>
        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
            <button v-if="addOwnerRoomBindingInfo.index != 2" type="button" class="btn btn-primary" style="margin-left:10px;"
                    v-on:click="_nextStep()">下一步
            </button>
            <button v-if="addOwnerRoomBindingInfo.index == 2" type="button" class="btn btn-primary" style="margin-left:10px;"
                    v-on:click="_finishStep()">完成
            </button>
        </div>
    </div>
</div>
WebService/src/main/resources/components/ownerPackage/addOwnerRoomBinding/addOwnerRoomBinding.js
New file
@@ -0,0 +1,98 @@
/**
    入驻小区
**/
(function(vc){
    vc.extends({
        data:{
            addOwnerRoomBindingInfo:{
                $step:{},
                index:0,
                infos:[]
            }
        },
        _initMethod:function(){
            vc.component._initStep();
        },
        _initEvent:function(){
            vc.on("addOwnerRoomBinding", "notify", function(_info){
                vc.component.addOwnerRoomBindingInfo.infos[vc.component.addOwnerRoomBindingInfo.index] = _info;
                if(vc.component.addOwnerRoomBindingInfo.index == 0){
                    vc.emit('searchRoom','listenerFloorInfo',_info);
                }
            });
        },
        methods:{
            _initStep:function(){
                vc.component.addOwnerRoomBindingInfo.$step = $("#step");
                vc.component.addOwnerRoomBindingInfo.$step.step({
                    index: 0,
                    time: 500,
                    title: ["选择楼栋","选择房屋","业主信息"]
                });
                vc.component.addOwnerRoomBindingInfo.index = vc.component.addOwnerRoomBindingInfo.$step.getIndex();
            },
            _prevStep:function(){
                vc.component.addOwnerRoomBindingInfo.$step.prevStep();
                vc.component.addOwnerRoomBindingInfo.index = vc.component.addOwnerRoomBindingInfo.$step.getIndex();
                vc.emit('viewFloorInfo', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
                vc.emit('sellRoomSelectRoom', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
                vc.emit('viewOwnerInfo', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
            },
            _nextStep:function(){
                var _currentData = vc.component.addOwnerRoomBindingInfo.infos[vc.component.addOwnerRoomBindingInfo.index];
                if( _currentData == null || _currentData == undefined){
                    vc.message("请选择或填写必选信息");
                    return ;
                }
                vc.component.addOwnerRoomBindingInfo.$step.nextStep();
                vc.component.addOwnerRoomBindingInfo.index = vc.component.addOwnerRoomBindingInfo.$step.getIndex();
                 vc.emit('viewFloorInfo', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
                vc.emit('sellRoomSelectRoom', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
                vc.emit('viewOwnerInfo', 'onIndex', vc.component.addOwnerRoomBindingInfo.index);
            },
            _finishStep:function(){
                var _currentData = vc.component.addOwnerRoomBindingInfo.infos[vc.component.addOwnerRoomBindingInfo.index];
                if( _currentData == null || _currentData == undefined){
                    vc.message("请选择或填写必选信息");
                    return ;
                }
                var param = {
                    communityId:vc.getCurrentCommunity().communityId,
                    data:vc.component.addOwnerRoomBindingInfo.infos
                }
               vc.http.post(
                   'addOwnerRoomBinding',
                   'binding',
                   JSON.stringify(param),
                   {
                       emulateJSON:true
                    },
                    function(json,res){
                       if(res.status == 200){
                           vc.message('处理成功',true);
                           //关闭model
                           vc.jumpToPage("/flow/roomFlow?" + vc.objToGetParam(JSON.parse(json)));
                           return ;
                       }
                       vc.message(json);
                    },
                    function(errInfo,error){
                       console.log('请求失败处理');
                       vc.message(errInfo);
                    });
            }
        }
    });
})(window.vc);
WebService/src/main/resources/components/ownerPackage/addOwnerView/addOwnerView.html
File was deleted
WebService/src/main/resources/components/ownerPackage/addOwnerView/addOwnerView.js
File was deleted
WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.html
@@ -107,7 +107,8 @@
                                           v-on:click="_openEditOwnerModel(owner)">修改业主</a>
                                        <a class="dropdown-item" href="#"
                                           v-on:click="_openDelOwnerModel(owner)">删除业主</a>
                                        <a class="dropdown-item" href="#">添加房屋</a>
                                        <a class="dropdown-item" href="#"
                                            v-on:click="_openAddOwnerRoom(owner)">添加房屋</a>
                                        <a class="dropdown-item" href="#">删除房屋</a>
                                        <div class="dropdown-divider"></div>
                                        <a class="dropdown-item" href="#">车位出租</a>
WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.js
@@ -69,6 +69,9 @@
            },
            _queryOwnerMethod:function(){
                vc.component._listOwnerData(DEFAULT_PAGE,DEFAULT_ROWS);
            },
            _openAddOwnerRoom:function(_owner){
                vc.jumpToPage("/flow/addOwnerRoomBindingFlow?ownerId="+_owner.ownerId);
            }
        }
    })
WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.html
New file
@@ -0,0 +1,62 @@
<div class="row">
    <div class="col-lg-12">
        <div class="ibox ">
            <div class="ibox-title">
                <h5>业主信息</h5>
                <div class="ibox-tools" style="top:10px;">
                </div>
            </div>
            <div class="ibox-content">
                <div class="row">
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label" >业主ID:</label>
                            <label class="">{{viewOwnerInfo.ownerId}}</label>
                        </div>
                    </div>
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label">名称:</label>
                            <label class="">{{viewOwnerInfo.name}}</label>
                        </div>
                    </div>
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label" >性别:</label>
                            <label class="">{{viewOwnerInfo.sex == 0 ? '男' : '女'}}</label>
                        </div>
                    </div>
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label" >年龄:</label>
                            <label class="">{{viewOwnerInfo.age}}</label>
                        </div>
                    </div>
                </div>
                <div class="row">
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label" >联系方式:</label>
                            <label class="">{{viewOwnerInfo.link}}</label>
                        </div>
                    </div>
                    <div class="col-sm-3">
                        <div class="form-group">
                            <label class="col-form-label">创建员工:</label>
                            <label class="">{{viewOwnerInfo.userName}}</label>
                        </div>
                    </div>
                    <div class="col-sm-6">
                        <div class="form-group">
                            <label class="col-form-label" >备注:</label>
                            <label class="">{{viewOwnerInfo.remark}}</label>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>
WebService/src/main/resources/components/ownerPackage/viewOwnerInfo/viewOwnerInfo.js
New file
@@ -0,0 +1,71 @@
/**
    权限组
**/
(function(vc){
    vc.extends({
        propTypes: {
           callBackListener:vc.propTypes.string,
           callBackFunction:vc.propTypes.string
        },
        data:{
            viewOwnerInfo:{
                flowComponent:'viewOwnerInfo',
                ownerId:"",
                name:"",
                age:"",
                sex:"",
                userName:"",
                remark:"",
                link:"",
            }
        },
        _initMethod:function(){
            vc.component._loadOwnerInfo();
        },
        _initEvent:function(){
            vc.on('viewOwnerInfo','onIndex',function(_index){
                if(_index == 2){
                   vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewOwnerInfo);
                }
            });
        },
        methods:{
            _loadOwnerInfo:function(){
                //加载 业主信息
                var _ownerId = vc.getParam('ownerId')
                if(!vc.notNull(_ownerId)){
                    return ;
                }
               var param = {
                    params:{
                        ownerId:_ownerId,
                        page:1,
                        row:1,
                        communityId:vc.getCurrentCommunity().communityId,
                        ownerTypeCd:'1001'
                    }
               }
                //发送get请求
               vc.http.get('viewOwner',
                            'getOwner',
                             param,
                             function(json,res){
                                var listOwnerData =JSON.parse(json);
                                vc.copyObject(listOwnerData.owners[0],vc.component.viewOwnerInfo);
                             },function(errInfo,error){
                                console.log('请求失败处理');
                             }
                           );
            }
        }
    });
})(window.vc);
WebService/src/main/resources/views/addOwnerRoomBindingFlow.html
File was renamed from WebService/src/main/resources/views/addOwnerBindingFlow.html
@@ -25,7 +25,7 @@
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="addOwnerBinding"></vc:create>
            <vc:create name="addOwnerRoomBinding"></vc:create>
        </div>
        <vc:create name="copyright"></vc:create>
java110-common/src/main/java/com/java110/common/constant/PrivilegeCodeConstant.java
@@ -85,7 +85,7 @@
    public static final String SERVICE_PROVIDE = "502019090149430005";
    public static final String ADD_OWNER = "502019091322800001";
    public static final String ADD_OWNER_ROOM = "502019091322800001";
}
java110-common/src/main/java/com/java110/common/constant/ServiceCodeAddOwnerBindingConstant.java
@@ -9,7 +9,7 @@
    /**
     * 添加 添加业主
     */
    public static final String BINDING_ADD_OWNER_BINDING = "owner.addOwnerBinding";
    public static final String BINDING_ADD_OWNER_BINDING = "owner.addOwnerRoomBinding";