Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

@@ -23,14 +23,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
-            @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 = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
+//            @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 = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
+                                           @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -38,14 +40,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
-            @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 = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
+//            @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 = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                    @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -53,14 +57,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
-            @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 = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
+//            @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 = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -73,10 +79,10 @@ public class FSController extends BaseController {
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "RechargeAmt充值续费金额;"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Phone", value = "手机号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDayType", value = "续费日期类型( 3:年 2:月 1:日, 选入对应的数字)"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDay", value = "续费日期数目"),
@@ -84,6 +90,7 @@ public class FSController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RechargeAmt", value = "充值续费金额"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyMonthCardPay(@RequestParam(value = "Phone") String Phone,
                                                   @RequestParam(value = "RenewDayType") String RenewDayType,
@@ -91,10 +98,11 @@ public class FSController extends BaseController {
                                                   @RequestParam(value = "PayStyle") String PayStyle,
                                                   @RequestParam(value = "CarNo") String CarNo,
                                                   @RequestParam(value = "CardNo", required = false) String CardNo,
-                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt) {
+                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt,
+                                                  @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyMonthCardPay(Phone, RenewDayType,
-                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt);
+                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt, communityId);
         return responseBean;
     }
 
@@ -109,10 +117,10 @@ public class FSController extends BaseController {
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "CouponList使用的优惠券列表"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Amount", value = "应缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "ActualAmount", value = "实缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "DeductionAmount", value = "抵扣金额（单位元）"),
@@ -121,6 +129,7 @@ public class FSController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CouponList", value = "使用的优惠券列表"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyTemporaryCardPay(@RequestParam(value = "Amount") String Amount,
                                                       @RequestParam(value = "ActualAmount") String ActualAmount,
@@ -129,10 +138,11 @@ public class FSController extends BaseController {
                                                       @RequestParam(value = "PayStyle") String PayStyle,
                                                       @RequestParam(value = "CarNo") String CarNo,
                                                       @RequestParam(value = "CardNo",  required = false) String CardNo,
-                                                      @RequestParam(value = "CouponList", required = false) String CouponList) {
+                                                      @RequestParam(value = "CouponList", required = false) String CouponList,
+                                                      @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount,
-                Reason, PayStyle, CarNo, CardNo, CouponList);
+                Reason, PayStyle, CarNo, CardNo, CouponList, communityId);
         return responseBean;
     }
 
@@ -140,15 +150,17 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
             @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 = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
-    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo,
+                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo, communityId);
         return responseBean;
     }
 

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaTemporaryLicenseOrderMapper extends BaseMapper<TaTemporaryLicenseOrder> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+}

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

@@ -0,0 +1,119 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 临时车缴费表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_temporary_license_order")
+public class TaTemporaryLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 1是支付宝 2是微信支付
+     */
+    private String paymentType;
+
+    /**
+     * 实缴金额
+     */
+    private String actualAmount;
+
+    /**
+     * 抵扣金额
+     */
+    private String deductionAmount;
+
+    /**
+     * 应缴金额
+     */
+    private String amount;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

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

@@ -0,0 +1,124 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 月租车缴费订单表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user_license_order")
+public class TaUserLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中 3:已关闭
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 延期月份
+     */
+    private Integer extensionMonth;
+
+    /**
+     * 延期费用
+     */
+    private String extensionPrice;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 0是微信支付 2是支付宝 
+     */
+    private String paymentType;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
+
+    /**
+     * 单价费用
+     */
+    private String unitPrice;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

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

@@ -13,7 +13,7 @@ public interface IFuShiService {
      * @param carNo
      * @return
      */
-    ResponseBean getParkInfoByCarNo(String carNo);
+    ResponseBean getParkInfoByCarNo(String carNo, Integer communityId);
 
     /**
      * 第三方月卡上发续费
@@ -26,7 +26,7 @@ public interface IFuShiService {
      * @param RechargeAmt 充值续费金额
      * @return
      */
-    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt);
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId);
 
 
     /**
@@ -52,26 +52,26 @@ public interface IFuShiService {
      *
      * @return
      */
-    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList);
+    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId);
 
     /**
      * 获取线下算费结果
      * @param CarNoOrCardNo 车牌号码或卡号
      * @return
      */
-    ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+    ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId);
 
     /**
      * 获取月租车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId);
 
     /**
      * 获取临时车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo, Integer communityId);
 }

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

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaTemporaryLicenseOrderService extends IService<TaTemporaryLicenseOrder> {
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder> {
+
+}

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

@@ -1,20 +1,32 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.commom.fushi.error.FuShiException;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.perproties.FuShiProperties;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.log.LogAnnotation;
 import com.community.huiju.log.LogEnums;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserLicenseOrder;
 import com.community.huiju.service.IFuShiService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -33,6 +45,15 @@ public class FuShiServiceImpl implements IFuShiService {
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private TaTemporaryLicenseOrderMapper taTemporaryLicenseOrderMapper;
+
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 获取 富士 json 值
      * @param jsonString
@@ -52,7 +73,7 @@ public class FuShiServiceImpl implements IFuShiService {
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
     @Override
-    public ResponseBean getParkInfoByCarNo(String carNo) {
+    public ResponseBean getParkInfoByCarNo(String carNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkInfo = fuShiRequestAPI.getParkInfoByCarNo(fuShiProperties.getParkingCode(), carNo);
         Map<String, Object> fuShiInfo = getFuShiInfo(parkInfo);
@@ -62,7 +83,7 @@ public class FuShiServiceImpl implements IFuShiService {
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
     @Override
-    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt) {
+    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
         // 交易编码
@@ -75,6 +96,58 @@ public class FuShiServiceImpl implements IFuShiService {
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("login_name", Phone);
+        TaUser user = taUserMapper.selectOne(userQueryWrapper);
+
+        // 月租车缴费记录
+        TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
+        taUserLicenseOrder.setCommunityId(communityId);
+        taUserLicenseOrder.setTaUserId(user.getUserId());
+        taUserLicenseOrder.setOrderNumber(dealNo);
+        taUserLicenseOrder.setOrderStatus("1");
+        taUserLicenseOrder.setCreateUser(user.getUserId());
+        taUserLicenseOrder.setCreateDate(new Date());
+        taUserLicenseOrder.setExtensionMonth(Integer.valueOf(RenewDay));
+        taUserLicenseOrder.setExtensionPrice(RechargeAmt);
+        taUserLicenseOrder.setPaymentTel(user.getLoginName());
+        taUserLicenseOrder.setPaymentName(user.getUserName());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taUserLicenseOrder.setPaymentType("0");
+        } else if (PayStyle.contains("支付宝")){
+            taUserLicenseOrder.setPaymentType("2");
+        }
+
+        // 查询这个交费后的车牌
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("月租车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        try {
+            taUserLicenseOrder.setExpireDate(format.parse(String.valueOf(result.get("EndTime"))));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        Object cost = result.get("Cost");
+        String costValue = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
+
+        taUserLicenseOrder.setUnitPrice(costValue.substring(0, costValue.lastIndexOf(".")));
+        taUserLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taUserLicenseOrder.setLicensePlate(CarNo);
+        taUserLicenseOrder.setSourceFrom("大苏");
+        taUserLicenseOrderMapper.insert(taUserLicenseOrder);
+
         return responseBean;
     }
 
@@ -103,7 +176,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方临时卡上发缴费")
     @Override
-    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList) {
+    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         // 交易编号
         String dealNo = idGen.nextId() + "";
@@ -112,12 +185,49 @@ public class FuShiServiceImpl implements IFuShiService {
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        // 临时车缴费记录
+        TaTemporaryLicenseOrder taTemporaryLicenseOrder = new TaTemporaryLicenseOrder();
+        taTemporaryLicenseOrder.setCommunityId(communityId);
+        taTemporaryLicenseOrder.setOrderNumber(dealNo);
+        taTemporaryLicenseOrder.setOrderStatus("1");
+        taTemporaryLicenseOrder.setCreateDate(new Date());
+        taTemporaryLicenseOrder.setUpdateDate(new Date());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taTemporaryLicenseOrder.setPaymentType("2");
+        } else if (PayStyle.contains("支付宝")){
+            taTemporaryLicenseOrder.setPaymentType("1");
+        }
+        taTemporaryLicenseOrder.setActualAmount(ActualAmount);
+        taTemporaryLicenseOrder.setDeductionAmount(DeductionAmount);
+        taTemporaryLicenseOrder.setAmount(Amount);
+
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("临时车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        taTemporaryLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taTemporaryLicenseOrder.setLicensePlate(CarNo);
+        taTemporaryLicenseOrder.setSourceFrom("大苏");
+
+        taTemporaryLicenseOrderMapper.insert(taTemporaryLicenseOrder);
+
+
+
         return responseBean;
     }
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取线下算费结果")
     @Override
-    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String apiGetOfflineFee = fuShiRequestAPI.apiGetOfflineFee(fuShiProperties.getParkingCode(), CarNoOrCardNo);
         String result = JSONObject.parseObject(apiGetOfflineFee).getString("Result");
@@ -134,7 +244,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
@@ -153,7 +263,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.service.ITaTemporaryLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 临时车缴费表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaTemporaryLicenseOrderServiceImpl extends ServiceImpl<TaTemporaryLicenseOrderMapper, TaTemporaryLicenseOrder> implements ITaTemporaryLicenseOrderService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/ICode.java

@@ -32,8 +32,10 @@ public interface ICode {
         String phoneCode = (String) AppkeyCache.getCache(phone);
         if ("1234".equals(code)) {
 
-        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+        }else if (StringUtils.isBlank(phoneCode)) {
             throw new WisdomException("请输入验证码!");
+        } else if (!phoneCode.equals(code)) {
+            throw new WisdomException("验证码错误!");
         }
         // 设置验证码为null字符
         // AppkeyCache.setCache(phone,"null");

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

@@ -5,6 +5,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaSysMenu;
 import com.community.huiju.model.ToBanner;
+import com.community.huiju.service.AssembleServiceI;
 import com.community.huiju.service.BannerServiceI;
 import com.community.huiju.service.MenuServiceI;
 import com.community.huiju.service.MessageServiceI;
@@ -51,13 +52,15 @@ public class AssembleController extends BaseController {
 	@Autowired
 	private TpShopServicel tpShopServicel;
 	
+	@Autowired
+	private AssembleServiceI assembleService;
+	
 	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
 	@RequestMapping(value = "/index/{communityId}",method = RequestMethod.GET)
 	public ResponseBean getIndexData(@PathVariable("communityId") Integer communityId, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {
@@ -86,6 +89,8 @@ public class AssembleController extends BaseController {
 		indexMap.put("tpShopList",((Map<Object, Object>)shopRes.getData()).get("tpShopList"));
 		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
 		responseBean.addSuccess(indexMap);
+		//获取成功的情况下记录
+		assembleService.saveBriskUser(userElement.getUserVerifyId(),userElement.getCommunityId());
 		return responseBean;
 	}
 }

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

@@ -61,7 +61,7 @@ public class HkController extends BaseController {
 
 	@ApiOperation(value = "门口机开门", notes = "门口机开门")
 	@ApiImplicitParams({
-			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "用户审核房产id")
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.POST)
 	public ResponseBean syncControl( HttpServletRequest request, HttpSession session){

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

@@ -98,7 +98,7 @@ public class MessageController extends BaseController {
 	@RequestMapping(value = "/readStatus/{communityId}",method = RequestMethod.POST)
 	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
+		Integer userId = userElement.getUserVerifyId();
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {

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

@@ -30,19 +30,22 @@ public class MonitoringController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.GET)
     public ResponseBean getList(@PathVariable("communityId") Integer communityId,
                                 @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                HttpSession session){
         ResponseBean response = new ResponseBean();
         if (!check(communityId)) {
             response.addError("小区不存在");
             return response;
         }
 
-        response = iMonitoringService.getByCommunityId(communityId,pageNo,pageSize);
+        UserElement userElement = getUserElement(session);
+        response = iMonitoringService.getByCommunityId(userElement,communityId,pageNo,pageSize);
         return response;
     }
 
@@ -71,15 +74,18 @@ public class MonitoringController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/monitoring/hls/{communityId}",method = RequestMethod.GET)
     public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
                                    @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize) {
+                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                   HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iMonitoringService.getHlsByCommunityId(communityId, pageNo, pageSize);
+        UserElement userElement = getUserElement(session);
+        responseBean = iMonitoringService.getHlsByCommunityId(userElement,communityId, pageNo, pageSize);
         return responseBean;
     }
 

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

@@ -129,7 +129,7 @@ public class SocialController extends BaseController {
                                            @RequestParam("activityId") Integer activityId,
                                            HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
 
         ResponseBean responseBean = new ResponseBean();
         if (!check(communityId)) {
@@ -252,7 +252,7 @@ public class SocialController extends BaseController {
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
 
         if (!check(communityId)) {
             responseBean.addError("小区不存在");
@@ -379,7 +379,7 @@ public class SocialController extends BaseController {
     public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
         ResponseBean response = socialServiceI.updateTransaction(paramets,userId,Integer.valueOf(id));
         return response;
     }
@@ -431,7 +431,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID，imgArr:可多张[]"),
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyId：被回复的评论ID，imgArr:可多张[]"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)

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

@@ -325,4 +325,20 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "app问题反馈", notes = "app问题反馈")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:问题描述,feedbackImg:反馈的图片,taUserTel:反馈人电话"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/addfeedback",method = RequestMethod.POST)
+    public ResponseBean addFeedback(@RequestBody String parameter, HttpSession session){
+        ResponseBean response = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        response = iTaUserService.addFeedback(userElement,parameter);
+        return response;
+
+    }
+
+
+
 }

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

@@ -70,4 +70,19 @@ public class VistorController extends BaseController {
         responseBean = vistorServiceI.invateHis(communityId, userId);
         return  responseBean;
     }
+
+    @ApiOperation(value = "查询是否开启了访客邀请的车辆", notes = "查询是否开启了访客邀请的车辆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/invate_license/bool", method = RequestMethod.GET)
+    public ResponseBean invateBool(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = vistorServiceI.invateBool(userElement);
+        return responseBean;
+    }
+
+
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaBriskUserMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaBriskUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+@Mapper
+public interface TaBriskUserMapper {
+	
+	List<TaBriskUser> selectByParams(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId,@Param("nowDate") Date nowDate);
+	
+	int saveBriskUser(TaBriskUser taBriskUser);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaFeedbackImgMapper.java

@@ -0,0 +1,30 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedbackImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaFeedbackImgMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedbackImg record);
+
+    int insertSelective(TaFeedbackImg record);
+
+    TaFeedbackImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedbackImg record);
+
+    int updateByPrimaryKey(TaFeedbackImg record);
+
+    /**
+     * 获取反馈当前图片
+     * @param id
+     * @return
+     */
+    List<String> selectImg(@Param("id") Integer id);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaFeedbackMapper.java

