解决冲突

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -124,4 +124,12 @@ public class Constant {
 	public static final String ADMIN_IS_EXIST = "管理员账号已存在";
 	
     public static final String SUCCESS = "success";
+    
+	public static final Integer Beijing = 2;
+	
+	public static final Integer Tianjin = 19;
+	
+	public static final Integer Shanghai = 857;
+	
+	public static final Integer Chongqing = 2459;
 }

CODE/smart-community/mq-message/src/main/java/com/community/huiju/runner/MqRunner.java

@@ -23,8 +23,8 @@ import javax.jms.Topic;
 @Component
 public class MqRunner implements ApplicationRunner {
 	
-	public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
-	//public static final String BROKER_URL = "failover:(tcp://localhost:8087)?timeout=2000";
+	//public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
+	public static final String BROKER_URL = "failover:(tcp://localhost:8877)?timeout=2000";
 	
 	public static final String TARGET = "openapi.acs.topic";
 	

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/SysNationMapper.java

@@ -14,7 +14,7 @@ public interface SysNationMapper {
 
     int insertSelective(SysNation record);
 
-    SysNation selectByPrimaryKey(Integer id);
+    SysNation selectByPrimaryKey(@Param("id") Integer id);
 
     int updateByPrimaryKeySelective(SysNation record);
 

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

@@ -21,10 +21,10 @@ public class ToCommunities {
     @NotNull(message = "所在区县乡不能为空!")
     private Integer districtId;
     
-    @NotBlank(message = "经纬度不能为空!")
+    @NotBlank(message = "高德坐标不能为空!")
     private String longitude;
     
-    @NotBlank(message = "经纬度不能为空!")
+    @NotBlank(message = "高德坐标不能为空!")
     private String latitude;
     
     @NotBlank(message = "管理员姓名不能为空!")

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

@@ -1,11 +1,13 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.constant.Constant;
 import com.community.huiju.dao.SysNationMapper;
 import com.community.huiju.model.SysNation;
 import com.community.huiju.service.CommonServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +38,13 @@ public class CommonServiceImpl implements CommonServiceI {
 	 */
 	@Override
 	public List<SysNation> getCityList(Integer provinceId) {
+		//直辖市是自己本身
+		if(provinceId.equals(Constant.Beijing) || provinceId.equals(Constant.Shanghai) ||
+			provinceId.equals(Constant.Tianjin) || provinceId.equals(Constant.Chongqing)) {
+			List<SysNation> list = new ArrayList<>();
+			list.add(sysNationMapper.selectByPrimaryKey(provinceId));
+			return list;
+		}
 		return sysNationMapper.getNationList(provinceId);
 	}
 	

VUECODE/smart-operate-manage/src/utils/validate.js

@@ -3,7 +3,7 @@
  */
 /* 手机号码*/
 export function isvalidUsername(str) {
-  const reg = /^1(3|4|5|7|8)\d{9}$/
+  const reg = /^1(3|4|5|7|8|9)\d{9}$/
   return reg.test(str)
 }
 

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -13,8 +13,8 @@
       <el-select v-model="listQuery.bannerPosition" placeholder="banner位置" clearable class="filter-item" style="width: 200px">
         <el-option v-for="item in bannerPositionArr" :key="item.id" :value="item.id" :label="item.value"/>
       </el-select>
-      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="handleFilter">清空</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="handleFilter">清空</el-button>
     </div>
 
     <el-row style="margin-top: 20px; margin-bottom: 20px;">

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

@@ -12,9 +12,9 @@
       <el-select v-model="listQuery.districtId" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
         <el-option v-for="item in districtList" :key="item.id" :label="item.district" :value="item.id"/>
       </el-select>
-      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-circle-plus" @click="handleCreate">添加</el-button>
+      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
     </div>
 
     <el-table
@@ -105,13 +105,13 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="margin-left:50px;">
-        <el-form-item label="社区名称">
+        <el-form-item label="社区名称*">
           <el-input v-model="detail.communityName"/>
         </el-form-item>
         <el-form-item label="社区别名">
           <el-input v-model="detail.communityAlias"/>
         </el-form-item>
-        <el-form-item label="所在区县">
+        <el-form-item label="所在区县*">
           <el-select v-model="detail.provinceId" placeholder="省" clearable style="width: 90px" class="filter-item" @change="getEditCityList">
             <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id"/>
           </el-select>
@@ -122,7 +122,7 @@
             <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="高德坐标">
+        <el-form-item label="高德坐标*">
           <el-input
             v-model="detail.longitude"
             placeholder="经度"/>
@@ -136,12 +136,12 @@
             <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
           </el-amap>
         </div>
-        <el-form-item label="管理员姓名">
+        <el-form-item label="管理员姓名*">
           <el-input
             v-model="detail.userName"
             placeholder="建议先填写运营人员姓名"/>
         </el-form-item>
-        <el-form-item label="管理员账号">
+        <el-form-item label="管理员账号*">
           <el-input
             v-model="detail.loginName"
             placeholder="建议先填写运营人员手机号"/>
@@ -153,7 +153,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="查看" :visible.sync="dialogLookFormVisible">
+    <el-dialog :title="'查看'" :visible.sync="dialogLookFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="margin-left:50px;">
         <el-form-item label="社区名称">
           <span>{{ detail.communityName }}</span>
@@ -360,6 +360,7 @@ export default {
       })
     },
     getDistrictList() {
+      this.listQuery.districtId = undefined
       this.FetchDistrictList(this.listQuery.cityId).then(() => {
       }).catch(() => {
         console.log('get list error')

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -13,7 +13,7 @@
           src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D"
         >
       </div>
-      <h3 class="title">智慧社区运营系统</h3>
+      <h3 class="title">智慧社区运营平台</h3>
       <el-form-item prop="username">
         <span class="svg-container">
           <svg-icon icon-class="user"/>