合并

CODE/foreign-service/pom.xml

@@ -119,12 +119,31 @@
             <version>1.4</version>
         </dependency>
 
+        <!-- JWT -->
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.6.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.community</groupId>
+            <artifactId>community-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>2.0.4.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>

CODE/foreign-service/src/main/java/com/community/huiju/foreign/ForeignServiceApplication.java

@@ -1,7 +1,12 @@
 package com.community.huiju.foreign;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class ForeignServiceApplication {
@@ -10,4 +15,15 @@ public class ForeignServiceApplication {
         SpringApplication.run(ForeignServiceApplication.class, args);
     }
 
+    @Bean
+    public HttpMessageConverters fastJsonConfigure(){
+        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+        FastJsonConfig fastJsonConfig = new FastJsonConfig();
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue, SerializerFeature.BrowserCompatible);
+        //日期格式化
+        //fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        converter.setFastJsonConfig(fastJsonConfig);
+        return new HttpMessageConverters(converter);
+    }
+
 }

CODE/foreign-service/src/main/java/com/community/huiju/foreign/aop/LogAOP.java

@@ -0,0 +1,91 @@
+package com.community.huiju.foreign.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.fushi.error.FuShiException;
+import com.community.huiju.foreign.log.LogAnnotation;
+import com.community.huiju.foreign.log.LogEnums;
+import com.community.huiju.foreign.log.LogFactory;
+import com.community.huiju.foreign.log.LogFileManager;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+@Slf4j
+public class LogAOP {
+
+    @Pointcut("@annotation(com.community.huiju.log.LogAnnotation)")
+    public void pointLog() {
+
+    }
+
+    @Around("pointLog()")
+    public Object logAround(ProceedingJoinPoint point) throws Throwable {
+
+        // 获取切面的点的实例
+        Object target = point.getTarget();
+        // 获取反射对象
+        Class<?> zClass = target.getClass();
+        // 获取切面点
+        Signature signature = point.getSignature();
+
+        // 判断日志注解是否用在方法上
+        if (!(signature instanceof MethodSignature)) {
+            throw new RuntimeException("该注解只允许在方法上使用！");
+        }
+
+        // 方法名称
+        String methodName = signature.getName();
+        // 获取方法参数类型
+        Class<?>[] parameterTypes = ((MethodSignature) signature).getMethod().getParameterTypes();
+
+        // 通过方法名称和方法参数类型
+        // 获取当前正在执行切面的方法
+        Method method = zClass.getMethod(methodName, parameterTypes);
+
+        // 所有方法输入参数
+        Object[] args = point.getArgs();
+        // 执行方法的返回值
+        Object result = null;
+        if (null != method && method.isAnnotationPresent(LogAnnotation.class)) {
+
+            // 获取这个注解
+            LogAnnotation logAnnotation = method.getAnnotation(LogAnnotation.class);
+            // 大苏操作
+            if (logAnnotation.record() && logAnnotation.value() == LogEnums.DA_SU) {
+                String alias = "".equals(logAnnotation.alias()) ? "未设置别名" : logAnnotation.alias();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{}, 请求参数:{}", methodName, alias,args);
+                    // 方法返回值
+                    result = point.proceed();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{},请求参数:{}，返回结果:{}", methodName, alias,args, result);
+
+                    String strPararmeter = String.format( "AOP拦截----大苏操作----执行方法:%s，方法别名:%s,请求参数:%s", methodName, alias, JSONObject.toJSONString(args));
+                    String strReturn = String.format("AOP拦截----大苏操作----执行方法:%s，方法别名:%s, 请求参数:%s，返回结果:%s", methodName, alias , JSONObject.toJSONString(args), JSONObject.toJSONString(result));
+
+                    LogFileManager.getInstance().executeLog(LogFactory.parametersAndReturn(strPararmeter, strReturn));
+
+            }
+
+        }
+
+        return result;
+    }
+
+    @AfterThrowing(value = "pointLog()", throwing = "cause")
+    public void doException(JoinPoint joinPoint, Throwable cause) {
+        if (null != cause) {
+            throw new FuShiException(cause.getMessage());
+        }
+    }
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/base/BaseController.java

@@ -0,0 +1,4 @@
+package com.community.huiju.foreign.common.base;
+
+public class BaseController {
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/perproties/DaSuProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.foreign.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 提供给 大苏 的 appid 和 appsecret
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "da-su")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DaSuProperties {
+
+    private String appid;
+
+    private String appSecret;
+
+    private String communityId;
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/perproties/FuShiProperties.java

@@ -0,0 +1,44 @@
+package com.community.huiju.foreign.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = "fu-shi")
+public class FuShiProperties {
+
+    /**
+     * 富士云 请求地址
+     */
+    private String url;
+
+    /**
+     * 富士云 appid
+     */
+    private String appid;
+
+    /**
+     * 富士云 appSecret
+     */
+    private String appSecret;
+
+    /**
+     * 富士云 私钥 privateKey
+     */
+    private String privateKey;
+
+    /**
+     * 停车场编码
+     */
+    private String parkingCode;
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/config/FuShiConfig.java

@@ -0,0 +1,40 @@
+package com.community.huiju.foreign.config;
+
+import com.community.commom.fushi.FuShiHttpClient;
+import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.huiju.foreign.common.perproties.FuShiProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@Configuration
+public class FuShiConfig {
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+
+    /**
+     * 初始化富士HTTP客户端
+     * @return FuShiHttpClient
+     */
+    @Bean
+    public FuShiHttpClient fuShiHttpClient() {
+        return new FuShiHttpClient(fuShiProperties.getUrl(), fuShiProperties.getAppid(), fuShiProperties.getAppSecret(), fuShiProperties.getPrivateKey());
+    }
+
+    /**
+     * 初始化富士请求 API
+     * @param fuShiHttpClient
+     * @return
+     */
+    @Bean
+    public FuShiRequestAPI fuShiRequestAPI(FuShiHttpClient fuShiHttpClient) {
+        return new FuShiRequestAPI(fuShiHttpClient);
+    }
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/controller/FSController.java

@@ -0,0 +1,116 @@
+package com.community.huiju.foreign.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.foreign.common.base.BaseController;
+import com.community.huiju.foreign.service.IFuShiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/")
+@Api(value = "车辆操作API", description = "车辆操作API")
+public class FSController extends BaseController {
+
+    @Autowired
+    private IFuShiService iFuShiService;
+
+    @RequestMapping(value = "/car/getParkInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "月卡续费", notes = "月卡续费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+                    "RenewDay续费日期数目;" +
+                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "RechargeAmt充值续费金额;")
+    })
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
+                jsonObject.getString("RenewDayType"),
+                jsonObject.getString("RenewDay"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("RechargeAmt"));
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+                    "ActualAmount实缴金额（单位元）;" +
+                    "DeductionAmount抵扣金额（单位元）;" +
+                    "Reason抵扣原因;" +
+                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "CouponList使用的优惠券列表")
+    })
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
+                jsonObject.getString("ActualAmount"),
+                jsonObject.getString("DeductionAmount"),
+                jsonObject.getString("Reason"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("CouponList"));
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号")
+    })
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        return responseBean;
+    }
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/jwt/JwtUtil.java

