修复 bug

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/AccountValidatorUtil.java

@@ -31,6 +31,22 @@ public class AccountValidatorUtil {
         }
 
 
+    /**
+     * 校验座机号
+     * @param phone
+     * @return
+     */
+    public static boolean isLandline(String phone) {
+        String regex = "/^(\\d{3}-)(\\d{8})$|^(\\d{4}-)(\\d{7})$|^(\\d{4}-)(\\d{8})$/";
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(phone);
+            boolean isMatch = m.matches();
+            if (!isMatch) {
+                //MToast.showToast("请填入正确的手机号");
+            }
+            return isMatch;
+    }
+
     public static void main(String[] args) {
         System.out.println(isPhone("15871301059"));
     }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java

@@ -4,6 +4,7 @@ package com.community.huiju.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.AnnouncementTel;
 import com.community.huiju.model.Bill;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -75,8 +78,20 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
-	public ResponseBean addTel(@RequestBody AnnouncementTel announcementTel, HttpSession session){
+	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
+		boolean isPhone = true;
+		boolean isLandline = true;
+		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
+			isLandline = false;
+		}
+		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
+			isPhone = false;
+		}
+		if (isPhone == false && isLandline == false) {
+			responseBean.addError("输入的号码不正确!");
+			return responseBean;
+		}
 		UserElement userElement = getUserElement(session);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
@@ -107,8 +122,20 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
-	public ResponseBean updateTel(@RequestBody AnnouncementTel announcementTel, HttpSession session) {
+	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session) {
 		ResponseBean responseBean = new ResponseBean();
+		boolean isPhone = true;
+		boolean isLandline = true;
+		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
+			isLandline = false;
+		}
+		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
+			isPhone = false;
+		}
+		if (isPhone == false && isLandline == false) {
+			responseBean.addError("输入的号码不正确!");
+			return responseBean;
+		}
 		UserElement userElement = getUserElement(session);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/AnnouncementTel.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -38,8 +40,10 @@ public class AnnouncementTel implements Serializable {
     /**
      * 电话名称
      */
+    @NotBlank(message = "请输入名称")
     private String name;
 
+    @NotBlank(message = "请输入号码")
     private String tel;
 
     private String remark;

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

@@ -272,10 +272,11 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 message.setUuid(userElement.getId());
                 message.setUuidType("2");
                 message.setSource("2");
-                message.setMessageContent("收费组“{" + bill.getBillName() +  "}”还未发布，点击发布");
+                message.setMessageContent("收费组“" + bill.getBillName() +  "”还未发布，点击发布");
                 message.setStatus("1");
                 message.setCreateDate(LocalDateTime.now());
                 message.setCreateUser(userElement.getId());
+                message.setBillId(bill.getId());
 
                 messageMapper.insert(message);
 

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -229,7 +229,7 @@ export default {
           return
         }
         this.$message.success(res.message)
-        this.getData()
+        this.getPropertyData()
       }).catch(() => {
         console.log('error TelDelete')
       })