合并

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

@@ -62,29 +62,19 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		if (size < 1){
 			return 0;
 		}
-		//查询这个用户是否包含多个小区
-		TpUser tpUserAlread = tpUserMapper.selectByLoginName(toCommunities.getLoginName());
-		if (null == tpUserAlread){
-			//构建用户信息
-			TpUser tpUser = new TpUser();
-			tpUser.setUserName(toCommunities.getUserName());
-			tpUser.setLoginName(toCommunities.getLoginName());
-			tpUser.setCreateDate(new Date());
-			tpUser.setCreateUser(1);
-			tpUser.setStatus(Constant.EFFECTIVE);
-			//插入用户信息
-			tpUserMapper.insertSelective(tpUser);
-			//维护此用户的角色
-			addUserAndRole(tpUser.getId(), 1);
-			//维护住户端用户与社区关系表
-			addUserAndCommunity(tpUser.getId(), toCommunities.getId());
-		}else {
-			//维护此用户的角色
-			addUserAndRole(tpUserAlread.getId(), 1);
-			//维护住户端用户与社区关系表
-			addUserAndCommunity(tpUserAlread.getId(), toCommunities.getId());
-		}
-		
+	 
+		//构建用户信息
+		TpUser tpUser = new TpUser();
+		tpUser.setUserName(toCommunities.getUserName());
+		tpUser.setLoginName(toCommunities.getLoginName());
+		tpUser.setCreateDate(new Date());
+		tpUser.setCreateUser(1);
+		tpUser.setCommunityId(toCommunities.getId());
+		tpUser.setStatus(Constant.EFFECTIVE);
+		//插入用户信息
+		tpUserMapper.insertSelective(tpUser);
+		//维护此用户的角色
+		addUserAndRole(tpUser.getId(), 1);
 		return size;
 	}
 
@@ -135,11 +125,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		ToCommunities oldCommunities = toCommunitiesMapper.selectByPrimaryKey(toCommunities.getId());
 		//未修改前的电话号码
 		String oldTel = oldCommunities.getLoginName();
-		//判断电话号码是否重复
-		TpUser tpUser = tpUserMapper.selectByTel(toCommunities.getId(),toCommunities.getLoginName());
-		if (null != tpUser && !tpUser.getLoginName().equals(oldTel)){
-			return Constant.ADMIN_IS_EXIST;
-		}
+		//修改手机号码
 		tpUserMapper.updateByTel(toCommunities.getId(),toCommunities.getLoginName(),toCommunities.getUserName(),oldTel);
 		toCommunitiesMapper.updateByPrimaryKeySelective(toCommunities);
 		return Constant.SUCCESS;

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

@@ -203,6 +203,7 @@
       </if>
     </set>
     where login_name = #{oldTel,jdbcType=VARCHAR}
+    and community_id = #{id}
     and status = 1
   </update>
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java

@@ -19,11 +19,11 @@ import java.util.List;
 public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
 
     /**
-     * 根据 用户Id 查询出
-     * @param userId
+     * 根据 电话号码 查询出
+     * @param phone
      * @return
      */
-    @Select("SELECT tc.* FROM tp_user_community tuc LEFT JOIN to_communities tc on tuc.community_id = tc.id WHERE tuc.tp_user_id=#{userId}")
-    List<ToCommunities> selectUserById(Integer userId);
+    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.community_id = tc.id WHERE tu.login_name = #{phone}")
+    List<ToCommunities> selectUserById(String phone);
 
 }

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

@@ -67,27 +67,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询用户
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_name", phone);
+        queryWrapper.eq("community_id", communityId);
         User user = userMapper.selectOne(queryWrapper) ;
         if (null == user) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
 
-        // 查询这个用户是否有这个小区的管理
-        QueryWrapper<TpUserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
-        userCommunityQueryWrapper.eq("tp_user_id", user.getId());
-        userCommunityQueryWrapper.eq("community_id", communityId);
-        TpUserCommunity tpUserCommunity = tpUserCommunityMapper.selectOne(userCommunityQueryWrapper);
-        if (null == tpUserCommunity) {
-            responseBean.addError("当前手机号未绑定该社区");
-            return responseBean;
-        }
-
         UserVO userVO = new UserVO();