@@ -0,0 +1,58 @@
+package com.community.huiju.foreign.jwt;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.jose4j.jwa.AlgorithmConstraints;
+import org.jose4j.jwe.ContentEncryptionAlgorithmIdentifiers;
+import org.jose4j.jwe.JsonWebEncryption;
+import org.jose4j.jwe.KeyManagementAlgorithmIdentifiers;
+import org.jose4j.keys.AesKey;
+import org.jose4j.lang.ByteUtil;
+import org.jose4j.lang.JoseException;
+
+import javax.crypto.SecretKey;
+import java.security.Key;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class JwtUtil {
+
+    public static String sigin() {
+        Key key = new AesKey(ByteUtil.randomBytes(16));
+        JsonWebEncryption jwe = new JsonWebEncryption();
+        jwe.setPayload("Hello World!");
+        jwe.setAlgorithmHeaderValue(KeyManagementAlgorithmIdentifiers.A128KW);
+        jwe.setEncryptionMethodHeaderParameter(ContentEncryptionAlgorithmIdentifiers.AES_128_CBC_HMAC_SHA_256);
+        jwe.setKey(key);
+        String sigin = null;
+        try {
+            sigin = jwe.getCompactSerialization();
+        } catch (JoseException e) {
+            e.printStackTrace();
+        }
+
+        log.info("创建签名: " + sigin);
+
+        jwe = new JsonWebEncryption();
+        jwe.setAlgorithmConstraints(new AlgorithmConstraints(AlgorithmConstraints.ConstraintType.WHITELIST,
+                KeyManagementAlgorithmIdentifiers.A128KW));
+        jwe.setContentEncryptionAlgorithmConstraints(new AlgorithmConstraints(AlgorithmConstraints.ConstraintType.WHITELIST,
+                ContentEncryptionAlgorithmIdentifiers.AES_128_CBC_HMAC_SHA_256));
+        jwe.setKey(key);
+        try {
+            jwe.setCompactSerialization(sigin);
+            log.info("解密：: " + jwe.getPayload());
+        } catch (JoseException e) {
+            e.printStackTrace();
+        }
+
+        return sigin;
+    }
+
+
+    public static void main(String[] args) {
+        sigin();
+    }
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogAnnotation.java

@@ -0,0 +1,32 @@
+package com.community.huiju.foreign.log;
+
+import java.lang.annotation.*;
+
+/**
+ * 日志注解
+ * @author weiximei
+ */
+@Retention(RetentionPolicy.RUNTIME) // 在运行时使用
+@Target({ ElementType.METHOD }) // 在方法上使用
+@Documented
+public @interface LogAnnotation {
+
+    /**
+     * 日志类型
+     * @return
+     */
+    LogEnums value() default LogEnums.NOT;
+
+    /**
+     * 是否记录
+     * @return
+     */
+    boolean record() default true;
+
+    /**
+     * 别名, 作为注释用
+     * @return
+     */
+    String alias() default "";
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogEnums.java

@@ -0,0 +1,43 @@
+package com.community.huiju.foreign.log;
+
+/**
+ * 日志类型
+ *
+ * @author weiximei
+ */
+public enum LogEnums {
+
+    NOT(8000, "无类型"),
+
+    DA_SU(8001, "大苏")
+
+    ;
+
+    private Integer code;
+
+    private String value;
+
+
+    LogEnums(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogFactory.java

@@ -0,0 +1,101 @@
+package com.community.huiju.foreign.log;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimerTask;
+
+/**
+ * 日志工厂
+ * @author weiximei
+ */
+public class LogFactory {
+
+    public static File getFile() {
+        LocalDate localDate = LocalDate.now();
+        String pathMkdir = "";
+
+        String os = System.getProperty("os.name");
+        if(os.toLowerCase().startsWith("win")){
+            pathMkdir = "E:" + File.separator + "log" + File.separator + "foreign-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        } else {
+            pathMkdir = "/home/fxf/smart-community" + File.separator + "log" + File.separator + "foreign-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        }
+
+        File file = new File(pathMkdir);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        file = new File(pathMkdir + File.separator + "foreign-log.log");
+
+        return file;
+    }
+
+    /**
+     * 记录请求参数和返回值
+     * @param parameters
+     * @param returnValue
+     * @return
+     */
+    public static TimerTask parametersAndReturn(String parameters, String returnValue){
+        return new TimerTask() {
+            @Override
+            public void run() {
+
+                RandomAccessFile accessFile = null;
+                FileChannel fileChannel = null;
+                FileLock fileLock = null;
+                try {
+                    // 获取这个文件的读和写的权限
+                    accessFile = new RandomAccessFile(getFile(), "rw");
+                    // 文件通道
+                    fileChannel = accessFile.getChannel();
+                    fileLock = null;
+                    while (true) {
+                        try {
+                            // 获取锁，如果失败，继续尝试
+                            fileLock = fileChannel.tryLock();
+                            break;
+                        } catch (Exception e) {
+                            Thread.sleep(100);
+                        }
+                    }
+
+                    // 获取当前这个文件的大小
+                    long length = accessFile.length();
+                    // 设置写入的指针, 设置到这个文件的末尾
+                    accessFile.seek(length);
+                    // 开始写入文件
+                    LocalDateTime localDateTime = LocalDateTime.now();
+                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+                    String str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + parameters + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+                    str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + returnValue + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    if (fileLock != null && fileChannel != null && accessFile != null) {
+                        // 释放锁
+                        try {
+                            fileLock.release();
+                            fileChannel.close();
+                            accessFile.close();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+
+            }
+        };
+    }
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogFileManager.java

@@ -0,0 +1,46 @@
+package com.community.huiju.foreign.log;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+/**
+ * 日志文件记录
+ * @author weiximei
+ */
+public class LogFileManager {
+
+    // 记录日志的线程池
+    private ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(10);
+
+    private LogFileManager() {}
+
+    public static LogFileManager getInstance() {
+        return LogSingleton.INSTANCE.getInstance();
+    }
+
+    /**
+     * 记录日志
+     * @param timerTask 任务
+     */
+    public void executeLog(TimerTask timerTask){
+        // 日志记录
+        scheduledThreadPoolExecutor.execute(timerTask);
+    }
+
+    /**
+     * 枚举
+     */
+    private static enum LogSingleton {
+        INSTANCE;
+
+        private LogFileManager logFileManager;
+        private LogSingleton() {
+            logFileManager = new LogFileManager();
+        }
+
+        public LogFileManager getInstance() {
+            return logFileManager;
+        }
+
+    }
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/service/IFuShiService.java

@@ -0,0 +1,77 @@
+package com.community.huiju.foreign.service;
+
+import com.community.commom.mode.ResponseBean;
+
+/**
+ * 富士 业务接口
+ */
+public interface IFuShiService {
+
+    /**
+     * 获取停车信息（通过车牌号）
+     *
+     * @param carNo
+     * @return
+     */
+    ResponseBean getParkInfoByCarNo(String carNo);
+
+    /**
+     * 第三方月卡上发续费
+     * @param Phone 车主手机号
+     * @param RenewDayType 续费日期类型: 3:年; 2:月; 1:日;
+     * @param RenewDay 续费日期数目
+     * @param PayStyle 交易方式(中文描述)，例如：微信、 支付宝、 银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param RechargeAmt 充值续费金额
+     * @return
+     */
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt);
+
+
+    /**
+     * 第三方临时卡上发缴费
+     * @param Amount 应缴金额（单位元）
+     * @param ActualAmount 实缴金额（单位元）
+     * @param DeductionAmount 抵扣金额（单位元）
+     * @param Reason 抵扣原因
+     * @param PayStyle 交易方式(汉字描述)，例如：微信、支付宝、银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param CouponList 使用的优惠券列表(JSON字符串)
+     *               MerchantName: 商户名称
+     *               CouponType: 优惠券优惠类型1全免2减免金额3减免时长4减免百分比
+     *               CouponValue： 对应优惠券类型的值 金额/时间/折扣
+     *               CouponCode： 优惠券编码
+     *               FavorableType： 优惠券类型1 纸质券 2 电子券 3 活动券
+     *               UseStatus：标识优惠券是线上或线下使用的状态 1只在线上使用 2只在线下使用 3线上线下都可以使用
+     *               IsAuto： 是否自动使用优惠券1是2否
+     *               EndTime： 截至时间
+     *               CouponDescribe： 优惠券描述
+     *               CouponName： 优惠券名称
+     *
+     * @return
+     */
+    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList);
+
+    /**
+     * 获取线下算费结果
+     * @param CarNoOrCardNo 车牌号码或卡号
+     * @return
+     */
+    ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/service/impl/FuShiServiceImpl.java

@@ -0,0 +1,167 @@
+package com.community.huiju.foreign.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.uuid.IdGen;
+import com.community.huiju.foreign.common.perproties.FuShiProperties;
+import com.community.huiju.foreign.log.LogAnnotation;
+import com.community.huiju.foreign.log.LogEnums;
+import com.community.huiju.foreign.service.IFuShiService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
+/**
+ * 富士业务实现
+ * @author weiximei
+ */
+@Slf4j
+@Service
+public class FuShiServiceImpl implements IFuShiService {
+
+    @Autowired
+    private FuShiRequestAPI fuShiRequestAPI;
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+    private IdGen idGen = IdGen.get();
+
+    /**
+     * 获取 富士 json 值
+     * @param jsonString
+     * @return
+     */
+    private Map<String,Object> getFuShiInfo(String jsonString) {
+        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> jsonParam = jsonObject.getJSONObject("JsonParam").getInnerMap();
+        // 移除优惠券
+        jsonParam.remove("CouponList");
+        map.put("JsonParam", jsonParam);
+        map.put("Redirect", jsonObject.getString("Redirect"));
+        map.put("DataType", jsonObject.getInteger("DataType"));
+        return map;
+    }
+
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
+    @Override
+    public ResponseBean getParkInfoByCarNo(String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkInfo = fuShiRequestAPI.getParkInfoByCarNo(fuShiProperties.getParkingCode(), carNo);
+        Map<String, Object> fuShiInfo = getFuShiInfo(parkInfo);
+        responseBean.addSuccess(fuShiInfo);
+        return responseBean;
+    }
+
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
+    @Override
+    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt) {
+        ResponseBean responseBean = new ResponseBean();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+        // 交易编码
+        String dealNo = idGen.nextId() + "";
+        // 第三方交易日期
+        String dateTime = dateTimeFormatter.format(LocalDateTime.now());
+        // 富士云请求
+        String partyMonthCardPay = fuShiRequestAPI.apiThirdPartyMonthCardPay(RenewDayType, RenewDay, dealNo, PayStyle, CarNo, fuShiProperties.getParkingCode(), CardNo, RechargeAmt, dateTime);
+        String tradeNo = JSONObject.parseObject(partyMonthCardPay).getString("TradeNo");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("TradeNo", tradeNo);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 第三方临时卡上发缴费
+     * @param Amount 应缴金额（单位元）
+     * @param ActualAmount 实缴金额（单位元）
+     * @param DeductionAmount 抵扣金额（单位元）
+     * @param Reason 抵扣原因
+     * @param PayStyle 交易方式(汉字描述)，例如：微信、支付宝、银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param CouponList 使用的优惠券列表(JSON字符串)
+     *               MerchantName: 商户名称
+     *               CouponType: 优惠券优惠类型1全免2减免金额3减免时长4减免百分比
+     *               CouponValue： 对应优惠券类型的值 金额/时间/折扣
+     *               CouponCode： 优惠券编码
+     *               FavorableType： 优惠券类型1 纸质券 2 电子券 3 活动券
+     *               UseStatus：标识优惠券是线上或线下使用的状态 1只在线上使用 2只在线下使用 3线上线下都可以使用
+     *               IsAuto： 是否自动使用优惠券1是2否
+     *               EndTime： 截至时间
+     *               CouponDescribe： 优惠券描述
+     *               CouponName： 优惠券名称
+     *
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方临时卡上发缴费")
+    @Override
+    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList) {
+        ResponseBean responseBean = new ResponseBean();
+        // 交易编号
+        String dealNo = idGen.nextId() + "";
+        String apiThirdPartyTemporaryCardPay = fuShiRequestAPI.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount, Reason, dealNo, PayStyle, CarNo, fuShiProperties.getParkingCode(), CardNo, "", CouponList);
+        String tradeNo = JSONObject.parseObject(apiThirdPartyTemporaryCardPay).getString("TradeNo");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("TradeNo", tradeNo);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取线下算费结果")
+    @Override
+    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String apiGetOfflineFee = fuShiRequestAPI.apiGetOfflineFee(fuShiProperties.getParkingCode(), CarNoOrCardNo);
+        String result = JSONObject.parseObject(apiGetOfflineFee).getString("Result");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

CODE/foreign-service/src/main/resources/application-dev.yml

@@ -1,4 +1,7 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
+      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true

CODE/foreign-service/src/main/resources/application-prod.yml

@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
+      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community_prod2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true

CODE/foreign-service/src/main/resources/application.yml

@@ -13,3 +13,36 @@ spring:
 mybatis-plus:
   type-aliases-package: com.community.huiju.foreign.model
   mapper-locations: classpath:mapper/*.xml
+# 打印sql
+logging:
+  level:
+    com.community.huiju.foreign.dao: debug
+
+# 大苏
+da-su:
+  appid: dssdw2576sd997
+  app-secret: fgexhd855sf4
+  community-id: 101
+
+# 富士E7+云平台
+fu-shi:
+  url: http://api.mops.fujica.com.cn/v2/Api
+  appid: fujica_a354fedcb214c86b
+  app-secret: 0a0897e0bf154169833f709d6693fe84
+  private-key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL8wJdXId6Pa6l/O
+    d6a+vE0z0RgujUTR2KxRZiRhEWpc4JSi1uyQPS2RS+CleByllAXkgPYCxhxelt6Y
+    wtFb3nuUVrQboesUrxv7DuGoRnbOeakMC2Cb83AanQlEC/erXspsTx9x9lecygAt
+    yOsEPv6nb8VHu8tTEEhFJIyWSTQBAgMBAAECgYA07AH9HGGptKZd4MwUFwYOpMJD
+    XFd0blX41QteFJR6ib0Mx8qQbxjQLUEArS0DWP4RZ4AfGQN3xOMkOMrsou6BcVjR
+    oVXvlKate4tIRQy3ay77dabM8LQFNg8uuigD7EWeGh9s4V1E5Jfuw8Y8zfmBKBbz
+    Id/Mm7bafgbfd4jCtQJBAPn0ik8Iv3pkJ90V60eQG4l6sVGAaskM0GWzyENpecLP
+    6UA7oYmAaqIx9vsY0UyiF4XctgxpMvqG6pM/U0y8LacCQQDDz8h7nhUWF0ZUH1IS
+    H+Qj3sUWR3hHel/WCjGPPKWO5iQUTfwVY9+L54IDIanAjisc40ueO3zK573zzlBE
+    /VYXAkEA61Qmm356+DovpeErILc2ldsj8r3ay+r6kaYQGBfIAXhJ/KWn0pNK0eYE
+    yCd3dpTtXKSN6WVqD6DSXUuzm31X5QJAEDMqlP+ZIwC98su8kH9O8qDFkXhMPS2k
+    rCKfwwfzcoUbywpApsxifEKlAPlR//pDGtq7MNYfFvJhRsB056BF9QJBAKHlCCnt
+    gtzRlhQxwYRg0th4uoJ99BT03+WM94Kepu6zfh3OmKLvPk2gW30TKSeYC5xmursq
+    xGP2TC4KxH2tAn0=
+  parking-code: 19000100250504 # 停车场编码
+
+

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

@@ -7,6 +7,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.HotelRoom;
 import com.community.huiju.service.IHotelRoomService;
+import com.community.huiju.model.Hotel;
 import com.community.huiju.service.IHotelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.community.huiju.common.base.BaseController;
 
@@ -75,6 +77,7 @@ public class HotelController extends BaseController {
         ResponseBean  responseBean = iHotelService.hotelRoomAdd(parameter,userElement);
         return responseBean;
     }
+
     @ApiOperation(value = "查询当前房间信息", notes = "查询当前房间信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID")})
@@ -118,6 +121,30 @@ public class HotelController extends BaseController {
         ResponseBean  responseBean = iHotelService.hotelRoomRoomStatus(parameter,userElement);
         return responseBean;
     }
-
-
+    
+    @ApiOperation(value = "根据小区获取酒店数据", notes = "根据搜索条件获取角色列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+    })
+    @RequestMapping(value = "/getHotelData",method = RequestMethod.GET)
+    public ResponseBean getHotelData(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        Hotel hotel = iHotelService.getHotelData(userElement);
+        responseBean.addSuccess(hotel);
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "添加房间", notes = "添加房间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "Hotel", name = "hotel", value = "酒店"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addHotel", method = RequestMethod.POST)
+    public ResponseBean addHotel(@RequestBody Hotel hotel, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.addHotel(hotel,userElement);
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 酒店图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-14
+ */
+@RestController
+@RequestMapping("/fxf/tp-hotel-img")
+public class TpHotelImgController extends BaseController {
+
+}

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpHotelImg;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 酒店图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-14
+ */
+public interface TpHotelImgMapper extends BaseMapper<TpHotelImg> {
+	
+	int batchInsert(List<TpHotelImg> hotelImgList);
+}

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

@@ -1,8 +1,11 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -74,6 +77,24 @@ public class Hotel implements Serializable {
      * 更新人
      */
     private Integer updateUser;
-
+    
+    
+    /**
+     * app首页展示图
+     */
+    @TableField(exist = false)
+    private String appIndexImg;
+    
+    /**
+     * app商铺轮播图
+     */
+    @TableField(exist = false)
+    private List<String> appCarouselImg;
+    
+    /**
+     * 酒店开关
+     */
+    @TableField(exist = false)
+    private Boolean hotelSettingValue;
 
 }

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

@@ -28,11 +28,6 @@ public class HotelSetting implements Serializable {
      */
     private Integer communityId;
 
-    /**
-     * 酒店ID
-     */
-    private Integer hotelId;
-
     /**
      * 创建时间
      */

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

@@ -0,0 +1,51 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 酒店图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpHotelImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 酒店ID
+     */
+    private Integer hotelId;
+
+    /**
+     * 酒店图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 酒店图片类型 1是首页图片每个酒店唯一，2是banner图片
+     */
+    private String imgType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -45,4 +45,19 @@ public interface IHotelService extends IService<Hotel> {
      * @return
      */
     ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement);
+	
+	/**
+	 * 根据小区id获取酒店信息
+	 * @param userElement
+	 * @return
+	 */
+	Hotel getHotelData(UserElement userElement);
+	
+	/**
+	 * 添加或修改酒店
+	 * @param hotel
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean addHotel(Hotel hotel, UserElement userElement);
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpHotelImg;
+
+/**
+ * <p>
+ * 酒店图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-14
+ */
+public interface ITpHotelImgService extends IService<TpHotelImg> {
+
+}

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

@@ -8,9 +8,13 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.HotelMapper;
 import com.community.huiju.dao.HotelRoomMapper;
+import com.community.huiju.dao.HotelSettingMapper;
+import com.community.huiju.dao.TpHotelImgMapper;
 import com.community.huiju.dao.UserMapper;
 import com.community.huiju.model.Hotel;
 import com.community.huiju.model.HotelRoom;
+import com.community.huiju.model.HotelSetting;
+import com.community.huiju.model.TpHotelImg;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.User;
 import com.community.huiju.service.IHotelService;
@@ -19,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -42,6 +47,13 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
 
     @Autowired
     private UserMapper tpUserMapper;
+    
+    @Autowired
+    private TpHotelImgMapper hotelImgMapper;
+    
+    @Autowired
+    private HotelSettingMapper hotelSettingMapper;
+    
     @Override
     public ResponseBean hotelRoomLiset(String parameter, Integer communityId) {
         ResponseBean response= new ResponseBean<>();
@@ -147,4 +159,126 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         responseBean.addSuccess("成功");
         return responseBean;
     }
+    
+    /**
+     * 根据小区id获取酒店信息
+     *
+     * @param userElement
+     * @return
+     */
+    @Override
+    public Hotel getHotelData(UserElement userElement) {
+        QueryWrapper<Hotel> hotelQueryWrapper = new QueryWrapper<>();
+        hotelQueryWrapper.eq("community_id",userElement.getCommunityId());
+        Hotel hotel = tpHotelMapper.selectOne(hotelQueryWrapper);
+        if (null != hotel){
+            //查看酒店开关是否开启
+            QueryWrapper<HotelSetting> hotelSettingQueryWrapper = new QueryWrapper<>();
+            hotelSettingQueryWrapper.eq("community_id",userElement.getCommunityId());
+            HotelSetting hotelSetting = hotelSettingMapper.selectOne(hotelSettingQueryWrapper);
+            hotel.setHotelSettingValue(null == hotelSetting ? false : true);
+            QueryWrapper<TpHotelImg> imgQueryWrapper = new QueryWrapper<>();
+            imgQueryWrapper.eq("community_id",hotel.getCommunityId());
+            imgQueryWrapper.eq("hotel_id",hotel.getId());
+            imgQueryWrapper.eq("img_type","1");
+            TpHotelImg tpHotelImg = hotelImgMapper.selectOne(imgQueryWrapper);
+            hotel.setAppIndexImg(tpHotelImg.getImgUrl());
+            //获取轮播图
+            QueryWrapper<TpHotelImg> imgQueryWrappers = new QueryWrapper<>();
+            imgQueryWrappers.eq("community_id",hotel.getCommunityId());
+            imgQueryWrappers.eq("hotel_id",hotel.getId());
+            imgQueryWrappers.eq("img_type","2");
+            List<TpHotelImg> tpHotelImgList = hotelImgMapper.selectList(imgQueryWrappers);
+            List<String> imgList = new ArrayList<>();
+            tpHotelImgList.stream().forEach(e -> {
+                imgList.add(e.getImgUrl());
+            });
+            hotel.setAppCarouselImg(imgList);
+        }
+        return hotel;
+    }
+    
+    /**
+     * 添加或修改酒店
+     *
+     * @param hotel
+     * @param userElement
+     * @return
+     */
+    @Override
+    public ResponseBean addHotel(Hotel hotel, UserElement userElement) {
+        if (hotel.getHotelSettingValue()){
+            HotelSetting hotelSetting = new HotelSetting();
+            hotelSetting.setCommunityId(userElement.getCommunityId());
+            hotelSetting.setCreateDate(LocalDateTime.now());
+            hotelSetting.setCreateUser(userElement.getId());
+            hotelSettingMapper.insert(hotelSetting);
+        }else {
+            QueryWrapper<HotelSetting> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("community_id",userElement.getCommunityId());
+            hotelSettingMapper.delete(queryWrapper);
+        }
+        ResponseBean responseBean = new ResponseBean();
+        if (null != hotel.getId()){
+            updateHotel(hotel,userElement);
+        }else{
+            addFirstHotel(hotel,userElement);
+        }
+        responseBean.addSuccess("更新成功");
+        return responseBean;
+    }
+    
+    private void updateHotel(Hotel hotel, UserElement userElement) {
+        hotel.setUpdateDate(LocalDateTime.now());
+        hotel.setUpdateUser(userElement.getId());
+        tpHotelMapper.updateById(hotel);
+        //更新首页图
+        TpHotelImg tpHotelImg = new TpHotelImg();
+        tpHotelImg.setImgUrl(hotel.getAppIndexImg());
+        QueryWrapper<TpHotelImg> tpHotelImgQueryWrapper = new QueryWrapper();
+        tpHotelImgQueryWrapper.eq("community_id",userElement.getCommunityId());
+        tpHotelImgQueryWrapper.eq("hotel_id",hotel.getId());
+        tpHotelImgQueryWrapper.eq("img_type","1");
+        hotelImgMapper.update(tpHotelImg,tpHotelImgQueryWrapper);
+        //更新轮播图
+        QueryWrapper<TpHotelImg> deleteImgQueryWrapper = new QueryWrapper();
+        deleteImgQueryWrapper.eq("community_id",userElement.getCommunityId());
+        deleteImgQueryWrapper.eq("hotel_id",hotel.getId());
+        deleteImgQueryWrapper.eq("img_type","2");
+        hotelImgMapper.delete(deleteImgQueryWrapper);
+        //重新插入
+        batchInsertImg(hotel,userElement);
+    }
+    
+    private void addFirstHotel(Hotel hotel, UserElement userElement) {
+        hotel.setCommunityId(userElement.getCommunityId());
+        hotel.setCreateDate(LocalDateTime.now());
+        hotel.setCreateUser(userElement.getId());
+        tpHotelMapper.insert(hotel);
+        //添加首页图
+        TpHotelImg tpHotelImg = new TpHotelImg();
+        tpHotelImg.setCommunityId(userElement.getCommunityId());
+        tpHotelImg.setCreateDate(LocalDateTime.now());
+        tpHotelImg.setHotelId(hotel.getId());
+        tpHotelImg.setImgType("1");
+        tpHotelImg.setImgUrl(hotel.getAppIndexImg());
+        hotelImgMapper.insert(tpHotelImg);
+        //添加轮播图
+        batchInsertImg(hotel,userElement);
+    }
+    
+    private void batchInsertImg(Hotel hotel, UserElement userElement) {
+        List<String> imgList = hotel.getAppCarouselImg();
+        List<TpHotelImg> hotelImgList = new ArrayList<>();
+        imgList.stream().forEach(e -> {
+            TpHotelImg hotelImg = new TpHotelImg();
+            hotelImg.setCommunityId(userElement.getCommunityId());
+            hotelImg.setCreateDate(LocalDateTime.now());
+            hotelImg.setHotelId(hotel.getId());
+            hotelImg.setImgType("2");
+            hotelImg.setImgUrl(e);
+            hotelImgList.add(hotelImg);
+        });
+        hotelImgMapper.batchInsert(hotelImgList);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpHotelImgMapper;
+import com.community.huiju.model.TpHotelImg;
+import com.community.huiju.service.ITpHotelImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 酒店图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-14
+ */
+@Service
+public class TpHotelImgServiceImpl extends ServiceImpl<TpHotelImgMapper, TpHotelImg> implements ITpHotelImgService {
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/TpHotelImgMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpHotelImgMapper">
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_hotel_img(community_id,hotel_id,img_url,img_type,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.hotelId},#{item.imgUrl},#{item.imgType},#{item.createDate})
+        </foreach>
+    </insert>
+</mapper>

VUECODE/smart-property-manage/src/store/modules/grogshop.js

@@ -1,4 +1,5 @@
-import { hotelRoom, hotelRoomAdd, hotelRoomEdit, getRoomId, hotelRoomRoomStatus } from '@/api/grogshop'
+
+import { hotelRoom, hotelRoomAdd, hotelRoomEdit, getRoomId, hotelRoomRoomStatus ,getHotelData,updateHotel  } from '@/api/grogshop'
 
 const grogshop = {
   actions: {
@@ -20,6 +21,7 @@ const grogshop = {
         })
       })
     },
+
     HotelRoomEdit({ commit }, data) {
       return new Promise((resolve, reject) => {
         hotelRoomEdit(data).then(response => {
@@ -29,6 +31,15 @@ const grogshop = {
         })
       })
     },
+    GetHotelData({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        getHotelData(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     GetRoomId({ commit }, data) {
       return new Promise((resolve, reject) => {
         getRoomId(data).then(response => {
@@ -46,6 +57,15 @@ const grogshop = {
           reject(error)
         })
       })
+    },
+    UpdateHotel({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        updateHotel(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -1,100 +1,210 @@
 <template>
   <div class="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input :disabled="true" v-model="ruleForm.roleName"/>
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item class="filter-item" label="酒店开关">
+        <el-switch
+          v-model="listData.hotelSettingValue"
+          active-color="#13ce66"
+          inactive-color="#ff4949">
+        </el-switch>
+        <span>关闭后业主在APP端将看不到酒店相关的页面</span>
       </el-form-item>
-      <el-form-item label="角色描述" prop="description">
-        <el-input :disabled="true" v-model="ruleForm.description"/>
+      <el-form-item label="酒店首页图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
       </el-form-item>
-      <el-form-item label="资源权限" prop="menuArray">
-        <el-tree
-          ref="tree"
-          :data="menuList"
-          show-checkbox
-          node-key="id"
-          :default-expanded-keys="ruleForm.menuArray"
-          :default-checked-keys="ruleForm.menuArray"
-          :props="defaultProps">
-        </el-tree>
-      </el-form-item> 
+      <el-form-item label="酒店banner图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :file-list="displayAppCarouselImg"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="hotelTel">
+        <el-input v-model="listData.hotelTel"/>
+      </el-form-item>
+      <el-form-item label="酒店地址" prop="hotelAddress">
+        <el-input v-model="listData.hotelAddress"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="房间介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="goEditRole">去修改</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-import { mapState, mapActions, mapMutations } from 'vuex'
-import waves from '@/directive/waves' // Waves directive
-import { parseTime } from '@/utils'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
 
 export default {
-  computed: {
-    ...mapState('role', {
-      menuList: s => s.menuList
-    })
-  },
+  components: { Pagination, Wangeditor },
   data() {
     return {
-      ruleForm: {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.hotelLongitude = e.lnglat.lng
+          this.listData.hotelLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
         id: '',
-        roleName: '',
-        description: '',
-        menuArray: []
+        hotelSettingValue: false,
+        appIndexImg: '',
+        appCarouselImg: [],
+        hotelTel: '',
+        hotelAddress: '',
+        hotelLongitude: '',
+        hotelLatitude: '',
+        hotelIntroduction: ''
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      displayAppCarouselImg: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
       },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
       rules: {
-        roleName: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' }
+        hotelAddress: [
+          { required: true, message: '请输入地址', trigger: 'blur' }
+        ],
+        hotelTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: '轮播图', trigger: 'blur' }
         ],
-        menuArray: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-        ]
-      },
-      defaultProps: {
-        children: 'children',
-        label: 'menuName',
-        disabled: () => true
       }
     }
   },
-  created(){
-    this.ruleForm.id = this.$route.params.id
-    this.getDataById()
-    this.getMenuList()
+  created() {
+    this.getHotelData()
   },
   methods: {
-    ...mapMutations('role', {
-    }),
-    ...mapActions('role', [
-      'FetchMenuList',
-      'UpdateRoleInfo',
-      'GetRoleInfo'
-    ]),
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    getHotelData() {
+      this.$store.dispatch('GetHotelData', this.listData.id).then((res) => {
+        const rentalData = res.data || {}
+        this.listData = { ...this.listData, ...rentalData }
+        // 多张图片进行遍历
+        for (let i = 0; i < rentalData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: rentalData.appCarouselImg[i] })
+        }
+      })
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.hotelIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
     submitForm(formName) { // 提交
-      // 获取选中的树形节点 key
-      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
-      console.log(this.ruleForm.menuArray)
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.updateRole()
+          this.updateRental()
         } else {
           console.log('error submit!!')
           return false
         }
       })
     },
-    getMenuList() {
-      this.FetchMenuList().then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
-    },
     resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    updateRole() {
+    updateRental() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -102,13 +212,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.UpdateRoleInfo(this.ruleForm).then((res) => {
+      this.$store.dispatch('UpdateHotel', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'role-index' })
+          this.$router.push({ name: 'grogshop-configindex' })
           loading.close()
           return
         }
@@ -116,26 +226,38 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error updateRole')
-      })
-    },
-    goEditRole(){
-      this.$router.push({ name: 'role-edit', params: { id: this.ruleForm.id }})
-    },
-    getDataById() {
-      this.GetRoleInfo(this.ruleForm.id).then((res) => {
-        this.ruleForm.roleName = res.data.roleName
-        this.ruleForm.description = res.data.description
-        this.ruleForm.menuArray = res.data.menuArray
-      }).catch(() => {
-        console.log('error init role')
+        console.log('error addRental')
       })
     }
   }
 }
 </script>
 
-<style scoped>
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
 .add-ruleForm{
   width: 800px;
   margin-left: auto;
@@ -143,3 +265,14 @@ export default {
   margin-top: 50px;
 }
 </style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

文档/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="1557813818" Name="smartCommunity" Objects="1162" Symbols="129" 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="1557818754" Name="smartCommunity" Objects="1163" Symbols="129" 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">
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:ModificationDate>1557306066</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((187327,18810), (204115,49108))</a:Rect>
+<a:Rect>((187327,18360), (204115,49558))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_rental_house</a:Code>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557813818</a:ModificationDate>
+<a:ModificationDate>1557818754</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>出租公寓表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -17734,6 +17734,18 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1037">
+<a:ObjectID>42F73021-2A57-4614-B1A8-3C713A84F54D</a:ObjectID>
+<a:Name>mattress</a:Name>
+<a:Code>mattress</a:Code>
+<a:CreationDate>1557818735</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557818754</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>床垫 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1038">
 <a:ObjectID>86AC4B40-FEBD-4FCB-A079-23ED794287E7</a:ObjectID>
 <a:Name>wardrobe</a:Name>
 <a:Code>wardrobe</a:Code>
@@ -17745,7 +17757,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1038">
+<o:Column Id="o1039">
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
 <a:Name>dining_table</a:Name>
 <a:Code>dining_table</a:Code>
@@ -17757,7 +17769,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1039">
+<o:Column Id="o1040">
 <a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
 <a:Name>computer_desk</a:Name>
 <a:Code>computer_desk</a:Code>
@@ -17769,7 +17781,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1040">
+<o:Column Id="o1041">
 <a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
 <a:Name>water_heater</a:Name>
 <a:Code>water_heater</a:Code>
@@ -17781,7 +17793,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1041">
+<o:Column Id="o1042">
 <a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
 <a:Name>chair</a:Name>
 <a:Code>chair</a:Code>
@@ -17793,7 +17805,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1042">
+<o:Column Id="o1043">
 <a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
 <a:Name>washing_machine</a:Name>
 <a:Code>washing_machine</a:Code>
@@ -17805,7 +17817,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1043">
+<o:Column Id="o1044">
 <a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
 <a:Name>air_conditioning</a:Name>
 <a:Code>air_conditioning</a:Code>
@@ -17817,7 +17829,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1044">
+<o:Column Id="o1045">
 <a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
 <a:Name>table_lamp</a:Name>
 <a:Code>table_lamp</a:Code>
@@ -17829,7 +17841,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1045">
+<o:Column Id="o1046">
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
 <a:Name>WiFi</a:Name>
 <a:Code>WiFi</a:Code>
@@ -17841,7 +17853,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1046">
+<o:Column Id="o1047">
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
 <a:Name>microwave_oven</a:Name>
 <a:Code>microwave_oven</a:Code>
@@ -17853,7 +17865,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1047">
+<o:Column Id="o1048">
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
 <a:Name>natural_gas</a:Name>
 <a:Code>natural_gas</a:Code>
@@ -17865,7 +17877,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1048">
+<o:Column Id="o1049">
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -17876,7 +17888,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1049">
+<o:Column Id="o1050">
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -17888,7 +17900,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1050">
+<o:Column Id="o1051">
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -17899,7 +17911,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1051">
+<o:Column Id="o1052">
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -17913,7 +17925,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1052">
+<o:Key Id="o1053">
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -17927,7 +17939,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1052"/>
+<o:Key Ref="o1053"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o253">
@@ -17941,7 +17953,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>商铺图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1053">
+<o:Column Id="o1054">
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -17954,7 +17966,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1054">
+<o:Column Id="o1055">
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -17966,7 +17978,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1055">
+<o:Column Id="o1056">
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
 <a:Name>shop_id</a:Name>
 <a:Code>shop_id</a:Code>
@@ -17978,7 +17990,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1056">
+<o:Column Id="o1057">
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -17990,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1057">
+<o:Column Id="o1058">
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18002,7 +18014,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1058">
+<o:Column Id="o1059">
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18015,7 +18027,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1059">
+<o:Key Id="o1060">
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18024,12 +18036,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557304098</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1053"/>
+<o:Column Ref="o1054"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1059"/>
+<o:Key Ref="o1060"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o255">
@@ -18043,7 +18055,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>出租房间图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1060">
+<o:Column Id="o1061">
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18056,7 +18068,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1061">
+<o:Column Id="o1062">
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18068,7 +18080,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1062">
+<o:Column Id="o1063">
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
 <a:Name>rental_house_id</a:Name>
 <a:Code>rental_house_id</a:Code>
@@ -18080,7 +18092,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1063">
+<o:Column Id="o1064">
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -18092,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1064">
+<o:Column Id="o1065">
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18104,7 +18116,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1065">
+<o:Column Id="o1066">
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18117,7 +18129,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1066">
+<o:Key Id="o1067">
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18126,12 +18138,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557307564</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1060"/>
+<o:Column Ref="o1061"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1066"/>
+<o:Key Ref="o1067"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o256">
@@ -18145,7 +18157,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>用户车牌号表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1067">
+<o:Column Id="o1068">
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18158,7 +18170,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1068">
+<o:Column Id="o1069">
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18170,7 +18182,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1069">
+<o:Column Id="o1070">
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
 <a:Name>ta_user_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18182,7 +18194,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1070">
+<o:Column Id="o1071">
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18194,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1071">
+<o:Column Id="o1072">
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18206,7 +18218,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1072">
+<o:Column Id="o1073">
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18217,7 +18229,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1073">
+<o:Column Id="o1074">
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18229,7 +18241,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1074">
+<o:Column Id="o1075">
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18241,7 +18253,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1075">
+<o:Column Id="o1076">
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
 <a:Name>renew_time</a:Name>
 <a:Code>renew_time</a:Code>
@@ -18253,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1076">
+<o:Column Id="o1077">
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
 <a:Name>license_type</a:Name>
 <a:Code>license_type</a:Code>
@@ -18265,7 +18277,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1077">
+<o:Column Id="o1078">
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18276,7 +18288,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1078">
+<o:Column Id="o1079">
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18288,7 +18300,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1079">
+<o:Column Id="o1080">
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18299,7 +18311,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1080">
+<o:Column Id="o1081">
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18313,7 +18325,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1081">
+<o:Key Id="o1082">
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18322,12 +18334,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557367718</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1067"/>
+<o:Column Ref="o1068"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1081"/>
+<o:Key Ref="o1082"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o257">
@@ -18341,7 +18353,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>月租车缴费订单表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1082">
+<o:Column Id="o1083">
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18354,7 +18366,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1083">
+<o:Column Id="o1084">
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18366,7 +18378,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1084">
+<o:Column Id="o1085">
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
 <a:Name>user_license_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18378,7 +18390,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1085">
+<o:Column Id="o1086">
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18390,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1086">
+<o:Column Id="o1087">
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
 <a:Name>order_status</a:Name>
 <a:Code>order_status</a:Code>
@@ -18402,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1087">
+<o:Column Id="o1088">
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18414,7 +18426,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1088">
+<o:Column Id="o1089">
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18425,7 +18437,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1089">
+<o:Column Id="o1090">
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18437,7 +18449,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1090">
+<o:Column Id="o1091">
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18448,7 +18460,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1091">
+<o:Column Id="o1092">
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
 <a:Name>extension_month</a:Name>
 <a:Code>extension_month</a:Code>
@@ -18460,7 +18472,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1092">
+<o:Column Id="o1093">
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
 <a:Name>extension_price</a:Name>
 <a:Code>extension_price</a:Code>
@@ -18472,7 +18484,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1093">
+<o:Column Id="o1094">
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
 <a:Name>payment_tel</a:Name>
 <a:Code>payment_tel</a:Code>
@@ -18484,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1094">
+<o:Column Id="o1095">
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
 <a:Name>payment_name</a:Name>
 <a:Code>payment_name</a:Code>
@@ -18496,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1095">
+<o:Column Id="o1096">
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
 <a:Name>payment_type</a:Name>
 <a:Code>payment_type</a:Code>
@@ -18508,7 +18520,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1096">
+<o:Column Id="o1097">
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18519,7 +18531,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1097">
+<o:Column Id="o1098">
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18531,7 +18543,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1098">
+<o:Column Id="o1099">
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18543,7 +18555,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1099">
+<o:Column Id="o1100">
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18557,7 +18569,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1100">
+<o:Key Id="o1101">
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18566,12 +18578,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557372945</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1082"/>
+<o:Column Ref="o1083"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1100"/>
+<o:Key Ref="o1101"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o259">
@@ -18585,7 +18597,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>app端版本号</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1101">
+<o:Column Id="o1102">
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18597,7 +18609,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>11</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1102">
+<o:Column Id="o1103">
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
 <a:Name>client_version</a:Name>
 <a:Code>client_version</a:Code>
@@ -18609,7 +18621,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1103">
+<o:Column Id="o1104">
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
 <a:Name>service_version</a:Name>
 <a:Code>service_version</a:Code>
@@ -18621,7 +18633,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1104">
+<o:Column Id="o1105">
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
 <a:Name>type</a:Name>
 <a:Code>type</a:Code>
@@ -18633,7 +18645,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1105">
+<o:Column Id="o1106">
 <a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
 <a:Name>update_address</a:Name>
 <a:Code>update_address</a:Code>
@@ -18647,7 +18659,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1106">
+<o:Key Id="o1107">
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18656,17 +18668,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557800616</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1101"/>
+<o:Column Ref="o1102"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1106"/>
+<o:Key Ref="o1107"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1107">
+<o:Group Id="o1108">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -19329,7 +19341,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1108">
+<o:TargetModel Id="o1109">
 <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="1557818754" Name="smartCommunity" Objects="1163" Symbols="129" 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="1557819544" Name="smartCommunity" Objects="1167" Symbols="129" 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">
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:ModificationDate>1557306066</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((187327,18360), (204115,49558))</a:Rect>
+<a:Rect>((187327,17010), (204115,50908))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_rental_house</a:Code>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557818754</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>出租公寓表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -17759,89 +17759,113 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o1039">
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
-<a:Name>dining_table</a:Name>
-<a:Code>dining_table</a:Code>
+<a:Name>sofa</a:Name>
+<a:Code>sofa</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>餐桌 1 有</a:Comment>
+<a:Comment>沙发 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1040">
-<a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
-<a:Name>computer_desk</a:Name>
-<a:Code>computer_desk</a:Code>
+<a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
+<a:Name>washing_machine</a:Name>
+<a:Code>washing_machine</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>电脑桌 1 有</a:Comment>
+<a:Comment> 洗衣机 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1041">
-<a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
-<a:Name>water_heater</a:Name>
-<a:Code>water_heater</a:Code>
+<a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
+<a:Name>air_conditioning</a:Name>
+<a:Code>air_conditioning</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>热水器 1 有</a:Comment>
+<a:Comment>空调 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1042">
-<a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
-<a:Name>chair</a:Name>
-<a:Code>chair</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>00143CC9-8BE2-4977-A1B3-83A931F33907</a:ObjectID>
+<a:Name>fridge</a:Name>
+<a:Code>fridge</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>椅子 1 有</a:Comment>
+<a:Comment>冰箱 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1043">
-<a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
-<a:Name>washing_machine</a:Name>
-<a:Code>washing_machine</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>2DA64D7F-937A-462D-8887-C882BF3B10CD</a:ObjectID>
+<a:Name>TV</a:Name>
+<a:Code>TV</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment> 洗衣机 1 有</a:Comment>
+<a:Comment>电视 1有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1044">
-<a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
-<a:Name>air_conditioning</a:Name>
-<a:Code>air_conditioning</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>A9AA4CDC-CAA9-4524-B36F-93BDC87C4F0E</a:ObjectID>
+<a:Name>smart_lock</a:Name>
+<a:Code>smart_lock</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>空调 1 有</a:Comment>
+<a:Comment>智能锁 1有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1045">
-<a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
-<a:Name>table_lamp</a:Name>
-<a:Code>table_lamp</a:Code>
+<a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
+<a:Name>water_heater</a:Name>
+<a:Code>water_heater</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>台灯 1 有</a:Comment>
+<a:Comment>热水器 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1046">
+<a:ObjectID>02B389B0-AF1E-4E9F-9FC6-F23DC270B992</a:ObjectID>
+<a:Name>desk</a:Name>
+<a:Code>desk</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557819511</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>桌子 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1047">
+<a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
+<a:Name>chair</a:Name>
+<a:Code>chair</a:Code>
+<a:CreationDate>1557307121</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557307546</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>椅子 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1048">
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
 <a:Name>WiFi</a:Name>
 <a:Code>WiFi</a:Code>
@@ -17853,31 +17877,43 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1047">
+<o:Column Id="o1049">
+<a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
+<a:Name>kitchen</a:Name>
+<a:Code>kitchen</a:Code>
+<a:CreationDate>1557307121</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557819511</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>厨房 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1050">
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
-<a:Name>microwave_oven</a:Name>
-<a:Code>microwave_oven</a:Code>
+<a:Name>bathroom</a:Name>
+<a:Code>bathroom</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819544</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>微波炉 1 有</a:Comment>
+<a:Comment>独卫 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1048">
+<o:Column Id="o1051">
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
-<a:Name>natural_gas</a:Name>
-<a:Code>natural_gas</a:Code>
+<a:Name>balcony</a:Name>
+<a:Code>balcony</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>天然气 1 有</a:Comment>
+<a:Comment>阳台 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1049">
+<o:Column Id="o1052">
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -17888,7 +17924,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1050">
+<o:Column Id="o1053">
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -17900,7 +17936,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1051">
+<o:Column Id="o1054">
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -17911,7 +17947,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1052">
+<o:Column Id="o1055">
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -17925,7 +17961,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1053">
+<o:Key Id="o1056">
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -17939,7 +17975,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1053"/>
+<o:Key Ref="o1056"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o253">
@@ -17953,7 +17989,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>商铺图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1054">
+<o:Column Id="o1057">
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -17966,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1055">
+<o:Column Id="o1058">
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -17978,7 +18014,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1056">
+<o:Column Id="o1059">
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
 <a:Name>shop_id</a:Name>
 <a:Code>shop_id</a:Code>
@@ -17990,7 +18026,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1057">
+<o:Column Id="o1060">
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -18002,7 +18038,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1058">
+<o:Column Id="o1061">
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18014,7 +18050,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1059">
+<o:Column Id="o1062">
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18027,7 +18063,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1060">
+<o:Key Id="o1063">
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18036,12 +18072,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557304098</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1054"/>
+<o:Column Ref="o1057"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1060"/>
+<o:Key Ref="o1063"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o255">
@@ -18055,7 +18091,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>出租房间图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1061">
+<o:Column Id="o1064">
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18068,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1062">
+<o:Column Id="o1065">
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18080,7 +18116,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1063">
+<o:Column Id="o1066">
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
 <a:Name>rental_house_id</a:Name>
 <a:Code>rental_house_id</a:Code>
@@ -18092,7 +18128,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1064">
+<o:Column Id="o1067">
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -18104,7 +18140,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1065">
+<o:Column Id="o1068">
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18116,7 +18152,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1066">
+<o:Column Id="o1069">
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18129,7 +18165,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1067">
+<o:Key Id="o1070">
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18138,12 +18174,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557307564</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1061"/>
+<o:Column Ref="o1064"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1067"/>
+<o:Key Ref="o1070"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o256">
@@ -18157,7 +18193,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>用户车牌号表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1068">
+<o:Column Id="o1071">
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18170,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1069">
+<o:Column Id="o1072">
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18182,7 +18218,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1070">
+<o:Column Id="o1073">
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
 <a:Name>ta_user_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18194,7 +18230,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1071">
+<o:Column Id="o1074">
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18206,7 +18242,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1072">
+<o:Column Id="o1075">
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18218,7 +18254,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1073">
+<o:Column Id="o1076">
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18229,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1074">
+<o:Column Id="o1077">
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18241,7 +18277,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1075">
+<o:Column Id="o1078">
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18253,7 +18289,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1076">
+<o:Column Id="o1079">
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
 <a:Name>renew_time</a:Name>
 <a:Code>renew_time</a:Code>
@@ -18265,7 +18301,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1077">
+<o:Column Id="o1080">
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
 <a:Name>license_type</a:Name>
 <a:Code>license_type</a:Code>
@@ -18277,7 +18313,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1078">
+<o:Column Id="o1081">
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18288,7 +18324,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1079">
+<o:Column Id="o1082">
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18300,7 +18336,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1080">
+<o:Column Id="o1083">
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18311,7 +18347,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1081">
+<o:Column Id="o1084">
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18325,7 +18361,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1082">
+<o:Key Id="o1085">
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18334,12 +18370,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557367718</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1068"/>
+<o:Column Ref="o1071"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1082"/>
+<o:Key Ref="o1085"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o257">
@@ -18353,7 +18389,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>月租车缴费订单表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1083">
+<o:Column Id="o1086">
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18366,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1084">
+<o:Column Id="o1087">
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18378,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1085">
+<o:Column Id="o1088">
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
 <a:Name>user_license_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18390,7 +18426,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1086">
+<o:Column Id="o1089">
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18402,7 +18438,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1087">
+<o:Column Id="o1090">
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
 <a:Name>order_status</a:Name>
 <a:Code>order_status</a:Code>
@@ -18414,7 +18450,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1088">
+<o:Column Id="o1091">
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18426,7 +18462,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1089">
+<o:Column Id="o1092">
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18437,7 +18473,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1090">
+<o:Column Id="o1093">
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18449,7 +18485,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1091">
+<o:Column Id="o1094">
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18460,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1092">
+<o:Column Id="o1095">
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
 <a:Name>extension_month</a:Name>
 <a:Code>extension_month</a:Code>
@@ -18472,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1093">
+<o:Column Id="o1096">
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
 <a:Name>extension_price</a:Name>
 <a:Code>extension_price</a:Code>
@@ -18484,7 +18520,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1094">
+<o:Column Id="o1097">
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
 <a:Name>payment_tel</a:Name>
 <a:Code>payment_tel</a:Code>
@@ -18496,7 +18532,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1095">
+<o:Column Id="o1098">
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
 <a:Name>payment_name</a:Name>
 <a:Code>payment_name</a:Code>
@@ -18508,7 +18544,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1096">
+<o:Column Id="o1099">
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
 <a:Name>payment_type</a:Name>
 <a:Code>payment_type</a:Code>
@@ -18520,7 +18556,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1097">
+<o:Column Id="o1100">
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18531,7 +18567,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1098">
+<o:Column Id="o1101">
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18543,7 +18579,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1099">
+<o:Column Id="o1102">
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18555,7 +18591,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1100">
+<o:Column Id="o1103">
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18569,7 +18605,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1101">
+<o:Key Id="o1104">
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18578,12 +18614,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557372945</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1083"/>
+<o:Column Ref="o1086"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1101"/>
+<o:Key Ref="o1104"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o259">
@@ -18597,7 +18633,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>app端版本号</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1102">
+<o:Column Id="o1105">
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18609,7 +18645,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>11</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1103">
+<o:Column Id="o1106">
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
 <a:Name>client_version</a:Name>
 <a:Code>client_version</a:Code>
@@ -18621,7 +18657,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1104">
+<o:Column Id="o1107">
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
 <a:Name>service_version</a:Name>
 <a:Code>service_version</a:Code>
@@ -18633,7 +18669,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1105">
+<o:Column Id="o1108">
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
 <a:Name>type</a:Name>
 <a:Code>type</a:Code>
@@ -18645,7 +18681,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1106">
+<o:Column Id="o1109">
 <a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
 <a:Name>update_address</a:Name>
 <a:Code>update_address</a:Code>
@@ -18659,7 +18695,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1107">
+<o:Key Id="o1110">
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18668,17 +18704,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557800616</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1102"/>
+<o:Column Ref="o1105"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1107"/>
+<o:Key Ref="o1110"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1108">
+<o:Group Id="o1111">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -19341,7 +19377,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1109">
+<o:TargetModel Id="o1112">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>