@@ -0,0 +1,25 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedback;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaFeedbackMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedback record);
+
+    int insertSelective(TaFeedback record);
+
+    TaFeedback selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedback record);
+
+    int updateByPrimaryKey(TaFeedback record);
+
+    List<TaFeedback> getFeedback(@Param("content") String content, @Param("tel") String tel, @Param("handleStatus") String handleStatus);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaPublicMonitorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaPublicMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaPublicMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaPublicMonitor record);
+
+    int insertSelective(TaPublicMonitor record);
+
+    TaPublicMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaPublicMonitor record);
+
+    int updateByPrimaryKey(TaPublicMonitor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaRemotelyDoorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyDoor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyDoorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyDoor record);
+
+    int insertSelective(TaRemotelyDoor record);
+
+    TaRemotelyDoor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyDoor record);
+
+    int updateByPrimaryKey(TaRemotelyDoor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaRemotelyMonitorMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyMonitor record);
+
+    int insertSelective(TaRemotelyMonitor record);
+
+    TaRemotelyMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyMonitor record);
+
+    int updateByPrimaryKey(TaRemotelyMonitor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseSettingMapper.java

@@ -0,0 +1,26 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVisitorLicenseSetting;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TaVisitorLicenseSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaVisitorLicenseSetting record);
+
+    int insertSelective(TaVisitorLicenseSetting record);
+
+    TaVisitorLicenseSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaVisitorLicenseSetting record);
+
+    int updateByPrimaryKey(TaVisitorLicenseSetting record);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_visitor_license_setting where community_id = #{communityId}")
+    TaVisitorLicenseSetting selectByCommunityId(@Param("communityId") Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -38,4 +38,6 @@ public interface TpActivityMapper {
      * @return
      */
     List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    TpActivity selectActivity(@Param("activityId") Integer activityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

@@ -24,4 +24,5 @@ public interface TpActivitySignInMapper {
      *
      */
     TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 
+import com.community.huiju.model.TpActivitySignIn;
 import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -1,10 +1,7 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBuildingOwnerInfo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -76,4 +73,25 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where ta_user_verify_id = #{userVerifyId}")
     TpBuildingOwnerInfo selectByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
+
+    /**
+     * 根据手机号更新手机号
+     * @param oldPhone
+     * @param newPhone
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Update("update tp_building_owner_info set owner_tel = #{newPhone} where owner_tel = #{oldPhone}")
+    Integer updateAllByPhone(@Param("oldPhone") String oldPhone, @Param("newPhone") String newPhone);
+
+    /**
+     * 根据手机号更新 性别 和 姓名
+     * @param phone
+     * @param gender
+     * @param userName
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Update("update tp_building_owner_info set owner_name = #{userName}, gender = #{gender} where owner_tel = #{phone}")
+    int updateGenderAndOwnerNameByPhone(@Param("phone") String phone, @Param("gender") String gender, @Param("userName") String userName);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java

@@ -25,10 +25,10 @@ public interface TpTransactionReplyMapper {
      * @param communityId
      * @param transactionId
      * @param userID
-     * @param founderUserID
+     * @param
      * @return
      */
-    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type, @Param("roomNoName")String roomNoName);
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("uuid") Integer uuid,@Param("uuidType") String uuidType,@Param("type")Integer type);
 
     /**
      * 查询我回复别人的帖子

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

@@ -0,0 +1,50 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+public class TaBriskUser {
+	
+	private Integer id;
+	
+	private Integer communityId;
+	
+	private Integer taUserVerifyId;
+	
+	private Date createDate;
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getCommunityId() {
+		return communityId;
+	}
+	
+	public void setCommunityId(Integer communityId) {
+		this.communityId = communityId;
+	}
+	
+	public Integer getTaUserVerifyId() {
+		return taUserVerifyId;
+	}
+	
+	public void setTaUserVerifyId(Integer taUserVerifyId) {
+		this.taUserVerifyId = taUserVerifyId;
+	}
+	
+	public Date getCreateDate() {
+		return createDate;
+	}
+	
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+}

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

@@ -0,0 +1,140 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TaFeedback {
+    private Integer id;
+
+    private String content;
+
+    private String taUserTel;
+
+    private String estateSource;
+
+    private String handleStatus;
+
+    private String handleRemark;
+
+    private String handleUser;
+
+    private Date handleTime;
+
+    private Date createDate;
+
+    private Integer createUser;
+
+    private Date updateDate;
+
+    private Integer updateUser;
+
+    /**
+     * 当前反馈图片
+     * @return
+     */
+    private List<String> taFeedbackImgLsit;
+
+    public List<String> getTaFeedbackImgLsit() {
+        return taFeedbackImgLsit;
+    }
+
+    public void setTaFeedbackImgLsit(List<String> taFeedbackImgLsit) {
+        this.taFeedbackImgLsit = taFeedbackImgLsit;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getTaUserTel() {
+        return taUserTel;
+    }
+
+    public void setTaUserTel(String taUserTel) {
+        this.taUserTel = taUserTel == null ? null : taUserTel.trim();
+    }
+
+    public String getEstateSource() {
+        return estateSource;
+    }
+
+    public void setEstateSource(String estateSource) {
+        this.estateSource = estateSource == null ? null : estateSource.trim();
+    }
+
+    public String getHandleStatus() {
+        return handleStatus;
+    }
+
+    public void setHandleStatus(String handleStatus) {
+        this.handleStatus = handleStatus == null ? null : handleStatus.trim();
+    }
+
+    public String getHandleRemark() {
+        return handleRemark;
+    }
+
+    public void setHandleRemark(String handleRemark) {
+        this.handleRemark = handleRemark == null ? null : handleRemark.trim();
+    }
+
+    public String getHandleUser() {
+        return handleUser;
+    }
+
+    public void setHandleUser(String handleUser) {
+        this.handleUser = handleUser == null ? null : handleUser.trim();
+    }
+
+    public Date getHandleTime() {
+        return handleTime;
+    }
+
+    public void setHandleTime(Date handleTime) {
+        this.handleTime = handleTime;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaFeedbackImg {
+    private Integer id;
+
+    private Integer feedbackId;
+
+    private String imgUrl;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getFeedbackId() {
+        return feedbackId;
+    }
+
+    public void setFeedbackId(Integer feedbackId) {
+        this.feedbackId = feedbackId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl == null ? null : imgUrl.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaPublicMonitor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaRemotelyDoor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Integer unitId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaRemotelyMonitor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Integer unitId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaVisitorLicenseSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Date createDate;
+
+    private Integer createUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+}

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

@@ -42,7 +42,17 @@ public class TpActivity {
     private Date updateDate;
     
     private String userName;
-    
+
+    private String signInCode;
+
+    public String getSignInCode() {
+        return signInCode;
+    }
+
+    public void setSignInCode(String signInCode) {
+        this.signInCode = signInCode;
+    }
+
     /**
      * 报名状态
      */

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

@@ -8,8 +8,6 @@ public class TpTransaction {
 
     private Integer communityId;
 
-    private Integer taUserId;
-
     private String transactionTitle;
 
     private String transactionContent;
@@ -29,6 +27,21 @@ public class TpTransaction {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    /**
+     * 身份ID 根据uuid_type区分是物业端TP_USER_ID还是TA_USER_VERIFY_ID
+     */
+    private Integer uuid;
+    
+    /**
+     * app/prop
+     */
+    private String uuidType;
+    
+    /**
+     * 话题发布人
+     */
+    private String uuidName;
 
     //返回查询帖子电话
     private String telephone;
@@ -58,11 +71,6 @@ public class TpTransaction {
      */
     private Integer noLikeCount;
 
-    /**
-     * 对应app端的角色表，物业端发帖时不维护
-     */
-    private Integer taUserVerifyId;
-
     /**
      * 0为app端，1为物业
      */
@@ -86,14 +94,6 @@ public class TpTransaction {
      */
     private String bel;
 
-    public Integer getTaUserVerifyId() {
-        return taUserVerifyId;
-    }
-
-    public void setTaUserVerifyId(Integer taUserVerifyId) {
-        this.taUserVerifyId = taUserVerifyId;
-    }
-
     public String getRoleName() {
         return roleName;
     }
@@ -124,14 +124,6 @@ public class TpTransaction {
         this.communityId = communityId;
     }
 
-    public Integer getTaUserId() {
-        return taUserId;
-    }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
-    }
-
     public String getTransactionTitle() {
         return transactionTitle;
     }
@@ -274,4 +266,28 @@ public class TpTransaction {
     public void setRoomNoName(String roomNoName) {
         this.roomNoName = roomNoName;
     }
+    
+    public Integer getUuid() {
+        return uuid;
+    }
+    
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+    
+    public String getUuidType() {
+        return uuidType;
+    }
+    
+    public void setUuidType(String uuidType) {
+        this.uuidType = uuidType;
+    }
+    
+    public String getUuidName() {
+        return uuidName;
+    }
+    
+    public void setUuidName(String uuidName) {
+        this.uuidName = uuidName;
+    }
 }

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

@@ -7,7 +7,7 @@ public class TpTransactionLike {
 
     private Integer communityId;
 
-    private Integer taUserId;
+    private Integer taUserVerifyId;
 
     private Integer transactionId;
 
@@ -32,15 +32,15 @@ public class TpTransactionLike {
     public void setCommunityId(Integer communityId) {
         this.communityId = communityId;
     }
-
-    public Integer getTaUserId() {
-        return taUserId;
+    
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
     }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
+    
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
     }
-
+    
     public Integer getTransactionId() {
         return transactionId;
     }

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

@@ -1,28 +1,81 @@
 package com.community.huiju.model;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
 public class TpTransactionReply {
-
+    
     private Integer id;
-
+    /**
+     * 小区id
+     */
     private Integer communityId;
-
+    
+    /**
+     * 交易帖子ID
+     */
     private Integer transactionId;
-
-    private Integer taUserId;
-
-    private String taUserName;
-
+    
+    /**
+     * 回复帖子的ID,根据uuid_type区分物业端app端
+     */
+    private Integer uuid;
+    
+    /**
+     * app/prop
+     */
+    private String uuidType;
+    
+    /**
+     * 回复帖子的姓名
+     */
+    private String uuidName;
+    
+    /**
+     * 回复帖子的角色
+     */
+    private String uuidRole;
+    
+    /**
+     * 回复内容
+     */
     private String replyContent;
-
-    private Integer replyTaUserId;
-
-    private String replyTaUserName;
-
+    
+    /**
+     * 被回复的评论内容的用户ID根据uuidtype区分
+     */
+    private Integer replyUuid;
+    
+    /**
+     * app/prop
+     */
+    private String replyUuidType;
+    
+    /**
+     * 被回复的评论内容的姓名
+     */
+    private String replyUuidName;
+    
+    /**
+     * 被回复的评论人的角色
+     */
+    private String replyUuidRole;
+    
+    /**
+     * 发布者身份
+     */
+    private String releaseIdentity;
+    
+    /**
+     * 创建时间
+     */
     private Date createDate;
-
+    
+    /**
+     * 用户角色
+     */
+    private String roleName;
     /**
      * 住户端 的角色
      */
@@ -32,25 +85,20 @@ public class TpTransactionReply {
      * 被回复人 的角色
      */
     private String replyRoleName;
-
+    
+    private String createUserName;
+    
     /**
-     * 回复的图片
-     * @return
+     * 被回复的评论ID
      */
-    private List<String> imgList;
-
+    private Integer replyId;
+    
     /**
-     *0代表app端用户，1代表物业端用户
+     * 回复的图片
      * @return
      */
-    private String releaseIdentity;
-
-    /**
-     * 用于查询app端角色，物业端不维护
-     * @param releaseIdentity
-     */
-    private  Integer taUserVerifyId;
-
+    private List<String> imgList;
+    
     private String roomNoName;
 
     public String getRoomNoName() {
@@ -61,13 +109,7 @@ public class TpTransactionReply {
         this.roomNoName = roomNoName;
     }
 
-    public void setTaUserVerifyId(Integer taUserVerifyId) {
-        this.taUserVerifyId = taUserVerifyId;
-    }
-
-    public Integer getTaUserVerifyId() {
-        return taUserVerifyId;
-    }
+    
 
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
@@ -108,23 +150,15 @@ public class TpTransactionReply {
     public void setTransactionId(Integer transactionId) {
         this.transactionId = transactionId;
     }
-
-    public Integer getTaUserId() {
-        return taUserId;
-    }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
-    }
-
-    public String getTaUserName() {
-        return taUserName;
+    
+    public String getRoleName() {
+        return roleName;
     }
-
-    public void setTaUserName(String taUserName) {
-        this.taUserName = taUserName == null ? null : taUserName.trim();
+    
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
-
+    
     public String getReplyContent() {
         return replyContent;
     }
@@ -132,23 +166,71 @@ public class TpTransactionReply {
     public void setReplyContent(String replyContent) {
         this.replyContent = replyContent == null ? null : replyContent.trim();
     }
-
-    public Integer getReplyTaUserId() {
-        return replyTaUserId;
+    
+    public Integer getUuid() {
+        return uuid;
     }
-
-    public void setReplyTaUserId(Integer replyTaUserId) {
-        this.replyTaUserId = replyTaUserId;
+    
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
     }
-
-    public String getReplyTaUserName() {
-        return replyTaUserName;
+    
+    public String getUuidType() {
+        return uuidType;
     }
-
-    public void setReplyTaUserName(String replyTaUserName) {
-        this.replyTaUserName = replyTaUserName == null ? null : replyTaUserName.trim();
+    
+    public void setUuidType(String uuidType) {
+        this.uuidType = uuidType;
     }
-
+    
+    public String getUuidName() {
+        return uuidName;
+    }
+    
+    public void setUuidName(String uuidName) {
+        this.uuidName = uuidName;
+    }
+    
+    public String getUuidRole() {
+        return uuidRole;
+    }
+    
+    public void setUuidRole(String uuidRole) {
+        this.uuidRole = uuidRole;
+    }
+    
+    public Integer getReplyUuid() {
+        return replyUuid;
+    }
+    
+    public void setReplyUuid(Integer replyUuid) {
+        this.replyUuid = replyUuid;
+    }
+    
+    public String getReplyUuidType() {
+        return replyUuidType;
+    }
+    
+    public void setReplyUuidType(String replyUuidType) {
+        this.replyUuidType = replyUuidType;
+    }
+    
+    public String getReplyUuidName() {
+        return replyUuidName;
+    }
+    
+    public void setReplyUuidName(String replyUuidName) {
+        this.replyUuidName = replyUuidName;
+    }
+    
+    public String getReplyUuidRole() {
+        return replyUuidRole;
+    }
+    
+    public void setReplyUuidRole(String replyUuidRole) {
+        this.replyUuidRole = replyUuidRole;
+    }
+    
     public Date getCreateDate() {
         return createDate;
     }
@@ -172,4 +254,20 @@ public class TpTransactionReply {
     public void setReplyRoleName(String replyRoleName) {
         this.replyRoleName = replyRoleName;
     }
+    
+    public String getCreateUserName() {
+        return createUserName;
+    }
+    
+    public Integer getReplyId() {
+        return replyId;
+    }
+    
+    public void setReplyId(Integer replyId) {
+        this.replyId = replyId;
+    }
+    
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
 }

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

@@ -0,0 +1,5 @@
+package com.community.huiju.service;
+
+public interface AssembleServiceI {
+	void saveBriskUser(Integer userVerifyId, Integer communityId);
+}

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

@@ -16,7 +16,7 @@ public interface IMonitoringService {
      * @param pageSize
      * @return
      */
-    ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize);
+    ResponseBean getByCommunityId(UserElement userElement, Integer communityId,Integer pageNo, Integer pageSize);
 
     /**
      * 生成 Token
@@ -32,7 +32,7 @@ public interface IMonitoringService {
      * @param communityId
      * @return
      */
-    ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize);
+    ResponseBean getHlsByCommunityId(UserElement userElement, Integer communityId, Integer pageNo, Integer pageSize);
 
     /**
      * 可是对讲 视频流

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

@@ -203,4 +203,12 @@ public interface ITaUserService {
      * @return
      */
     ResponseBean daSuToken(String appid, String datetime, String encrypt, String communityId, String phone,String sign, HttpSession session);
+
+    /**
+     * 反馈添加
+     * @param userElement
+     * @param parameter
+     * @return
+     */
+    ResponseBean addFeedback(UserElement userElement, String parameter);
 }

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

@@ -28,4 +28,11 @@ public interface TaVistorServiceI {
      * @return
      */
     ResponseBean invateHis(Integer communityId, Integer userId);
+
+    /**
+     * 查询 邀请访客车辆 是否开启
+     * @param userElement
+     * @return
+     */
+    ResponseBean invateBool(UserElement userElement);
 }

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

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.TaBriskUserMapper;
+import com.community.huiju.model.TaBriskUser;
+import com.community.huiju.service.AssembleServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+@Service("assembleService")
+@Transactional(rollbackFor = Exception.class)
+public class AssembleServiceImpl implements AssembleServiceI {
+	
+	@Autowired
+	private TaBriskUserMapper taBriskUserMapper;
+	
+	/**
+	 * 记录日活跃用户，同一个用户当天只记录一次
+	 * @param userVerifyId
+	 * @param communityId
+	 */
+	@Override
+	public void saveBriskUser(Integer userVerifyId, Integer communityId) {
+		//先查看此用户当天是否进入过首页，没进入过则插入
+		Date date = new Date();
+		List<TaBriskUser> list = taBriskUserMapper.selectByParams(userVerifyId,communityId,date);
+		if (list.size() < 1) {
+			//插入一条数据
+			TaBriskUser taBriskUser = new TaBriskUser();
+			taBriskUser.setCommunityId(communityId);
+			taBriskUser.setTaUserVerifyId(userVerifyId);
+			taBriskUser.setCreateDate(date);
+			taBriskUserMapper.saveBriskUser(taBriskUser);
+		}
+	}
+}

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

@@ -50,6 +50,9 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private TaRemotelyDoorMapper taRemotelyDoorMapper;
+
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -354,6 +357,15 @@ public class HKServiceImpl implements IHKService {
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");
         if (errorCode == 0) {
+
+            // 记录 远程开门次数
+            TaRemotelyDoor taRemotelyDoor = new TaRemotelyDoor();
+            taRemotelyDoor.setCommunityId(userVerify.getCommunityId());
+            taRemotelyDoor.setTaUserVerifyId(userVerify.getUserId());
+            taRemotelyDoor.setUnitId(userVerify.getUnitId());
+            taRemotelyDoor.setCreateDate(new Date());
+            taRemotelyDoorMapper.insertSelective(taRemotelyDoor);
+
             responseBean.addSuccess("操作成功!");
             return responseBean;
         }

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

@@ -25,9 +25,11 @@ import org.springframework.stereotype.Service;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 监控 业务实现
@@ -67,8 +69,14 @@ public class MonitoringServiceImpl implements IMonitoringService {
     @Autowired
     private ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private TaPublicMonitorMapper taPublicMonitorMapper;
+
+    @Autowired
+    private TaRemotelyMonitorMapper taRemotelyMonitorMapper;
+
     @Override
-    public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
+    public ResponseBean getByCommunityId(UserElement userElement, Integer communityId,Integer pageNo, Integer pageSize) {
 
         // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
 
@@ -95,6 +103,14 @@ public class MonitoringServiceImpl implements IMonitoringService {
         Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityId(communityId);
 
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            response.addError("系统未配置监控设备!");
+            return response;
+        }
+
+        // TODO 过滤 hls 的流地址，后面拆表后，就可以将改代码移除
+        tpEquipments = tpEquipments.stream().filter(e-> e.getMonitoringUrl().contains("rtsp")).collect(Collectors.toList());
+
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNo", page.getPageNum());
         map.put("pageSize", page.getPageSize());
@@ -102,9 +118,29 @@ public class MonitoringServiceImpl implements IMonitoringService {
         map.put("list", tpEquipments);
         response.addSuccess(map);
 
+        // 记录 查看监控
+        insertPublicMonitor(communityId, userElement.getId());
+
         return response;
     }
 
+    /**
+     * 记录 查看监控
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    private TaPublicMonitor insertPublicMonitor(Integer communityId, Integer userId) {
+        // 记录查看监控设备
+        TaPublicMonitor taPublicMonitor = new TaPublicMonitor();
+        taPublicMonitor.setCommunityId(communityId);
+        taPublicMonitor.setTaUserVerifyId(userId);
+        taPublicMonitor.setCreateDate(new Date());
+        taPublicMonitorMapper.insertSelective(taPublicMonitor);
+
+        return taPublicMonitor;
+    }
+
     @Override
     public ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize) {
 
@@ -168,17 +204,29 @@ public class MonitoringServiceImpl implements IMonitoringService {
     }
 
     @Override
-    public ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize) {
+    public ResponseBean getHlsByCommunityId(UserElement userElement, Integer communityId, Integer pageNo, Integer pageSize) {
         ResponseBean response = new ResponseBean();
         Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectHlsByCommunityId(communityId);
 
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            response.addError("系统未配置监控设备!");
+            return response;
+        }
+
+        // TODO 过滤 rtsp 的流地址，后面拆表后，就可以将改代码移除
+        tpEquipments = tpEquipments.stream().filter(e-> e.getMonitoringUrl().contains("m3u8")).collect(Collectors.toList());
+
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNo", page.getPageNum());
         map.put("pageSize", page.getPageSize());
         map.put("total", page.getTotal());
         map.put("list", tpEquipments);
         response.addSuccess(map);
+
+        // 记录 查看监控
+        insertPublicMonitor(communityId, userElement.getId());
+
         return response;
     }
 
@@ -238,6 +286,15 @@ public class MonitoringServiceImpl implements IMonitoringService {
         map.put("address", toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
         map.put("token", tpEquipment.getOpUserUuid());
         responseBean.addSuccess(map);
+
+        // 记录 单元门监控查看
+        TaRemotelyMonitor taRemotelyMonitor = new TaRemotelyMonitor();
+        taRemotelyMonitor.setCommunityId(userElement.getCommunityId());
+        taRemotelyMonitor.setTaUserVerifyId(userElement.getId());
+        taRemotelyMonitor.setUnitId(userElement.getUnitId());
+        taRemotelyMonitor.setCreateDate(new Date());
+        taRemotelyMonitorMapper.insertSelective(taRemotelyMonitor);
+
         return responseBean;
     }
 }

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

@@ -206,8 +206,11 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-
-        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        TpActivity  tpActivity=new TpActivity();
+         tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        if(null == tpActivity){
+            tpActivity = tpActivityMapper.selectActivity(activityId);
+        }
         TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
         if (null != tpUser) {
             tpActivity.setUserName(tpUser.getUserName());
@@ -300,13 +303,15 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpTransaction> tpTransactions = tpTransactionMapper.findAllTransaction(communityId, transactionTitle, type);
 
         tpTransactions.stream().forEach(e -> {
-            if (null != e.getTaUserVerifyId()) {
-                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(e.getTaUserVerifyId());
+            if (e.getUuidType().equals("app")) {
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(e.getUuid()).getRoleId());
                 e.setRoleId(taSysRole.getId());
                 e.setRoleName(taSysRole.getRoleName());
             }
-            TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
-            e.setCreateUserName(taUser.getUserName());
+            if (e.getUuidType().equals("prop")) {
+                e.setRoleName("物业");
+            }
+            e.setCreateUserName(e.getUuidName());
         });
 
         parameter.put("list", tpTransactions);
@@ -333,14 +338,15 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setTransactionContent(transactionContent);
         tpTransaction.setType(type);
         tpTransaction.setCommunityId(userElement.getCommunityId());
-        tpTransaction.setTaUserId(userElement.getId());
+        tpTransaction.setUuid(userElement.getUserVerifyId());
+        tpTransaction.setUuidType("app");
+        tpTransaction.setUuidName(userElement.getUserName());
         tpTransaction.setCreateUser(userElement.getId());
         tpTransaction.setStatus("1");
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userElement.getId());
         tpTransaction.setUpdateDate(new Date());
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        tpTransaction.setTaUserVerifyId(taUserVerify.getRoleId());
         tpTransaction.setRoomNoName(taUserVerify.getRoomNoName());
         tpTransaction.setIsReported("0");
         // 发布者身份  0 APP  1 物业
@@ -394,7 +400,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageLsit = PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactions = tpTransactionMapper.selectTransaction(userElement.getId(), userElement.getCommunityId(), type);
+        List<TpTransaction> tpTransactions = tpTransactionMapper.selectTransaction(userElement.getUserVerifyId(), userElement.getCommunityId(), type);
 
         tpTransactions.stream().forEach(e -> {
             // 角色
@@ -425,7 +431,7 @@ public class SocialServiceImpl implements SocialServiceI {
         transaction.setTransactionContent(tpTransaction.getTransactionContent());
 
 
-        if (null != transaction && userId.equals(transaction.getTaUserId())) {
+        if (null != transaction && userId.equals(transaction.getUuid()) && transaction.getUuidType().equals("app")) {
             tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
 
             insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
@@ -441,7 +447,7 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean deleteransaction(Integer id, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         TpTransaction tpTransaction = tpTransactionMapper.getById(Integer.valueOf(id));
-        if (null != tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
+        if (null != tpTransaction && userElement.getUserVerifyId().equals(tpTransaction.getUuid()) && tpTransaction.getUuidType().equals("app")) {
             tpTransaction.setStatus("0");
             tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
@@ -562,22 +568,24 @@ public class SocialServiceImpl implements SocialServiceI {
         if (null != array) {
             reply = array.toArray(new String[]{});
         }
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
-        tpTransactionReply.setTaUserId(userElement.getId());
-        tpTransactionReply.setTaUserName(userElement.getUserName());
+        tpTransactionReply.setUuid(userElement.getUserVerifyId());
+        tpTransactionReply.setUuidType("app");
+        tpTransactionReply.setUuidName(userElement.getUserName());
+        tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
             // 由于评论帖子和评论对话是同一个接口，当tpTransactionReply.getReplyTaUserId()为空时查询Ta_user里面的名字
-        TpTransaction tpTransaction= tpTransactionMapper.getById(tpTransactionReply.getTransactionId());
-        TaUser taUser= taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
-
-        tpTransactionReply.setReplyTaUserName(tpTransactionReply.getReplyTaUserId()==null?taUser.getUserName():taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
+        TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
+        
         //  评论帖子取 TpTransaction 的创建人，回复对话取传过来的值
-        tpTransactionReply.setReplyTaUserId(tpTransactionReply.getReplyTaUserId()==null?tpTransaction.getCreateUser():tpTransactionReply.getReplyTaUserId());
+        tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
+        tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
+        tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
+        tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getReplyUuidRole());
         tpTransactionReply.setReleaseIdentity("0");
-        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        tpTransactionReply.setTaUserVerifyId(taUserVerify.getRoleId());
-        tpTransactionReply.setRoomNoName(taUserVerify.getRoomNoName());
+        
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
@@ -601,9 +609,9 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean response = new ResponseBean();
         TpTransactionLike tpTransactionLike = JSONObject.parseObject(paramets, TpTransactionLike.class);
         tpTransactionLike.setCommunityId(userElement.getCommunityId());
-        tpTransactionLike.setTaUserId(userElement.getId());
+        tpTransactionLike.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransactionLike.setCreateDate(new Date());
-        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(), userElement.getCommunityId(), userElement.getId());
+        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(), userElement.getCommunityId(), userElement.getUserVerifyId());
         if (null != isUser) {
             response.addError("您已点赞或踩");
             return response;
@@ -618,7 +626,7 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpActivity> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getId(), userElement.getCommunityId());
+        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getUserVerifyId(), userElement.getCommunityId());
         parameter.put("list", tpActivity);
         parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);
@@ -631,7 +639,7 @@ public class SocialServiceImpl implements SocialServiceI {
         //拿到我自己所有的帖子
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(), userElement.getCommunityId());
+        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getUserVerifyId(), userElement.getCommunityId());
 
         parameter.put("list", tpTransactionList);
         parameter.put("total", pageList.getTotal());
@@ -643,6 +651,32 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         Integer activityId = JSONObject.parseObject(paramets).getInteger("activityId");
+        // 校验扫码签到
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,userElement.getCommunityId());
+        /*当前用户扫的是否是本小区的码*/
+        TpActivity activity = tpActivityMapper.selectActivity(activityId);
+        if (null!=activity && (!userElement.getCommunityId().equals(activity.getCommunityId()))){
+            responseBean.addError("活动不属于当前登录小区，请在个人中心切换小区");
+            return responseBean;
+        }
+        /*查看当前用户是否报名*/
+         TpActivitySignup signIn= tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId,userElement.getCommunityId(),userElement.getUserVerifyId());
+        if (signIn == null){
+            responseBean.addError("请先报名");
+            return responseBean;
+        }
+        /*活动不需要签到*/
+
+        if (null!=tpActivity && "2".equals(tpActivity.getSignInCode())){
+            responseBean.addError("活动已不能签到");
+            return responseBean;
+        }
+        /*活动作废*/
+        if (null!=tpActivity && "0".equals(tpActivity.getStatus())){
+            responseBean.addError("活动已被作废");
+            return responseBean;
+        }
+
         TpActivitySignIn tpActivitySignIn = new TpActivitySignIn();
         tpActivitySignIn.setActivityId(activityId);
         tpActivitySignIn.setCommunityId(userElement.getCommunityId());
@@ -679,12 +713,12 @@ public class SocialServiceImpl implements SocialServiceI {
         TpTransactionReply tpTransactionReply = new TpTransactionReply();
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTransactionId(transactionId);
-        tpTransactionReply.setTaUserId(userElement.getId());
-        tpTransactionReply.setTaUserName(userElement.getUserName());
+        //tpTransactionReply.setTaUserId(userElement.getId());
+        //tpTransactionReply.setTaUserName(userElement.getUserName());
         tpTransactionReply.setReleaseIdentity("0");
-        tpTransactionReply.setReplyContent(replyContent);
-        tpTransactionReply.setReplyTaUserId(replyUserId);
-        tpTransactionReply.setReplyTaUserName(userName);
+        //tpTransactionReply.setReplyContent(replyContent);
+        //tpTransactionReply.setReplyTaUserId(replyUserId);
+        //tpTransactionReply.setReplyTaUserName(userName);
         tpTransactionReply.setCreateDate(new Date());
         response.addSuccess("成功");
         tpTransactionReplyMapper.insert(tpTransactionReply);
@@ -785,7 +819,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);
-        tpActivitySignup.setTaUserId(userElement.getId());
+        tpActivitySignup.setTaUserId(userElement.getUserVerifyId());
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignup.setRemark(remark);
 
@@ -833,9 +867,6 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId, communityId);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
-        tpTransaction.setTelephone(taUser.getLoginName());
-        tpTransaction.setCreateUserName(taUser.getUserName());
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("uuid", tpTransaction.getId());
@@ -908,8 +939,8 @@ public class SocialServiceImpl implements SocialServiceI {
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
         //房间号
-         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getId(), tpTransaction.getCreateUser(),type,taUserVerify.getRoomNoName());
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUserVerifyId(), tpTransaction.getUuid(),tpTransaction.getUuidType(),type);
         for (TpTransactionReply tpTransactionReply : replies) {
             List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
             List<String> list = new ArrayList<>();

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

@@ -142,10 +142,16 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         taUserLicense.setLicenseType(dataType);
 
         taUserLicense.setLicensePlate(carNo);
-        String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
-        taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
+        Object cost = jsonParam.get("Cost");
+        if (null != cost) {
+            String price = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
+            taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
+        }
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
-        taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
+        Object renewTime = jsonParam.get("RenewTime");
+        if (null != renewTime) {
+            taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(renewTime)));
+        }
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         try {

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

@@ -160,6 +160,13 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Autowired
     private TpMessageMapper tpMessageMapper;
+
+    @Autowired
+    private TaFeedbackMapper taFeedbackMapper;
+
+    @Autowired
+    private  TaFeedbackImgMapper taFeedbackImgMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
@@ -325,10 +332,16 @@ public class TaUserServiceImpl implements ITaUserService {
         // 校验手机号和验证码
         iCode.checkPhoneAndCode(phone, code);
 
-        //当前小区下的电话校验
-        TaUser loginName = taUserMapper.getByLoginName(user.getCommunityId(), phone);
-        if (null != loginName) {
-            response.addError("号码已占用");
+        // 查询出这个手机号
+        TaUser hasUserPhone = hasUserPhone(phone);
+        if (null != hasUserPhone && user.getId().intValue() != hasUserPhone.getId().intValue()) {
+            response.addError("手机号已被使用，请更换其他手机号");
+            return response;
+        }
+
+        // 如果提交上来的手机号 和 这个用户本身的手机号相等，就直接返回，不做其他操作
+        if (null != hasUserPhone && user.getLoginName().equals(phone)) {
+            response.addError("手机号已被使用，请更换其他手机号");
             return response;
         }
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
@@ -337,7 +350,7 @@ public class TaUserServiceImpl implements ITaUserService {
         int errorCode = jsonobject.getInteger("errorCode");
         if (errorCode != 0) {
             log.error("海康电话已存在,推送海康电话修改失败");
-            response.addError("此手机号已注册");
+            response.addError("手机号已被使用，请更换其他手机号");
             return response;
         }
 
@@ -348,24 +361,10 @@ public class TaUserServiceImpl implements ITaUserService {
         taUser.setUpdateDate(new Date());
         taUser.setUpdateUser(user.getId());
         taUserMapper.updateLongName(taUser);
-        response.addSuccess("修改成功");
+        response.addSuccess("修改手机号成功，以后请使用新手机号登录");
 
-        /**
-         * 如果是 家属或者租客,修改手机号, 就不允许修改资料库的信息
-         * 根据房产判断 当前是否是 业主
-         */
-
-        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
-
-        // 修改楼栋信息资料库的手机号
-        // 1 业主 2 租客 3 家属
-        // 只允许业主修改
-        if (null != sysRole && sysRole.getId().intValue() == 1) {
-            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(userVerify.getRoomNoId());
-            buildingOwnerInfo.setOwnerTel(phone);
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
-        }
+        // 修改楼栋资料库手机号
+        tpBuildingOwnerInfoMapper.updateAllByPhone(user.getLoginName(), phone);
 
         // 给前端返回一个空数组
         response.addSuccess(new String[0]);
@@ -414,26 +413,12 @@ public class TaUserServiceImpl implements ITaUserService {
         // 数据库数据
         TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
 
-        /**
-         * 判断是否 是业主，如果业主就连着 楼栋资料库 信息修改
-         */
-
-        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
-
         BeanTools.copyProperties(user, taUser);
         int result = taUserMapper.updateByPrimaryKeySelective(taUser);
-        // int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
-        if (1 == sysRole.getId()) {
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            tpBuildingOwnerInfo.setOwnerName(user.getUserName());
-            tpBuildingOwnerInfo.setGender(user.getGender());
-            tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
-            tpBuildingOwnerInfo.setUpdateDate(new Date());
-            tpBuildingOwnerInfo.setUpdateUser(taUser.getId());
-            tpBuildingOwnerInfo.setId(userElement.getRoomNoId());
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(tpBuildingOwnerInfo);
-        }
+
+        // 修改楼栋资料库手机号
+        result = tpBuildingOwnerInfoMapper.updateGenderAndOwnerNameByPhone(taUser.getLoginName(), user.getGender(), user.getUserName());
+
         if (result > 0) {
             response.addSuccess("修改成功!");
         } else {
@@ -1228,4 +1213,36 @@ public class TaUserServiceImpl implements ITaUserService {
         checkLogin(responseBean, currentUser, session);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean addFeedback(UserElement userElement, String parameter) {
+       ResponseBean response= new ResponseBean<>();
+       TaFeedback taFeedback= JSONObject.parseObject(parameter,TaFeedback.class);
+
+        if (!AccountValidatorUtil.isPhone(taFeedback.getTaUserTel())) {
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+
+       TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+       /*期-栋-单元-楼层-户号*/
+       taFeedback.setEstateSource(null==taUserVerify?null:taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
+       taFeedback.setHandleStatus("2");
+       taFeedback.setCreateDate(new Date());
+       taFeedback.setCreateUser(userElement.getUserVerifyId());
+       taFeedbackMapper.insert(taFeedback);
+        JSONArray jSONArray= JSONObject.parseObject(parameter).getJSONArray("feedbackImg");
+       if(null!=jSONArray) {
+           String[] feedbackImgArr = jSONArray.toArray(new String[]{});
+           for (String imgUrl : feedbackImgArr) {
+               TaFeedbackImg taFeedbackImg = new TaFeedbackImg();
+               taFeedbackImg.setImgUrl(imgUrl);
+               taFeedbackImg.setCreateDate(new Date());
+               taFeedbackImg.setFeedbackId(taFeedback.getId());
+               taFeedbackImgMapper.insert(taFeedbackImg);
+           }
+       }
+        response.addSuccess("成功");
+        return response;
+    }
 }

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

@@ -5,14 +5,8 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.hk.HKOpenApi;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TaVisitorLicenseMapper;
-import com.community.huiju.dao.TaVisitorMapper;
-import com.community.huiju.dao.TpEquipmentTreeMapper;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TaVisitor;
-import com.community.huiju.model.TaVisitorLicense;
-import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TaVistorServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -46,6 +40,9 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
 
+    @Autowired
+    private TaVisitorLicenseSettingMapper taVisitorLicenseSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement) {
@@ -145,4 +142,14 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         throw new RuntimeException("创建访问登记失败!" + errorMessage);
 
     }
+
+
+    @Override
+    public ResponseBean invateBool(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        TaVisitorLicenseSetting taVisitorLicenseSetting = taVisitorLicenseSettingMapper.selectByCommunityId(userElement.getCommunityId());
+        // true 表示启用了访客邀请的车辆， false 表示未启用访客邀请的车辆
+        responseBean.addSuccess(null != taVisitorLicenseSetting ? true : false);
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaBriskUserMapper" >
+
+    <resultMap id="BaseResultMap" type="com.community.huiju.model.TaBriskUser" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="community_id" property="communityId" jdbcType="INTEGER" />
+        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+        <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    </resultMap>
+
+    <select id="selectByParams" resultMap="BaseResultMap">
+        select
+          id,community_id,ta_user_verify_id,create_date
+        from ta_brisk_user
+        where ta_user_verify_id = #{userVerifyId}
+        AND community_id = #{communityId}
+        AND to_days(create_date) = to_days(#{nowDate})
+    </select>
+
+    <insert id="saveBriskUser" parameterType="com.community.huiju.model.TaBriskUser" >
+    insert into ta_brisk_user (id, community_id, ta_user_verify_id,create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+</mapper>

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaFeedbackImgMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedbackImg" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="feedback_id" property="feedbackId" jdbcType="INTEGER" />
+    <result column="img_url" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, feedback_id, img_url, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_feedback_img
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_feedback_img
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    insert into ta_feedback_img (id, feedback_id, img_url, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{feedbackId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    insert into ta_feedback_img
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="feedbackId != null" >
+        feedback_id,
+      </if>
+      <if test="imgUrl != null" >
+        img_url,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="feedbackId != null" >
+        #{feedbackId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null" >
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    update ta_feedback_img
+    <set >
+      <if test="feedbackId != null" >
+        feedback_id = #{feedbackId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null" >
+        img_url = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    update ta_feedback_img
+    set feedback_id = #{feedbackId,jdbcType=INTEGER},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectImg" resultType="string">
+    select img_url from  ta_feedback_img where feedback_id =  #{id,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaFeedbackMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedback" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="ta_user_tel" property="taUserTel" jdbcType="VARCHAR" />
+    <result column="estate_source" property="estateSource" jdbcType="VARCHAR" />
+    <result column="handle_status" property="handleStatus" jdbcType="VARCHAR" />
+    <result column="handle_remark" property="handleRemark" jdbcType="VARCHAR" />
+    <result column="handle_user" property="handleUser" jdbcType="VARCHAR" />
+    <result column="handle_time" property="handleTime" jdbcType="TIMESTAMP" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, content, ta_user_tel, estate_source, handle_status, handle_remark, handle_user, 
+    handle_time, create_date, create_user, update_date, update_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_feedback
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_feedback
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedback" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_feedback (id, content, ta_user_tel, 
+      estate_source, handle_status, handle_remark, 
+      handle_user, handle_time, create_date, 
+      create_user, update_date, update_user
+      )
+    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{taUserTel,jdbcType=VARCHAR}, 
+      #{estateSource,jdbcType=VARCHAR}, #{handleStatus,jdbcType=VARCHAR}, #{handleRemark,jdbcType=VARCHAR}, 
+      #{handleUser,jdbcType=VARCHAR}, #{handleTime,jdbcType=TIMESTAMP}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedback" >
+    insert into ta_feedback
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+      <if test="taUserTel != null" >
+        ta_user_tel,
+      </if>
+      <if test="estateSource != null" >
+        estate_source,
+      </if>
+      <if test="handleStatus != null" >
+        handle_status,
+      </if>
+      <if test="handleRemark != null" >
+        handle_remark,
+      </if>
+      <if test="handleUser != null" >
+        handle_user,
+      </if>
+      <if test="handleTime != null" >
+        handle_time,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserTel != null" >
+        #{taUserTel,jdbcType=VARCHAR},
+      </if>
+      <if test="estateSource != null" >
+        #{estateSource,jdbcType=VARCHAR},
+      </if>
+      <if test="handleStatus != null" >
+        #{handleStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="handleRemark != null" >
+        #{handleRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="handleUser != null" >
+        #{handleUser,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null" >
+        #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedback" >
+    update ta_feedback
+    <set >
+      <if test="content != null" >
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserTel != null" >
+        ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
+      </if>
+      <if test="estateSource != null" >
+        estate_source = #{estateSource,jdbcType=VARCHAR},
+      </if>
+      <if test="handleStatus != null" >
+        handle_status = #{handleStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="handleRemark != null" >
+        handle_remark = #{handleRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="handleUser != null" >
+        handle_user = #{handleUser,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null" >
+        handle_time = #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedback" >
+    update ta_feedback
+    set content = #{content,jdbcType=VARCHAR},
+      ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
+      estate_source = #{estateSource,jdbcType=VARCHAR},
+      handle_status = #{handleStatus,jdbcType=VARCHAR},
+      handle_remark = #{handleRemark,jdbcType=VARCHAR},
+      handle_user = #{handleUser,jdbcType=VARCHAR},
+      handle_time = #{handleTime,jdbcType=TIMESTAMP},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getFeedback" resultMap="BaseResultMap">
+    select * from  ta_feedback
+    <where>
+      <if test="tel != null and tel !=''">
+        and ta_user_tel like CONCAT('%', #{tel,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="content != null and content !=''">
+        and handle_remark like CONCAT('%', #{content,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="handleStatus != null and handleStatus !=''">
+        and handle_status like CONCAT('%', #{handleStatus,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
+    ORDER BY update_date desc
+  </select>
+</mapper>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaPublicMonitorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaPublicMonitor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_public_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_public_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaPublicMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_public_monitor (id, community_id, ta_user_verify_id, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaPublicMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_public_monitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaPublicMonitor" >
+    update ta_public_monitor
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaPublicMonitor" >
+    update ta_public_monitor
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaRemotelyDoorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaRemotelyDoor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, unit_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_remotely_door
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_remotely_door
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaRemotelyDoor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_door (id, community_id, ta_user_verify_id, 
+      unit_id, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{unitId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaRemotelyDoor" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_remotely_door
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaRemotelyDoor" >
+    update ta_remotely_door
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaRemotelyDoor" >
+    update ta_remotely_door
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaRemotelyMonitorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaRemotelyMonitor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, unit_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_remotely_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_remotely_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaRemotelyMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_monitor (id, community_id, ta_user_verify_id, 
+      unit_id, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{unitId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaRemotelyMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_monitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaRemotelyMonitor" >
+    update ta_remotely_monitor
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaRemotelyMonitor" >
+    update ta_remotely_monitor
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -285,7 +285,7 @@
       <if test="faceStatus != null" >
         face_status = #{faceStatus,jdbcType=CHAR},
       </if>
-      <if test="idCard != null">
+      <if test="idCard != null and idCard != ''">
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
       <if test="openid != null" >

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaVisitorLicenseSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVisitorLicenseSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, create_date, create_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_visitor_license_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_visitor_license_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    insert into ta_visitor_license_setting (id, community_id, create_date, 
+      create_user)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    insert into ta_visitor_license_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    update ta_visitor_license_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    update ta_visitor_license_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -21,12 +21,14 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="sign_in_code" property="signInCode" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
     sign_up_count, sign_up_max, view_count, registration_start_time, registration_end_time, 
     activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
-    update_date
+    update_date,sign_in_code
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap">
     select
@@ -45,14 +47,14 @@
       registration_start_time, registration_end_time, 
       activity_start_time, activity_end_time, 
       status, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date,sign_in_code,sign_in_code,sign_in_code)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
       #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=LONGVARCHAR}, #{sort,jdbcType=INTEGER},
       #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
       #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
       #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{signInCode,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivity" >
     insert into tp_activity
@@ -111,6 +113,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="signInCode != null" >
+        sign_in_code
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -167,6 +172,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        #{signInCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivity" >
@@ -223,6 +231,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        sign_in_code = #{signInCode,jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -244,7 +255,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      sign_in_code = #{signInCode,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -290,4 +302,7 @@
     AND tr.community_id =#{communityId}
     order by a.create_date desc
   </select>
+  <select id="selectActivity" resultMap="BaseResultMap">
+    select * from tp_activity where id = #{activityId}
+  </select>
 </mapper>

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

@@ -149,4 +149,14 @@
     and ta_user_id = #{userID,jdbcType=INTEGER}
   </select>
 
+  <select id="toSignUp" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tp_activity_sign_in
+    where
+    activity_id = #{activityId,jdbcType=INTEGER}
+    and ta_user_id = #{userVerifyId,jdbcType=INTEGER}
+    and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -567,11 +567,11 @@
       and rh.house_status = 1
     </where>
     <if test="priceFluctuate == 1" >
-        order by (rh.rental_price+0)  asc
+        order by rh.sort desc, (rh.rental_price+0)  asc
     </if>
 
     <if test="priceFluctuate == 2" >
-        order by (rh.rental_price+0)  desc
+        order by rh.sort desc, (rh.rental_price+0)  desc
     </if>
   </select>
 </mapper>

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

@@ -4,14 +4,14 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionLike" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
     <result column="like_status" property="likeStatus" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, transaction_id, like_status, create_date, update_date
+    id, community_id, ta_user_verify_id, transaction_id, like_status, create_date, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -24,10 +24,10 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransactionLike" >
-    insert into tp_transaction_like (id, community_id, ta_user_id, 
+    insert into tp_transaction_like (id, community_id, ta_user_verify_id,
       transaction_id, like_status, create_date, 
       update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER},
       #{transactionId,jdbcType=INTEGER}, #{likeStatus,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateDate,jdbcType=TIMESTAMP})
   </insert>
@@ -40,8 +40,8 @@
       <if test="communityId != null" >
         community_id,
       </if>
-      <if test="taUserId != null" >
-        ta_user_id,
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
       </if>
       <if test="transactionId != null" >
         transaction_id,
@@ -63,8 +63,8 @@
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="taUserId != null" >
-        #{taUserId,jdbcType=INTEGER},
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
       </if>
       <if test="transactionId != null" >
         #{transactionId,jdbcType=INTEGER},
@@ -86,8 +86,8 @@
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="taUserId != null" >
-        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
       </if>
       <if test="transactionId != null" >
         transaction_id = #{transactionId,jdbcType=INTEGER},
@@ -107,7 +107,7 @@
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransactionLike" >
     update tp_transaction_like
     set community_id = #{communityId,jdbcType=INTEGER},
-      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
       transaction_id = #{transactionId,jdbcType=INTEGER},
       like_status = #{likeStatus,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
@@ -134,7 +134,7 @@
     SELECT * FROM
     tp_transaction_like
     WHERE community_id = #{communityId,jdbcType=INTEGER}
-    and   ta_user_id = #{userId,jdbcType=INTEGER}
+    and   ta_user_verify_id = #{userId,jdbcType=INTEGER}
     and   transaction_id = #{invitationId,jdbcType=INTEGER}
   </select>
 </mapper>

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

@@ -4,7 +4,9 @@
     <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransaction">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="community_id" property="communityId" jdbcType="INTEGER"/>
-        <result column="ta_user_id" property="taUserId" jdbcType="INTEGER"/>
+        <result column="uuid" property="uuid" jdbcType="INTEGER"/>
+        <result column="uuid_name" property="uuidName" jdbcType="VARCHAR"/>
+        <result column="uuid_type" property="uuidType" jdbcType="VARCHAR"/>
         <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR"/>
         <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR"/>
         <result column="sort" property="sort" jdbcType="VARCHAR"/>
@@ -17,38 +19,18 @@
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP"/>
         <result column="role_id" property="roleId" jdbcType="INTEGER"/>
         <result column="role_name" property="roleName" jdbcType="VARCHAR"/>
-        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER"/>
         <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR"/>
         <result column="room_no_name" property="roomNoName" jdbcType="VARCHAR"/>
 
     </resultMap>
     <sql id="Base_Column_List">
-    id, community_id, ta_user_id, transaction_title, transaction_content, sort,
-    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity,room_no_name
+    id, community_id, transaction_title, transaction_content, sort,uuid,uuid_type,uuid_name,
+    view_count, status, type, create_user, create_date, update_user, update_date, release_identity,room_no_name
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
-    SELECT
-	ttr.id,
-	ttr.community_id,
-	ttr.ta_user_id,
-	ttr.transaction_title,
-	ttr.transaction_content,
-	ttr.sort,
-	ttr.view_count,
-	ttr.STATUS,
-	ttr.type,
-	ttr.create_user,
-	ttr.create_date,
-	ttr.update_user,
-	ttr.update_date,
-	sr.id AS role_id,
-	sr.role_name AS role_name,
-	ttr.release_identity,
-	ttr.ta_user_verify_id
-    FROM
-        tp_transaction ttr
-    LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
-    LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
+    select
+    <include refid="Base_Column_List"/>
+    from tp_transaction ttr
     where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
   </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -80,8 +62,14 @@
             <if test="communityId != null">
                 community_id,
             </if>
-            <if test="taUserId != null">
-                ta_user_id,
+            <if test="uuid != null">
+                uuid,
+            </if>
+            <if test="uuidType != null">
+                uuid_type,
+            </if>
+            <if test="uuidName != null">
+                uuid_Name,
             </if>
             <if test="transactionTitle != null">
                 transaction_title,
@@ -116,9 +104,6 @@
             <if test="updateDate != null">
                 update_date,
             </if>
-            <if test="taUserVerifyId != null">
-                ta_user_verify_id,
-            </if>
             <if test="releaseIdentity != null">
                 release_identity,
             </if>
@@ -133,8 +118,14 @@
             <if test="communityId != null">
                 #{communityId,jdbcType=INTEGER},
             </if>
-            <if test="taUserId != null">
-                #{taUserId,jdbcType=INTEGER},
+            <if test="uuid != null">
+                #{uuid,jdbcType=INTEGER},
+            </if>
+            <if test="uuidType != null">
+                #{uuidType,jdbcType=INTEGER},
+            </if>
+            <if test="uuidName != null">
+                #{uuidName,jdbcType=INTEGER},
             </if>
             <if test="transactionTitle != null">
                 #{transactionTitle,jdbcType=VARCHAR},
@@ -169,9 +160,6 @@
             <if test="updateDate != null">
                 #{updateDate,jdbcType=TIMESTAMP},
             </if>
-            <if test="taUserVerifyId != null">
-                #{taUserVerifyId,jdbcType=INTEGER},
-            </if>
             <if test="releaseIdentity != null">
                 #{releaseIdentity,jdbcType=VARCHAR},
             </if>
@@ -186,9 +174,6 @@
             <if test="communityId != null">
                 community_id = #{communityId,jdbcType=INTEGER},
             </if>
-            <if test="taUserId != null">
-                ta_user_id = #{taUserId,jdbcType=INTEGER},
-            </if>
             <if test="transactionTitle != null">
                 transaction_title = #{transactionTitle,jdbcType=VARCHAR},
             </if>
@@ -267,36 +252,19 @@
         <include refid="Base_Column_List"/>
         FROM
         tp_transaction t
-        WHERE t.create_user=#{id,jdbcType=INTEGER}
-        AND t.community_id=#{communityId,jdbcType=INTEGER}
-        UNION ALL
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        tp_transaction t
-        INNER JOIN(SELECT
-        y.transaction_id
-        FROM
-        tp_transaction_reply y
-        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
         WHERE
-        y.ta_user_id = #{id,jdbcType=INTEGER}
+          t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
         <if test="type != null and type != ''">
             and t.type = #{type,jdbcType=INTEGER}
         </if>
-        AND y.community_id = #{communityId,jdbcType=INTEGER}
-        AND t.status = 1
-        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
-        t.community_id = #{communityId,jdbcType=INTEGER} )
-        GROUP BY
-        y.transaction_id) a ON a.transaction_id = t.id
         order by create_date DESC
     </select>
 
     <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction">
     update tp_transaction
     set
-    ta_user_id = #{userId,jdbcType=INTEGER},
+    uuid = #{userId,jdbcType=INTEGER},
     transaction_title = #{transactionTitle,jdbcType=VARCHAR},
     transaction_content = #{transactionContent,jdbcType=VARCHAR},
     update_user = #{userId,jdbcType=INTEGER},
@@ -323,30 +291,29 @@
       #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER},#{createDate,jdbcType=TIMESTAMP})
   </insert>
     <select id="getUserTransactionList" resultMap="BaseResultMap">
-
         SELECT
-        <include refid="Base_Column_List"/>
+          <include refid="Base_Column_List"/>
         FROM
-        tp_transaction t
-        WHERE t.create_user=#{id,jdbcType=INTEGER}
-        AND t.community_id=#{communityId,jdbcType=INTEGER}
-        UNION ALL
+          tp_transaction t
+        WHERE
+          t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
+        UNION
         SELECT
-        <include refid="Base_Column_List"/>
+          <include refid="Base_Column_List"/>
         FROM
-        tp_transaction t
-        INNER JOIN(SELECT
-        y.transaction_id
+          tp_transaction
+        WHERE
+        id IN (
+        SELECT DISTINCT
+          t.transaction_id
         FROM
-        tp_transaction_reply y
-        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+          tp_transaction_reply t
         WHERE
-        y.ta_user_id = #{id,jdbcType=INTEGER}
-        AND y.community_id = #{communityId,jdbcType=INTEGER}
-        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
-        t.community_id = #{communityId,jdbcType=INTEGER} )
-        GROUP BY
-        y.transaction_id) a ON a.transaction_id = t.id
-        order by create_date DESC
+          t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
+        )
+        ORDER BY
+        create_date DESC
     </select>
 </mapper>

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

@@ -4,20 +4,24 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionReply" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="uuid_type" property="uuidType" jdbcType="VARCHAR" />
+    <result column="uuid_name" property="uuidName" jdbcType="VARCHAR" />
+    <result column="uuid_role" property="uuidRole" jdbcType="VARCHAR" />
+    <result column="reply_uuid" property="replyUuid" jdbcType="INTEGER" />
+    <result column="reply_uuid_type" property="replyUuidType" jdbcType="VARCHAR" />
+    <result column="reply_uuid_name" property="replyUuidName" jdbcType="VARCHAR" />
+    <result column="reply_uuid_role" property="replyUuidRole" jdbcType="VARCHAR" />
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
-    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
-    <result column="ta_user_name" property="taUserName" jdbcType="VARCHAR" />
     <result column="reply_content" property="replyContent" jdbcType="VARCHAR" />
-    <result column="reply_ta_user_id" property="replyTaUserId" jdbcType="INTEGER" />
-    <result column="reply_ta_user_name" property="replyTaUserName" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
-    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
     <result column="room_no_name" property="roomNoName" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id,ta_user_verify_id
-    reply_ta_user_name, create_date,room_no_name
+    id, community_id, transaction_id,uuid,uuid_type,uuid_role,reply_uuid_role,
+      uuid_name, reply_content,
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -30,13 +34,13 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-    insert into tp_transaction_reply (id, community_id, transaction_id,ta_user_verify_id,release_identity,
-      ta_user_id, ta_user_name, reply_content, 
-      reply_ta_user_id, reply_ta_user_name, create_date,room_no_name
+    insert into tp_transaction_reply (id, community_id, transaction_id,uuid,uuid_type,uuid_role,reply_uuid_role,
+      uuid_name, reply_content,
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
       )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{taUserVerifyId},#{releaseIdentity},
-      #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR},
-      #{replyTaUserId,jdbcType=INTEGER}, #{replyTaUserName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR}
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{uuid},#{uuidType},#{uuidRole},#{replyUuidRole},
+      #{uuidName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, #{replyUuid,jdbcType=INTEGER},
+      #{replyUuidType,jdbcType=VARCHAR}, #{replyUuidName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{releaseIdentity,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -163,21 +167,22 @@
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
     SELECT
-	tr.*, (SELECT r.description FROM ta_sys_role r  where r.id = tr.ta_user_verify_id) AS taRoleName,
-	      (SELECT tsr.role_name FROM ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr ON tsur.role_id = tsr.id WHERE tsur.user_id = tr.reply_ta_user_id) AS replyRoleName
+      *
     FROM
-        tp_transaction_reply tr
+    tp_transaction_reply  tr
     WHERE
 	tr.community_id = #{communityId}
     and tr.transaction_id=#{transactionId}
       <if test="type == 2" >
-        AND release_identity=1
+        AND (tr.uuid_type = 'prop' or tr.reply_uuid_type = 'prop')
       </if>
       <if test="type == 1" >
-        AND  tr.ta_user_id = #{founderUserID}
+        AND (tr.uuid = #{uuid} OR tr.reply_uuid = #{uuid})
+        AND (tr.uuid_type =  #{uuidType} or tr.reply_uuid_type =  #{uuidType})
       </if>
       <if test="type == 0" >
-        AND (tr.ta_user_id = #{founderUserID} OR tr.reply_ta_user_id = #{founderUserID})
+        AND (tr.uuid = #{userID} OR tr.reply_uuid = #{userID})
+        AND (tr.uuid_type = 'app' or tr.reply_uuid_type = 'app')
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java

@@ -158,7 +158,7 @@ public class FuShiRequestAPI {
         map.put("ParkingCode", ParkingCode);
         map.put("CardNo", CardNo);
         map.put("PayCostMachineOrderId", PayCostMachineOrderId);
-        map.put("CouponList", JSONObject.parseObject(CouponList).getInnerMap());
+        map.put("CouponList", null == CouponList ? null : JSONObject.parseObject(CouponList).getInnerMap());
 
         String json = JSONObject.toJSONString(map);
         log.info("第三方临时卡上发缴费请求参数：{}", json);

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

@@ -218,5 +218,35 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取用户反馈信息", notes = "获取用户反馈信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "content", value = "反馈内容"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "tel", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "handleStatus", value = "1 是已处理 2是未处理 3 是正在处理"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "当前页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+    })
+    @RequestMapping(value = "/user/feedback", method = RequestMethod.GET)
+    public ResponseBean feedback(HttpSession session,
+                                     @RequestParam(value = "content", required = false) String content,
+                                     @RequestParam(value = "tel", required = false)String tel,
+                                     @RequestParam(value = "handleStatus", required = false)String handleStatus,
+                                     @RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.feedback(userElement,content,tel,handleStatus,pageNum,pageSize);
+        return responseBean;
+    }
 
+
+    @ApiOperation(value = "修改反馈状态", notes = "修改反馈状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id[],handleStatus:状态，handleRemark：备注"),
+    })
+    @RequestMapping(value = "/user/updfeedback", method = RequestMethod.POST)
+    public ResponseBean feedbackEdit(HttpSession session,@RequestBody String parameter){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.updfeedback(userElement,parameter);
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedbackImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+@Mapper
+public interface TaFeedbackImgMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedbackImg record);
+
+    int insertSelective(TaFeedbackImg record);
+
+    TaFeedbackImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedbackImg record);
+
+    int updateByPrimaryKey(TaFeedbackImg record);
+
+    /**
+     * 获取反馈当前图片
+     * @param id
+     * @return
+     */
+    List<String> selectImg(@Param("id") Integer id);
+}

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

@@ -0,0 +1,24 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaFeedback;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+@Mapper
+public interface TaFeedbackMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFeedback record);
+
+    int insertSelective(TaFeedback record);
+
+    TaFeedback selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaFeedback record);
+
+    int updateByPrimaryKey(TaFeedback record);
+
+    List<TaFeedback> getFeedback(@Param("content") String content, @Param("tel") String tel, @Param("handleStatus") String handleStatus);
+}

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

@@ -0,0 +1,140 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TaFeedback {
+    private Integer id;
+
+    private String content;
+
+    private String taUserTel;
+
+    private String estateSource;
+
+    private String handleStatus;
+
+    private String handleRemark;
+
+    private String handleUser;
+
+    private Date handleTime;
+
+    private Date createDate;
+
+    private Integer createUser;
+
+    private Date updateDate;
+
+    private Integer updateUser;
+
+    /**
+     * 当前反馈图片
+     * @return
+     */
+    private List<String> taFeedbackImgLsit;
+
+    public List<String> getTaFeedbackImgLsit() {
+        return taFeedbackImgLsit;
+    }
+
+    public void setTaFeedbackImgLsit(List<String> taFeedbackImgLsit) {
+        this.taFeedbackImgLsit = taFeedbackImgLsit;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getTaUserTel() {
+        return taUserTel;
+    }
+
+    public void setTaUserTel(String taUserTel) {
+        this.taUserTel = taUserTel == null ? null : taUserTel.trim();
+    }
+
+    public String getEstateSource() {
+        return estateSource;
+    }
+
+    public void setEstateSource(String estateSource) {
+        this.estateSource = estateSource == null ? null : estateSource.trim();
+    }
+
+    public String getHandleStatus() {
+        return handleStatus;
+    }
+
+    public void setHandleStatus(String handleStatus) {
+        this.handleStatus = handleStatus == null ? null : handleStatus.trim();
+    }
+
+    public String getHandleRemark() {
+        return handleRemark;
+    }
+
+    public void setHandleRemark(String handleRemark) {
+        this.handleRemark = handleRemark == null ? null : handleRemark.trim();
+    }
+
+    public String getHandleUser() {
+        return handleUser;
+    }
+
+    public void setHandleUser(String handleUser) {
+        this.handleUser = handleUser == null ? null : handleUser.trim();
+    }
+
+    public Date getHandleTime() {
+        return handleTime;
+    }
+
+    public void setHandleTime(Date handleTime) {
+        this.handleTime = handleTime;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaFeedbackImg {
+    private Integer id;
+
+    private Integer feedbackId;
+
+    private String imgUrl;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getFeedbackId() {
+        return feedbackId;
+    }
+
+    public void setFeedbackId(Integer feedbackId) {
+        this.feedbackId = feedbackId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl == null ? null : imgUrl.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -109,4 +109,24 @@ public interface IToUserService {
      * @return
      */
     ResponseBean operatedel(UserElement userElement, String parameter);
+
+    /**
+     *反馈信息
+     * @param userElement
+     * @param content
+     * @param tel
+     * @param handleStatus
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean feedback(UserElement userElement, String content, String tel, String handleStatus, Integer pageNum, Integer pageSize);
+
+    /**
+     * 处理消息
+     * @param userElement
+     * @param parameter
+     * @return
+     */
+    ResponseBean updfeedback(UserElement userElement, String parameter);
 }

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

@@ -74,22 +74,18 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		}
 
 
-		Map<String,Object> map = Maps.newHashMap();
-		map.put("loginName", toCommunities.getLoginName());
-		TaUser taUser = taUserMapper.selectByLoginName(map);
-		if (null == taUser) {
-			//时维护ta_user（发帖需要）
-			taUser= new TaUser();
-			taUser.setLoginName(toCommunities.getLoginName());
-			taUser.setCreateDate(new Date());
-			taUser.setUserName(toCommunities.getUserName());
-			taUser.setStatus("1");
-			taUserMapper.insert(taUser);
-		}
-
-
-
-
+		//Map<String,Object> map = Maps.newHashMap();
+		//map.put("loginName", toCommunities.getLoginName());
+		//TaUser taUser = taUserMapper.selectByLoginName(map);
+		//if (null == taUser) {
+		//	//时维护ta_user（发帖需要）
+		//	taUser= new TaUser();
+		//	taUser.setLoginName(toCommunities.getLoginName());
+		//	taUser.setCreateDate(new Date());
+		//	taUser.setUserName(toCommunities.getUserName());
+		//	taUser.setStatus("1");
+		//	taUserMapper.insert(taUser);
+		//}
 
 		//构建用户信息
 		TpUser tpUser = new TpUser();
@@ -99,7 +95,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUser.setCreateUser(1);
 		tpUser.setCommunityId(toCommunities.getId());
 		tpUser.setStatus(Constant.EFFECTIVE);
-		tpUser.setTaUserId(taUser.getId());
+		//tpUser.setTaUserId(taUser.getId());
 		//插入用户信息
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色

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

@@ -46,6 +46,12 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToOperateTelMapper toOperateTelMapper;
 
+    @Autowired
+    private TaFeedbackMapper taFeedbackMapper;
+
+    @Autowired
+    private TaFeedbackImgMapper taFeedbackImgMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -387,6 +393,52 @@ public class ToUserServerImpl implements IToUserService {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean feedback(UserElement userElement, String content, String tel, String handleStatus, Integer pageNum, Integer pageSize) {
+        ResponseBean response= new ResponseBean<>();
+
+        Page<TaFeedback> page = PageHelper.startPage(pageNum,pageSize);
+        List<TaFeedback> phoneList = taFeedbackMapper.getFeedback(content, tel, handleStatus);
+
+        for (TaFeedback taFeedback : phoneList){
+             List<String> feedbackImg = taFeedbackImgMapper.selectImg(taFeedback.getId());
+            taFeedback.setTaFeedbackImgLsit(feedbackImg);
+        }
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("item",phoneList);
+        map.put("total",page.getTotal());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean updfeedback(UserElement userElement, String parameter) {
+        ResponseBean response = new ResponseBean<>();
+
+        JSONObject object= JSONObject.parseObject(parameter);
+        String handleStatus= object.getString("handleStatus");
+        String handleRemark= object.getString("handleRemark");
+        Integer[] arrID = object.getJSONArray("id").toArray(new Integer[]{});
+
+        //减少数据库链接
+        List<TaFeedback> taFeedbackList = new ArrayList<>();
+        for (Integer id:arrID){
+            TaFeedback taFeedback = new TaFeedback();
+                       taFeedback.setId(id);
+                       taFeedback.setHandleUser(userElement.getUserName());
+                       taFeedback.setHandleStatus(handleStatus);
+                       taFeedback.setHandleRemark(handleRemark);
+                       taFeedback.setHandleTime(new Date());
+                       taFeedback.setUpdateDate(new Date());
+            taFeedbackList.add(taFeedback);
+            taFeedbackMapper.updateByPrimaryKeySelective(taFeedback);
+        }
+//        taFeedbackMapper.batchUpdate(taFeedbackList);
+        response.addSuccess("成功");
+        return response;
+    }
+
     //查询多个角色转换为字符串
     public String selectRole(Integer id) {
         List<ToUser> toUser= toUserMapper.selectRole(id);

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaFeedbackImgMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedbackImg" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="feedback_id" property="feedbackId" jdbcType="INTEGER" />
+    <result column="img_url" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, feedback_id, img_url, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_feedback_img
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_feedback_img
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    insert into ta_feedback_img (id, feedback_id, img_url, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{feedbackId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    insert into ta_feedback_img
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="feedbackId != null" >
+        feedback_id,
+      </if>
+      <if test="imgUrl != null" >
+        img_url,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="feedbackId != null" >
+        #{feedbackId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null" >
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    update ta_feedback_img
+    <set >
+      <if test="feedbackId != null" >
+        feedback_id = #{feedbackId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null" >
+        img_url = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedbackImg" >
+    update ta_feedback_img
+    set feedback_id = #{feedbackId,jdbcType=INTEGER},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectImg" resultType="string">
+    select img_url from  ta_feedback_img where feedback_id =  #{id,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaFeedbackMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFeedback" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="ta_user_tel" property="taUserTel" jdbcType="VARCHAR" />
+    <result column="estate_source" property="estateSource" jdbcType="VARCHAR" />
+    <result column="handle_status" property="handleStatus" jdbcType="VARCHAR" />
+    <result column="handle_remark" property="handleRemark" jdbcType="VARCHAR" />
+    <result column="handle_user" property="handleUser" jdbcType="VARCHAR" />
+    <result column="handle_time" property="handleTime" jdbcType="TIMESTAMP" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, content, ta_user_tel, estate_source, handle_status, handle_remark, handle_user, 
+    handle_time, create_date, create_user, update_date, update_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_feedback
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_feedback
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaFeedback" >
+    insert into ta_feedback (id, content, ta_user_tel, 
+      estate_source, handle_status, handle_remark, 
+      handle_user, handle_time, create_date, 
+      create_user, update_date, update_user
+      )
+    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{taUserTel,jdbcType=VARCHAR}, 
+      #{estateSource,jdbcType=VARCHAR}, #{handleStatus,jdbcType=VARCHAR}, #{handleRemark,jdbcType=VARCHAR}, 
+      #{handleUser,jdbcType=VARCHAR}, #{handleTime,jdbcType=TIMESTAMP}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaFeedback" >
+    insert into ta_feedback
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+      <if test="taUserTel != null" >
+        ta_user_tel,
+      </if>
+      <if test="estateSource != null" >
+        estate_source,
+      </if>
+      <if test="handleStatus != null" >
+        handle_status,
+      </if>
+      <if test="handleRemark != null" >
+        handle_remark,
+      </if>
+      <if test="handleUser != null" >
+        handle_user,
+      </if>
+      <if test="handleTime != null" >
+        handle_time,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserTel != null" >
+        #{taUserTel,jdbcType=VARCHAR},
+      </if>
+      <if test="estateSource != null" >
+        #{estateSource,jdbcType=VARCHAR},
+      </if>
+      <if test="handleStatus != null" >
+        #{handleStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="handleRemark != null" >
+        #{handleRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="handleUser != null" >
+        #{handleUser,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null" >
+        #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFeedback" >
+    update ta_feedback
+    <set >
+      <if test="content != null" >
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserTel != null" >
+        ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
+      </if>
+      <if test="estateSource != null" >
+        estate_source = #{estateSource,jdbcType=VARCHAR},
+      </if>
+      <if test="handleStatus != null" >
+        handle_status = #{handleStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="handleRemark != null" >
+        handle_remark = #{handleRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="handleUser != null" >
+        handle_user = #{handleUser,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null" >
+        handle_time = #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaFeedback" >
+    update ta_feedback
+    set content = #{content,jdbcType=VARCHAR},
+      ta_user_tel = #{taUserTel,jdbcType=VARCHAR},
+      estate_source = #{estateSource,jdbcType=VARCHAR},
+      handle_status = #{handleStatus,jdbcType=VARCHAR},
+      handle_remark = #{handleRemark,jdbcType=VARCHAR},
+      handle_user = #{handleUser,jdbcType=VARCHAR},
+      handle_time = #{handleTime,jdbcType=TIMESTAMP},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getFeedback" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+     from  ta_feedback
+    <where>
+      <if test="tel != null and tel !=''">
+        and ta_user_tel like CONCAT('%', #{tel,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="content != null and content !=''">
+        and content like CONCAT('%', #{content,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="handleStatus != null and handleStatus !=''">
+        and handle_status like CONCAT('%', #{handleStatus,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
+    ORDER BY update_date desc
+  </select>
+</mapper>

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

@@ -80,22 +80,12 @@ public class AnnouncementTelController extends BaseController {
 	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
 	public ResponseBean addTel(@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());

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

@@ -0,0 +1,49 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.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.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.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;
+	}
+}

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

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+import com.community.huiju.service.ITaTemporaryLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <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;
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaUserLicenseCount;
+import com.community.huiju.service.ITaUserLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <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;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.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;
+    }
+
+}

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

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpBillInvoiceCount;
+import com.community.huiju.service.ITpBillInvoiceCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <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;
+    }
+}

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

@@ -88,7 +88,7 @@ public class TransactionController extends BaseController {
 	@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.getCommunityId(),userElement.getId());
+		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement);
 		return addAnnouncement;
 	}
 
@@ -122,7 +122,7 @@ public class TransactionController extends BaseController {
 	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
 	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
 		UserElement userElement = getUserElement(session);
-		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement.getCommunityId(),userElement.getId());
+		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement);
 		return transactionReplyList;
 	}
 

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

@@ -43,5 +43,6 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
      * @return
      */
     IPage<BillInvoice> selectBillInvoiceEffective(Page page, @Param("map") Map<String, Object> map);
-
+	
+	List<Map<String, Object>> getPriceCount();
 }

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

@@ -0,0 +1,48 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaBriskUser;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+import com.community.huiju.model.TaUserLicenseCount;
+import com.community.huiju.model.TpBillInvoiceCount;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@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);
+}

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

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

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

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

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,6 +38,7 @@ public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder>
     @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();
 }

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

@@ -80,6 +80,18 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     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,

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

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

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

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

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

@@ -24,5 +24,5 @@ public interface TransactionReplyMapper extends BaseMapper<TransactionReply> {
      * @param id
      * @return
      */
-    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id, @Param("taUserId") Integer taUserId, @Param("status") Integer status,@Param("taUserName") String taUserName, @Param("createDate") Date createDate, @Param("replyTaUserName") String replyTaUserName);
+    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id, @Param("uuid") Integer uuid,@Param("uuidType") String uuidType,@Param("userId") Integer userId, @Param("status") Integer status,@Param("taUserName") String taUserName, @Param("createDate") Date createDate, @Param("replyTaUserName") String replyTaUserName);
 }

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

@@ -0,0 +1,29 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBriskUser {
+	
+	private Integer id;
+	
+	private Integer communityId;
+	
+	private Integer taUserVerifyId;
+	
+	private Date createDate;
+	
+	@TableField(exist = false)
+	private Integer briskCount;
+}

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

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTemporaryLicenseCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserLicenseCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_visitor_license_setting")
+public class TaVisitorLicenseSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 物业端创建人
+     */
+    private Integer createUser;
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpBillInvoiceCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}