提交

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

@@ -45,14 +45,27 @@ public class BannerController {
 
     @ApiOperation(value = "获取首页运营所有banner接口", notes = "获取首页所有运营banner")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端banner")
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端"),
     })
     @RequestMapping(value = "/banners", method = RequestMethod.GET)
-    public ResponseBean selectAllToBannerImg(@RequestParam Integer bannerPosition){
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition){
         ResponseBean responseBean = new ResponseBean();
         List<ToBanner> toBannerList = bannerService.viewAllBannerImg(bannerPosition);
         responseBean.addSuccess(toBannerList);
         return responseBean;
     }
 
+    @ApiOperation(value = "获取广告banner接口", notes = "获取广告运营banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = " 3 广告banner"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区编号")
+    })
+    @RequestMapping(value = "/banners/advertising", method = RequestMethod.GET)
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition, @RequestParam(value = "communityId", required = false) Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImgAndCommunityId(bannerPosition, communityId);
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
+
 }

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

@@ -13,5 +13,5 @@ public interface ToBannerMapper {
 
     ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId);
 
-    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition);
+    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition, @Param("communityId") Integer communityId);
 }

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

@@ -20,6 +20,6 @@ public interface TpCarouselSettingMapper {
 
      Integer getcarouselNum(@Param("lease") String lease, @Param("communityId") Integer communityId);
 
-    Integer selectCarouselNum(String carouselType);
+    Integer selectCarouselNum(@Param("carouselType") String carouselType, @Param("communityId") Integer communityId);
 
 }

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

@@ -0,0 +1,17 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpConfiguration;
+
+public interface TpConfigurationMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpConfiguration record);
+
+    int insertSelective(TpConfiguration record);
+
+    TpConfiguration selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpConfiguration record);
+
+    int updateByPrimaryKey(TpConfiguration record);
+}

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

