物业端代码

src/main/java/com/huiju/estateagents/property/aop/LogAOP.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.property.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.property.log.LogAnnotation;
+import com.huiju.estateagents.property.log.LogEnums;
+import com.huiju.estateagents.property.log.LogFactory;
+import com.huiju.estateagents.property.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.huiju.estateagents.property.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());
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/property/common/Constant.java

@@ -0,0 +1,249 @@
+package com.huiju.estateagents.property.common;
+
+/**
+ * 定义公共属性
+ * @author weiximei
+ */
+public class Constant {
+
+    /** 系统异常 500 **/
+    public static final String REQUEST_ERROR = "500";
+
+    /** APP端session **/
+    public static final String APP_USER_SESSION = "appUser";
+
+    /** WEB运营端session **/
+    // 待废弃
+    public static final String WEB_USER_SESSION = "webUser";
+
+    /** WEB运营端session **/
+    @Deprecated
+    public static final String WEB_OPERATE_USER_SESSION = "webOperateUser";
+
+    /** WEB物业端session **/
+    @Deprecated
+    public static final String WEB_PROPERTY_USER_SESSION = "webPropertyUser";
+
+    /** 不需要权限的URL身份 **/
+    public static final String ROLE_NONEUSER = "ROLE_NONEUSER";
+
+    /** 校验出现问题后的默认身份 **/
+    public static final String ROLE_NONE = "ROLE_NONE";
+
+    /** app登陆类型 **/
+    public static final String APP_LOGIN_TYPE = "app";
+
+    /** web登陆类型 **/
+    public static final String WEB_LOGIN_TYPE = "web";
+
+    /** 手机验证码 **/
+    public static final String SESSION_PHONE_CODE = "phone_code";
+
+    /** 图形验证码 **/
+    public static final String SESSION_OMG_CODE = "img_code";
+
+    /** 手机验证码 模板 **/
+    public static final String CODE = "0201";
+
+    /** 请求发送验证码的远程服务器地址 **/
+    public static final String REQUEST_URL = "http://micservice.ycjcjy.com/sms";
+
+    /** 本地缓存过期时间 单位秒 **/
+    public static final Long CACHE_EXPIRE = 120L;
+
+    /** 本地緩存最大个数 **/
+    public static final Long CACHE_SIZE = 1000L;
+
+    /** 住户APP端消息 **/
+    public static final Integer MODEL_TYPE_NEWS = 1;
+    
+    /** 住户APP端待办 **/
+    public static final Integer MODEL_TYPE_UPCOMING = 2;
+
+    /** 社交/图片 公告类型**/
+    public static final String ANNOUNCEMENT = "announcement";
+
+    /** 社交/图片 活动类型**/
+    public static final String ACTIVITY = "activity";
+
+    /** 社交/图片 租贷类型**/
+    public static final String TRANSACTION = "transaction";
+
+    /** 监控封面 图片类型 **/
+    public static final String MONITORING = "monitoring";
+
+    /** 社交二手租赁类型**/
+    public static final String LEASE = "lease";
+
+    /** banner类型公告**/
+    public static final String BANNER = "banner";
+
+    /**有效状态，开车**/
+    public static final String EFFECTIVE = "1";
+
+    /**无效状态，不开车**/
+    public static final String INVALID = "0";
+
+    /**业主角色**/
+    public static final String OWNER = "OWNER";
+    public static final Integer OWNER_ID = 1;
+
+    /**租客角色**/
+    public static final String TENANT = "TENANT";
+    public static final Integer TENANT_ID = 2;
+
+    /**家属角色**/
+    public static final String RELATION = "RELATION";
+    public static final Integer RELATION_ID = 3;
+    
+    /** 工单回复的发起人 **/
+    public static final String TICKET_USER_TYPE = "1";
+
+    /** banner的类型 外链接 **/
+    public static final String BANNER_TYPE_LINK = "1";
+
+    /** banner的类型 文章 **/
+    public static final String BANNER_TYPE_ARTICLE = "2";
+
+    /**图片社交类型**/
+    public static final String SOCIAL = "social";
+
+    /**图片回复类型**/
+    public static final String REPLY = "reply";
+
+    /**图片服务类型**/
+    public static final String SERVICE = "service";
+
+
+
+
+    /**判断业主，家属的身份是否已停用的提示**/
+    public static final String STATE_DISCONTINUED = "您的身份已停用，请联系物业";
+
+    /**判断业主，家属的身份是否已停用的状态**/
+    public static final String STATE_HINT = "9996";
+
+    /**认证通过后的**/
+
+
+    /** 添加用户所对应的部门 住户 **/
+    public static final String DEPT_RESIDENTS = "荟房会议室";
+    
+    /**
+     * 报名状态 已报名
+     */
+    public static final String STATUS_SIGNED = "signed";
+    
+    /**
+     * 报名状态 未报名
+     */
+    public static final String STATUS_UNSIGN = "unsigned";
+    
+    /**
+     * 运营端修改管理员已存在
+     */
+	public static final String ADMIN_IS_EXIST = "管理员账号已存在";
+	
+    public static final String SUCCESS = "success";
+    
+    /**
+     * 直辖市
+     */
+	public static final Integer Beijing = 2;
+	
+	public static final Integer Tianjin = 19;
+	
+	public static final Integer Shanghai = 857;
+	
+	public static final Integer Chongqing = 2459;
+    
+    /**
+     * 访客消息
+     */
+    public static final String MESSAGE_TYPE_VISITOR = "4";
+    
+    /**
+     * 公告
+     */
+    public static final String MESSAGE_TYPE_ANNOUNCEMENT = "5";
+    
+    /**
+     * 系统通知
+     */
+    public static final String MESSAGE_TYPE_SYS = "6";
+    
+    /**
+     * 收费单
+     */
+    public static final String MESSAGE_TYPE_BILL = "7";
+    
+    /**
+     * 活动
+     */
+    public static final String MESSAGE_TYPE_ACTIVITY = "8";
+    
+    /**
+     * excel后缀
+     */
+    public static final String SUFFIX_2003 = ".xls";
+    public static final String SUFFIX_2007 = ".xlsx";
+    
+    /**
+     * 成功
+     */
+    public static final String RESPONSE_SUCCESS = "0";
+    
+    /**
+     * 未认证
+     */
+	public static final String UN_VERIFY_STATUS = "0";
+    
+    /**
+     * 已认证
+     */
+    public static final String VERIFY_STATUS = "1";
+
+    /**
+     * 认证作废
+     */
+    public static final String INVALID_VERIFY_STATUS = "3";
+
+    /**
+     * 人员状态  拉黑 (运营端操作 APP端的用户)
+     */
+    public static final String BLACKLIST_STATUS = "2";
+
+    /**
+     * 人员状态  有效
+     */
+    public static final String EFFECTIVE_STATUS = "1";
+
+    /**
+     * 人员状态  无效
+     */
+    public static final String INVALID_STATUS = "0";
+
+    /** 已绑定微信 **/
+    public static final Integer BINDING_WX = 1;
+
+    /** 未绑定微信 **/
+    public static final Integer NO_BINDING_WX = 0;
+
+    /** 用户审核通过 **/
+    public static final String APPROVED = "1";
+
+    /** 用户审核不通过 **/
+    public static final String REJECTED = "2";
+
+    /** 用户待审核 **/
+    public static final String TO_AUDIT = "0";
+
+    /** 缴费类型 物业 **/
+    public static final String PAY_TYPE_BILL = "bill";
+
+
+    /** 缴费类型 车缴费 **/
+    public static final String PAY_TYPE_CAR = "car";
+
+
+}

src/main/java/com/huiju/estateagents/property/common/UserElement.java

@@ -0,0 +1,95 @@
+package com.huiju.estateagents.property.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * session 基础类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserElement implements Serializable {
+
+
+
+
+    /** 用户唯一标识符 **/
+    private Integer id;
+
+    /** 小区id **/
+    private Integer communityId;
+
+    /** 用户名 **/
+    private String userName;
+
+    /** 登陆名 **/
+    private String loginName;
+
+    /** 邮箱 **/
+    private String email;
+
+    /** 用户状态 **/
+    private String status;
+
+    /** 登陆类型 **/
+    private String loginType;
+
+    /** 当前登陆的房产 **/
+    private Integer userVerifyId;
+
+    /** 当前登录 期id **/
+    private Integer phaseId;
+
+    /** 当前登录 栋id **/
+    private Integer buildingId;
+
+    /** 当前登录 单元id **/
+    private Integer unitId;
+
+    /** 当前登录 楼层id **/
+    private Integer levelId;
+
+    /** 当前登录 户号id **/
+    private Integer roomNoId;
+
+    /**
+     * 海康人员编号
+     */
+    private String hkPersonNo;
+
+    /**
+     * 海康用户id
+     */
+    private String hkUserId;
+
+    /**
+     * 海康卡片号码
+     */
+    private String hkCardNo;
+
+    @Override
+    public String toString() {
+        return "UserElement{" +
+                "id=" + id +
+                ", communityId=" + communityId +
+                ", userName='" + userName + '\'' +
+                ", loginName='" + loginName + '\'' +
+                ", email='" + email + '\'' +
+                ", status='" + status + '\'' +
+                ", loginType='" + loginType + '\'' +
+                ", userVerifyId=" + userVerifyId +
+                ", phaseId=" + phaseId +
+                ", buildingId=" + buildingId +
+                ", unitId=" + unitId +
+                ", levelId=" + levelId +
+                ", roomNoId=" + roomNoId +
+                ", hkPersonNo='" + hkPersonNo + '\'' +
+                ", hkUserId='" + hkUserId + '\'' +
+                ", hkCardNo='" + hkCardNo + '\'' +
+                '}';
+    }
+}

