合并

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

@@ -242,7 +242,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
 
                     //可视对讲时 指定人员人脸权限下载
                     List<Integer> userIdList = new ArrayList<>();
-                    userIdList.add(user.getHkUserId());
+                    userIdList.add(taUserHk.getHkUserId());
                     //临时设备编号
                     // TODO 根据期楼栋号，来查询出门口机
                     HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());

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

@@ -72,7 +72,7 @@ public class AssembleController extends BaseController {
 		//获取菜单数据
 		List<TaSysMenu> menuList = menuService.getMenuList(communityId);
 		//获取首页banner数据
-		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
+		List<ToBanner> toBannerList = bannerService.viewAllBannerImgAndCommunityId(1,communityId);
 		//获取消息总数接口
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
 		//获取当前小区的酒店信息

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

@@ -108,6 +108,6 @@ public interface TpEquipmentMapper {
      * @param expireTime
      * @return
      */
-    @Select("update tp_equipment set op_user_uuid = #{accessToken} and unit_uuids = #{expireTime} where community_id = #{communityId} and equipment_type=5")
+    @Select("update tp_equipment set op_user_uuid = #{accessToken}, unit_uuids = #{expireTime} where community_id = #{communityId} and equipment_type=3")
     Integer updateYinShiYunByCommunityId(@Param("communityId") Integer communityId,@Param("accessToken") String accessToken, @Param("expireTime") String expireTime);
 }

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

@@ -287,6 +287,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
                     // 根据小区更新所有的门口机的萤石云 token, token有效期
                     tpEquipmentMapper.updateYinShiYunByCommunityId(userElement.getCommunityId(), accessToken, expireTime);
                 } catch (Exception exception) {
+                    exception.printStackTrace();
                     throw new WisdomException("获取视频Token失败！");
                 }
 

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.5.0
-version=0.0.1
-groupId=com.community
-artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,45 +0,0 @@
-com/community/commom/utils/HttpClientUtils.class
-com/community/commom/hk/entity/MonitoryPoint.class
-com/community/commom/utils/PayPriceUtils.class
-com/community/commom/utils/StringConverter.class
-com/community/commom/fushi/FuShiHttpClient.class
-com/community/commom/redis/FastJsonSerializer.class
-com/community/commom/session/UserElement.class
-com/community/commom/utils/MD5Utils.class
-com/community/commom/redis/SerializationFailedException.class
-com/community/commom/utils/CommonUtils.class
-com/community/commom/utils/DESUtils.class
-com/community/commom/utils/CookieUtil.class
-com/community/commom/fushi/Base64.class
-com/community/commom/hk/HKConstant.class
-com/community/commom/redis/SingleRedisTemplate.class
-com/community/commom/hk/HttpClientSSLUtils$1.class
-com/community/commom/redis/RedisJsonSerializer.class
-com/community/commom/uuid/IdGen$IdGenHolder.class
-com/community/commom/hk/HttpClientSSLUtils.class
-com/community/commom/redis/RedisTemplate.class
-com/community/commom/hk/entity/MonitoryPoint$MonitoryPointData.class
-com/community/commom/hk/test/OpenapiTest.class
-com/community/commom/ailiyun/AESDecode.class
-com/community/commom/fushi/FuShiRequestAPI$SignBuild.class
-com/community/commom/fushi/FushiConstant.class
-com/community/commom/redis/RedisObjectSerializer.class
-com/community/commom/mode/ResponseBean.class
-com/community/commom/hk/HKOpenApi.class
-com/community/commom/mode/HkResponseBean.class
-com/community/commom/utils/BeanTools.class
-com/community/commom/uuid/IdGen.class
-com/community/commom/utils/OssUtil.class
-com/community/commom/hk/PicUtils.class
-com/community/commom/fushi/FuShiRequestAPI.class
-com/community/commom/redis/RedisSerializer.class
-com/community/commom/hk/entity/MonitoryPoint$MonitoryPointList.class
-com/community/commom/hk/HttpClientSSLUtils$2.class
-com/community/commom/redis/RedisConfiguration.class
-com/community/commom/hk/Digests.class
-com/community/commom/utils/EnumUtils.class
-com/community/commom/fushi/error/FuShiException.class
-com/community/commom/utils/AccountValidatorUtil.class
-com/community/commom/constant/Constant.class
-com/community/commom/utils/QRCodeGeneratorUtils.class
-com/community/commom/utils/DateUtils.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,39 +0,0 @@
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/EnumUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/Base64.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/error/FuShiException.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/FastJsonSerializer.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/uuid/IdGen.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/entity/MonitoryPoint.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/mode/HkResponseBean.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/Digests.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/test/OpenapiTest.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/mode/ResponseBean.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/ailiyun/AESDecode.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/SingleRedisTemplate.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HttpClientSSLUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/BeanTools.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/RedisConfiguration.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/StringConverter.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/RedisTemplate.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/CookieUtil.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/DESUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/RedisObjectSerializer.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/OssUtil.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/QRCodeGeneratorUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/AccountValidatorUtil.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FushiConstant.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/SerializationFailedException.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/CommonUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/HttpClientUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/PayPriceUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/MD5Utils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/RedisJsonSerializer.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/utils/DateUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKConstant.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiHttpClient.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/hk/PicUtils.java
-/Users/weiximei/hbgit/smartCommunity/CODE/smart-community/community-common/src/main/java/com/community/commom/redis/RedisSerializer.java

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