@@ -0,0 +1,41 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpEquipment;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpEquipmentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpEquipment record);
+
+    int insertSelective(TpEquipment record);
+
+    TpEquipment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpEquipment record);
+
+    int updateByPrimaryKey(TpEquipment record);
+
+    /**
+     * 根据小区获取 监控列表
+     * @param communityId
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.id as id, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddressId " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = 1")
+    List<TpEquipment> selectByCommunityId(@Param("communityId") Integer communityId);
+}

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

@@ -0,0 +1,105 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpConfiguration {
+    private Integer id;
+
+    private String key;
+
+    private String configurationName;
+
+    private Integer configurationType;
+
+    private String configurationValue;
+
+    private Date createTiem;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    private Integer communityId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key == null ? null : key.trim();
+    }
+
+    public String getConfigurationName() {
+        return configurationName;
+    }
+
+    public void setConfigurationName(String configurationName) {
+        this.configurationName = configurationName == null ? null : configurationName.trim();
+    }
+
+    public Integer getConfigurationType() {
+        return configurationType;
+    }
+
+    public void setConfigurationType(Integer configurationType) {
+        this.configurationType = configurationType;
+    }
+
+    public String getConfigurationValue() {
+        return configurationValue;
+    }
+
+    public void setConfigurationValue(String configurationValue) {
+        this.configurationValue = configurationValue == null ? null : configurationValue.trim();
+    }
+
+    public Date getCreateTiem() {
+        return createTiem;
+    }
+
+    public void setCreateTiem(Date createTiem) {
+        this.createTiem = createTiem;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+}

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

@@ -0,0 +1,188 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpEquipment {
+    private Integer id;
+
+    private Integer urlId;
+
+    private Integer communityId;
+
+    private Integer securityGuardTelId;
+
+    private Integer securityRoomTelId;
+
+    private Integer addressId;
+
+    private Date createTime;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    private Integer uuidId;
+
+    private String equipmentType;
+
+    private Integer equipmentTreeId;
+    // ====================================
+
+    /**
+     * 监控url
+     */
+    private String monitoringUrl;
+
+    /**
+     * 保卫人员电话
+     */
+    private String securityGuardTel;
+
+    /**
+     * 安保室电话
+     */
+    private String securityRoomTel;
+
+    /**
+     * 监控地址
+     */
+    private String monitoringAddress;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUrlId() {
+        return urlId;
+    }
+
+    public void setUrlId(Integer urlId) {
+        this.urlId = urlId;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getSecurityGuardTelId() {
+        return securityGuardTelId;
+    }
+
+    public void setSecurityGuardTelId(Integer securityGuardTelId) {
+        this.securityGuardTelId = securityGuardTelId;
+    }
+
+    public Integer getSecurityRoomTelId() {
+        return securityRoomTelId;
+    }
+
+    public void setSecurityRoomTelId(Integer securityRoomTelId) {
+        this.securityRoomTelId = securityRoomTelId;
+    }
+
+    public Integer getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(Integer addressId) {
+        this.addressId = addressId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Integer getUuidId() {
+        return uuidId;
+    }
+
+    public void setUuidId(Integer uuidId) {
+        this.uuidId = uuidId;
+    }
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
+
+    public Integer getEquipmentTreeId() {
+        return equipmentTreeId;
+    }
+
+    public void setEquipmentTreeId(Integer equipmentTreeId) {
+        this.equipmentTreeId = equipmentTreeId;
+    }
+
+    public String getMonitoringUrl() {
+        return monitoringUrl;
+    }
+
+    public void setMonitoringUrl(String monitoringUrl) {
+        this.monitoringUrl = monitoringUrl;
+    }
+
+    public String getSecurityGuardTel() {
+        return securityGuardTel;
+    }
+
+    public void setSecurityGuardTel(String securityGuardTel) {
+        this.securityGuardTel = securityGuardTel;
+    }
+
+    public String getSecurityRoomTel() {
+        return securityRoomTel;
+    }
+
+    public void setSecurityRoomTel(String securityRoomTel) {
+        this.securityRoomTel = securityRoomTel;
+    }
+
+    public String getMonitoringAddress() {
+        return monitoringAddress;
+    }
+
+    public void setMonitoringAddress(String monitoringAddress) {
+        this.monitoringAddress = monitoringAddress;
+    }
+}

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

@@ -12,5 +12,19 @@ import java.util.List;
 public interface BannerServiceI {
 
     ToBanner viewBannerImg(Integer bannerId);
+
+    /**
+     * 根据 banner位置，小区获取
+     * @param bannerPosition
+     * @param communityId
+     * @return
+     */
+    List<ToBanner> viewAllBannerImgAndCommunityId(Integer bannerPosition, Integer communityId);
+
+    /**
+     * 根据banner位置
+     * @param bannerPosition
+     * @return
+     */
     List<ToBanner> viewAllBannerImg(Integer bannerPosition);
 }

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

@@ -31,12 +31,12 @@ public class BannerServiceImpl implements BannerServiceI {
     }
 
     @Override
-    public List<ToBanner> viewAllBannerImg(Integer bannerPosition) {
+    public List<ToBanner> viewAllBannerImgAndCommunityId(Integer bannerPosition, Integer communityId) {
         //查询轮播图数量
-        Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.BANNER);
+        Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.BANNER, null);
 
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
-        List<ToBanner> bannersList = toBannerMapper.selectAllByNum(nowTime, bannerNum, bannerPosition);
+        List<ToBanner> bannersList = toBannerMapper.selectAllByNum(nowTime, bannerNum, bannerPosition, communityId);
         bannersList.stream().forEach(banner -> {
             if (banner.getBannerType().equals(Constant.BANNER_TYPE_ARTICLE)){
                 banner.setExternalLink("http://101.132.102.231:8011/#/bannerDetail?from=index&id="+banner.getId());
@@ -44,4 +44,9 @@ public class BannerServiceImpl implements BannerServiceI {
         });
         return bannersList;
     }
+
+    @Override
+    public List<ToBanner> viewAllBannerImg(Integer bannerPosition) {
+        return viewAllBannerImgAndCommunityId(bannerPosition, null);
+    }
 }

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

@@ -1,20 +1,18 @@
 package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.community.commom.hk.Digests;
-import com.community.commom.hk.HttpClientSSLUtils;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.hk.HKConstant;
-import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.dao.TpEquipmentMapper;
+import com.community.huiju.model.TpEquipment;
 import com.community.huiju.service.IMonitoringService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import springfox.documentation.spring.web.json.Json;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -26,30 +24,43 @@ import java.util.Map;
 @Slf4j
 public class MonitoringServiceImpl implements IMonitoringService {
 
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
     @Override
     public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
 
         // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
 
+//        ResponseBean response = new ResponseBean();
+//        Map<String,Object> parMap = Maps.newHashMap();
+//        parMap.put("pageNo",pageNo);
+//        parMap.put("pageSize",pageSize);
+//        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+//        // 组织中心编号
+//        parMap.put("unitUuids","1048576");
+//
+//        String result = HKOpenApi.getMonitoryPoint(parMap);
+//        // String url = "rtsp://vipgz1.idcfengye.com:10004/realplay://#cameraUuid#:SUB:";
+//        String url = "rtsp://222.190.241.190:556/realplay://#cameraUuid#:SUB:";
+//        JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
+//        List<String> urlList = new ArrayList<String>();
+//        for (Object cameraMap : cameraList){
+//            JSONObject camera = (JSONObject) cameraMap;
+//            urlList.add(url.replace("#cameraUuid#",camera.getString("cameraUuid")));
+//        }
+//
+//        response.addSuccess(urlList);
         ResponseBean response = new ResponseBean();
-        Map<String,Object> parMap = Maps.newHashMap();
-        parMap.put("pageNo",pageNo);
-        parMap.put("pageSize",pageSize);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        // 组织中心编号
-        parMap.put("unitUuids","1048576");
+        Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityId(communityId);
 
-        String result = HKOpenApi.getMonitoryPoint(parMap);
-        // String url = "rtsp://vipgz1.idcfengye.com:10004/realplay://#cameraUuid#:SUB:";
-        String url = "rtsp://222.190.241.190:556/realplay://#cameraUuid#:SUB:";
-        JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
-        List<String> urlList = new ArrayList<String>();
-        for (Object cameraMap : cameraList){
-            JSONObject camera = (JSONObject) cameraMap;
-            urlList.add(url.replace("#cameraUuid#",camera.getString("cameraUuid")));
-        }
-        
-        response.addSuccess(urlList);
+        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);
 
         return response;
     }

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

