修复 bug

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

@@ -1,10 +1,15 @@
 package com.community.huiju;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @EnableDiscoveryClient
@@ -16,4 +21,15 @@ public class PropertyApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(PropertyApplication.class, args);
 	}
+
+	@Bean
+	public HttpMessageConverters fastJsonConfigure(){
+		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue);
+		//日期格式化
+		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		converter.setFastJsonConfig(fastJsonConfig);
+		return new HttpMessageConverters(converter);
+	}
 }

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -72,22 +73,22 @@ public class TpActivity implements Serializable {
     /**
      * 报名开始时间
      */
-    private LocalDateTime registrationStartTime;
+    private Date registrationStartTime;
 
     /**
      * 报名结束时间
      */
-    private LocalDateTime registrationEndTime;
+    private Date registrationEndTime;
 
     /**
      * 活动开始时间
      */
-    private LocalDateTime activityStartTime;
+    private Date activityStartTime;
 
     /**
      * 活动结束时间
      */
-    private LocalDateTime activityEndTime;
+    private Date activityEndTime;
 
     /**
      * 0 是已作废 1 是已发布   2 是草稿 3 是已修改

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

@@ -369,6 +369,24 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
 
+        /**
+         * 通过分组来去重
+         *
+         * 1. building 为空表示为 building 字段进行分组
+         * 2. unit 为空表示为 unit 字段进行分组
+         * 3. level 为空表示为 level 字段进行分组
+         * 4. room_no 为空表示为 room_no 字段进行分组
+         */
+        if (null == tpBuildingOwnerInfo.getBuilding() || "".equals(tpBuildingOwnerInfo.getBuilding())) {
+            queryWrapper.groupBy("building");
+        } else if (null == tpBuildingOwnerInfo.getUnit() || "".equals(tpBuildingOwnerInfo.getUnit())) {
+            queryWrapper.groupBy("unit");
+        } else if (null == tpBuildingOwnerInfo.getLevel() || "".equals(tpBuildingOwnerInfo.getLevel())) {
+            queryWrapper.groupBy("level");
+        } else if (null == tpBuildingOwnerInfo.getRoomNo() || "".equals(tpBuildingOwnerInfo.getRoomNo())) {
+            queryWrapper.groupBy("room_no");
+        }
+
         /**
          * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
          * 2.如果 楼栋存在表示查询单元

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.*;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.UserMapper;
@@ -145,9 +146,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
      */
     private void getUserRole(User user,UserVO userVO){
 
-        BeanUtils.copyProperties(user,userVO);
+        BeanTools.copyProperties(user,userVO);
         userVO.setCommunityId(user.getCommunityId());
 
+        ToCommunities toCommunities = toCommunitiesMapper.selectById(user.getCommunityId());
+        // 设置小区名称
+        userVO.setCommunityName(toCommunities.getCommunityName());
+
         // 查询该用户的权限
         Map<String, Object> map = Maps.newHashMap();
         map.put("userId", user.getId());

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/UserVO.java

@@ -16,4 +16,7 @@ public class UserVO extends User {
     /** 角色 **/
     private List<TpSysRole> roles;
 
+    /** 小区名称 **/
+    private String communityName;
+
 }