合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java

@@ -0,0 +1,44 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.HkResponseBean;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.HkVisitorBill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-01-23
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "海康相关的API",description = "海康相关的API")
+public class HkController {
+	
+	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
+	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
+	public HkResponseBean allMessageRead(@RequestBody HkVisitorBill hkVisitorBill){
+		HkResponseBean hkResponseBean = new HkResponseBean();
+		System.out.println("测试："+hkVisitorBill.getBillFee());
+		System.out.println("测试："+hkVisitorBill.getBillNum());
+		System.out.println("测试："+hkVisitorBill.getPlateNum());
+		System.out.println("测试："+hkVisitorBill.getReservationNum());
+		System.out.println("测试："+hkVisitorBill.getLeaveTime());
+		hkResponseBean.addSuccess("账单发送成功","");
+		return hkResponseBean;
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/HkVisitorBill.java

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+/**
+ * @author FXF
+ * @date 2019-01-23
+ */
+public class HkVisitorBill {
+	/**
+	 * 账单号
+	 */
+	private String billNum;
+	
+	/**
+	 * 预约单号
+	 */
+	private String reservationNum;
+	
+	/**
+	 * 出场车牌号
+	 */
+	private String plateNum;
+	
+	/**
+	 * 出场时间
+	 */
+	private Long leaveTime;
+	
+	/**
+	 * 账单金额
+	 */
+	private Integer billFee;
+	
+	public String getBillNum() {
+		return billNum;
+	}
+	
+	public void setBillNum(String billNum) {
+		this.billNum = billNum;
+	}
+	
+	public String getReservationNum() {
+		return reservationNum;
+	}
+	
+	public void setReservationNum(String reservationNum) {
+		this.reservationNum = reservationNum;
+	}
+	
+	public String getPlateNum() {
+		return plateNum;
+	}
+	
+	public void setPlateNum(String plateNum) {
+		this.plateNum = plateNum;
+	}
+	
+	public Long getLeaveTime() {
+		return leaveTime;
+	}
+	
+	public void setLeaveTime(Long leaveTime) {
+		this.leaveTime = leaveTime;
+	}
+	
+	public Integer getBillFee() {
+		return billFee;
+	}
+	
+	public void setBillFee(Integer billFee) {
+		this.billFee = billFee;
+	}
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/mode/HkResponseBean.java

@@ -0,0 +1,53 @@
+package com.community.commom.mode;
+
+import java.io.Serializable;
+
+/**
+ * 接口统一状态返回BEAN.
+ */
+public class HkResponseBean<T> implements Serializable {
+
+    private static final long serialVersionUID = 3593827217136880822L;
+
+    public static final String CODE_SUCCESS =  "0";
+    public static final String CODE_FAIL =  "1";
+
+    private String errorCode = "0";
+
+    private String errorMessage = "成功";
+
+    private T data;
+
+    public HkResponseBean() {
+    }
+ 
+    public void addSuccess(String errorMessage,T data) {
+        this.errorCode = "0";
+        this.errorMessage = errorMessage;
+        this.data = data;
+    }
+    
+    public String getErrorCode() {
+        return errorCode;
+    }
+    
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+    
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+    
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+    
+    public T getData() {
+        return data;
+    }
+    
+    public void setData(T data) {
+        this.data = data;
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -208,6 +208,11 @@ public class ToUserServerImpl implements IToUserService {
         ToUser toUser = new ToUser();
 
         String loginName = object.getString("loginName");
+        Integer ID= object.getInteger("id");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
 
         if (!AccountValidatorUtil.isPhone(loginName)){
             response.addError("请输入正确的手机号!");
@@ -215,13 +220,8 @@ public class ToUserServerImpl implements IToUserService {
         }
         ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
         // 修改手机号排除自身
-        if (null!=userLoginName && null != userLoginName.getLoginName()) {
+        if (null!=userLoginName && null != userLoginName.getLoginName() &&(ID).equals(userLoginName.getId())) {
             if (loginName.equals(userLoginName.getLoginName())){
-                Integer ID= object.getInteger("id");
-                String userName = object.getString("userName");
-                JSONArray List = object.getJSONArray("menuArray");
-                Integer[] roleIDArray = List.toArray(new Integer[]{});
-                String remark = object.getString("remark");
 
                 toUser.setUserName(userName);
                 toUser.setLoginName(loginName);

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

@@ -276,9 +276,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         queryWrapper.lambda().eq(User::getLoginName,loginName);
         queryWrapper.lambda().eq(User::getCommunityId,communityId);
         List<User> userLoginName= userMapper.selectList(queryWrapper);
+        Integer ID= object.getInteger("id");
         for (User us:userLoginName) {
-            // 修改手机号码时排除自身
-            if (null != us.getLoginName()&&loginName.equals(us.getLoginName())){
+            // 修改手机号码时排除自身,通过比如ID排除是不是修改的本身
+            if (null != us.getLoginName()&&loginName.equals(us.getLoginName()) && (ID).equals(us.getId())){
                 break;
             }
             if (null != us.getLoginName()) {
@@ -286,7 +287,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 return response;
             }
         }
-        Integer ID= object.getInteger("id");
+
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIDArray = List.toArray(new Integer[]{});

VUECODE/smart-property-manage/src/views/account/user/addUser.vue

@@ -54,7 +54,7 @@ export default {
         children: 'children'
       },
       rules: {
-        roleName: [
+        userName: [
           { required: true, message: '名称', trigger: 'blur' }
         ],
         loginName: [

VUECODE/smart-property-manage/src/views/account/user/index.vue

@@ -34,8 +34,8 @@
       <el-table-column prop="createNmae" label="创建人" align="center"/>
       <el-table-column prop="createDate" label="创建时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
-          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
-          </el-table-column>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
+      </el-table-column>
     </el-table>
     <div class="block">
       <el-pagination
@@ -64,7 +64,7 @@ export default {
         createUser: '',
         updateUser: '',
         updateDate: '',
-        status : '',
+        status: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -77,6 +77,10 @@ export default {
   mounted() {
     // 获取数据
     this.dataQuery()
+    // 截取角色
+    if(this.listQuery.roleName.length>1){
+      this.listQuery.roleName = this.listQuery.roleName.slice(0,10)+'...';
+    }
   },
   methods: {
     ...mapActions('listAnnouncement', [
@@ -109,11 +113,9 @@ export default {
         this.listLoading = false
         console.log('error EmployeesList')
       })
-      
     },
     handleSelectionChange(data) {
-      // 设置为 空
-      this.deleteIds = []
+      this.deleteIds = [] // 设置为 空
       for (let i = 0; i < data.length; i++) {
         this.deleteIds.push(data[i].id)
       }