src/main/java/com/huiju/estateagents/property/common/base/BaseController.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.property.common.base;
+
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.exception.WisdomException;
+import com.huiju.estateagents.property.vo.UserVO;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @author FXF
+ * @date 2018-12-18
+ */
+@Slf4j
+public class BaseController {
+    
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session){
+        log.info("获取sessionId: {}", session.getId());
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        if (null == userElement) {
+            throw new WisdomException("用户凭证不存在!");
+        }
+        return userElement;
+    }
+
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected void setUserElement(HttpSession session, UserVO userVO){
+        log.info("获取sessionId: {}", session.getId());
+        UserElement userElement = new UserElement();
+        userElement.setId(userVO.getId());
+        userElement.setCommunityId(userVO.getCommunityId());
+        userElement.setEmail(userVO.getEmail());
+        userElement.setLoginName(userVO.getLoginName());
+        userElement.setUserName(userVO.getUserName());
+        userElement.setStatus(userVO.getStatus());
+        userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
+
+        session.setAttribute(Constant.WEB_USER_SESSION, userElement);
+    }
+
+
+    /**
+     * 清除 用户 session
+     * @param session
+     */
+    protected void cleanUserSession(HttpSession session){
+        log.info("退出登陆!");
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        if (null != userElement) {
+            session.setAttribute(Constant.WEB_USER_SESSION, null);
+        }
+    }
+
+    /**
+     * 发送响应流方法
+     */
+    protected void setResponseHeader(HttpServletResponse response, String fileName) {
+        try {
+            try {
+                fileName = new String(fileName.getBytes(),"utf-8");
+            } catch (UnsupportedEncodingException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+//            response.setContentType("application/octet-stream;charset=ISO8859-1");
+//            response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
+//            response.addHeader("Pargam", "no-cache");
+//            response.addHeader("Cache-Control", "no-cache");
+
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+fileName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/property/common/base/QRCode.java

@@ -0,0 +1,69 @@
+package com.huiju.estateagents.property.common.base;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.binarywang.utils.qrcode.BufferedImageLuminanceSource;
+import com.github.binarywang.utils.qrcode.MatrixToImageWriter;
+import com.google.zxing.*;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class QRCode {
+
+    /**
+     * 生成图像
+     *
+     * @throws WriterException
+     * @throws IOException
+     */
+    public static InputStream encode(String url, String tpActivityId) throws WriterException, IOException {
+        // 内容
+        String content = url + tpActivityId;
+        // 图像宽度
+        int width = 200;
+        // 图像高度
+        int height = 200;
+        // 图像类型
+        String format = "png";
+        Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>();
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        // 生成矩阵
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints);
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        MatrixToImageWriter.writeToStream(bitMatrix, format, byteArrayOutputStream);
+
+        return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+    }
+
+    /**
+     * 解析图像
+     */
+    public void dcode() {
+        String filePath = "D://zxing.png";
+        BufferedImage image;
+        try {
+            image = ImageIO.read(new File(filePath));
+            LuminanceSource source = new BufferedImageLuminanceSource(image);
+            Binarizer binarizer = new HybridBinarizer(source);
+            BinaryBitmap binaryBitmap = new BinaryBitmap(binarizer);
+            Map<DecodeHintType, Object> hints = new HashMap<DecodeHintType, Object>();
+            hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+            Result result = new MultiFormatReader().decode(binaryBitmap, hints);// 对图像进行解码
+            JSONObject content = JSONObject.parseObject(result.getText());
+            System.out.println("图片中内容：  ");
+            System.out.println("author： " + content.getString("author"));
+            System.out.println("zxing：  " + content.getString("zxing"));
+            System.out.println("图片中格式：  ");
+            System.out.println("encode： " + result.getBarcodeFormat());
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (NotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/huiju/estateagents/property/common/base/messagePush.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.common.base;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/18
+ **/
+public class  messagePush {
+    public String[]  messagePushAll() {
+        String[] messageArr = new String[13];
+        messageArr[0] = "账号已审核通过，看看下面的消息了解下APP如何使用吧！";
+        messageArr[1] = "点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
+        messageArr[2] = "点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";
+        messageArr[3] = "点击上方 访客邀请，将生成的二维码发送给访客，访客即可使用二维码开门";
+        messageArr[4] = "点击上方 公区监控，查看小区公共区域视频直播，看看大家都在干什么";
+        messageArr[5] = "点击上方 智能家居，安装APP玩转室内智能家居设备";
+        messageArr[6] = "想知道物业公告和社区活动？点击底部 论坛 查看";
+        messageArr[7] = "参与社区议事，发布二手/求购/租赁等热门话题，点击底部 论坛 话题";
+        messageArr[8] = "点击底部开锁图标，获取开门二维码，即可扫码开门";
+        messageArr[9] = "楼道灯不亮，电梯坏了，通下水道，找保洁？点击底部 服务 报修";
+        messageArr[10] = "想投诉施工扰民、乱搭乱建、乱停车？点击底部 服务 投诉";
+        messageArr[11] = "有很急的事需要马上联系物业？点击底部 服务 物业 电话联系物业";
+        messageArr[12] = "家人想刷脸进门不会操作？点击底部 个人 房屋成员管理 邀请新成员为TA录入人脸";
+        return  messageArr;
+    }
+}

src/main/java/com/huiju/estateagents/property/common/code/cache/AppkeyCache.java

@@ -0,0 +1,50 @@
+package com.huiju.estateagents.property.common.code.cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.huiju.estateagents.property.common.Constant;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存
+ * @author weiximei
+ */
+@Slf4j
+public class AppkeyCache {
+
+    // 给定时间内没有被读/写访问，则回收。
+    // .refreshAfterWrite(3, TimeUnit.HOURS)
+    static LoadingCache<String, Object> cache = CacheBuilder.newBuilder()
+            // 缓存过期时间和redis缓存时长一样
+            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)
+            // 设置缓存个数
+            .maximumSize(Constant.CACHE_SIZE).
+            build(new CacheLoader<String, Object>() {
+            @Override
+            /** 当本地缓存命没有中时，调用load方法获取结果并将结果缓存 **/
+            public String load(String appKey) throws Exception {
+                return null;
+            }
+
+    });
+
+    public static Object getCache(String appKey) {
+        Object value = null;
+        try {
+            value = cache.get(appKey);
+        } catch (Exception e) {
+            //e.printStackTrace();
+            value = null;
+        }
+        return value;
+    }
+
+    public static void setCache(String appKey,Object appValue){
+        log.info("缓存的key-value: {}-{}", appKey,appValue);
+        cache.put(appKey,appValue);
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/common/code/entity/CodeEntity.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.property.common.code.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CodeEntity {
+
+   private String code;
+
+   private String tel;
+
+    /**
+     * 参数 格式 String params = "["xxx"]"
+     */
+   private String params;
+
+
+
+}

src/main/java/com/huiju/estateagents/property/common/code/impl/ImgCodeImpl.java

@@ -0,0 +1,11 @@
+package com.huiju.estateagents.property.common.code.impl;
+
+/**
+ * 图片验证码
+ * @author weiximei
+ */
+public class ImgCodeImpl {
+
+
+
+}

src/main/java/com/huiju/estateagents/property/common/perproties/DaSuProperties.java

@@ -0,0 +1,26 @@
+package com.huiju.estateagents.property.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;
+
+}

src/main/java/com/huiju/estateagents/property/common/perproties/FuShiProperties.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.property.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;
+}

src/main/java/com/huiju/estateagents/property/common/perproties/QRCodePerproties.java

@@ -0,0 +1,26 @@
+package com.huiju.estateagents.property.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/12
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ConfigurationProperties(prefix = "qr-code")
+@Component
+public class QRCodePerproties {
+
+    private String url;
+
+}

src/main/java/com/huiju/estateagents/property/common/sign/DaSuSign.java

@@ -0,0 +1,82 @@
+package com.huiju.estateagents.property.common.sign;
+
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * 大苏签名校验
+ */
+@Slf4j
+public class DaSuSign {
+
+    /**
+     * 校验签名是否相等
+     * @param val_1
+     * @param val_2
+     * @return true 相等  false 不相等
+     */
+    public static boolean isMD5Sign(String val_1, String val_2) {
+        return StringUtils.equals(val_1, val_2);
+    }
+
+    /**
+     *
+     * 创建签名
+     *
+     * @param appid
+     * @param appSecret
+     * @param datetime 时间戳
+     * @param encrypt 加密方式(目前就 MD5)
+     * @param communityId 小区id
+     * @return
+     */
+    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String communityId){
+        TreeMap<String ,Object> treeMap = Maps.newTreeMap();
+        treeMap.put("appid", appid);
+        treeMap.put("datetime", datetime);
+        treeMap.put("encrypt", encrypt);
+        treeMap.put("communityid", communityId);
+
+        String sign = "";
+
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<String, Object>> entries = treeMap.entrySet();
+        entries.forEach(e-> {
+            sb.append(e.getKey());
+            sb.append("=");
+            sb.append(e.getValue());
+            sb.append("&");
+        });
+
+        sign = sb.toString();
+        sign = sign.substring(0, sign.lastIndexOf("&"));
+
+        log.info("签名之前参数: {}" , sign);
+
+        try {
+            String str = new String(sign.getBytes("UTF-8"), "UTF-8");
+            sign = DigestUtils.md5Hex( str + appSecret);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        log.info("签名: {}" , sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+
+        Long timeMillis = System.currentTimeMillis();
+        System.out.println(timeMillis);
+        String sign = createSign("dssdw2576sd997", "fgexhd855sf4", timeMillis + "", "md5", "101");
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -0,0 +1,184 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.AnnouncementTel;
+import com.huiju.estateagents.property.service.IAnnouncementTelService;
+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.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 物业号码表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "物业端号码 API", description = "物业端号码 API")
+public class AnnouncementTelController extends BaseController {
+	
+	@Autowired
+	private IAnnouncementTelService announcementTelService;
+	
+	@ApiOperation(value = "根据搜索条件获取物业端号码", notes = "根据搜索条件获取物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "name", value = "名称（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "tel", value = "号码（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "备注（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tels",method = RequestMethod.GET)
+	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
+                                @RequestParam(value = "tel", required = false) String tel,
+                                @RequestParam(value = "remark", required = false) String remark,
+                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		AnnouncementTel announcementTel = new AnnouncementTel();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setName(name);
+		announcementTel.setTel(tel);
+		announcementTel.setRemark(remark);
+		responseBean = announcementTelService.getTelList(announcementTel,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加物业端号码", notes = "添加物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
+	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+
+//		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
+//			responseBean.addError("输入的号码不正确!");
+//			return responseBean;
+//		}
+
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
+		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
+		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
+		if (null != telServiceOne) {
+			responseBean.addError("此号码已存在");
+			return responseBean;
+		}
+		LocalDateTime time = LocalDateTime.now();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setCreateUser(userElement.getId());
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setCreateDate(time);
+		announcementTel.setUpdateDate(time);
+		boolean state = announcementTelService.save(announcementTel);
+		if (state){
+			responseBean.addSuccess("添加物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("添加物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID修改物业端号码", notes = "根据ID修改物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
+	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		boolean isPhone = true;
+		boolean isLandline = true;
+//		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
+//			isLandline = false;
+//		}
+//		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
+//			isPhone = false;
+//		}
+//		if (isPhone == false && isLandline == false) {
+//			responseBean.addError("输入的号码不正确!");
+//			return responseBean;
+//		}
+//		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
+//			responseBean.addError("输入的号码不正确!");
+//			return responseBean;
+//		}
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
+		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
+		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
+		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
+			announcementTel.setUpdateUser(userElement.getId());
+			announcementTel.setUpdateDate(LocalDateTime.now());
+			announcementTelService.updateById(announcementTel);
+			responseBean.addSuccess("修改物业端号码成功");
+			return responseBean;
+		}
+		if (null != telServiceOne) {
+			responseBean.addError("此号码已存在");
+			return responseBean;
+		}
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setUpdateDate(LocalDateTime.now());
+		boolean state = announcementTelService.updateById(announcementTel);
+		if (state){
+			responseBean.addSuccess("修改物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("修改物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取Id获取物业端号码详情", notes = "获取Id获取物业端号码详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/{id}",method = RequestMethod.GET)
+	public ResponseBean getNoticeById(@PathVariable(value ="id") Integer id, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		AnnouncementTel announcementTel = announcementTelService.getById(id);
+		responseBean.addSuccess(announcementTel);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID批量删除物业端号码", notes = "根据ID批量删除物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "integer", name = "ids", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/delete", method = RequestMethod.POST)
+	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		boolean state = announcementTelService.removeByIds(ids);
+		if (state){
+			responseBean.addSuccess("删除物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("删除物业端号码失败");
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -0,0 +1,165 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.Bill;
+import com.huiju.estateagents.property.service.IBillService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费项表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "缴费项 API", description = "缴费项 API")
+public class BillController extends BaseController {
+
+    @Autowired
+    private IBillService iBillService;
+    
+    
+    @ApiOperation(value = "根据搜索条件获取缴费项列表", notes = "根据搜索条件获取缴费项列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "billId", value = "收费组编号"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "billName", value = "收费组名（模糊查询）"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "billExplain", value = "收费组说明（模糊查询）"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/bills",method = RequestMethod.GET)
+    public ResponseBean getList(@RequestParam(value = "billId", required = false) Integer billId,
+                                @RequestParam(value = "billName", required = false) String billName,
+                                @RequestParam(value = "billExplain", required = false) String billExplain,
+                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        Bill bill = new Bill();
+        bill.setId(billId);
+        bill.setBillName(billName);
+        bill.setBillExplain(billExplain);
+        bill.setCommunityId(userElement.getCommunityId());
+        responseBean = iBillService.getBillList(bill,pageNum,pageSize);
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "根据 id 查询缴费项详情", notes = "根据 id 查询缴费项详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "id编号")
+    })
+    @RequestMapping(value = "/bill/{id}", method = RequestMethod.GET)
+    public ResponseBean getByBillId(HttpSession session, @PathVariable("id") Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBillService.getByBillId(id);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
+    @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.getExcelData(file, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "上传缴费项接口, 保存/修改", notes = "上传缴费项接口, 保存/修改")
+    @PostMapping(value = "/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean addUploadExcel(HttpSession session,
+                                       @RequestParam(value = "billId", required = false) Integer billId,
+                                       @RequestParam(value = "file", required = false) MultipartFile file,
+                                       @RequestParam("billExplain") String billExplain,
+                                       @RequestParam("billName") String billName,
+                                       @RequestParam("endDate") String endDate,
+                                       @RequestParam("billStatus") String billStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = null;
+        try {
+            String d = simpleDateFormat.format(new Long(endDate));
+            date = simpleDateFormat.parse(d);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, date, billStatus, userElement);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "根据 id 修改缴费项状态", notes = "根据 id 修改缴费项状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "id编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "billStatus", value = "状态 0：正在收费  2： 草稿")
+    })
+    @RequestMapping(value = "/bill/updateBillStatus/{id}", method = RequestMethod.PUT)
+    public ResponseBean updateBillStatus(HttpSession session,
+                                         @RequestParam("billStatus") Integer billStatus,
+                                         @PathVariable("id") Integer id) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.updateBillStatus(userElement, billStatus, id);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据 id集合 删除缴费项", notes = "根据 id集合 删除缴费项")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id编号集合"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/deleteBillBeach", method = RequestMethod.POST)
+    public ResponseBean deleteBillBeach(HttpSession session,
+                                        @RequestBody List<Integer> ids) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.deleteBillBeach(userElement, ids);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "下载Excel模板", notes = "下载Excel模板")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
+        this.setResponseHeader(response, "缴费单模板.xls");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -0,0 +1,235 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.BillInvoice;
+import com.huiju.estateagents.property.service.IBillInvoiceService;
+import com.huiju.estateagents.property.service.IBillService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费单 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "缴费单 API", description = "缴费单 API")
+public class BillInvoiceController extends BaseController {
+
+    @Autowired
+    private IBillInvoiceService iBillInvoiceService;
+
+    @Autowired
+    private IBillService iBillService;
+
+    @ApiOperation(value = "查询缴费单", notes = "查询缴费单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billId: 缴费项目id," +
+                    "phase: 期,building: 栋,unit: 单元,roomNo: 户号,ownerName: 业主姓名," +
+                    "billStatus: 缴费状态,payName: 缴费人,pageSize: 一页多少行,pageNum: 第几页"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+    })
+    @RequestMapping(value = "/bill/invoice/list", method = RequestMethod.POST)
+    public ResponseBean getBillList(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.getBillList(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改缴费项 收费项名称,缴费项说明,截止时间", notes = "修改缴费项 收费项名称,缴费项说明,截止时间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billName收费项名称,billExplain缴费项说明,endDate截止时间"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/updateBill", method = RequestMethod.PUT)
+    public ResponseBean updateBill(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据 id集合 删除缴费单", notes = "根据 id集合 删除缴费单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/delete", method = RequestMethod.POST)
+    public ResponseBean delete(HttpSession session, @RequestBody List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+
+        responseBean = iBillInvoiceService.deleteBillInvoice(ids, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "设置线下缴费", notes = "设置线下缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/offlinePayment", method = RequestMethod.POST)
+    public ResponseBean offlinePayment(HttpSession session, @RequestBody List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+
+        responseBean = iBillInvoiceService.offlinePayment(ids, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "由前台批量添加收费单, 默认定为 作废", notes = "由前台批量添加收费单, 默认定为 作废")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billId缴费项编号,phase期/区," +
+                    "building栋,unit单元,roomNo户号,worthOf截止时间(催缴日期),billInvoiceExplain收费单说明,payPrice收费金额"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/addTempBillInvoice", method = RequestMethod.POST)
+    public ResponseBean addTempBillInvoice(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.addTempBillInvoice(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "由前台批量添加收费单, 进行统一的提交, 修改为有效", notes = "由前台批量添加收费单, 进行统一的提交, 修改为有效")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/updateBillInvoiceStatus", method = RequestMethod.POST)
+    public ResponseBean updateBillInvoiceStatus(HttpSession session, @RequestBody List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.updateBillInvoiceStatus(ids, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询前台批量添加的收费单, 状态是作废", notes = "查询前台批量添加的收费单, 状态是作废")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/getTempBillInvoice/{billId}", method = RequestMethod.GET)
+    public ResponseBean getTempBillInvoice(HttpSession session, @PathVariable("billId") Integer billId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.getTempBillInvoice(billId, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据id删除收费单, 只能删除作废的", notes = "根据id删除收费单, 只能删除作废的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/deleteTempBillInvoice/{billId}", method = RequestMethod.DELETE)
+    public ResponseBean deleteTempBillInvoice(HttpSession session, @PathVariable("billId") Integer billId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.deleteTempBillInvoice(billId, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据缴费单id, 修改金额", notes = "根据缴费单id, 修改金额")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "payPrice金额"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdPayPrice/{billId}", method = RequestMethod.POST)
+    public ResponseBean updateBillInvoiceIdPayPrice(HttpSession session, @PathVariable Integer billId, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        Double payPrice = JSONObject.parseObject(parameter).getDouble("payPrice");
+//        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, PayPriceUtils.yuanConversionPoints(payPrice) , userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据缴费单id, 修改收费说明", notes = "根据缴费单id, 修改收费说明")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billInvoiceExplain收费说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
+    public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpSession session, @PathVariable Integer billId, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        String billInvoiceExplain = JSONObject.parseObject(parameter).getString("billInvoiceExplain");
+        if (StringUtils.isBlank(billInvoiceExplain)) {
+            responseBean.addError("收费说明不能为空!");
+            return responseBean;
+        }
+        BillInvoice billInvoice = iBillInvoiceService.getById(billId);
+        billInvoice.setBillInvoiceExplain(billInvoiceExplain);
+        boolean b = iBillInvoiceService.updateById(billInvoice);
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/exportExcel/{billId}", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session, @PathVariable("billId") Integer billId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillInvoiceService.exportExcel(userElement, billId).getData();
+        this.setResponseHeader(response, "缴费单.xls");
+        //响应到客户端
+        try {
+             OutputStream os = response.getOutputStream();
+             workbook.write(os);
+             os.flush();
+             os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    @ApiOperation(value = "根据缴费项id, 查询草稿", notes = "根据缴费项id, 查询草稿")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "billId缴费项id,pageNum当前页,pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/getInvoiceInvalid", method = RequestMethod.POST)
+    public ResponseBean getInvoiceInvalid(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.getInvoiceInvalid(userElement, parameter);
+        return responseBean;
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/controller/BillOrderController.java

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IBillOrderService;
+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.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 缴费订单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-18
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "订单 API", description = "订单 API")
+public class BillOrderController extends BaseController {
+
+    @Autowired
+    private IBillOrderService iBillOrderService;
+
+
+    @RequestMapping(value = "/bill/order/getByOrderNumberBillInvoice/{orderNumber}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据订单查询 缴费单", notes = "根据订单查询 缴费单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "orderNumber", value = "订单号")
+    })
+    public ResponseBean getByOrderNumberBillInvoice(HttpSession session, @PathVariable("orderNumber") String orderNumber) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillOrderService.getByOrderNumberBillInvoice(userElement, orderNumber);
+        return responseBean;
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/controller/BillStatementController.java

@@ -0,0 +1,76 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IBillStatementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+
+/**
+ * <p>
+ * 账单流水表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "流水/订单 信息 API", description = "流水/订单 信息 API")
+public class BillStatementController extends BaseController {
+
+    @Autowired
+    private IBillStatementService iBillStatementService;
+
+    @ApiOperation(value = "获取订单信息", notes = "获取订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "payPhone订单号," +
+                    "billId缴费项编号,billName缴费项名称,billInvoiceId缴费单编号,payName缴费人"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/bill/statement/all", method = RequestMethod.POST)
+    public ResponseBean getBillStatement(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillStatementService.getBillStatement(userElement, parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/statement/exportExcel", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillStatementService.exportExcel(userElement).getData();
+        this.setResponseHeader(response, "流水信息.xls");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -0,0 +1,330 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TaFace;
+import com.huiju.estateagents.property.model.TaUser;
+import com.huiju.estateagents.property.model.TaUserVerify;
+import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
+import com.huiju.estateagents.property.service.ITaFaceService;
+import com.huiju.estateagents.property.service.ITaUserVerifyService;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "楼栋业主资料信息", description = "楼栋业主资料信息 Api")
+public class BuildingOwnerInfoController extends BaseController {
+
+    @Autowired
+    private IBuildingOwnerInfoService iBuildingOwnerInfoService;
+
+    @Autowired
+    private ITaUserVerifyService iTaUserVerifyService;
+
+    @Autowired
+    private ITaFaceService iTaFaceService;
+
+    @ApiOperation(value = "获取楼栋业主信息", notes = "根据条件获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "buildingId栋;" +
+                    "unitId单元;levelId楼层;roomNoId户号;" +
+                    "ownerName业主姓名;" +"ownerTel业主手机号;" +"idCard身份证;" +
+                    "pageNum第几页;pageSize 一页多少行;")
+    })
+    @RequestMapping(value = "/building/list", method = RequestMethod.POST)
+    public ResponseBean getList(@RequestBody String parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取楼栋业主审核详情", notes = "获取楼栋业主审核详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "userVerifyId",value = "审核Id")
+    })
+    @RequestMapping(value = "/building/verify/{userVerifyId}", method = RequestMethod.GET)
+    public ResponseBean getById(@PathVariable(value = "userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify userVerify = iTaUserVerifyService.getById(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("审核数据不存在！");
+            return responseBean;
+        }
+//        TaUser user = iTaUserService.getById(userVerify.getUserId());
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("verify", userVerify);
+//        map.put("info", user);
+
+        // true 标识业主 false 非业主
+        map.put("boolRole", false);
+
+        // 默认人脸未录入
+        map.put("face", "unregister");
+
+        QueryWrapper<TaUserVerify> userVerifyQueryWrapper = new QueryWrapper<>();
+        userVerifyQueryWrapper.eq("phase_id", userVerify.getPhaseId());
+        userVerifyQueryWrapper.eq("building_id", userVerify.getBuildingId());
+        userVerifyQueryWrapper.eq("unit_id", userVerify.getUnitId());
+        userVerifyQueryWrapper.eq("level_id", userVerify.getLevelId());
+        userVerifyQueryWrapper.eq("room_no_id", userVerify.getRoomNoId());
+        userVerifyQueryWrapper.eq("user_id", userVerify.getUserId());
+        userVerifyQueryWrapper.eq("role_id", 1);
+        TaUserVerify userVerifyOne = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
+        if (null != userVerifyOne) {
+            map.put("boolRole", true);
+        }
+
+        // 人脸是否录入
+        QueryWrapper<TaFace> faceQueryWrapper = new QueryWrapper<>();
+        faceQueryWrapper.eq("ta_user_verify_id", userVerify.getId());
+        TaFace face = iTaFaceService.getOne(faceQueryWrapper);
+        if (null != face) {
+            map.put("face", "register");
+        }
+
+
+        responseBean.addSuccess(map);
+        return responseBean;
+
+    }
+
+    @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "userVerifyId审核编号;roleId角色编号;verifyStatus审核 true通过；false不通过;remark备注"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
+    public ResponseBean update(@RequestBody String parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.update(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加楼栋业务信息", notes = "添加楼栋业务信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phaseId期;buildingId栋;" +
+                    "unitId单元;levelId楼层;roomNoId户号;" +
+                    "ownerName业主姓名;" +
+                    "ownerTel业主手机号;roleId角色id;gender性别 1：男   2：女;"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/building/add", method = RequestMethod.POST)
+    public ResponseBean add(@RequestBody String parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.add(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "批量删除楼栋业主信息", notes = "批量删除楼栋业主信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids",value = "id集合"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
+    public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.deleteIds(ids, userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/building/phase",method = RequestMethod.GET)
+    public ResponseBean getPhaseList(HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 楼栋", notes = "查询 楼栋")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "phaseId",value = "期区ID")
+    })
+    @RequestMapping(value = "/building/building",method = RequestMethod.GET)
+    public ResponseBean getBuildingList(@RequestParam Integer phaseId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getBuildingList(phaseId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 单元", notes = "查询 单元")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "buildingId",value = "楼栋ID")
+    })
+    @RequestMapping(value = "/building/unit",method = RequestMethod.GET)
+    public ResponseBean getUnitList(@RequestParam Integer buildingId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getUnitList(buildingId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 楼层", notes = "查询 楼层")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "unitId",value = "单元ID")
+    })
+    @RequestMapping(value = "/building/level",method = RequestMethod.GET)
+    public ResponseBean getLevelList(@RequestParam Integer unitId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getLevelList(unitId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 房间号", notes = "查询 房间号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "levelId",value = "楼层ID")
+    })
+    @RequestMapping(value = "/building/roomno",method = RequestMethod.GET)
+    public ResponseBean getRoomNoList(@RequestParam Integer levelId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getRoomNoList(levelId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "上传楼栋信息接口", notes = "上传楼栋信息接口")
+    @PostMapping(value = "/building/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.getExcelData(file);
+        return responseBean;
+    }
+ 
+    @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
+    @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        try {
+            responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        }catch (Exception e){
+            responseBean.addError("导入数据失败" + e.getMessage());
+            e.printStackTrace();
+        }
+        
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="ownerName:姓名,ownerTel:手机号 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
+
+    @RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
+    public ResponseBean userPassCertification(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets,userElement.getCommunityId());
+        return allApprove;
+    }
+
+    @ApiOperation(value = "修改用户当前认证状态",nickname ="修改用户当前认证状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="ownerTel:手机号,verifyStatus:当前状态")})
+
+    @RequestMapping(value="/updataPassCertification",method = RequestMethod.POST)
+    public ResponseBean updataPassCertification(@RequestBody String paramets){
+        ResponseBean userParent=iBuildingOwnerInfoService.updataApprove(paramets);
+        return userParent;
+    }
+
+    @ApiOperation(value = "小区楼栋资料表",nickname ="小区楼栋资料表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="phase:期,building:楼栋 ,unit:单元,level:楼层，roomNo:户号， pageNum:每页显示多少条,pageSzie:当前页数"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+    @RequestMapping(value="/buildinglist",method = RequestMethod.POST)
+    public ResponseBean buildinglist(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean buildinglist=iBuildingOwnerInfoService.buildinglist(paramets,userElement);
+        return buildinglist;
+    }
+
+    @ApiOperation(value = "小区楼栋资料表-查询 楼栋/单元/楼层/户号", notes = "小区楼栋资料表-查询 楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phase:期;building楼栋;" +
+                    "unit单元;level楼层：roomNo:户号") // ;roomNo户号
+    })
+    @RequestMapping(value = "/buildinghouse",method = RequestMethod.POST)
+    public ResponseBean puildinghouse(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iBuildingOwnerInfoService.puildinghouse(parameter, userElement.getCommunityId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "小区楼栋资料表-修改 楼栋/单元/楼层/户号", notes = "小区楼栋资料表-修改 楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phase:期；building:当前楼栋;" +
+                    "unit:当前楼层单元;level:当前楼层楼层;roomNo:当前楼层楼层")
+    })
+    @RequestMapping(value = "/communitybuilding/update",method = RequestMethod.POST)
+    public ResponseBean communitybuildingAdd(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iBuildingOwnerInfoService.communitybuildingUpdate(parameter, userElement.getCommunityId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "下载Excel模板(小区楼栋信息)", notes = "下载Excel模板(小区楼栋信息)")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/building/downloadExcel", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
+        this.setResponseHeader(response, "业主资料库.xlsx");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    @ApiOperation(value = "住户资料详情",nickname ="住户资料详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:楼栋住户ID"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+    @RequestMapping(value="/building/details",method = RequestMethod.POST)
+    public ResponseBean buildingDetails(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean buildinglist=iBuildingOwnerInfoService.buildingDetails(paramets,userElement);
+        return buildinglist;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/BuildingTreeController.java

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.BuildingTreeServiceI;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-04-01
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "楼栋树管理", description = "楼栋树管理 Api")
+public class BuildingTreeController extends BaseController {
+	
+	@Autowired
+	private BuildingTreeServiceI buildingTreeService;
+	
+	@ApiOperation(value = "上传楼栋信息接口", notes = "上传楼栋信息接口")
+	@PostMapping(value = "/tree/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+	public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = buildingTreeService.getExcelData(file);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
+	@PostMapping(value = "/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = buildingTreeService.submitExcelData(file,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取树形数据", notes = "获取树形数据")
+	@GetMapping(value = "/trees")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "id", value = "当前节点id(查期时ID为空)"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "treeType", value = "phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)")
+	})
+	public ResponseBean getTreeList(@RequestParam(value = "id", required = false) Integer id, @RequestParam("treeType") String treeType, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();UserElement userElement = getUserElement(session);
+
+		responseBean = buildingTreeService.getTreeList(userElement.getCommunityId(),id,treeType);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "添加当前节点", notes = "添加当前节点")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;" +
+					"name:节点名称;type：(phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)), roomNonodeNumber:输入的节点")
+	})
+	@RequestMapping(value = "/addnode",method = RequestMethod.POST)
+	public ResponseBean addNode(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+	    ResponseBean	responseBean = buildingTreeService.addNode(parameter, userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "删除当前节点", notes = "删除当前节点")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;type:(end:(房间)，roomNo:(楼层),level:(单元)，unit:(楼栋),building:(期))")
+	})
+	@RequestMapping(value = "/deletenode",method = RequestMethod.POST)
+	public ResponseBean deletenode(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean	responseBean = buildingTreeService.deleteNode(parameter, userElement.getCommunityId());
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/CarouselSettingController.java

@@ -0,0 +1,138 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TpCarouselSetting;
+import com.huiju.estateagents.property.service.ICarouselSettingService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 轮播数设置表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "轮播数设置表 API", description = "轮播数设置表 API")
+public class CarouselSettingController extends BaseController {
+
+    @Autowired
+    private ICarouselSettingService iCarouselSettingService;
+
+    @ApiOperation(value = "添加/修改公告的Banner数量", notes = "添加/修改公告的Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
+    })
+    @RequestMapping(value = "/carousel/announcement/banner", method = RequestMethod.PUT)
+    public ResponseBean updateAnnouncementBanner(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("carousel_type","announcement");
+        TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
+        Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
+        boolean b = false;
+        // 修改
+        if (null != one) {
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.updateById(one);
+        } else {
+            one = new TpCarouselSetting();
+            one.setCarouselNum(carouselNum);
+            one.setCarouselType("announcement");
+            one.setCommunityId(userElement.getCommunityId());
+            // 添加
+            b = iCarouselSettingService.save(one);
+
+        }
+
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加/修改活动的Banner数量", notes = "添加/修改活动的Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
+    })
+    @RequestMapping(value = "/carousel/activity/banner", method = RequestMethod.PUT)
+    public ResponseBean updateActivityBanner(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("carousel_type","activity");
+        TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
+        Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
+        boolean b = false;
+        if (null != one) {
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.updateById(one);
+        } else {
+            one = new TpCarouselSetting();
+            one.setCarouselType("activity");
+            one.setCommunityId(userElement.getCommunityId());
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.save(one);
+        }
+
+
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取Banner数量", notes = "获取Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+    })
+    @RequestMapping(value = "/carousel/getBanner", method = RequestMethod.GET)
+    public ResponseBean getBannerNum(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("community_id", userElement.getCommunityId());
+        activityQueryWrapper.eq("carousel_type","activity");
+        TpCarouselSetting activityOne = iCarouselSettingService.getOne(activityQueryWrapper);
+
+        QueryWrapper<TpCarouselSetting> announcementQueryWrapper = new QueryWrapper<>();
+        announcementQueryWrapper.eq("community_id", userElement.getCommunityId());
+        announcementQueryWrapper.eq("carousel_type","announcement");
+        TpCarouselSetting announcementOne = iCarouselSettingService.getOne(announcementQueryWrapper);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("activity", activityOne);
+        map.put("announcement", announcementOne);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/CommunitiesController.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IUserService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 所有小区表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "小区Api", description = "小区Api")
+public class CommunitiesController extends BaseController {
+
+    @Autowired
+    private IUserService iUserService;
+
+    @ApiOperation(value = "根据手机号 和 验证码 获取小区列表", notes = "根据手机号 和 验证码 获取小区列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码")
+    })
+    @RequestMapping(value = "/community/user", method = RequestMethod.POST)
+    public ResponseBean userCommunity(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iUserService.userCommunity(jsonObject.getString("loginName"), jsonObject.getString("code"));
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/HotelController.java

@@ -0,0 +1,147 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.Hotel;
+import com.huiju.estateagents.property.model.HotelRoom;
+import com.huiju.estateagents.property.service.IHotelRoomService;
+import com.huiju.estateagents.property.service.IHotelService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 酒店 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "", description = "酒店管理API")
+public class HotelController extends BaseController {
+    @Autowired
+    private IHotelService iHotelService;
+
+    @Autowired
+    private IHotelRoomService tpHotelRoomService;
+
+
+    @ApiOperation(value = "房屋列表", notes = "房屋列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "beginTime:开始时间"+
+                    "endTime:结束时间"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomList", method = RequestMethod.POST)
+    public ResponseBean hotelRoom(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomLiset(parameter,userElement.getCommunityId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加房间", notes = "添加房间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "remark:(描述)"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomAdd", method = RequestMethod.POST)
+    public ResponseBean hotelRoomAdd(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomAdd(parameter,userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询当前房间信息", notes = "查询当前房间信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID")})
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/getRoom", method = RequestMethod.POST)
+    public ResponseBean getRoom(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean= new ResponseBean<>();
+
+       JSONObject object= JSONObject.parseObject(parameter);
+        Integer id= object.getInteger("id");
+         HotelRoom totelRoom= tpHotelRoomService.getById(id);
+         responseBean.addSuccess(totelRoom);
+         return responseBean;
+    }
+    @ApiOperation(value = "编辑房间", notes = "编辑房间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID，roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "remark:(描述)"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomEdit", method = RequestMethod.POST)
+    public ResponseBean hotelRoomEdit(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomEdit(parameter,userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改当前房间上架或下架状态", notes = "修改当前房间上架或下架状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:[]房间ID，roomStatus:(1:是已上架 2:是已下架)"
+            )})
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomRoomStatus", method = RequestMethod.POST)
+    public ResponseBean hotelRoomRoomStatus(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        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;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/HotelRoomController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 酒店房间表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class HotelRoomController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/ImageController.java

@@ -0,0 +1,76 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ImageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+
+import javax.sql.rowset.serial.SerialBlob;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: ImageController
+ * @Description: 图片上传以及获取url
+ * @date 2018/10/31
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "图片操作API", description = "图片操作API")
+public class ImageController extends BaseController {
+
+    @Autowired
+    private ImageServiceI imageService;
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimageBase64")
+    public ResponseBean uploadImgBase64AndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) String uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        // int index = uploadFiles.indexOf("data:image/jpeg;base64,");
+        //uploadFiles = uploadFiles.substring(23);
+        String[] split = uploadFiles.split("base64,");
+        SerialBlob serialBlob = null;
+        if (split.length > 1) {
+            serialBlob = decodeToImage(split[1]);
+        } else {
+            serialBlob = decodeToImage(split[0]);
+        }
+
+        String url = imageService.getImageUrl(serialBlob.getBinaryStream());
+        urls.add(url);
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
+
+    public static SerialBlob decodeToImage(String imageString) throws Exception {
+        BASE64Decoder decoder = new BASE64Decoder();
+        byte[] imageByte = decoder.decodeBuffer(imageString);
+        return new SerialBlob(imageByte);
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/controller/IndexCountController.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IndexCountServiceI;
+import com.google.common.collect.Maps;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class IndexCountController extends BaseController {
+	
+	@Autowired
+	private IndexCountServiceI indexCountService;
+	
+	@ApiOperation(value = "获取物业端首页所有统计数据", notes = "获取物业端首页所有统计数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/index/count", method = RequestMethod.GET)
+	public ResponseBean getIndexCount(HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = new ResponseBean();
+		Map<String,Object> indexCountMap = Maps.newHashMap();
+		try {
+			indexCountMap = indexCountService.getIndexCount(userElement);
+		}catch (Exception e){
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		responseBean.addSuccess(indexCountMap);
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/MessageController.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IMessageService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业端消息表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "消息通知API", description = "消息通知API")
+public class MessageController extends BaseController {
+
+    @Autowired
+    private IMessageService messageService;
+    @ApiOperation(value = "消息待办", notes = "消息待办")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:待办消息类型(-1:论坛，-2:工单，-3:缴费),status:(0:无效，1:有效)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/messageLiset", method = RequestMethod.POST)
+    public ResponseBean messageLiset(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.messageLiset(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "我的消息", notes = "我的消息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:消息类型(-1:论坛，-2:工单，-3:缴费),readStatus:(0:未读，1:已读)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/myMessageList", method = RequestMethod.POST)
+    public ResponseBean myMessageList(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.myMessageList(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "消息已读", notes = "消息已读")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:(多个) ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/delectRead", method = RequestMethod.POST)
+    public ResponseBean delectRead(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getId());
+        return responseBean;
+    }
+}
+
+

src/main/java/com/huiju/estateagents/property/controller/RoleController.java

@@ -0,0 +1,107 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.SysRole;
+import com.huiju.estateagents.property.service.RoleServiceI;
+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.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-01-16
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "物业端角色API", description = "物业端角色API")
+public class RoleController extends BaseController {
+	
+	@Autowired
+	private RoleServiceI roleService;
+	
+	@ApiOperation(value = "根据搜索条件获取角色列表", notes = "根据搜索条件获取角色列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "roleName", value = "帖子标题（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/roles",method = RequestMethod.GET)
+	public ResponseBean getRoleList(@RequestParam(value = "roleName", required = false) String roleName,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+	                            HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.getRoleList(roleName,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加角色", notes = "添加角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/add", method = RequestMethod.POST)
+	public ResponseBean addRole(@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.addRole(sysRole, userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取角色详情", notes = "获取角色详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/{id}",method = RequestMethod.GET)
+	public ResponseBean getRoleInfo(@PathVariable(value = "id", required = false) Integer id,
+	                            HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.getRoleInfo(id,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "修改角色", notes = "修改角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/update/{id}", method = RequestMethod.PUT)
+	public ResponseBean updateRole(@PathVariable Integer id, @RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		sysRole.setId(id);
+		responseBean = roleService.updateRole(sysRole, userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "删除角色", notes = "删除角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "idArray角色id集合")
+	})
+	@RequestMapping(value = "/role/delete", method = RequestMethod.POST)
+	public ResponseBean deleteRole(@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.deleteRole(sysRole, userElement);
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/SysUserRoleController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+@RestController
+@RequestMapping("/tp/sys-user-role")
+public class SysUserRoleController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TaTemporaryLicenseCountController.java

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TaTemporaryLicenseCount;
+import com.huiju.estateagents.property.service.ITaTemporaryLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 临时车统计表，按天计算 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaTemporaryLicenseCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTemporaryLicenseCountController.class);
+
+    @Autowired
+    public ITaTemporaryLicenseCountService iTaTemporaryLicenseCountService;
+
+
+    /**
+     * 保存对象
+     * @param taTemporaryLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TaTemporaryLicenseCount taTemporaryLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTemporaryLicenseCountService.save(taTemporaryLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTemporaryLicenseCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTemporaryLicenseCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTemporaryLicenseCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taTemporaryLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TaTemporaryLicenseCount taTemporaryLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTemporaryLicenseCountService.updateById(taTemporaryLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTemporaryLicenseCountService.getById(id));
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/TaUserLicenseCountController.java

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TaUserLicenseCount;
+import com.huiju.estateagents.property.service.ITaUserLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 月租车统计表，按天计算 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserLicenseCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserLicenseCountController.class);
+
+    @Autowired
+    public ITaUserLicenseCountService iTaUserLicenseCountService;
+
+
+    /**
+     * 保存对象
+     * @param taUserLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taUserLicenseCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TaUserLicenseCount taUserLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserLicenseCountService.save(taUserLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUserLicenseCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserLicenseCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserLicenseCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taUserLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taUserLicenseCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TaUserLicenseCount taUserLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserLicenseCountService.updateById(taUserLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUserLicenseCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserLicenseCountService.getById(id));
+        }catch (Exception e){
+            logger.error("taUserLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/TaUserLicenseOrderController.java

@@ -0,0 +1,87 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ITaUserLicenseOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+
+/**
+ * <p>
+ * 月租车缴费订单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "月租车缴费订单表", description = "月租车缴费订单表")
+public class TaUserLicenseOrderController extends BaseController {
+
+    @Autowired
+    private ITaUserLicenseOrderService iTaUserLicenseOrderService;
+
+    @RequestMapping(value = "/user/license/order", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车缴费记录", notes = "获取月租车缴费记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "licensePlate", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "orderNumber", value = "订单号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentName", value = "缴费人姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentTel", value = "缴费人手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少条"),
+    })
+    public ResponseBean getAll(@RequestParam(value = "id",required = false) Integer id,
+                               @RequestParam(value = "licensePlate",required = false) String licensePlate,
+                               @RequestParam(value = "orderNumber",required = false) String orderNumber,
+                               @RequestParam(value = "paymentName",required = false) String paymentName,
+                               @RequestParam(value = "paymentTel",required = false) String paymentTel,
+                               @RequestParam(value = "pageNum",defaultValue = "1", required = false) Integer pageNum,
+                               @RequestParam(value = "pageSize" ,defaultValue = "10", required = false) Integer pageSize,
+                               HttpSession session) {
+
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserLicenseOrderService.getAll(id, licensePlate, orderNumber, paymentName, paymentTel, pageNum, pageSize, userElement);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "月租车导出数据", notes = "月租车导出数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/user/license/export", method = RequestMethod.GET)
+    public void exportDate(HttpServletRequest request, HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserLicenseOrderService.exportDate(userElement);
+        Workbook workbook = (Workbook) responseBean.getData();
+        this.setResponseHeader(response, "月租租车.xlsx");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/TaVisitorLicenseSettingController.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ITaVisitorLicenseSettingService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "录入访客车牌功能开关", description = "录入访客车牌功能开关")
+public class TaVisitorLicenseSettingController extends BaseController {
+
+    @Autowired
+    private ITaVisitorLicenseSettingService taVisitorLicenseSettingService;
+
+    @ApiOperation(value = "是否开启访客邀请车辆", notes = "是否开启访客邀请车辆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Boolean.class, paramType = "form", name = "visitorLicenseBool", value = "true 表示开启  false 关闭"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/visitor/saveOrDelete", method = RequestMethod.POST)
+    public ResponseBean saveOrDelete(HttpSession session, @RequestParam("visitorLicenseBool") Boolean visitorLicenseBool){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taVisitorLicenseSettingService.saveOrDelete(userElement, visitorLicenseBool);
+
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "查看是否开启访客车辆邀请", notes = "查看是否开启访客车辆邀请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/visitor", method = RequestMethod.GET)
+    public ResponseBean getVisitorLicense(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taVisitorLicenseSettingService.getVisitorLicense(userElement);
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpAnnouncementController.java

@@ -0,0 +1,81 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.TpAnnouncementService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+
+@RequestMapping("/")
+@Api(value = "公告管理API", description = "公告管理API")
+public class TpAnnouncementController extends BaseController {
+    @Autowired
+    private TpAnnouncementService tpAnnouncementService;
+
+    @ApiOperation(value = "获取公告管理列表",nickname ="获取公告管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告编号,announcementTitle:公告标题 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value="/tpAnnouncement",method = RequestMethod.POST)
+    public ResponseBean tpAnnouncement(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean tpAnnouncementList=tpAnnouncementService.tpAnnouncemenList(paramets,userElement.getCommunityId());
+        return tpAnnouncementList;
+    }
+
+    @ApiOperation(value = "添加公告",nickname ="添加公告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="announcementTitle:公告标题，" +
+                    "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value="/addAnnouncement",method = RequestMethod.POST)
+    public ResponseBean addAnnouncement(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  addAnnouncement= tpAnnouncementService.addAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+        return addAnnouncement;
+    }
+
+    @ApiOperation(value = "查询公告详情",nickname ="查询公告详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id")})
+    @RequestMapping(value="/announcementById",method = RequestMethod.POST)
+    public ResponseBean announcementById(@RequestBody String paramets){
+        ResponseBean tpAnnouncement= tpAnnouncementService.announcementById(paramets);
+        return tpAnnouncement;
+    }
+
+    @ApiOperation(value = "修改公告",nickname ="修改公告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id，announcementTitle:公告标题，" +
+                    "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
+    @RequestMapping(value="/updateAnnouncement",method = RequestMethod.POST)
+    public ResponseBean updateAnnouncement(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean tpAnnouncement= tpAnnouncementService.updateAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+        return tpAnnouncement;
+    }
+
+    @ApiOperation(value = "批量删除公告",nickname ="批量删除公告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id(多个)")})
+    @RequestMapping(value="/deleteAnnouncement",method = RequestMethod.POST)
+    public ResponseBean deleteAnnouncement(@RequestBody String paramets, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean tpAnnouncement= tpAnnouncementService.deleteAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+        return tpAnnouncement;
+    }
+
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpBillInvoiceCountController.java

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.property.controller;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TpBillInvoiceCount;
+import com.huiju.estateagents.property.service.ITpBillInvoiceCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 收费单统计表，按天统计 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TpBillInvoiceCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpBillInvoiceCountController.class);
+
+    @Autowired
+    public ITpBillInvoiceCountService iTpBillInvoiceCountService;
+
+
+    /**
+     * 保存对象
+     * @param tpBillInvoiceCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TpBillInvoiceCount tpBillInvoiceCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTpBillInvoiceCountService.save(tpBillInvoiceCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tpBillInvoiceCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tpBillInvoiceCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTpBillInvoiceCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param tpBillInvoiceCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TpBillInvoiceCount tpBillInvoiceCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTpBillInvoiceCountService.updateById(tpBillInvoiceCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTpBillInvoiceCountService.getById(id));
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/TpConfigurationController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备配置表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+public class TpConfigurationController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpEquipmentController.java

@@ -0,0 +1,100 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ITpEquipmentService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "设备表", description = "设备表")
+public class TpEquipmentController extends BaseController {
+
+    @Autowired
+    private ITpEquipmentService iTpEquipmentService;
+
+    @RequestMapping(value = "/equipment/list", method = RequestMethod.GET)
+    @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
+        @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean getAll(@RequestParam("type") Integer type, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpEquipmentService.getAllByCommunityAndEquipmentType(userElement, type);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/equipment/monitoring", method = RequestMethod.POST)
+    @ApiOperation(value = "添加或修改监控设备", notes = "添加或修改监控设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "parameter", value = "监控设备数据"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean saveOrUpdateMonitoring(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpEquipmentService.saveOrUpdateMonitoring(parameter, userElement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/equipment/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除设备", notes = "删除设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean deleteEquipmentById(@PathVariable("id") Integer id, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpEquipmentService.deleteEquipmentById(id);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/equipment/delete", method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除设备", notes = "批量删除设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "ids", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean deleteBachEquipmentById(@RequestBody List<Integer> ids, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpEquipmentService.deleteBachEquipmentById(ids);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/equipment/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean getMonitoringById(@RequestParam("type") Integer type, @PathVariable("id") Integer id, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpEquipmentService.getMonitoringById(userElement, type, id);
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpEquipmentTreeController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备树 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+public class TpEquipmentTreeController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpHotelImgController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.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 {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpRentalHouseController.java

@@ -0,0 +1,169 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TpRentalHouse;
+import com.huiju.estateagents.property.service.ITpRentalHouseService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 出租公寓表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "长租公寓API", description = "长租公寓API")
+public class TpRentalHouseController extends BaseController {
+	
+	@Autowired
+	private ITpRentalHouseService tpRentalHouseService;
+	
+	@ApiOperation(value = "根据搜索条件获取公寓列表", notes = "根据搜索条件获取公寓列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "房间编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseName", value = "房间名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "startPrice", value = "开始价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "endPrice", value = "结束价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "rentalType", value = "租赁方式"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseType", value = "户型"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseStatus", value = "上架状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/rentals",method = RequestMethod.GET)
+	public ResponseBean getRentalList(@RequestParam(value = "id") Integer id,
+	                                @RequestParam(value = "houseName") String houseName,
+	                                @RequestParam(value = "startPrice") Integer startPrice,
+	                                @RequestParam(value = "endPrice") Integer endPrice,
+	                                @RequestParam(value = "rentalType") String rentalType,
+	                                @RequestParam(value = "houseType") String houseType,
+	                                @RequestParam(value = "houseStatus") String houseStatus,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+	                                HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.getRentalList(id,houseName,startPrice,endPrice,rentalType,houseType,houseStatus,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加公寓", notes = "添加公寓")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/add",method = RequestMethod.POST)
+	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.saveRental(rentalHouse,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新公寓", notes = "更新公寓")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
+	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.updateRental(rentalHouse,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getRental(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpRentalHouse rentalHouse = tpRentalHouseService.getRentalById(id);
+		responseBean.addSuccess(rentalHouse);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "上架房间", notes = "上架房间")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/shelf",method = RequestMethod.POST)
+	public ResponseBean shelfRental(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpRentalHouse> rentalList = new ArrayList<>();
+		for (Object id : ids){
+			TpRentalHouse rentalHouse = new TpRentalHouse();
+			rentalHouse.setId((Integer) id);
+			rentalHouse.setHouseStatus("1");
+			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateDate(LocalDateTime.now());
+			rentalList.add(rentalHouse);
+		}
+		
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
+		if (state){
+			responseBean.addSuccess("上架成功");
+		}else{
+			responseBean.addError("上架失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "下架房间", notes = "下架房间")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/obtained",method = RequestMethod.POST)
+	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpRentalHouse> rentalList = new ArrayList<>();
+		for (Object id : ids){
+			TpRentalHouse rentalHouse = new TpRentalHouse();
+			rentalHouse.setId((Integer) id);
+			rentalHouse.setHouseStatus("2");
+			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateDate(LocalDateTime.now());
+			rentalList.add(rentalHouse);
+		}
+		
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
+		if (state){
+			responseBean.addSuccess("下架成功");
+		}else{
+			responseBean.addError("下架失败");
+		}
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/TpRentalHouseImgController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出租房间图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class TpRentalHouseImgController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpShopController.java

@@ -0,0 +1,163 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TpShop;
+import com.huiju.estateagents.property.service.ITpShopService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 小区商铺表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "商铺API", description = "商铺API")
+public class TpShopController extends BaseController {
+	
+	@Autowired
+	private ITpShopService shopService;
+	
+	@ApiOperation(value = "根据搜索条件获取角色列表", notes = "根据搜索条件获取角色列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "商铺编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopName", value = "商铺名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "shopTypeId", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopStatus", value = "上架状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/shops",method = RequestMethod.GET)
+	public ResponseBean getShopList(@RequestParam(value = "id") Integer id,
+	                                @RequestParam(value = "shopName") String shopName,
+	                                @RequestParam(value = "shopTypeId") Integer shopTypeId,
+	                                @RequestParam(value = "shopStatus") String shopStatus,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+	                                HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.getShopList(id,shopName,shopTypeId,shopStatus,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加商铺", notes = "添加商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add",method = RequestMethod.POST)
+	public ResponseBean saveShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.saveShop(shop,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取商铺信息", notes = "获取商铺信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getShop(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpShop tpShop = shopService.getShopById(id);
+		responseBean.addSuccess(tpShop);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新商铺", notes = "更新商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/update",method = RequestMethod.POST)
+	public ResponseBean updateShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.updateShop(shop,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "上架商铺", notes = "上架商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/shelf",method = RequestMethod.POST)
+	public ResponseBean shelfShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("1");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		if (state){
+			responseBean.addSuccess("上架成功");
+		}else{
+			responseBean.addError("上架失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "下架商铺", notes = "下架商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/obtained",method = RequestMethod.POST)
+	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("2");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		if (state){
+			responseBean.addSuccess("下架成功");
+		}else{
+			responseBean.addError("下架失败");
+		}
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/TpShopImgController.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.property.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商铺图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/")
+public class TpShopImgController extends BaseController {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpShopSettingController.java

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ITpShopSettingService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 商铺开关设置 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-09
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "商铺配置API", description = "商铺配置API")
+public class TpShopSettingController extends BaseController {
+
+	@Autowired
+	private ITpShopSettingService shopSettingService;
+	
+	@ApiOperation(value = "商铺配置启动和关闭", notes = "商铺配置启动和关闭")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺配置值"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add/setting",method = RequestMethod.POST)
+	public ResponseBean changeShopSetting(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopSettingService.changeShopSetting(userElement,jsonString);
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/TpShopTypeController.java

@@ -0,0 +1,157 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TpShopType;
+import com.huiju.estateagents.property.service.ITpShopTypeService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺类型 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-09
+ */
+@RestController
+@RequestMapping("/")
+
+@Api(value = "商铺类型API", description = "商铺类型API")
+public class TpShopTypeController extends BaseController {
+	
+	@Autowired
+	private ITpShopTypeService shopTypeService;
+	
+	@ApiOperation(value = "获取商铺配置列表", notes = "获取商铺配置列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/types",method = RequestMethod.GET)
+	public ResponseBean getTypesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopTypeService.getTypesList(userElement.getCommunityId(),pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加商铺类型", notes = "添加商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add/type",method = RequestMethod.POST)
+	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		shopType.setCommunityId(userElement.getCommunityId());
+		shopType.setSource("self");
+		shopType.setCreateUser(userElement.getId());
+		shopType.setCreateDate(LocalDateTime.now());
+		//查看索引是否存在
+		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
+		shopTypeQueryWrapper.eq("community_id",shopType.getCommunityId());
+		shopTypeQueryWrapper.eq("sort",shopType.getSort());
+		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
+		if (list.size() > 0){
+			responseBean.addError("此索引已存在");
+			return responseBean;
+		}
+		boolean state  = shopTypeService.save(shopType);
+		if (state){
+			responseBean.addSuccess("添加成功");
+		}else{
+			responseBean.addError("添加失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取商铺类型", notes = "获取商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺类型Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/get/type/{id}",method = RequestMethod.GET)
+	public ResponseBean getShopType(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpShopType tpShopType = shopTypeService.getById(id);
+		responseBean.addSuccess(tpShopType);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新商铺类型", notes = "更新商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/update/type",method = RequestMethod.POST)
+	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		//查看索引是否存在
+		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
+		shopTypeQueryWrapper.eq("community_id",userElement.getCommunityId());
+		shopTypeQueryWrapper.eq("sort",shopType.getSort());
+		shopTypeQueryWrapper.ne("id",shopType.getId());
+		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
+		if (list.size() > 0){
+			responseBean.addError("此索引已存在");
+			return responseBean;
+		}
+		
+		boolean state  = shopTypeService.updateById(shopType);
+		if (state){
+			responseBean.addSuccess("更新成功");
+		}else{
+			responseBean.addError("更新失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "删除商铺类型", notes = "删除商铺类型")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/delete/type",method = RequestMethod.DELETE)
+	public ResponseBean deleteShopType(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = shopTypeService.deleteShopType(jsonString);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取商铺配置列表", notes = "获取商铺配置列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/type/select",method = RequestMethod.GET)
+	public ResponseBean getTypesSelect(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("community_id",userElement.getCommunityId());
+		queryWrapper.orderByAsc("sort");
+		queryWrapper.orderByAsc("create_date");
+		responseBean.addSuccess(shopTypeService.list(queryWrapper));
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -0,0 +1,112 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IUserService;
+import com.huiju.estateagents.property.service.TpTicketService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 工单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "工单列表API", description = "工单列表API")
+public class TpTicketController extends BaseController {
+    @Autowired
+    private IUserService userService;
+
+    @Autowired
+    private TpTicketService tpTicketService;
+    @ApiOperation(value = "工单列表", notes = "工单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号，" +
+                    "type:工单类型(1:投诉 2:报修   3:联系物业)," +
+                    "ticketTitle:工单标题，createUser:发起人," +
+                    "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止'）" +
+                    "tpUserId:当前处理人" )
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
+    public ResponseBean ticketLiset(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getCommunityId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "工单详情", notes = "工单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/ticketDetails", method = RequestMethod.POST)
+    public ResponseBean ticketDetails(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getId(),userElement.getCommunityId());
+        return responseBean;
+    }
+    @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
+                    "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
+    public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.addRecordComment(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        return responseBean;
+    }
+    @ApiOperation(value = "工单受理分配", notes = "工单受理分配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id，" +
+                    "id:当前处理人id")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/addRecord", method = RequestMethod.POST)
+    public ResponseBean addRecord(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.addRecord(parameter,userElement.getId(),userElement.getCommunityId());
+        return responseBean;
+    }
+    @ApiOperation(value = "修改工单状态为拒绝处理", notes = "修改工单状态为拒绝处理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id,textContent:拒绝的内容" )
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
+    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改当前状态为待评价", notes = "修改当前状态为待评价")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id" )
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
+    public ResponseBean updateTicket(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName(),userElement.getLoginName());
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/TransactionController.java

@@ -0,0 +1,152 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.ITransactionService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业web端二手交易表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "二手租赁相关信息", description = "二手租赁相关信息Api")
+public class TransactionController extends BaseController {
+	
+	@Autowired
+	private ITransactionService transactionService;
+	
+	@ApiOperation(value = "根据搜索条件获取二手租赁列表", notes = "根据搜索条件获取二手租赁列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:话题编号，transactionTitle：标题" +
+					"userName：发布人，status：状态，pageNum：总数，pageSize当前页"
+					)
+	})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value = "/transactions",method = RequestMethod.POST)
+	public ResponseBean getList(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = transactionService.getTransactionList(parameter,userElement.getCommunityId() );
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取二手租赁详情", notes = "获取二手租赁详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
+	})
+	@RequestMapping(value = "/transaction/{id}",method = RequestMethod.GET)
+	public ResponseBean getList(@PathVariable(value = "id") Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = transactionService.getTransactionInfo(id);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "作废二手租赁", notes = "作废二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
+	})
+	@RequestMapping(value = "/transaction/update/{id}",method = RequestMethod.POST)
+	public ResponseBean updateTransaction(@PathVariable(value = "id") Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = transactionService.updateTransactionById(id,userElement.getId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "添加二手租赁",nickname ="添加二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
+					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/add",method = RequestMethod.POST)
+	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement);
+		return addAnnouncement;
+	}
+
+	@ApiOperation(value = "修改二手租赁",nickname ="修改二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
+					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/updata",method = RequestMethod.POST)
+	public ResponseBean transactionsUpdata(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionsUpdata= transactionService.transactionsUpdata(paramets,userElement.getCommunityId(),userElement.getId());
+		return transactionsUpdata;
+	}
+	@ApiOperation(value = "删除二手租赁",nickname ="删除二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
+	public ResponseBean transactionsDelete(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionsUpdata= transactionService.transactionsDelete(paramets,userElement.getCommunityId(),userElement.getId());
+		return transactionsUpdata;
+	}
+
+	@ApiOperation(value = "二手评论列表",nickname ="二手评论列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，replyTaUserName：被回复人，taUserName：回复人，" +
+					"status:（0回复我的,1回复全部物业人员的,2全部物业人员回复的,3话题发起人回复的）,createDate:时间" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
+	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement);
+		return transactionReplyList;
+	}
+
+	@ApiOperation(value = "删除二手帖子评论",nickname ="删除二手帖子评论")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
+	@RequestMapping(value="/deleteReply",method = RequestMethod.POST)
+	public ResponseBean deleteReply(@RequestBody String paramets, HttpSession session){
+		ResponseBean  transactionsUpdata= transactionService.deleteReply(paramets);
+		return transactionsUpdata;
+	}
+
+	@ApiOperation(value = "添加二手帖子评论",nickname ="添加二手帖子评论")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，contentImg:评论所带图片,replyContent:评论内容" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactionReply/add",method = RequestMethod.POST)
+	public ResponseBean transactionReplyAdd(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionReplyAdd= transactionService.transactionReplyAdd(paramets,userElement);
+		return transactionReplyAdd;
+	}
+
+	@ApiOperation(value = "二手帖子举报列表",nickname ="二手帖子举报列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =":举报人姓名，reportPhone：举报人电话,transactionId:帖子ID" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactionReportList",method = RequestMethod.POST)
+	public ResponseBean transactionReportList(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionReplyList= transactionService.transactionReportList(paramets,userElement);
+		return transactionReplyList;
+	}
+}

src/main/java/com/huiju/estateagents/property/controller/UserController.java

@@ -0,0 +1,196 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.service.IUserService;
+import com.huiju.estateagents.property.vo.UserVO;
+import com.google.common.collect.Maps;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端用户表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@RestController
+
+@RequestMapping("/")
+@Api(value = "物业端用户API", description = "物业端用户API")
+public class UserController extends BaseController {
+	
+	@Autowired
+	private IUserService userService;
+	
+	@ApiOperation(value = "获取用户列表",nickname = "获取用户信息")
+	@ApiImplicitParams({
+			//@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+	})
+	@RequestMapping(value = "/users",method = RequestMethod.GET)
+	public ResponseBean getInfo(HttpSession session) {
+		ResponseBean response = new ResponseBean();
+		response.addSuccess(userService.list());
+		Page a = new Page(1,10);
+//		response.addSuccess(userService.page(a));
+		return response;
+	}
+
+	@ApiOperation(value = "登陆", notes = "登陆")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;communityId小区Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/user/login", method = RequestMethod.POST)
+	public ResponseBean login(@RequestBody String parameter, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject jsonObject = JSONObject.parseObject(parameter);
+		responseBean = userService.login(jsonObject.getString("loginName"),
+				jsonObject.getInteger("communityId"),
+				jsonObject.getString("code"));
+
+		// 为 0 表示成功
+		if ("0".equals(responseBean.getCode())) {
+			UserVO userVO = (UserVO)responseBean.getData();
+			setUserElement(session,userVO);
+			userVO.setToken(session.getId());
+		}
+
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+		@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/user/info", method = RequestMethod.GET)
+	public ResponseBean info(HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = userService.userInfo(userElement);
+		UserVO userVO = (UserVO)responseBean.getData();
+		userVO.setCommunityId(userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "注销登录", notes = "注销登录")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/user/logOut", method = RequestMethod.POST)
+	public ResponseBean longOut(HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		cleanUserSession(session);
+		responseBean.addSuccess("退出成功!");
+		return responseBean;
+	}
+	@ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号, " +
+					"userName：用户名,pageNum:第几页，pageSize：每页长度")
+	})
+	@RequestMapping(value = "/user/userList", method = RequestMethod.POST)
+	public ResponseBean userList(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.userList(parameter,userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "添加成员", notes = "用户成员列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注" )
+	})
+	@RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
+	public ResponseBean addUser(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.addUser(parameter,userElement.getId(),userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "修改成员", notes = "修改成员")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注，id：修改id" )
+	})
+	@RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
+	public ResponseBean upDate(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.upDate(parameter,userElement.getId(),userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "查看成员详情", notes = "查看成员详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value="id:当前id")
+	})
+	@RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
+	public ResponseBean selectById(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.selectById(parameter,userElement.getId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "修改当前状态", notes = "修改当前状态")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value=("status:传入当前状态(0:无效，1：有效),id:当前修改的id"))
+	})
+	@RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
+	public ResponseBean upDateStatus(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.upDateStatus(parameter,userElement.getId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "查看所有角色", notes = "查看所有角色")
+	@RequestMapping(value = "/user/userRole", method = RequestMethod.POST)
+	public ResponseBean userRole(@RequestBody String parameter, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.allUserRole(userElement.getCommunityId());
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取令牌", notes = "获取令牌")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "提供的appid"),
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "encrypt加密方式(目前值为md5)"),
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "communityId", value = "提供的小区编号"),
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "生成的签名"),
+	})
+	@RequestMapping(value = "/user/token", method = RequestMethod.GET)
+	public ResponseBean daSuToken(@RequestParam("appid") String appid,
+								  @RequestParam("datetime") String datetime,
+								  @RequestParam("encrypt") String encrypt,
+								  @RequestParam("communityId") String communityId,
+								  @RequestParam("sign") String sign,
+								  HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = userService.daSuToken(appid, datetime, encrypt, communityId, sign);
+		// 为 0 表示成功
+		if ("0".equals(responseBean.getCode())) {
+			UserVO userVO = (UserVO)responseBean.getData();
+			setUserElement(session,userVO);
+			userVO.setToken(session.getId());
+
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("token", session.getId());
+			responseBean.addSuccess(map);
+		}
+		return responseBean;
+	}
+
+}

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

@@ -0,0 +1,176 @@
+package com.huiju.estateagents.property.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.common.base.BaseController;
+import com.huiju.estateagents.property.model.TaUser;
+import com.huiju.estateagents.property.model.TaUserVerify;
+import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
+import com.huiju.estateagents.property.service.ITaUserVerifyService;
+import com.google.common.collect.Maps;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Map;
+
+@RestController
+
+@RequestMapping("/")
+@Api(value = "审核用户API", description = "审核用户API")
+public class UserVerifyController extends BaseController {
+
+    @Autowired
+    private ITaUserVerifyService iTaUserVerifyService;
+
+
+    @Autowired
+    private IBuildingOwnerInfoService iBuildingOwnerInfoService;
+
+    @RequestMapping(value = "/user/verify/all", method = RequestMethod.GET)
+    @ApiOperation(value = "获取待审核的用户列表", notes = "获取待审核的用户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户名"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+    })
+    public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
+                               @RequestParam(value = "userName", required = false) String userName,
+                               @RequestParam(value = "idCard", required = false) String idCard,
+                               @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize, userElement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/audit/{userVerifyId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "审核用户", notes = "审核用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "verifyStatus", value = "true通过；false不通过"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "审核不通过的原因"),
+    })
+    public ResponseBean getAll(@PathVariable("userVerifyId") Integer userVerifyId,
+                               @RequestParam("verifyStatus") Boolean verifyStatus,
+                               @RequestParam(value = "remark", required = false) String remark,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.auditUser(userElement, userVerifyId, verifyStatus, remark);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/ta/user/has", method = RequestMethod.GET)
+    @ApiOperation(value = "校验移动端手机号是否注册", notes = "校验移动端手机号是否注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "手机号"),
+    })
+    public ResponseBean taUserHas(@RequestParam("ownerTel") String ownerTel,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", ownerTel);
+//        TaUser user = iTaUserService.getOne(queryWrapper);
+//        if (null == user) {
+//            responseBean.addError("未注册");
+//            return responseBean;
+//        }
+
+        Map<String, Object> map = Maps.newHashMap();
+//        map.put("info", user);
+
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/ta/user/hasOwner", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 期/栋/单元/楼层/户号 校验是否有业主", notes = "根据 期/栋/单元/楼层/户号 校验是否有业主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "审核id"),
+    })
+    public ResponseBean taUserHasOwner(@RequestParam("phaseId") Integer phaseId,
+                               @RequestParam("buildingId")Integer buildingId,
+                               @RequestParam("unitId")Integer unitId,
+                               @RequestParam("levelId")Integer levelId,
+                               @RequestParam("roomNoId")Integer roomNoId,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("boolRole", false);
+
+        hasAddress(phaseId, buildingId, unitId, levelId ,roomNoId, map);
+
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 校验该 房产是否有房主
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param map
+     * @return
+     */
+    private Map<String, Object> hasAddress(Integer phaseId,Integer buildingId,Integer unitId,Integer levelId,Integer roomNoId, Map<String, Object> map) {
+        map.put("boolRole", false);
+        QueryWrapper<TaUserVerify> userVerifyQueryWrapper = new QueryWrapper<>();
+        userVerifyQueryWrapper.eq("phase_id", phaseId);
+        userVerifyQueryWrapper.eq("building_id", buildingId);
+        userVerifyQueryWrapper.eq("unit_id", unitId);
+        userVerifyQueryWrapper.eq("level_id", levelId);
+        userVerifyQueryWrapper.eq("room_no_id", roomNoId);
+        userVerifyQueryWrapper.eq("role_id", 1);
+        userVerifyQueryWrapper.eq("verify_status", 1);
+        TaUserVerify userVerify = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
+        if (null != userVerify) {
+            map.put("boolRole", true);
+        }
+        return map;
+    }
+
+    @RequestMapping(value = "/user/verifyinfo/{userVerifyId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "楼栋详情页面审核", notes = "楼栋详情页面审核")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "roleState", value = "1:业主，2:租客，3:家属"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "verifyStatus", value = "0 是未审核1是审核通过2是审核不通过"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "审核不通过的原因"),
+    })
+    public ResponseBean verifyinfoAdd(@PathVariable("userVerifyId") Integer userVerifyId,
+                               @RequestParam("verifyStatus") String verifyStatus,
+                               @RequestParam("roleState") String roleState,
+                               @RequestParam(value = "remark", required = false) String remark,
+                               HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.verifyinfoAdd(userElement, userVerifyId, verifyStatus, roleState,remark);
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/dao/AnnouncementTelMapper.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.AnnouncementTel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业号码表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Mapper
+public interface AnnouncementTelMapper extends BaseMapper<AnnouncementTel> {
+	
+	/**
+	 * 分页获取电话号码
+	 * @param page
+	 * @param announcementTel
+	 * @return
+	 */
+	List<AnnouncementTel> selectListByParams(Page page, @Param("announcementTel") AnnouncementTel announcementTel);
+}

src/main/java/com/huiju/estateagents/property/dao/BillInvoiceMapper.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.BillInvoice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 缴费单 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@Mapper
+public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
+
+    /**
+     * 查询有效的缴费单
+     * @param page
+     * @param map
+     * @return
+     */
+    IPage<BillInvoice> selectBillInvoice(Page page, @Param("map") Map<String, Object> map);
+
+    /**
+     * 查询作废的缴费单
+     *      前台批量添加的缴费单, 默认是 作废
+     * @param map
+     * @return
+     */
+    List<BillInvoice> selectBillInvoiceTemp(@Param("map") Map<String, Object> map);
+
+    /**
+     * 查询有效的缴费单
+     * @param page
+     * @return
+     */
+    IPage<BillInvoice> selectBillInvoiceEffective(Page page, @Param("map") Map<String, Object> map);
+	
+	List<Map<String, Object>> getPriceCount();
+}

src/main/java/com/huiju/estateagents/property/dao/BillMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.Bill;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费项表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@Mapper
+public interface BillMapper extends BaseMapper<Bill> {
+	
+	List<Bill> selectListByParams(Page page, @Param("bill") Bill bill);
+}

src/main/java/com/huiju/estateagents/property/dao/BillStatementMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.BillStatement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 账单流水表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-02-13
+ */
+@Mapper
+public interface BillStatementMapper extends BaseMapper<BillStatement> {
+
+    IPage<BillStatement> getBillStatementAll(Page page, @Param("map") Map<String, Object> map);
+}

src/main/java/com/huiju/estateagents/property/dao/HotelMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.Hotel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 酒店 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelMapper extends BaseMapper<Hotel> {
+
+    /**
+     * 查询酒店，当前小区酒店只有一个
+     * @return
+     */
+    Hotel selectHotel(@Param("communityId") Integer communityId);
+}

src/main/java/com/huiju/estateagents/property/dao/HotelRoomMapper.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.HotelRoom;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 酒店房间表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelRoomMapper extends BaseMapper<HotelRoom> {
+
+    /**
+     * 查询房间列表
+     * @param hotelRoom
+     * @param beginTime
+     * @param endTime
+     * @param communityId
+     * @return
+     */
+    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom, @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("communityId") Integer communityId);
+}

src/main/java/com/huiju/estateagents/property/dao/HotelSettingMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.HotelSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 酒店开关设置 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelSettingMapper extends BaseMapper<HotelSetting> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/IndexCountMapper.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.property.dao;
+
+import com.huiju.estateagents.property.model.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface IndexCountMapper {
+	/**
+	 * 获取工单统计
+	 * @param communityId
+	 * @return
+	 */
+	List<TpTicket> getTicketList(@Param("communityId") Integer communityId);
+	
+	Integer selectCommunityOpenDoorCount();
+	
+	Integer selectUnitsOpenDoorCount(Integer eventType);
+	
+	Integer getPublicCameraCount(@Param("communityId") Integer communityId);
+	
+	Integer getRemoteMonitoringCount(@Param("communityId") Integer communityId);
+	
+	Integer getRemoteUnitCount(@Param("communityId") Integer communityId);
+	
+	List<TpBillInvoiceCount> getBillInvoiceCountList(@Param("communityId") Integer communityId);
+	
+	List<TaUserLicenseCount> getUserLicenseCountList(@Param("communityId") Integer communityId);
+	
+	List<TaTemporaryLicenseCount> getTemporaryLicenseCountList(@Param("communityId") Integer communityId);
+	
+	Integer getRegisterUserCount(@Param("communityId") Integer communityId, @Param("roleId") Integer roleId);
+	
+	List<TaBriskUser> getBriskUserList(@Param("communityId") Integer communityId);
+	
+	Integer getAnnouncementCount(@Param("communityId") Integer communityId);
+	
+	Integer getActivityCount(@Param("communityId") Integer communityId);
+	
+	Integer getTopicCount(@Param("communityId") Integer communityId);
+}

src/main/java/com/huiju/estateagents/property/dao/MessageMapper.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.property.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.Message;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 物业web端用户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@Mapper
+public interface MessageMapper extends BaseMapper<Message> {
+    /**
+     * 消息待办
+     * @param page
+     * @param messageType
+     * @param status
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> messageLiset(Page page, @Param("messageType") String messageType, @Param("status") String status, @Param("createDate") Date createDate, @Param("messageContent") String messageContent, @Param("uuid") Integer uuid);
+
+    /**
+     * 公告消息推送
+     * @param message
+     */
+    void updateMessage(@Param(value = "message") Message message);
+
+    /**
+     * 工单消息推送
+     * @param message
+     */
+    void updateTicketMessage(Message message);
+
+    /**
+     * 关于我的消息
+     * @param page
+     * @param messageType
+     * @param readStatus
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> myMessageList(Page<Message> page, @Param("messageType") String messageType, @Param("readStatus") String readStatus, @Param("createDate") Date createDate, @Param("messageContent") String messageContent, @Param("uuid") Integer uuid);
+
+    /**
+     * 工单分配后改变message的状态
+     * @param ticketId
+     */
+    void updateTickMessageStatus(@Param("ticketId") Integer ticketId);
+}

src/main/java/com/huiju/estateagents/property/dao/RoleMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.SysRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端用户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@Mapper
+public interface RoleMapper extends BaseMapper<SysRole> {
+	List<SysRole> getRoleListByParams(Page page, @Param("role") SysRole role);
+
+	SysRole selectByRoleName(@Param("roleName") String roleName, @Param("communityId") Integer communityId);
+}

src/main/java/com/huiju/estateagents/property/dao/SysRoleMenuMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.SysRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业端角色可查看的菜单 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-18
+ */
+@Mapper
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+	
+	int insertList(List<SysRoleMenu> sysRoleMenuList);
+}

src/main/java/com/huiju/estateagents/property/dao/SysUserRoleMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 物业web端用户是那些角色 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-21
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TaFaceMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaFace;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 人脸检测图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-11
+ */
+@Mapper
+public interface TaFaceMapper extends BaseMapper<TaFace> {
+
+    TaFace getByUserVerifyId(Integer userVerifyId);
+
+    void insertSelective(TaFace taFace);
+
+    void updateByPrimaryKeySelective(TaFace taFace);
+}

src/main/java/com/huiju/estateagents/property/dao/TaSysMenuMapper.java

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaSysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * APP端菜单页面 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Mapper
+public interface TaSysMenuMapper extends BaseMapper<TaSysMenu> {
+
+    /**
+     * 根据小区查询出APP菜单列表
+     * @param communityId
+     * @return
+     */
+    List<TaSysMenu> selectList(Integer communityId);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TaSysRoleMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.property.dao;
+
+
+import com.huiju.estateagents.property.model.TaSysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaSysRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysRole record);
+
+    int insertSelective(TaSysRole record);
+
+    TaSysRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysRole record);
+
+    int updateByPrimaryKey(TaSysRole record);
+
+    TaSysRole findRoleByUserId(Integer userId);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TaSysUserRoleMapper.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaSysUserRole;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * app端用户是那些角色 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-21
+ */
+@Mapper
+public interface TaSysUserRoleMapper extends BaseMapper<TaSysUserRole> {
+
+    /**
+     * 根据 用户id 和 小区Id  删除数据
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @Delete("delete from ta_sys_user_role where community_id=#{communityId} and user_id=#{userId}")
+    int deleteByCommunityIdAndUserId(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TaTemporaryLicenseCountMapper.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaTemporaryLicenseCount;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Mapper
+public interface TaTemporaryLicenseCountMapper extends BaseMapper<TaTemporaryLicenseCount> {
+	
+	List<Map<String, Object>> getTemporaryLicenseOrderPriceCount();
+}

src/main/java/com/huiju/estateagents/property/dao/TaUserLicenseCountMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaUserLicenseCount;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Mapper
+public interface TaUserLicenseCountMapper extends BaseMapper<TaUserLicenseCount> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TaUserLicenseOrderMapper.java

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaUserLicenseOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 月租车缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+    /**
+     * 分页查询
+     * @param communityId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ResultType(TaUserLicenseOrder.class)
+    @Select("select * from ta_user_license_order where community_id = #{communityId} limit #{pageNum},#{pageSize}")
+    List<TaUserLicenseOrder> getLicensePage(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 查询总数
+     * @param communityId
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(*) from ta_user_license_order where community_id = #{communityId}")
+    Integer getCount(@Param("communityId") Integer communityId);
+    
+    
+    List<Map<String, Object>> getPriceCount();
+}

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -0,0 +1,103 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TaUserVerify;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app端用户审核表，存放用户的角色还有房产信息 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-03
+ */
+@Mapper
+public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
+
+    /**
+     * 根据 手机号 、用户名、身份证
+     * @param page
+     * @param phone
+     * @param userName
+     * @param idCard
+     * @return
+     */
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("communityId") Integer communityId);
+
+    /**
+     * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    TaUserVerify selectCommunityAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
+
+    /**
+     * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号、角色id 进行条件查询出
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("roleId") Integer roleId);
+
+
+    /**
+     * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @return
+     */
+    @ResultType(TaUserVerify.class)
+    @Select("select  *  from ta_user_verify " +
+            "where community_id = #{communityId} " +
+            "and phase_name = #{phaseName} " +
+            "and building_name = #{buildingName} " +
+            "and unit_name = #{unitName} " +
+            "and level_name = #{levelName} " +
+            "and room_no_name = #{roomNoName} " +
+            "and verify_status = 1 " +
+            "and role_id = 1")
+    TaUserVerify selectCommunityAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+
+
+    /**
+     * 查询用户审核数据！   小区id，用户id，期id，栋id，单元id，楼层id，房间id，审核状态
+     * @param userId
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param verifyStatus
+     * @return
+     */
+    List<TaUserVerify> selectUserVerifyCommunityAndAddress(@Param("userId") Integer userId,
+                                                           @Param("communityId") Integer communityId,
+                                                           @Param("phaseId") Integer phaseId,
+                                                           @Param("buildingId") Integer buildingId,
+                                                           @Param("unitId") Integer unitId,
+                                                           @Param("levelId") Integer levelId,
+                                                           @Param("roomNoId") Integer roomNoId,
+                                                           @Param("verifyStatus") Integer verifyStatus);
+}

src/main/java/com/huiju/estateagents/property/dao/TaVisitorLicenseSettingMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TaVisitorLicenseSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@Mapper
+public interface TaVisitorLicenseSettingMapper extends BaseMapper<TaVisitorLicenseSetting> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TdImagesMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TdImages;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 图片表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-29
+ */
+@Mapper
+public interface TdImagesMapper extends BaseMapper<TdImages> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/ToCommunitiesMapper.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.ToCommunities;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 所有小区表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
+
+    /**
+     * 根据 电话号码 查询出
+     * @param phone
+     * @return
+     */
+    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.community_id = tc.id WHERE tu.login_name = #{phone}")
+    List<ToCommunities> selectUserById(String phone);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpActivityMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpActivity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 物业web端活动表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-28
+ */
+@Mapper
+public interface TpActivityMapper extends BaseMapper<TpActivity> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpActivitySignInMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpActivitySignIn;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 活动签到表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Mapper
+public interface TpActivitySignInMapper extends BaseMapper<TpActivitySignIn> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpActivitySignUpMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpActivitySignUp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 物业web端活动报名表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-01-03
+ */
+@Mapper
+public interface TpActivitySignUpMapper extends BaseMapper<TpActivitySignUp> {
+
+//    @Select("SELECT tas.* FROM tp_activity_sign_up tas LEFT JOIN ta_user tau on tas.ta_user_id = tau.id where tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%') and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')")
+    IPage<TpActivitySignUp> listQuery(Page page, @Param("userName") String userName, @Param("phone") String phone, @Param("activityId") Integer activityId);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpAnnouncementMapper.java

@@ -0,0 +1,36 @@
+package com.huiju.estateagents.property.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpAnnouncement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpAnnouncement record);
+
+    TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    int updateByPrimaryKeySelective(@Param("id") Integer id, @Param("viewCount") Integer viewCount);
+
+    int updateTpAnnouncement(TpAnnouncement record);
+
+    IPage<TpAnnouncement> getAnnouncements(Page page, @Param("record") TpAnnouncement record);
+
+    List<TpAnnouncement> getById(@Param("record") TpAnnouncement record);
+
+    /**
+     * 公告轮播图
+     * @param communityId
+     * @param sum
+     * @return
+     */
+    List<TpAnnouncement> getAnnouncement(@Param("communityId") Integer communityId, @Param("sum") Integer sum);
+}

src/main/java/com/huiju/estateagents/property/dao/TpBillInvoiceCountMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpBillInvoiceCount;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Mapper
+public interface TpBillInvoiceCountMapper extends BaseMapper<TpBillInvoiceCount> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpBillOrderMapper.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpBillOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-18
+ */
+@Mapper
+public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
+
+    /**
+     * 查询订单数据
+     * @param page
+     * @param map
+     * @return
+     */
+    IPage<TpBillOrder> getBillOrderAll(Page page, @Param("map") Map<String, Object> map);
+
+    /**
+     * 根据订单号，查询所有 缴费组
+     * @param orderNumber
+     * @return
+     */
+    @ResultType(TpBillOrder.class)
+    @Select("select " +
+            "tbo.id as id, " +
+            "tbo.community_id as communityId, " +
+            "tbo.tp_bill_id as tpBillId, " +
+            "tbo.tp_bill_invoice_id as tpBillInvoiceId, " +
+            "tbo.order_bumber as orderBumber, " +
+            "tbo.create_user as createUser, " +
+            "tbo.create_date as createDate, " +
+            "tbo.update_user as updateUser, " +
+            "tbo.update_date as updateDate, " +
+            "tbo.order_status as orderStatus, " +
+            "tbo.pay_phone as payPhone, " +
+            "tb.bill_name as billName " +
+            "from tp_bill_order tbo " +
+            "LEFT JOIN tp_bill tb on tbo.tp_bill_id = tb.id " +
+            "where tbo.order_bumber = #{orderNumber} " +
+            "GROUP BY tbo.tp_bill_id")
+    List<TpBillOrder> getByOrderNumberBillInvoice(@Param("orderNumber") String orderNumber);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpBuildingMapper.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.property.dao;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
+
+    /**
+     * 楼栋资料库列表
+     * @param page
+     * @param tpBuilding
+     * @return
+     */
+    IPage<TpBuilding> buildinglist(Page<TpBuilding> page, @Param("tpBuilding") TpBuilding tpBuilding);
+}

src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+@Mapper
+public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInfo> {
+    /**
+     * 获取已认证通过的
+     * @param
+     * @return
+     */
+    IPage<TpBuildingOwnerInfo> selectUserApprove(Page page, @Param("ownerName") String r, @Param("ownerTel") String ownerTel, @Param("VerifyStatus") String VerifyStatus, @Param("CommunityId") Integer CommunityId);
+
+    int batchInsert(List<TpBuildingOwnerInfo> list);
+
+    int batchUpdate(List<TpBuildingOwnerInfo> list);
+
+	List<TpBuildingOwnerInfo> selectListByParams(Page page, @Param("tpBuildingOwnerInfo") TpBuildingOwnerInfo tpBuildingOwnerInfo);
+
+    /**
+     * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param ownerTel
+     * @return
+     */
+	@ResultType(TpBuildingOwnerInfo.class)
+	@Select("select * FROM tp_building_owner_info tpio " +
+            "WHERE tpio.community_id = #{communityId} " +
+            "and tpio.phase_id = #{phaseId} " +
+            "and tpio.building_id = #{buildingId} " +
+            "and tpio.unit_id = #{unitId} " +
+            "and tpio.level_id = #{levelId} " +
+            "AND tpio.room_no_id = #{roomNoId} " +
+            "AND tpio.owner_tel = #{ownerTel}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("ownerTel") String ownerTel);
+
+
+    /**
+     * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @param ownerTel
+     * @return
+     */
+    @ResultType(TpBuildingOwnerInfo.class)
+    @Select("select * FROM tp_building_owner_info tpio " +
+            "WHERE tpio.community_id = #{communityId} " +
+            "and tpio.phase_name = #{phaseName} " +
+            "and tpio.building_name = #{buildingName} " +
+            "and tpio.unit_name = #{unitName} " +
+            "and tpio.level_name = #{levelName} " +
+            "AND tpio.room_no_name = #{roomNoName} " +
+            "AND tpio.owner_tel = #{ownerTel}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
+
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpCarouselSettingMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpCarouselSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 轮播数设置表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+@Mapper
+public interface TpCarouselSettingMapper extends BaseMapper<TpCarouselSetting> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpConfigurationMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpConfiguration;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 设备配置表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpConfigurationMapper extends BaseMapper<TpConfiguration> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpEquipmentMapper.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpEquipment;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
+
+    /**
+     * 根据小区id 和 类型查询
+     * @param communityId
+     * @param equipmentType
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.*, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as url, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as address, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType}")
+    List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType);
+
+
+    /**
+     * 根据小区id 和 类型查询 和 设备id
+     * @param communityId
+     * @param equipmentType
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.*, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as url, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as address, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
+    TpEquipment getMonitoringById(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType, @Param("monitoringId") Integer monitoringId);
+
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpEquipmentTreeMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpEquipmentTree;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 设备树 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpEquipmentTreeMapper extends BaseMapper<TpEquipmentTree> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpHotelImgMapper.java

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

src/main/java/com/huiju/estateagents/property/dao/TpLevelMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpLevel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小区楼层资料表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-01
+ */
+@Mapper
+public interface TpLevelMapper extends BaseMapper<TpLevel> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpPhase;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小区期区资料表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-01
+ */
+@Mapper
+public interface TpPhaseMapper extends BaseMapper<TpPhase> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpRentalHouseImgMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpRentalHouseImg;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出租房间图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface TpRentalHouseImgMapper extends BaseMapper<TpRentalHouseImg> {
+	
+	int batchInsert(List<TpRentalHouseImg> rentalHouseImgList);
+}

src/main/java/com/huiju/estateagents/property/dao/TpRentalHouseMapper.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpRentalHouse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出租公寓表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface TpRentalHouseMapper extends BaseMapper<TpRentalHouse> {
+	
+	/**
+	 * 获取公寓列表
+	 * @param page
+	 * @param tpRentalHouse
+	 * @return
+	 */
+	List<TpRentalHouse> getRentalList(Page page, @Param("tpRentalHouse") TpRentalHouse tpRentalHouse);
+}

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpRoomNo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 户号信息表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Mapper
+public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
+
+
+    /**
+     * 根据 小区，期，栋，单元，楼层，房间  查询房间信息
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @return
+     */
+    @ResultType(TpRoomNo.class)
+    @Select("select * from tp_room_no " +
+            "where community_id = #{communityId} " +
+            "and phase_name = #{phaseName} " +
+            "and building_name = #{buildingName} " +
+            "and unit_name = #{unitName} " +
+            "and level_name = #{levelName} " +
+            "and name = #{roomNoName}")
+    TpRoomNo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+
+    /**
+     * 查询数据，分页
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ResultType(TpRoomNo.class)
+    @Select("select * from tp_room_no where community_id = #{communityId} limit #{pageNum},#{pageSize}")
+    List<TpRoomNo> selectCommunityIdList(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 查询数据，分页
+     * @param communityId
+     * @return
+     */
+    @ResultType(Long.class)
+    @Select("select count(1) from tp_room_no where community_id = #{communityId}")
+    Long selectCommunityIdCount(@Param("communityId") Integer communityId);
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpShopImgMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpShopImg;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TpShopImgMapper extends BaseMapper<TpShopImg> {
+	
+	int batchSave(List<TpShopImg> carouselList);
+}

src/main/java/com/huiju/estateagents/property/dao/TpShopMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpShop;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 小区商铺表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TpShopMapper extends BaseMapper<TpShop> {
+	
+	List<TpShop> getShopList(Page page, @Param("tpShop") TpShop tpShop);
+}

src/main/java/com/huiju/estateagents/property/dao/TpShopSettingMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpShopSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商铺开关设置 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-09
+ */
+@Mapper
+public interface TpShopSettingMapper extends BaseMapper<TpShopSetting> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpShopTypeMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpShopType;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺类型 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-09
+ */
+@Mapper
+public interface TpShopTypeMapper extends BaseMapper<TpShopType> {
+	
+	int insertBatchIds(List<TpShopType> list);
+}

src/main/java/com/huiju/estateagents/property/dao/TpSysRoleMapper.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpSysRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端角色表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface TpSysRoleMapper extends BaseMapper<TpSysRole> {
+
+    /**
+     * 多表查询 查询出这个用户所有的角色权限
+     * @param map
+     * @return
+     */
+    List<TpSysRole> selectByUserIdAndRoleId(Map<String, Object> map);
+
+    /**
+     * 得到所有角色
+     * @param communityId
+     */
+    List<TpSysRole> allUserRole(@Param("communityId") Integer communityId);
+}

src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpTicket;
+import com.huiju.estateagents.property.vo.TpTicketVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 工单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Mapper
+public interface TpTicketMapper extends BaseMapper<TpTicket> {
+
+    IPage<TpTicket> ticketList(Page page, @Param("ticket") TpTicket ticket, @Param("userName") String UserNmae, @Param("updateUserNmae") String updateUserNmae, @Param("communityId") Integer communityId);
+    TpTicketVO ticketDetails(@Param("id") Integer id);
+}

src/main/java/com/huiju/estateagents/property/dao/TpTicketRecordCommentMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpTicketRecordComment;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 物业端工单追问表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Mapper
+public interface TpTicketRecordCommentMapper extends BaseMapper<TpTicketRecordComment> {
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpTicketRecordMapper.java

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpTicketRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 工单处理表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Mapper
+public interface TpTicketRecordMapper extends BaseMapper<TpTicketRecord> {
+
+    TpTicketRecord selectTpTicketRecord(@Param("ticketId") Integer ticketId, @Param("status") Integer status);
+
+    /**
+     * 在状态为待分配的情况下根据工单ID修改
+     * @param tpTicketRecord
+     */
+    void updateTicketRecord(TpTicketRecord tpTicketRecord);
+
+    String statusName(@Param("status") String status);
+}

src/main/java/com/huiju/estateagents/property/dao/TpTransactionMapper.java

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.property.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.property.model.TpTransaction;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端二手交易表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@Mapper
+public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
+
+	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle, @Param("userName") String userName, @Param("id") Integer id, @Param("status") String status, @Param("communityId") Integer communityId);
+
+
+    /**
+     * 作废话题
+     * @param uuid
+     * @param uuidType
+     */
+    @Update("update tp_transaction set status = 0 where uuid = #{uuid} and uuid_type = #{uuidType}")
+    void invalidByUuidAndUuidType(@Param("uuid") Integer uuid, @Param("uuidType") String uuidType);
+}