修改bug

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -69,8 +70,13 @@ public class CommunityController {
 					"communityName：社区名称,communityAlias：小区别名， provinceId:省份id,cityId:城市id,districtId:区县id，longitude: 经度,latitude: 纬度,userName:物业端用户名,loginName:物业端登录名")
 	})
 	@RequestMapping(value = "/community/add",method = RequestMethod.POST)
-	public ResponseBean addCommunity(@RequestBody ToCommunities toCommunities){
+	public ResponseBean addCommunity(@RequestBody @Valid ToCommunities toCommunities){
 		ResponseBean responseBean = new ResponseBean();
+		String telRegex = "[1][3578]\\d{9}";
+		if (!toCommunities.getLoginName().matches(telRegex)){
+			responseBean.addError("请输入正确格式的手机号！");
+			return responseBean;
+		}
 		Integer size = communityService.addCommunity(toCommunities);
 		responseBean.addSuccess(size);
 		return responseBean;
@@ -96,6 +102,11 @@ public class CommunityController {
 	@RequestMapping(value = "/community/update",method = RequestMethod.POST)
 	public ResponseBean updateCommunityById(@RequestBody ToCommunities toCommunities){
 		ResponseBean responseBean = new ResponseBean();
+		String telRegex = "[1][3578]\\d{9}";
+		if (!toCommunities.getLoginName().matches(telRegex)){
+			responseBean.addError("请输入正确格式的手机号！");
+			return responseBean;
+		}
 		String message = communityService.updateCommunityById(toCommunities);
 		if (message.equals(Constant.SUCCESS)){
 			responseBean.addSuccess(message);

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToCommunities.java

@@ -1,26 +1,36 @@
 package com.community.huiju.model;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 public class ToCommunities {
     private Integer id;
-
+    
+    @NotBlank(message = "社区名称不能为空!")
     private String communityName;
 
     private String communityAlias;
-
+    
+    @NotNull(message = "所在省不能为空!")
     private Integer provinceId;
-
+    
+    @NotNull(message = "所在市不能为空!")
     private Integer cityId;
-
+    
+    @NotNull(message = "所在区县乡不能为空!")
     private Integer districtId;
-
+    
+    @NotBlank(message = "经纬度不能为空!")
     private String longitude;
-
+    
+    @NotBlank(message = "经纬度不能为空!")
     private String latitude;
     
+    @NotBlank(message = "管理员姓名不能为空!")
     private String userName;
     
+    @NotBlank(message = "管理员账号不能为空!")
     private String loginName;
     
     private Integer createUser;
@@ -30,6 +40,13 @@ public class ToCommunities {
     private Integer updateUser;
     
     private Date updateDate;
+    
+    private String province;
+    
+    private String city;
+    
+    private String district;
+    
 
     public Integer getId() {
         return id;
@@ -142,4 +159,28 @@ public class ToCommunities {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getProvince() {
+        return province;
+    }
+    
+    public void setProvince(String province) {
+        this.province = province;
+    }
+    
+    public String getCity() {
+        return city;
+    }
+    
+    public void setCity(String city) {
+        this.city = city;
+    }
+    
+    public String getDistrict() {
+        return district;
+    }
+    
+    public void setDistrict(String district) {
+        this.district = district;
+    }
 }

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

@@ -57,6 +57,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	
 	@Override
 	public Integer addCommunity(ToCommunities toCommunities) {
+		toCommunities.setCreateDate(new Date());
 		Integer size = toCommunitiesMapper.insertSelective(toCommunities);
 		if (size < 1){
 			return 0;

CODE/smart-community/operate-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -16,6 +16,9 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="province" property="province" jdbcType="VARCHAR" />
+    <result column="city" property="city" jdbcType="VARCHAR" />
+    <result column="district" property="district" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_name, community_alias, province_id, city_id, district_id, longitude,
@@ -72,6 +75,18 @@
       <if test="loginName != null" >
         login_name,
       </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -104,6 +119,18 @@
       <if test="loginName != null" >
         #{loginName,jdbcType=VARCHAR},
       </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.ToCommunities" >
@@ -152,25 +179,45 @@
   </update>
 
   <select id="selectByCommunityName" resultMap="BaseResultMap" parameterType="com.community.huiju.model.ToCommunities" >
-    select
-    <include refid="Base_Column_List" />
-    from to_communities
+    SELECT
+      c.id,
+      c.community_name,
+      c.community_alias,
+      c.province_id,
+      c.city_id,
+      c.district_id,
+      c.longitude,
+      c.latitude,
+      c.user_name,
+      c.login_name,
+      c.create_user,
+      c.create_date,
+      c.update_user,
+      c.update_date,
+      n.province,
+      a.city,
+      t.district
+    FROM
+      to_communities c
+    LEFT JOIN sys_nation n ON c.province_id = n.id
+    LEFT JOIN sys_nation a ON c.city_id = a.id
+    LEFT JOIN sys_nation t ON c.district_id = t.id
     where 1=1
     <if test="communityName != null and communityName != ''" >
-      and community_name like concat('%',#{communityName,jdbcType=VARCHAR},'%')
+      and c.community_name like concat('%',#{communityName,jdbcType=VARCHAR},'%')
     </if>
     <if test="id != null and id != ''" >
-      and id like concat('%',#{id,jdbcType=INTEGER},'%')
+      and c.id like concat('%',#{id,jdbcType=INTEGER},'%')
     </if>
     <if test="provinceId != null and provinceId != ''" >
-      and province_id = #{provinceId,jdbcType=INTEGER}
+      and c.province_id = #{provinceId,jdbcType=INTEGER}
     </if>
     <if test="cityId != null and cityId != ''" >
-      and city_id = #{cityId,jdbcType=INTEGER}
+      and c.city_id = #{cityId,jdbcType=INTEGER}
     </if>
     <if test="districtId != null and districtId != ''" >
-      and district_id = #{districtId,jdbcType=INTEGER}
+      and c.district_id = #{districtId,jdbcType=INTEGER}
     </if>
-    order by create_date desc
+    order by c.create_date desc
   </select>
 </mapper>

VUECODE/smart-operate-manage/src/store/modules/community.js

@@ -82,7 +82,7 @@ const community = {
     CreateCommunity({ commit }, datail) {
       return new Promise((resolve, reject) => {
         createCommunity(datail).then(response => {
-          resolve()
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column label="所在地区" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.provinceId }}{{ scope.row.cityId }}{{ scope.row.districtId }}</span>
+          <span>{{ scope.row.province }}{{ scope.row.city }}{{ scope.row.district }}</span>
         </template>
       </el-table-column>
       <el-table-column label="物业人员数量" align="center">
@@ -317,6 +317,8 @@ export default {
       })
     },
     getCityList() {
+      this.listQuery.cityId = undefined
+      this.listQuery.districtId = undefined
       this.FetchCityList(this.listQuery.provinceId).then(() => {
       }).catch(() => {
         console.log('get list error')
@@ -397,15 +399,20 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.CreateCommunity(this.detail).then(() => {
+          this.CreateCommunity(this.detail).then((res) => {
             this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '创建成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.getList()
+            if (res.code == 0) {
+              this.$message({
+                message: '创建成功',
+                type: 'success'
+              })
+              this.getList()
+            }else if (res.code == 0) {
+              this.$message({
+                message: res.message,
+                type: 'warning'
+              })
+            }
           })
         }
       })