暂存所有

CODE/smart-community/app-api/pom.xml

@@ -218,6 +218,25 @@
 					</compilerArguments>
 				</configuration>
 			</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/app-api/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/app-api/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='app-api'
+# jar名称
+JAR_NAME='app-api-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"

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -441,7 +441,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c,6d4b9c4ad10b47bdbdccd8710c4d1d71,765532274ae84f9bb495d801444a7f1e");
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c");
         parMap.put("personIds",personIds);
         parMap.put("type",1);
         String params =  JSON.toJSONString(parMap);
@@ -612,4 +612,38 @@ public class HKOpenApi {
     public static void main(String[] args) {
     }
 
+
+    /**
+     * 修改电话推送海康
+     * @param personId 人员ID
+     * @param personNo 人员编号
+     * @param personName 姓名
+     * @param phoneNo 电话
+     * @return
+     */
+    public static String HKpersonPhone(Integer personId,Integer personNo,String personName,String phoneNo) {
+
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid", HKConstant.OP_USER_UUID);
+        map.put("personId", personId);
+        map.put("personNo", personNo);
+        map.put("personName", personName);
+        map.put("phoneNo", phoneNo);
+        String params = JSON.toJSONString(map);
+        log.info("修改电话 请求参数：{}",params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("修改电话请求结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("修改电话 请求失败：{}",e);
+            throw new RuntimeException("修改电话失败!");
+        }
+        return data;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
@@ -355,11 +356,11 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
+            @ApiImplicitParam(name = "parameter", value = "score 评分, comment 评语 ", required = true, dataType = "String"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
-    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId") String ticketId, HttpSession session) {
+    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody String parameter, @RequestParam("ticketId") String ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
@@ -369,6 +370,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }

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

@@ -62,7 +62,7 @@ public class UserController extends BaseController {
     }
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)

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

@@ -38,7 +38,7 @@ public class VistorController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
-                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人电话,visitorEndTime:访问人结束时间")})
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间")})
     public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -0,0 +1,66 @@
+package com.community.huiju.exception;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
+        return response;
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseBean handleException(RuntimeException e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(WisdomException.class)
+    public ResponseBean handleException(WisdomException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/exception/WisdomException.java

@@ -0,0 +1,17 @@
+package com.community.huiju.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class WisdomException extends RuntimeException {
+
+
+    public WisdomException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public WisdomException(String msg) {
+        super(msg);
+    }
+}

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

@@ -63,6 +63,8 @@ public class TpMessage {
      * 消息详情url链接
      */
     private String messageDetailUrl;
+    
+    private String messageIconTitle;
 
     public Integer getId() {
         return id;
@@ -247,4 +249,12 @@ public class TpMessage {
     public void setMessageDetailUrl(String messageDetailUrl) {
         this.messageDetailUrl = messageDetailUrl;
     }
+    
+    public String getMessageIconTitle() {
+        return messageIconTitle;
+    }
+    
+    public void setMessageIconTitle(String messageIconTitle) {
+        this.messageIconTitle = messageIconTitle;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -46,6 +47,11 @@ public class MessageServiceImpl implements MessageServiceI {
 		Page page = PageHelper.startPage(pageNum, pageSize);
 		// 获取数据
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
+		messageList.stream().forEach(tpMessage -> {
+			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
+				tpMessage.setMessageDetailUrl(tpMessage.getMessageDetailUrl() + "&id=" + tpMessage.getTicketId());
+			}
+		});
 		Map<String,Object> map = new HashMap<>();
 		map.put("list",messageList);
 		map.put("total",page.getTotal());

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -230,8 +230,21 @@ public class TaUserServiceImpl implements ITaUserService {
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String phone = (String) jsonObject.get("phone");
         String code = (String) jsonObject.get("code");
+        String otherUserId = (String) jsonObject.get("otherUserId");
 
-        TaUser user=taUserMapper.selectByPrimaryKey(id);
+        // 默认为当前用户
+        Integer userId = id;
+
+        if (StringUtils.isNotBlank(otherUserId)) {
+            /**校验otherUserId是否为当前登入用户的家属和业主**/
+            response=getTaFaceParentId( id, Integer.valueOf(otherUserId));
+            if ("1".equals(response.getCode())) {
+                return response;
+            }
+            userId = Integer.valueOf(otherUserId.trim());
+        }
+
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
         //系统验证码
         String  codes= (String) AppkeyCache.getCache(phone);
         //用户电话
@@ -243,24 +256,41 @@ public class TaUserServiceImpl implements ITaUserService {
         //当前小区下的电话校验
         TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
         if (null!=loginName)  {
-            response.addError("号码重复");
+            response.addError("号码已占用");
             return response;
         }
-        if(null!=codes && codes.equals(code)){
+        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getId(),user.getUserName(),phone);
+       try {
+             if (null == data) {
+            throw new RuntimeException("海康人脸推送失敗！");
+        }
+       }catch (Exception e){
+           e.printStackTrace();
+           log.error("海康修改电话失敗！ {}",e);
+           throw new RuntimeException("海康修改电话失敗！");
+       }
+        if(null!=codes && codes.equals(code)){;
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
-            taUser.setId(user.getId());
+            taUser.setId(userId);
             taUserMapper.updateLongName(taUser);
-             response.addSuccess("修改成功");
+            response.addSuccess("修改成功");
             AppkeyCache.setCache(user.getLoginName(),"null");
             return response;
         }else {
             response.addError("验证码错误或电话号码错误");
             return response;
         }
+    }
 
-
-
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
+        ResponseBean  responseBean= new ResponseBean();
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
+        if (null == users || !userId.equals(users.getParentId())){
+            responseBean.addError("您输入的家属或租户ID有误");
+            return responseBean;
+        }
+        return responseBean;
     }
 
     @Override

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -111,6 +111,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
             Map<String,Object> map = Maps.newHashMap();
             map.put("message","创建访问登记成功!");
             map.put("visitorCode",resultJSON.getJSONObject("data").getString("QRCode"));
+            map.put("visitorStartTime",visitor.getVisitorStartTime());
+            map.put("visitorEndTime",visitor.getVisitorEndTime());
 
             // 把访问码存入
             visitor.setVisitorCode(visitorCode);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -140,8 +140,10 @@ public class TicketServiceImpl implements ITicketService {
                     "房屋质量":"2".equals(repairType)?
                     "户内设施":null;
             tpTicketVO.setRepairName(repairName);
-            tpTicketVO.setStatus(recordList.get(0).getStatus());
-            tpTicketVO.setTicketStatusName(recordList.get(0).getTicketStatusName());
+            tpTicketVO.setStatus(recordList.get(recordList.size()-1).getStatus());
+            tpTicketVO.setTicketStatusName(recordList.get(recordList.size()-1).getTicketStatusName());
+            tpTicketVO.setTicketRecordDate(recordList.get(recordList.size()-1).getCreateDate());
+            tpTicketVO.setTicketStatusContent(recordList.get(recordList.size()-1).getContent());
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -58,6 +58,12 @@ public class TpTicketVO {
     /** 流程状态名称 **/
     private String ticketStatusName;
 
+    /** 流程状态内容 **/
+    private String ticketStatusContent;
+
+    /** 流程状态时间 **/
+    private Date ticketRecordDate;
+
     /** 最新进展 **/
     private String commentContent;
 

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -25,6 +25,7 @@
     <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
     <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
     <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
+    <result column="message_icon_title" property="messageIconTitle" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -288,7 +289,8 @@
         d.name as ticket_status,
         i.read_message_icon,
 		i.unread_message_icon,
-		i.message_detail_url
+		i.message_detail_url,
+		i.message_icon_title
     FROM
         tp_message t
     LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml

@@ -122,6 +122,7 @@
         t.status,
         t.ticket_id AS ticketId,
         t.community_id AS communityId,
+        t.content AS content,
         d.NAME AS ticketStatusName
     FROM
         tp_ticket_record t
@@ -130,6 +131,6 @@
     WHERE
         community_id = #{communityId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
-    order by t.create_date
+    order by t.status
   </select>
 </mapper>

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/pom.xml

@@ -268,8 +268,26 @@
 					</compilerArguments>
 				</configuration>
 			</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>
 
-
 </project>

CODE/smart-community/mq-message/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/mq-message/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='mq-meaasge'
+# jar名称
+JAR_NAME='mq-message-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"

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

@@ -4,6 +4,7 @@ import com.community.huiju.common.hk.code.EventDis;
 import com.community.huiju.service.MqMessageServiceI;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -23,8 +24,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";
+	@Value("${broker.url}")
+	private String BROKER_URL;
 	
 	public static final String TARGET = "openapi.acs.topic";
 	

CODE/smart-community/mq-message/src/main/resources/bootstrap.yml

@@ -20,5 +20,4 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:8080/eureka/
-
+      defaultZone: http://localhost:8080/eureka/

CODE/smart-community/operate-api/pom.xml

@@ -162,6 +162,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/operate-api/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/operate-api/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='operate-api'
+# jar名称
+JAR_NAME='operate-api-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"

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

@@ -46,14 +46,13 @@ public class CodeController {
         }
 
         int code = (int) ((Math.random()*9+1)*1000);
-        //boolean result = iCode.sendCode(phone,String.valueOf(code));
-        boolean result = true;
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        //boolean result = true;
         if (result) {
             log.info("{} 验证码: {}",phone,code);
             // 设置缓存
             AppkeyCache.setCache(phone,String.valueOf(code));
-            //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
-            response.addSuccess("发送成功!"+code);
+            response.addSuccess("发送成功!");
         } else {
             response.addError("发送失败!");
         }

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/ToBanner.java

@@ -9,8 +9,8 @@ public class ToBanner {
     @NotBlank(message = "标题不能为空!")
     private String title;
 
-    @Min(value = 0,message = "请选择有效的小区!")
-    @NotNull(message = "小区不能空!")
+    @Min(value = 0,message = "请选择有效的投放社区!")
+    @NotNull(message = "投放社区不能为空！")
     private Integer communityId;
 
     // @NotBlank(message = "跳转描述不能为空!")

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);
 	}
 	

CODE/smart-community/property-api/pom.xml

@@ -106,6 +106,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/property-api/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/property-api/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='property-api'
+# jar名称
+JAR_NAME='property-api-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"

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -30,8 +30,8 @@ eureka:
 
 zuul:
   host:
-    connect-timeout-millis: 60000
-    socket-timeout-millis: 60000
+    connect-timeout-millis: 180000
+    socket-timeout-millis: 180000
 
 hystrix:
   command:
@@ -39,7 +39,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 60000
+            timeoutInMilliseconds: 180000
 
 
 ## Mybatis

VUECODE/smart-operate-manage/build/webpack.dev.conf.js

@@ -56,7 +56,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       filename: 'index.html',
       template: 'index.html',
       inject: true,
-      favicon: resolve('favicon.ico'),
+      favicon: resolve('zhihui.jpg'),
       title: '智慧社区运营平台'
     })
   ]

VUECODE/smart-operate-manage/build/webpack.prod.conf.js

@@ -54,7 +54,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       filename: config.build.index,
       template: 'index.html',
       inject: true,
-      favicon: resolve('favicon.ico'),
+      favicon: resolve('zhihui.jpg'),
       title: '智慧社区运营平台',
       minify: {
         removeComments: true,

VUECODE/smart-operate-manage/src/router/index.js

@@ -24,7 +24,6 @@ import Layout from '../views/layout/Layout'
 export const constantRouterMap = [
   { path: '/login', component: () => import('@/views/login/index'), hidden: true },
   { path: '/404', component: () => import('@/views/404'), hidden: true },
-
   {
     path: '/dashboard',
     component: Layout,
@@ -41,8 +40,6 @@ export const constantRouterMap = [
     path: '/',
     component: Layout,
     redirect: '/index',
-    alwaysShow: true,
-    meta: { title: '首页', icon: 'zip' },
     children: [
       {
         path: '',

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/addBanner/index.vue

@@ -1,28 +1,28 @@
 <template>
   <div class="app-container">
     <el-form ref="addForm" :model="addForm">
-      <el-form-item :label-width="formLabelWidth" label="标题">
+      <el-form-item :label-width="formLabelWidth" label="标题 *">
         <el-input v-model="addForm.title"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="权重">
+      <el-form-item :label-width="formLabelWidth" label="权重 *">
         <el-input v-model="addForm.sort"/>
       </el-form-item>
-       <el-form-item :label-width="formLabelWidth" label="生效时间">
+       <el-form-item :label-width="formLabelWidth" label="生效时间 *">
         <el-date-picker
           v-model="addForm.effTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="失效时间">
+      <el-form-item :label-width="formLabelWidth" label="失效时间 *">
         <el-date-picker
           v-model="addForm.expTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner图">
+      <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           class="avatar-uploader"
-          action="http://localhost:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8085/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">
@@ -30,7 +30,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner位">
+      <el-form-item :label-width="formLabelWidth" label="banner位 *">
         <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
           <!-- <el-option label="请选择位置" value="-1"/> -->
           <el-option
@@ -42,7 +42,7 @@
           <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
         </el-select>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="投放社区">
+      <el-form-item :label-width="formLabelWidth" label="投放社区 *">
         <el-select v-model="addForm.communityId" placeholder="请选择社区">
           <!-- <el-option label="请选择社区" value="-1"/> -->
           <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
@@ -56,18 +56,18 @@
           type="textarea"
           placeholder="请输入跳转描述"/>
       </el-form-item> -->
-      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+      <el-form-item :label-width="formLabelWidth" label="banner跳转 *">
         <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
         <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
       </el-form-item>
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接 *">
         <el-input v-model="addForm.externalLink" placeholder="跳转链接"/>
       </el-form-item>
       <div v-if="showContentVisible">
-        <el-form-item :label-width="formLabelWidth" label="内容标题">
+        <el-form-item :label-width="formLabelWidth" label="内容标题 *">
           <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
         </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="内容详情">
+        <el-form-item :label-width="formLabelWidth" label="内容详情 *">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor v-on:wangeditorEvent="wangeditorValue"></wangeditor>

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

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图">
         <el-upload
           class="avatar-uploader"
-          action="http://localhost:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8085/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">
@@ -129,6 +129,7 @@ export default {
       calendarTypeOptions,
       listQuery: [],
       form: {
+        id: '',
         title: '',
         sort: '1',
         bannerCover: '',
@@ -174,7 +175,7 @@ export default {
     ]),
     handleAvatarSuccess(res, file) { // 上传成功回调
       this.imageUrl = URL.createObjectURL(file.raw)
-      this.addForm.bannerCover = res.data[0]
+      this.form.bannerCover = res.data[0]
     },
     dialogAddForm() {
       this.dialogFormVisible = true

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

@@ -5,16 +5,16 @@
       <el-input v-model="listQuery.title" placeholder="请输入标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
       <!-- <label>跳转概述</label>
       <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/> -->
-      <label>选择小区</label>
-      <el-select v-model="listQuery.communityId" placeholder="选择小区" clearable style="width: 200px" class="filter-item">
+      <label>适用社区</label>
+      <el-select v-model="listQuery.communityId" placeholder="适用社区" clearable style="width: 200px" class="filter-item">
         <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
       </el-select>
-      <label>位置</label>
+      <label>banner位置</label>
       <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;">
@@ -34,15 +34,10 @@
       @selection-change="handleSelectionChange">
       <el-table-column label="选择" type="selection" sortable="custom" align="center" >
       </el-table-column>
-      <el-table-column label="编号" align="center" min-width="30px">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
-          <span class="link-type" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
+          <span class="link-type title-span" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
         </template>
       </el-table-column>
       <el-table-column label="适用社区" align="center">
@@ -91,7 +86,7 @@
     <el-pagination
       :total="total"
       :current-page="listQuery.pageNum"
-      :page-sizes="[5, 10, 20, 30]"
+      :page-sizes="[10, 20, 30]"
       :page-size="listQuery.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       @size-change="handleSizeChange"
@@ -140,12 +135,16 @@ export default {
       listLoading: true,
       listQuery: {
         pageNum: 1,
-        pageSize: 5,
+        pageSize: 10,
         title: undefined,
         bannerPosition: undefined,
         bannerDescription: undefined,
         communityId: undefined
       },
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 200,
+      },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
       addForm: {
@@ -267,7 +266,7 @@ export default {
     },
     getCommuniryList() {
       this.listLoading = true
-      this.FetchCommunityList().then(() => {
+      this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
         this.loading = false
@@ -303,3 +302,20 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.title-span {
+  background-color: rgba(64,158,255,.1);
+  padding: 0 10px;
+  height: 32px;
+  line-height: 30px;
+  font-size: 12px;
+  color: #409EFF;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid rgba(64,158,255,.2);
+  white-space: nowrap;
+}
+</style>
+

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

@@ -50,6 +50,7 @@
       </div>
     </el-form>
     <div slot="footer" class="dialog-footer">
+      <el-button @click="updateBanner" type="primary">修 改</el-button>
       <el-button @click="dialogForm('0')">返 回</el-button>
     </div>
   </div>
@@ -100,6 +101,7 @@ export default {
       calendarTypeOptions,
       listQuery: [],
       form: {
+        id: '',
         title: '',
         sort: '1',
         bannerCover: '',
@@ -184,6 +186,9 @@ export default {
         this.showURLVisible = false
       }
     },
+    updateBanner() {
+      this.$router.push({ name: 'banner-edi', params: { id: this.form.id, listQuery: this.listQuery }})
+    },
     updateData() {
       this.$refs['form'].validate((valid) => {
         if (valid) {

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,32 +153,20 @@
       </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="社区名称">
-          <el-input v-model="detail.communityName"/>
+          <span>{{ detail.communityName }}</span>
         </el-form-item>
         <el-form-item label="社区别名">
-          <el-input v-model="detail.communityAlias"/>
+          <span>{{ detail.communityAlias }}</span>
         </el-form-item>
         <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>
-          <el-select v-model="detail.cityId" placeholder="市" clearable class="filter-item" style="width: 130px" @change="getEditDistrictList">
-            <el-option v-for="item in editCityList" :key="item.id" :label="item.city" :value="item.id"/>
-          </el-select>
-          <el-select v-model="detail.districtId" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
-            <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id"/>
-          </el-select>
+          <span>{{ getProvinceName(detail.provinceId) + getCityName(detail.cityId) + getDistrictName(detail.districtId) }}</span>
         </el-form-item>
         <el-form-item label="高德坐标">
-          <el-input
-            v-model="detail.longitude"
-            placeholder="经度"/>
-          <el-input
-            v-model="detail.latitude"
-            placeholder="纬度"/>
+          <span>{{ '经度: ' + detail.longitude }}</span>
+          <span>{{ '纬度: ' + detail.latitude }}</span>
         </el-form-item>
         <!-- <el-amap-search-box class="search-box" :search-option="searchOption" :on-search-result="onSearchResult"></el-amap-search-box> -->
         <div style="width:100%;height:200px;">
@@ -187,14 +175,10 @@
           </el-amap>
         </div>
         <el-form-item label="管理员姓名">
-          <el-input
-            v-model="detail.userName"
-            placeholder="建议先填写运营人员姓名"/>
+          <span>{{ detail.userName }}</span>
         </el-form-item>
         <el-form-item label="管理员账号">
-          <el-input
-            v-model="detail.loginName"
-            placeholder="建议先填写运营人员手机号"/>
+          <span>{{ detail.loginName }}</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -376,6 +360,7 @@ export default {
       })
     },
     getDistrictList() {
+      this.listQuery.districtId = undefined
       this.FetchDistrictList(this.listQuery.cityId).then(() => {
       }).catch(() => {
         console.log('get list error')
@@ -550,7 +535,31 @@ export default {
           return v[j]
         }
       }))
-    }
+    },
+    getProvinceName(provinceId) {
+      const tempProvince = this.provinceList
+      for (const i in tempProvince) {
+        if (tempProvince[i].id === provinceId) {
+          return tempProvince[i].province
+        }
+      }
+    },
+    getCityName(cityId) {
+      const tempCity = this.editCityList
+      for (const i in tempCity) {
+        if (tempCity[i].id === cityId) {
+          return tempCity[i].city
+        }
+      }
+    },
+    getDistrictName(districtId) {
+      const tempDistrict = this.editDistrictList
+      for (const i in tempDistrict) {
+        if (tempDistrict[i].id === districtId) {
+          return tempDistrict[i].district
+        }
+      }
+    },
   }
 }
 </script>

VUECODE/smart-operate-manage/src/views/layout/components/Navbar.vue

@@ -8,8 +8,8 @@
     <breadcrumb/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <span style="position: relative;top: -15px;right:5px">{{ userData.userName }}</span>
-        <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != ''">
+        <span style="position: relative;top: -15px;right:5px;">{{ userData.userName }}</span>
+        <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != '' && userData.headPortrait != undefined">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">

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

@@ -1,5 +1,6 @@
 <template>
   <div class="login-container">
+    <div class="login-box">
     <el-form
       ref="loginForm"
       :model="loginForm"
@@ -13,7 +14,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"/>
@@ -46,6 +47,8 @@
         @click.native.prevent="handleLogin"
       >登录</el-button>
     </el-form>
+    </div>
+    <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
   </div>
 </template>
 
@@ -97,8 +100,10 @@ export default {
           this.loading = true
           this.$store.dispatch('Login', this.loginForm).then((res) => {
             if (res.code === '0') {
+              console.log('登陆结果: ',res)
               this.loading = false
-              this.$router.push({ path: this.redirect || '/' })
+              // this.$router.push({ path: this.redirect || '/index' })
+              this.$router.push({ name: 'index' })
             } else {
               this.loading = false
             }
@@ -128,16 +133,35 @@ $light_gray: #eee;
 
 /* reset element-ui css */
 .login-container {
+
+  .bottom-desc{
+    position: absolute;
+    top: 95%;
+    left: 39.5%;
+    color: #fff
+  }
+  
+  .login-box{
+    position: absolute;
+    width: 400px;
+    height: 425px;
+    background-color: rgba(21,22,58,0.53);
+    top: 28%;
+    left: 40%;
+    border-radius: 10px;
+    box-shadow:  #666 0px 0px 10px inset;
+    }
+
   .el-input {
     display: inline-block;
-    height: 47px;
+    height: 40px;
     width: 85%;
     input {
       background: transparent;
       border: 0px;
       -webkit-appearance: none;
       border-radius: 0px;
-      padding: 12px 5px 12px 15px;
+      padding: 4px 5px 12px 15px;
       color: $light_gray;
       height: 47px;
       &:-webkit-autofill {
@@ -174,10 +198,10 @@ $light_gray: #eee;
     position: absolute;
     left: 0;
     right: 0;
-    width: 520px;
+    width: 382px;
     max-width: 100%;
     padding: 35px 35px 15px 35px;
-    margin: 120px auto;
+    margin: 20px auto;
     .pwdSend {
       float: left;
       .el-form-item {
@@ -202,7 +226,7 @@ $light_gray: #eee;
     }
   }
   .svg-container {
-    padding: 6px 5px 6px 15px;
+    padding: 0px 5px 0px 15px;
     color: $dark_gray;
     vertical-align: middle;
     width: 30px;

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1543392472" Name="smartCommunity" Objects="686" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1543480192" Name="smartCommunity" Objects="698" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542791427</a:ModificationDate>
+<a:ModificationDate>1543480192</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
+<a:Rect>((-22201,-63417), (-5413,-56519))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -12175,7 +12175,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_message_icon</a:Code>
 <a:CreationDate>1542706044</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1542768591</a:ModificationDate>
+<a:ModificationDate>1543480192</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>消息图标表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -12241,9 +12241,20 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
+<o:Column Id="o613">
+<a:ObjectID>F8DE996A-E9C4-44EA-8206-53522A2FCF05</a:ObjectID>
+<a:Name>message_icon_title</a:Name>
+<a:Code>message_icon_title</a:Code>
+<a:CreationDate>1543480070</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1543480192</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:DataType>varchar(255)</a:DataType>
+<a:Length>255</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o613">
+<o:Key Id="o614">
 <a:ObjectID>26A69CCB-020F-4EF0-9143-8764DED242E3</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -12257,7 +12268,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o613"/>
+<o:Key Ref="o614"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o162">
@@ -12271,7 +12282,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>消息订阅消息表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o614">
+<o:Column Id="o615">
 <a:ObjectID>4DD5CBA6-770E-473F-8934-5EDD96D121F6</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -12284,7 +12295,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o615">
+<o:Column Id="o616">
 <a:ObjectID>F0349ADD-66D0-430E-9B11-967D6DF4BC81</a:ObjectID>
 <a:Name>event_state</a:Name>
 <a:Code>event_state</a:Code>
@@ -12295,7 +12306,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o616">
+<o:Column Id="o617">
 <a:ObjectID>CBD7DBE3-3C04-499A-94AB-1C22E7AF0412</a:ObjectID>
 <a:Name>event_level</a:Name>
 <a:Code>event_level</a:Code>
@@ -12306,7 +12317,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o617">
+<o:Column Id="o618">
 <a:ObjectID>BAA092FC-2CAA-4436-A1A3-A8893186518D</a:ObjectID>
 <a:Name>unit_idx</a:Name>
 <a:Code>unit_idx</a:Code>
@@ -12317,7 +12328,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o618">
+<o:Column Id="o619">
 <a:ObjectID>742654AC-6855-4891-87C7-4F7335D8BA0C</a:ObjectID>
 <a:Name>event_type</a:Name>
 <a:Code>event_type</a:Code>
@@ -12328,7 +12339,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(25)</a:DataType>
 <a:Length>25</a:Length>
 </o:Column>
-<o:Column Id="o619">
+<o:Column Id="o620">
 <a:ObjectID>11434250-0829-481C-ADDB-8789D8B5C945</a:ObjectID>
 <a:Name>event_type_name</a:Name>
 <a:Code>event_type_name</a:Code>
@@ -12339,7 +12350,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o620">
+<o:Column Id="o621">
 <a:ObjectID>915EB2CD-278E-4ACA-A7B7-32B7D61E580A</a:ObjectID>
 <a:Name>sub_sys_type</a:Name>
 <a:Code>sub_sys_type</a:Code>
@@ -12350,7 +12361,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o621">
+<o:Column Id="o622">
 <a:ObjectID>524D78DB-D5B6-4E21-9A78-65FC94CA9B71</a:ObjectID>
 <a:Name>event_name</a:Name>
 <a:Code>event_name</a:Code>
@@ -12361,7 +12372,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o622">
+<o:Column Id="o623">
 <a:ObjectID>F9586B5B-ACA5-4E20-B579-B82194825179</a:ObjectID>
 <a:Name>start_time</a:Name>
 <a:Code>start_time</a:Code>
@@ -12371,7 +12382,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o623">
+<o:Column Id="o624">
 <a:ObjectID>BE71711E-DB09-4B43-B3FA-73BB502535F0</a:ObjectID>
 <a:Name>stop_time</a:Name>
 <a:Code>stop_time</a:Code>
@@ -12381,7 +12392,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o624">
+<o:Column Id="o625">
 <a:ObjectID>9729C389-4C89-4E46-8E41-4EA84669E2B2</a:ObjectID>
 <a:Name>source_idx</a:Name>
 <a:Code>source_idx</a:Code>
@@ -12392,7 +12403,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o625">
+<o:Column Id="o626">
 <a:ObjectID>5DA158D3-6F7D-4D03-8D78-C3D556CB6AC5</a:ObjectID>
 <a:Name>source_type</a:Name>
 <a:Code>source_type</a:Code>
@@ -12403,7 +12414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o626">
+<o:Column Id="o627">
 <a:ObjectID>3D617607-AAB2-4D24-8C28-578B3FBC4917</a:ObjectID>
 <a:Name>source_name</a:Name>
 <a:Code>source_name</a:Code>
@@ -12414,7 +12425,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o627">
+<o:Column Id="o628">
 <a:ObjectID>2FB9D075-CCF8-4343-A18C-D1B6D0B8BB01</a:ObjectID>
 <a:Name>region_idx</a:Name>
 <a:Code>region_idx</a:Code>
@@ -12425,7 +12436,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o628">
+<o:Column Id="o629">
 <a:ObjectID>4E2A38B4-023B-4E01-BA6A-4B84AF01B9FE</a:ObjectID>
 <a:Name>event_code</a:Name>
 <a:Code>event_code</a:Code>
@@ -12436,7 +12447,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o629">
+<o:Column Id="o630">
 <a:ObjectID>A7312C07-60F4-4674-83F6-090D266440BA</a:ObjectID>
 <a:Name>device_id</a:Name>
 <a:Code>device_id</a:Code>
@@ -12447,7 +12458,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o630">
+<o:Column Id="o631">
 <a:ObjectID>F5E5F8C9-7034-420B-8B3E-1A301730D33C</a:ObjectID>
 <a:Name>device_type</a:Name>
 <a:Code>device_type</a:Code>
@@ -12458,7 +12469,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o631">
+<o:Column Id="o632">
 <a:ObjectID>062C16C4-1155-4D16-913D-66F096B57D1A</a:ObjectID>
 <a:Name>device_name</a:Name>
 <a:Code>device_name</a:Code>
@@ -12469,7 +12480,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o632">
+<o:Column Id="o633">
 <a:ObjectID>BBD618AF-FDB0-417A-A778-3A0B8997050E</a:ObjectID>
 <a:Name>event_card</a:Name>
 <a:Code>event_card</a:Code>
@@ -12480,7 +12491,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o633">
+<o:Column Id="o634">
 <a:ObjectID>34808DF1-4711-4258-81A4-B6DB181DD52D</a:ObjectID>
 <a:Name>person_id</a:Name>
 <a:Code>person_id</a:Code>
@@ -12491,7 +12502,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o634">
+<o:Column Id="o635">
 <a:ObjectID>32CEE916-F12F-45AF-BC83-1D42B8B8BD20</a:ObjectID>
 <a:Name>person_name</a:Name>
 <a:Code>person_name</a:Code>
@@ -12502,7 +12513,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o635">
+<o:Column Id="o636">
 <a:ObjectID>27739F03-7477-4759-A70A-E1BF5D1ACF77</a:ObjectID>
 <a:Name>dept_id</a:Name>
 <a:Code>dept_id</a:Code>
@@ -12513,7 +12524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o636">
+<o:Column Id="o637">
 <a:ObjectID>5F000DC1-611B-492E-B9D8-589F39BFA951</a:ObjectID>
 <a:Name>dept_name</a:Name>
 <a:Code>dept_name</a:Code>
@@ -12524,7 +12535,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o637">
+<o:Column Id="o638">
 <a:ObjectID>D7E8BB80-0895-4A12-9F55-7E9FE12C83D2</a:ObjectID>
 <a:Name>dept_code</a:Name>
 <a:Code>dept_code</a:Code>
@@ -12535,7 +12546,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o638">
+<o:Column Id="o639">
 <a:ObjectID>02FC83B5-57D3-40CF-A434-0B2B6A66EE2F</a:ObjectID>
 <a:Name>in_out</a:Name>
 <a:Code>in_out</a:Code>
@@ -12546,7 +12557,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
-<o:Column Id="o639">
+<o:Column Id="o640">
 <a:ObjectID>EDF7E2FE-E5B8-4EB2-8622-37D735B11AC3</a:ObjectID>
 <a:Name>ext_txt</a:Name>
 <a:Code>ext_txt</a:Code>
@@ -12556,7 +12567,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>text</a:DataType>
 </o:Column>
-<o:Column Id="o640">
+<o:Column Id="o641">
 <a:ObjectID>2D0F6C5E-E444-4A9D-A180-9E6849EAA091</a:ObjectID>
 <a:Name>card_status</a:Name>
 <a:Code>card_status</a:Code>
@@ -12567,7 +12578,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
-<o:Column Id="o641">
+<o:Column Id="o642">
 <a:ObjectID>85DCD41F-8F80-4AFB-9629-3A14080EFB37</a:ObjectID>
 <a:Name>pic_url</a:Name>
 <a:Code>pic_url</a:Code>
@@ -12580,7 +12591,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o642">
+<o:Key Id="o643">
 <a:ObjectID>471D6AE4-41F1-4EBB-B439-16ED2470870B</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -12589,17 +12600,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1542952415</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o614"/>
+<o:Column Ref="o615"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o642"/>
+<o:Key Ref="o643"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o643">
+<o:Group Id="o644">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -13041,7 +13052,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o644">
+<o:TargetModel Id="o645">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1543392472" Name="smartCommunity" Objects="686" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1543480192" Name="smartCommunity" Objects="698" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542791427</a:ModificationDate>
+<a:ModificationDate>1543480192</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
+<a:Rect>((-22201,-63417), (-5413,-56519))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -12175,7 +12175,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_message_icon</a:Code>
 <a:CreationDate>1542706044</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1542768591</a:ModificationDate>
+<a:ModificationDate>1543480192</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>消息图标表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -12241,9 +12241,20 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
+<o:Column Id="o613">
+<a:ObjectID>F8DE996A-E9C4-44EA-8206-53522A2FCF05</a:ObjectID>
+<a:Name>message_icon_title</a:Name>
+<a:Code>message_icon_title</a:Code>
+<a:CreationDate>1543480070</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1543480192</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:DataType>varchar(255)</a:DataType>
+<a:Length>255</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o613">
+<o:Key Id="o614">
 <a:ObjectID>26A69CCB-020F-4EF0-9143-8764DED242E3</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -12257,7 +12268,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o613"/>
+<o:Key Ref="o614"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o162">
@@ -12271,7 +12282,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>消息订阅消息表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o614">
+<o:Column Id="o615">
 <a:ObjectID>4DD5CBA6-770E-473F-8934-5EDD96D121F6</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -12284,7 +12295,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o615">
+<o:Column Id="o616">
 <a:ObjectID>F0349ADD-66D0-430E-9B11-967D6DF4BC81</a:ObjectID>
 <a:Name>event_state</a:Name>
 <a:Code>event_state</a:Code>
@@ -12295,7 +12306,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o616">
+<o:Column Id="o617">
 <a:ObjectID>CBD7DBE3-3C04-499A-94AB-1C22E7AF0412</a:ObjectID>
 <a:Name>event_level</a:Name>
 <a:Code>event_level</a:Code>
@@ -12306,7 +12317,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o617">
+<o:Column Id="o618">
 <a:ObjectID>BAA092FC-2CAA-4436-A1A3-A8893186518D</a:ObjectID>
 <a:Name>unit_idx</a:Name>
 <a:Code>unit_idx</a:Code>
@@ -12317,7 +12328,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o618">
+<o:Column Id="o619">
 <a:ObjectID>742654AC-6855-4891-87C7-4F7335D8BA0C</a:ObjectID>
 <a:Name>event_type</a:Name>
 <a:Code>event_type</a:Code>
@@ -12328,7 +12339,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(25)</a:DataType>
 <a:Length>25</a:Length>
 </o:Column>
-<o:Column Id="o619">
+<o:Column Id="o620">
 <a:ObjectID>11434250-0829-481C-ADDB-8789D8B5C945</a:ObjectID>
 <a:Name>event_type_name</a:Name>
 <a:Code>event_type_name</a:Code>
@@ -12339,7 +12350,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o620">
+<o:Column Id="o621">
 <a:ObjectID>915EB2CD-278E-4ACA-A7B7-32B7D61E580A</a:ObjectID>
 <a:Name>sub_sys_type</a:Name>
 <a:Code>sub_sys_type</a:Code>
@@ -12350,7 +12361,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o621">
+<o:Column Id="o622">
 <a:ObjectID>524D78DB-D5B6-4E21-9A78-65FC94CA9B71</a:ObjectID>
 <a:Name>event_name</a:Name>
 <a:Code>event_name</a:Code>
@@ -12361,7 +12372,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o622">
+<o:Column Id="o623">
 <a:ObjectID>F9586B5B-ACA5-4E20-B579-B82194825179</a:ObjectID>
 <a:Name>start_time</a:Name>
 <a:Code>start_time</a:Code>
@@ -12371,7 +12382,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o623">
+<o:Column Id="o624">
 <a:ObjectID>BE71711E-DB09-4B43-B3FA-73BB502535F0</a:ObjectID>
 <a:Name>stop_time</a:Name>
 <a:Code>stop_time</a:Code>
@@ -12381,7 +12392,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o624">
+<o:Column Id="o625">
 <a:ObjectID>9729C389-4C89-4E46-8E41-4EA84669E2B2</a:ObjectID>
 <a:Name>source_idx</a:Name>
 <a:Code>source_idx</a:Code>
@@ -12392,7 +12403,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o625">
+<o:Column Id="o626">
 <a:ObjectID>5DA158D3-6F7D-4D03-8D78-C3D556CB6AC5</a:ObjectID>
 <a:Name>source_type</a:Name>
 <a:Code>source_type</a:Code>
@@ -12403,7 +12414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o626">
+<o:Column Id="o627">
 <a:ObjectID>3D617607-AAB2-4D24-8C28-578B3FBC4917</a:ObjectID>
 <a:Name>source_name</a:Name>
 <a:Code>source_name</a:Code>
@@ -12414,7 +12425,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o627">
+<o:Column Id="o628">
 <a:ObjectID>2FB9D075-CCF8-4343-A18C-D1B6D0B8BB01</a:ObjectID>
 <a:Name>region_idx</a:Name>
 <a:Code>region_idx</a:Code>
@@ -12425,7 +12436,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o628">
+<o:Column Id="o629">
 <a:ObjectID>4E2A38B4-023B-4E01-BA6A-4B84AF01B9FE</a:ObjectID>
 <a:Name>event_code</a:Name>
 <a:Code>event_code</a:Code>
@@ -12436,7 +12447,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o629">
+<o:Column Id="o630">
 <a:ObjectID>A7312C07-60F4-4674-83F6-090D266440BA</a:ObjectID>
 <a:Name>device_id</a:Name>
 <a:Code>device_id</a:Code>
@@ -12447,7 +12458,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o630">
+<o:Column Id="o631">
 <a:ObjectID>F5E5F8C9-7034-420B-8B3E-1A301730D33C</a:ObjectID>
 <a:Name>device_type</a:Name>
 <a:Code>device_type</a:Code>
@@ -12458,7 +12469,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o631">
+<o:Column Id="o632">
 <a:ObjectID>062C16C4-1155-4D16-913D-66F096B57D1A</a:ObjectID>
 <a:Name>device_name</a:Name>
 <a:Code>device_name</a:Code>
@@ -12469,7 +12480,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o632">
+<o:Column Id="o633">
 <a:ObjectID>BBD618AF-FDB0-417A-A778-3A0B8997050E</a:ObjectID>
 <a:Name>event_card</a:Name>
 <a:Code>event_card</a:Code>
@@ -12480,7 +12491,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o633">
+<o:Column Id="o634">
 <a:ObjectID>34808DF1-4711-4258-81A4-B6DB181DD52D</a:ObjectID>
 <a:Name>person_id</a:Name>
 <a:Code>person_id</a:Code>
@@ -12491,7 +12502,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o634">
+<o:Column Id="o635">
 <a:ObjectID>32CEE916-F12F-45AF-BC83-1D42B8B8BD20</a:ObjectID>
 <a:Name>person_name</a:Name>
 <a:Code>person_name</a:Code>
@@ -12502,7 +12513,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o635">
+<o:Column Id="o636">
 <a:ObjectID>27739F03-7477-4759-A70A-E1BF5D1ACF77</a:ObjectID>
 <a:Name>dept_id</a:Name>
 <a:Code>dept_id</a:Code>
@@ -12513,7 +12524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(90)</a:DataType>
 <a:Length>90</a:Length>
 </o:Column>
-<o:Column Id="o636">
+<o:Column Id="o637">
 <a:ObjectID>5F000DC1-611B-492E-B9D8-589F39BFA951</a:ObjectID>
 <a:Name>dept_name</a:Name>
 <a:Code>dept_name</a:Code>
@@ -12524,7 +12535,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o637">
+<o:Column Id="o638">
 <a:ObjectID>D7E8BB80-0895-4A12-9F55-7E9FE12C83D2</a:ObjectID>
 <a:Name>dept_code</a:Name>
 <a:Code>dept_code</a:Code>
@@ -12535,7 +12546,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o638">
+<o:Column Id="o639">
 <a:ObjectID>02FC83B5-57D3-40CF-A434-0B2B6A66EE2F</a:ObjectID>
 <a:Name>in_out</a:Name>
 <a:Code>in_out</a:Code>
@@ -12546,7 +12557,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
-<o:Column Id="o639">
+<o:Column Id="o640">
 <a:ObjectID>EDF7E2FE-E5B8-4EB2-8622-37D735B11AC3</a:ObjectID>
 <a:Name>ext_txt</a:Name>
 <a:Code>ext_txt</a:Code>
@@ -12556,7 +12567,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>szc</a:Modifier>
 <a:DataType>text</a:DataType>
 </o:Column>
-<o:Column Id="o640">
+<o:Column Id="o641">
 <a:ObjectID>2D0F6C5E-E444-4A9D-A180-9E6849EAA091</a:ObjectID>
 <a:Name>card_status</a:Name>
 <a:Code>card_status</a:Code>
@@ -12567,7 +12578,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
-<o:Column Id="o641">
+<o:Column Id="o642">
 <a:ObjectID>85DCD41F-8F80-4AFB-9629-3A14080EFB37</a:ObjectID>
 <a:Name>pic_url</a:Name>
 <a:Code>pic_url</a:Code>
@@ -12580,7 +12591,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o642">
+<o:Key Id="o643">
 <a:ObjectID>471D6AE4-41F1-4EBB-B439-16ED2470870B</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -12589,17 +12600,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1542952415</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o614"/>
+<o:Column Ref="o615"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o642"/>
+<o:Key Ref="o643"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o643">
+<o:Group Id="o644">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -13041,7 +13052,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o644">
+<o:TargetModel Id="o645">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>