加入修改业主信息

Api/src/main/java/com/java110/api/listener/owner/EditOwnerListener.java

@@ -104,11 +104,7 @@ public class EditOwnerListener extends AbstractServiceApiDataFlowListener {
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessOwner = new JSONObject();
-        businessOwner.put("ownerId", paramInJson.getString("ownerId"));
-        businessOwner.put("name", paramInJson.getString("name"));
-        businessOwner.put("remark", paramInJson.getString("remark"));
-        businessOwner.put("userId", paramInJson.getString("userId"));
-        businessOwner.put("ownerNum", paramInJson.getString("ownerNum"));
+        businessOwner.putAll(paramInJson);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwner", businessOwner);
 
         return business;

UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

@@ -85,7 +85,8 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
     private void refreshOwner(OwnerDto owner, List<UserDto> users) {
         for (UserDto user : users) {
             if (owner.getUserId().equals(user.getUserId())) {
-                BeanConvertUtil.covertBean(user, owner);
+                //BeanConvertUtil.covertBean(user, owner);
+                owner.setUserName(user.getUserName());
             }
         }
     }

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

@@ -139,7 +139,6 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
         paramIn.put("userId", pd.getUserId());
-        paramIn.put("name", paramIn.getString("ownerName"));
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/owner.editOwner",
                 HttpMethod.POST);
@@ -193,6 +192,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
     private void validateEditOwner(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
         Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含小区楼ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(pd.getReqData(), "age", "请求报文中未包含age");
         Assert.jsonObjectHaveKey(pd.getReqData(), "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "请求报文中未包含sex");
@@ -207,6 +207,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
     private void validateSaveOwner(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
         Assert.jsonObjectHaveKey(pd.getReqData(), "age", "请求报文中未包含age");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(pd.getReqData(), "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");

WebService/src/main/resources/components/edit-owner/editOwner.html

@@ -5,22 +5,35 @@
                 <h3 class="m-t-none m-b ">修改小区楼</h3>
                 <div class="ibox-content">
                     <div>
-                        <p style="color:red;">{{editOwnerInfo.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="editOwnerInfo.ownerName" type="text" placeholder="必填，请填写名称" class="form-control"></div>
+                                <label class="col-sm-2 col-form-label">名称</label>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.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="editOwnerInfo.ownerNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
+                                <label class="col-sm-2 col-form-label">性别</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editOwnerInfo.sex">
+                                        <option selected  disabled value="">必填，请选择性别</option>
+                                        <option value="0">男</option>
+                                        <option value="1">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">年龄</label>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.age" type="number" 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="editOwnerInfo.link" type="number" 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="editOwnerInfo.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="editOwnerMethod()" ><i class="fa fa-check"></i>&nbsp;修改</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveOwnerInfo()" ><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>

WebService/src/main/resources/components/edit-owner/editOwner.js

@@ -4,10 +4,11 @@
         data:{
             editOwnerInfo:{
                 ownerId:'',
-                ownerName:'',
-                ownerNum:'',
-                remark:'',
-                errorInfo:''
+                name:'',
+                age:'',
+                link:'',
+                sex:'',
+                remark:''
             }
         },
          _initMethod:function(){
@@ -15,7 +16,6 @@
          },
          _initEvent:function(){
             vc.on('editOwner','openEditOwnerModal',function(_owner){
-                vc.component.editOwnerInfo.errorInfo="";
                 vc.copyObject(_owner,vc.component.editOwnerInfo);
                 $('#editOwnerModel').modal('show');
             });
@@ -25,31 +25,50 @@
                 return vc.validate.validate({
                     editOwnerInfo:vc.component.editOwnerInfo
                 },{
-                    'editOwnerInfo.ownerName':[
+                   'addOwnerInfo.name':[
                         {
                             limit:"required",
                             param:"",
-                            errInfo:"楼名称不能为空"
+                            errInfo:"名称不能为空"
                         },
                         {
                             limit:"maxin",
                             param:"2,10",
-                            errInfo:"楼名称长度必须在2位至10位"
+                            errInfo:"名称长度必须在2位至10位"
                         },
                     ],
-                    'editOwnerInfo.ownerNum':[
+                    'addOwnerInfo.age':[
                         {
                             limit:"required",
                             param:"",
-                            errInfo:"楼编号不能为空"
+                            errInfo:"年龄不能为空"
                         },
                         {
                             limit:"num",
                             param:"",
-                            errInfo:"不是有效的数字"
+                            errInfo:"年龄不是有效的数字"
                         },
                     ],
-                    'editOwnerInfo.remark':[
+                    'addOwnerInfo.sex':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"性别不能为空"
+                        }
+                    ],
+                    'addOwnerInfo.link':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"手机号不能为空"
+                        },
+                        {
+                            limit:"phone",
+                            param:"",
+                            errInfo:"不是有效的手机号"
+                        }
+                    ],
+                    'addOwnerInfo.remark':[
 
                         {
                             limit:"maxLength",
@@ -63,7 +82,8 @@
             editOwnerMethod:function(){
 
                 if(!vc.component.editOwnerValidate()){
-                    vc.component.editOwnerInfo.errorInfo = vc.validate.errInfo;
+                    vc.message(vc.validate.errInfo);
+
                     return ;
                 }
 
@@ -87,24 +107,23 @@
 
                             return ;
                         }
-                        vc.component.editOwnerInfo.errorInfo = json;
+                        vc.message(json);
 
                      },
                      function(errInfo,error){
                         console.log('请求失败处理');
-
-                        vc.component.editOwnerInfo.errorInfo = errInfo;
-
+                        vc.message(errInfo);
                      });
             },
             clearEditOwnerInfo:function(){
                 vc.component.editOwnerInfo = {
-                                            ownerId:'',
-                                            ownerName:'',
-                                            ownerNum:'',
-                                            remark:'',
-                                            errorInfo:''
-                                        };
+                    ownerId:'',
+                    name:'',
+                    age:'',
+                    link:'',
+                    sex:'',
+                    remark:''
+                };
             }
         }
     });

WebService/src/main/resources/components/list-owner/listOwner.js

@@ -40,7 +40,7 @@
 
                                 vc.component.listOwnerInfo.total = listOwnerData.total;
                                 vc.component.listOwnerInfo.records = listOwnerData.records;
-                                vc.component.listOwnerInfo.owners = listOwnerData.apiOwnerDataVoList;
+                                vc.component.listOwnerInfo.owners = listOwnerData.owners;
 
                                 vc.emit('pagination','init',{
                                     total:vc.component.listOwnerInfo.records,

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

@@ -26,6 +26,8 @@ public class OwnerDto extends PageDto implements Serializable {
     private String age;
     private String memberId;
 
+    private String userName;
+
 
     private Date createTime;
 
@@ -113,4 +115,12 @@ public void setMemberId(String memberId) {
     public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml

@@ -96,7 +96,9 @@ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id
 
     <!-- 查询业主信息 add by wuxw 2018-07-03 -->
     <select id="getOwnerInfo" parameterType="Map" resultType="Map">
-        select  t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId 
+        select  t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,
+        t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
+        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId
 from building_owner t 
 where 1 =1 
 <if test="sex !=null and sex != ''">