-
-        // 设置为当前小区Id
-        user.setCommunityId(tpUserCommunity.getCommunityId());
-
         // 查询该用户的权限
         // 获取用户权限
         getUserRole(user,userVO);
@@ -104,18 +91,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         checkPhoneAndCode(phone, code);
 
         // 获取这个用户所管理的小区
-        // 查询用户
-        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("login_name", phone);
-        User user = userMapper.selectOne(queryWrapper);
-        if (null == user) {
+        List<ToCommunities> toCommunities = toCommunitiesMapper.selectUserById(phone);
+        if (toCommunities.size() < 1) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
-
-        List<ToCommunities> toCommunities = toCommunitiesMapper.selectUserById(user.getId());
+        
         responseBean.addSuccess(toCommunities);
-
         return responseBean;
     }
 

CODE/smart-community/zuul/pom.xml

@@ -158,6 +158,25 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<!--服务化打包工具-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

CODE/smart-community/zuul/src/main/assembly/assembly.xml

@@ -0,0 +1,30 @@
+<assembly>
+    <id>assembly</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>META-INF/**</include>
+                <include>*.yml</include>
+                <include>conf/**</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>

CODE/smart-community/zuul/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='zuul'
+# jar名称
+JAR_NAME='zuul-0.0.1.jar'
+cd `dirname $0`
+BIN_DIR=`pwd`
+cd ..
+DEPLOY_DIR=`pwd`
+CONF_DIR=$DEPLOY_DIR/conf
+# 获取应用的端口号
+SERVER_PORT=`sed -nr '/port: [0-9]+/ s/.*port: +([0-9]+).*/\1/p' conf/bootstrap.yml`
+
+PIDS=`ps -f | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+if [ "$1" = "status" ]; then
+    if [ -n "$PIDS" ]; then
+        echo "The $SERVER_NAME is running...!"
+        echo "PID: $PIDS"
+        exit 0
+    else
+        echo "The $SERVER_NAME is stopped"
+        exit 0
+    fi
+fi
+
+if [ -n "$PIDS" ]; then
+    echo "ERROR: The $SERVER_NAME already started!"
+    echo "PID: $PIDS"
+    exit 1
+fi
+
+if [ -n "$SERVER_PORT" ]; then
+    SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l`
+    if [ $SERVER_PORT_COUNT -gt 0 ]; then
+        echo "ERROR: The $SERVER_NAME port $SERVER_PORT already used!"
+        exit 1
+    fi
+fi
+
+LOGS_DIR=$DEPLOY_DIR/logs
+if [ ! -d $LOGS_DIR ]; then
+    mkdir $LOGS_DIR
+fi
+STDOUT_FILE=$LOGS_DIR/stdout.log
+
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_DEBUG_OPTS=""
+if [ "$1" = "debug" ]; then
+    JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "
+fi
+
+JAVA_JMX_OPTS=""
+if [ "$1" = "jmx" ]; then
+    JAVA_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false "
+fi
+
+JAVA_MEM_OPTS=""
+BITS=`java -version 2>&1 | grep -i 64-bit`
+if [ -n "$BITS" ]; then
+    JAVA_MEM_OPTS=" -server -Xmx512m -Xms512m -Xmn256m -XX:PermSize=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
+else
+    JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:PermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
+fi
+
+CONFIG_FILES=" -Dspring.config.location=$CONF_DIR/ "
+echo -e "Starting the $SERVER_NAME ..."
+nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/lib/$JAR_NAME > $STDOUT_FILE 2>&1 &
+
+COUNT=0
+while [ $COUNT -lt 1 ]; do
+    echo -e ".\c"
+    sleep 1
+    if [ -n "$SERVER_PORT" ]; then
+        COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
+    else
+        COUNT=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l`
+    fi
+    if [ $COUNT -gt 0 ]; then
+        break
+    fi
+done
+
+echo "OK!"
+PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
+echo "PID: $PIDS"
+echo "STDOUT: $STDOUT_FILE"

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1547546690">下载模板</a></el-button>
+          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771">下载模板</a></el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>