@@ -193,7 +193,7 @@ public class TaUserServiceImpl implements ITaUserService {
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addSuccess(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()));
+            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()));
             return response;
         }
 
@@ -208,7 +208,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
             return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
-            response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
+            response.addError(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
             return response;
         }
 
@@ -1045,7 +1045,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
         String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
                 "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
-        responseBean.addSuccess(UserVerifyEnum.getMsg(resultCode), taUserVO, loginCodePerproties.getLoginCode().get(resultCode));
+        responseBean.addError(UserVerifyEnum.getMsg(resultCode), taUserVO, loginCodePerproties.getLoginCode().get(resultCode));
         return responseBean;
     }
 

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

@@ -72,7 +72,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			result.put("userInfo", userInfo);
 			result.put("openid", openId);
 
-			responseBean.addSuccess(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()));
+			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()));
 			return responseBean;
 		}
 

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

@@ -44,6 +44,9 @@
     <if test="bannerPosition != null">
       and banner_position = #{bannerPosition,jdbcType=INTEGER}
     </if>
+    <if test="communityId != null">
+      and community_id = #{communityId}
+    </if>
     order by t.sort, t.eff_time
     <if test="num != null">
       limit #{num}

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

@@ -21,6 +21,9 @@
     carousel_num
     from tp_carousel_setting
     where carousel_type = #{carouselType}
+    <if test="communityId != null">
+      and community_id = #{communityId}
+    </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_carousel_setting

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