@@ -2,15 +2,14 @@ package com.community.huiju.model;
 
 import javax.validation.constraints.*;
 import java.util.Date;
+import java.util.List;
 
 public class ToBanner {
     private Integer id;
 
     @NotBlank(message = "标题不能为空!")
     private String title;
-
-    @Min(value = 0,message = "请选择有效的投放社区!")
-    @NotNull(message = "投放社区不能为空！")
+    
     private Integer communityId;
 
     // @NotBlank(message = "跳转描述不能为空!")
@@ -48,6 +47,10 @@ public class ToBanner {
     private Date updateDate;
 
     private String bannerContent;
+    
+    //@Min(value = 0,message = "请选择有效的投放社区!")
+    @NotNull(message = "投放社区不能为空！")
+    private List<Integer> communityIds;
 
     public Integer getId() {
         return id;
@@ -184,4 +187,12 @@ public class ToBanner {
     public void setBannerContent(String bannerContent) {
         this.bannerContent = bannerContent == null ? null : bannerContent.trim();
     }
+    
+    public List<Integer> getCommunityIds() {
+        return communityIds;
+    }
+    
+    public void setCommunityIds(List<Integer> communityIds) {
+        this.communityIds = communityIds;
+    }
 }

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

@@ -107,11 +107,17 @@ public class ToBannerServiceImpl implements IToBannerService {
         banner.setUpdateDate(new Date());
         banner.setUpdateUser(toUser.getId());
 
-        int result = toBannerMapper.insertSelective(banner);
-        if (result > 0) {
-            response.addSuccess("添加成功!");
+        try {
+            for (Integer communityId : banner.getCommunityIds()){
+                banner.setCommunityId(communityId);
+                toBannerMapper.insertSelective(banner);
+            }
+        }catch (Exception e){
+            response.addError("添加失败:" + e.getMessage());
+            return response;
         }
-
+    
+        response.addSuccess("添加成功!");
         return response;
     }
 

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

@@ -554,6 +554,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return;
         }
 
+        // 校验这个房产有没有业主，只能存在一个业主
+        if (taUserVerify.getRoleId().intValue() == 1) {
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
+                    tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+                    tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
+            if (null != hasUserVerify) {
+                return;
+            }
+        }
+
+
         taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
         taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
         taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());

VUECODE/smart-operate-manage/config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://106.14.20.193:8086/operate-api"',
+  // BASE_API: '"http://operate.jcjyhn.com/operate-api"',
 }

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

@@ -43,7 +43,12 @@
         </el-select>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="投放社区 *">
-        <el-select v-model="addForm.communityId" placeholder="请选择社区">
+        <el-select v-model="addForm.communityIds"
+            multiple
+            filterable
+            allow-create
+            default-first-option 
+            placeholder="请选择社区">
           <!-- <el-option label="请选择社区" value="-1"/> -->
           <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
           <!-- <el-option label="区域一" value="shanghai"/> -->
@@ -141,6 +146,7 @@ export default {
         bannerCover: '',
         bannerPosition: '',
         communityId: '',
+        communityIds: [],
         effTime: '',
         expTime: '',
         bannerType: '1',
@@ -252,6 +258,31 @@ export default {
 }
 </script>
 
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>
 <style scoped>
 .app-container {
   width: 50%;
@@ -260,28 +291,5 @@ export default {
 .dialog-footer {
   text-align: center;
 }
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
 </style>
 

VUECODE/smart-property-manage/config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://106.14.20.193:8086/property-api"',
+  // BASE_API: '"http://property.jcjyhn.com/property-api"',
 }

VUECODE/smart-property-manage/src/components/chart/chart5.vue

@@ -97,7 +97,7 @@ export default {
       chart.guide().html({
         position: ["5%", "-35%"],
         html:
-          '<div class="chart5-title"><p class="title">月租车总缴费统计</p></div>'
+          '<div class="chart5-title"><p class="title">线上月租车总缴费统计</p></div>'
       });
         chart.guide().html({
         position: ["1%", "-22%"],

VUECODE/smart-property-manage/src/components/chart/chart6.vue

@@ -135,7 +135,7 @@ export default {
       chart.guide().html({
         position: ["5%", "-35%"],
         html:
-          '<div class="chart4-title"><p class="title">临时车总缴费统计</p></div>'
+          '<div class="chart4-title"><p class="title">线上临时车总缴费统计</p></div>'
       });
         chart.guide().html({
         position: ["1%", "-22%"],

VUECODE/smart-property-manage/src/views/index/index.vue

@@ -7,8 +7,8 @@
     </div>
     <div class="middle">
       <line-chart id="chat4" :data="data4" title="收费组总缴费统计" axis-x="日期" axis-y="金额(元)" />
-      <line-chart id="chat5" :data="data5" title="月租车总缴费统计" axis-x="日期" axis-y="金额(元)" />
-      <line-chart id="chat6" :data="data6" title="临时车总缴费统计" axis-x="日期" axis-y="金额(元)" />
+      <line-chart id="chat5" :data="data5" title="线上月租车总缴费统计" axis-x="日期" axis-y="金额(元)" />
+      <line-chart id="chat6" :data="data6" title="线上临时车总缴费统计" axis-x="日期" axis-y="金额(元)" />
     </div>
     <div class="right">
       <bar-chart id="chat7" :data="data7" title="注册用户总数" axis-x="" axis-y="数量(个)" />
@@ -121,7 +121,7 @@ export default {
           item: dayjs(createDate).format('M.D'),
           value: priceTotal,
         })
-      })
+      }).reverse()
     },
     data5 () {
       let billList = (this.IndexInfo || {}).taUserLicenseCountList || []
@@ -131,7 +131,7 @@ export default {
           item: dayjs(createDate).format('M.D'),
           value: priceTotal,
         })
-      })
+      }).reverse()
     },
     data6 () {
       let billList = (this.IndexInfo || {}).taTemporaryLicenseCountList || []
@@ -141,7 +141,7 @@ export default {
           item: dayjs(createDate).format('M.D'),
           value: priceTotal,
         })
-      })
+      }).reverse()
     },
     data7 () {
       let { houseOwnerCount = 0, houseRelationCount = 0, houseTenantCount = 0 } = (this.IndexInfo || {}).registerUserMap || {}
@@ -169,7 +169,7 @@ export default {
           item: dayjs(createDate).format('M.D'),
           value: briskCount,
         })
-      })
+      }).reverse()
     },
     data9 () {
       let { activityCount = 0, announcementCount = 0, topicCount = 0 } = (this.IndexInfo || {}).publishContentMap || {}