@@ -0,0 +1,153 @@
+<?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.TpConfigurationMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpConfiguration" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="key" property="key" jdbcType="VARCHAR" />
+    <result column="configuration_name" property="configurationName" jdbcType="VARCHAR" />
+    <result column="configuration_type" property="configurationType" jdbcType="INTEGER" />
+    <result column="configuration_value" property="configurationValue" jdbcType="VARCHAR" />
+    <result column="create_tiem" property="createTiem" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, key, configuration_name, configuration_type, configuration_value, create_tiem, 
+    create_user, update_time, update_user, community_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_configuration
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_configuration
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpConfiguration" >
+    insert into tp_configuration (id, key, configuration_name, 
+      configuration_type, configuration_value, 
+      create_tiem, create_user, update_time, 
+      update_user, community_id)
+    values (#{id,jdbcType=INTEGER}, #{key,jdbcType=VARCHAR}, #{configurationName,jdbcType=VARCHAR}, 
+      #{configurationType,jdbcType=INTEGER}, #{configurationValue,jdbcType=VARCHAR}, 
+      #{createTiem,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpConfiguration" >
+    insert into tp_configuration
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="key != null" >
+        key,
+      </if>
+      <if test="configurationName != null" >
+        configuration_name,
+      </if>
+      <if test="configurationType != null" >
+        configuration_type,
+      </if>
+      <if test="configurationValue != null" >
+        configuration_value,
+      </if>
+      <if test="createTiem != null" >
+        create_tiem,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="key != null" >
+        #{key,jdbcType=VARCHAR},
+      </if>
+      <if test="configurationName != null" >
+        #{configurationName,jdbcType=VARCHAR},
+      </if>
+      <if test="configurationType != null" >
+        #{configurationType,jdbcType=INTEGER},
+      </if>
+      <if test="configurationValue != null" >
+        #{configurationValue,jdbcType=VARCHAR},
+      </if>
+      <if test="createTiem != null" >
+        #{createTiem,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpConfiguration" >
+    update tp_configuration
+    <set >
+      <if test="key != null" >
+        key = #{key,jdbcType=VARCHAR},
+      </if>
+      <if test="configurationName != null" >
+        configuration_name = #{configurationName,jdbcType=VARCHAR},
+      </if>
+      <if test="configurationType != null" >
+        configuration_type = #{configurationType,jdbcType=INTEGER},
+      </if>
+      <if test="configurationValue != null" >
+        configuration_value = #{configurationValue,jdbcType=VARCHAR},
+      </if>
+      <if test="createTiem != null" >
+        create_tiem = #{createTiem,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpConfiguration" >
+    update tp_configuration
+    set key = #{key,jdbcType=VARCHAR},
+      configuration_name = #{configurationName,jdbcType=VARCHAR},
+      configuration_type = #{configurationType,jdbcType=INTEGER},
+      configuration_value = #{configurationValue,jdbcType=VARCHAR},
+      create_tiem = #{createTiem,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      community_id = #{communityId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,188 @@
+<?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.TpEquipmentMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpEquipment" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="url_id" property="urlId" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="security_guard_tel_id" property="securityGuardTelId" jdbcType="INTEGER" />
+    <result column="security_room_tel_id" property="securityRoomTelId" jdbcType="INTEGER" />
+    <result column="address_id" property="addressId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="uuid_id" property="uuidId" jdbcType="INTEGER" />
+    <result column="equipment_type" property="equipmentType" jdbcType="VARCHAR" />
+    <result column="equipment_tree_id" property="equipmentTreeId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, url_id, community_id, security_guard_tel_id, security_room_tel_id, address_id,
+    create_time, create_user, update_time, update_user, uuid_id, equipment_type, equipment_tree_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from tp_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpEquipment" >
+    insert into tp_equipment (id, url_id, community_id,
+      security_guard_tel_id, security_room_tel_id,
+      address_id, create_time, create_user,
+      update_time, update_user, uuid_id,
+      equipment_type, equipment_tree_id)
+    values (#{id,jdbcType=INTEGER}, #{urlId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},
+      #{securityGuardTelId,jdbcType=INTEGER}, #{securityRoomTelId,jdbcType=INTEGER},
+      #{addressId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER},
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{uuidId,jdbcType=INTEGER},
+      #{equipmentType,jdbcType=VARCHAR}, #{equipmentTreeId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpEquipment" >
+    insert into tp_equipment
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="urlId != null" >
+        url_id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="securityGuardTelId != null" >
+        security_guard_tel_id,
+      </if>
+      <if test="securityRoomTelId != null" >
+        security_room_tel_id,
+      </if>
+      <if test="addressId != null" >
+        address_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="uuidId != null" >
+        uuid_id,
+      </if>
+      <if test="equipmentType != null" >
+        equipment_type,
+      </if>
+      <if test="equipmentTreeId != null" >
+        equipment_tree_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="urlId != null" >
+        #{urlId,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="securityGuardTelId != null" >
+        #{securityGuardTelId,jdbcType=INTEGER},
+      </if>
+      <if test="securityRoomTelId != null" >
+        #{securityRoomTelId,jdbcType=INTEGER},
+      </if>
+      <if test="addressId != null" >
+        #{addressId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="uuidId != null" >
+        #{uuidId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentType != null" >
+        #{equipmentType,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentTreeId != null" >
+        #{equipmentTreeId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpEquipment" >
+    update tp_equipment
+    <set >
+      <if test="urlId != null" >
+        url_id = #{urlId,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="securityGuardTelId != null" >
+        security_guard_tel_id = #{securityGuardTelId,jdbcType=INTEGER},
+      </if>
+      <if test="securityRoomTelId != null" >
+        security_room_tel_id = #{securityRoomTelId,jdbcType=INTEGER},
+      </if>
+      <if test="addressId != null" >
+        address_id = #{addressId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="uuidId != null" >
+        uuid_id = #{uuidId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentType != null" >
+        equipment_type = #{equipmentType,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentTreeId != null" >
+        equipment_tree_id = #{equipmentTreeId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpEquipment" >
+    update tp_equipment
+    set url_id = #{urlId,jdbcType=INTEGER},
+      community_id = #{communityId,jdbcType=INTEGER},
+      security_guard_tel_id = #{securityGuardTelId,jdbcType=INTEGER},
+      security_room_tel_id = #{securityRoomTelId,jdbcType=INTEGER},
+      address_id = #{addressId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      uuid_id = #{uuidId,jdbcType=INTEGER},
+      equipment_type = #{equipmentType,jdbcType=VARCHAR},
+      equipment_tree_id = #{equipmentTreeId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/mode/ResponseBean.java

@@ -39,6 +39,13 @@ public class ResponseBean<T> implements Serializable {
         this.url = url;
     }
 
+    public void addError(String message, T data, String url) {
+        this.code = "1";
+        this.message = message;
+        this.url = url;
+        this.data = data;
+    }
+
     public void addSuccess(String message) {
         this.code = "0";
         this.message = message;