Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -162,4 +162,10 @@ public class TaUser implements Serializable {
     
     @TableField(exist = false)
     private String buildingId;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+    @TableField(exist = false)
+    private int orgNum;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -104,6 +104,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setName(taUser.getOrgName());
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
+		taOrg.setOrgNum(taUser.getOrgNum());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
@@ -161,6 +162,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
+			taUser.setOrgNum(taOrg.getOrgNum());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -184,6 +186,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
+			taOrg.setOrgNum(taUser.getOrgNum());
 
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");

src/main/java/com/huiju/estateagents/controller/TaPolicyController.java

@@ -262,7 +262,12 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyGetWx(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPolicyService.getById(id));
+            TaPolicy policy = iTaPolicyService.getById(id);
+            if (null != policy) {
+                policy.setPvNum(policy.getPvNum() + 1);
+                iTaPolicyService.updateById(policy);
+            }
+            responseBean.addSuccess(policy);
         }catch (Exception e){
             logger.error("taPolicyDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/entity/TaOrg.java

@@ -56,4 +56,9 @@ public class TaOrg implements Serializable {
     private LocalDateTime createDate;
 
     private String waterMark;
+
+    /**
+     * 最大数
+     */
+    private int orgNum;
 }

src/main/java/com/huiju/estateagents/entity/TaPolicy.java

@@ -99,4 +99,9 @@ public class TaPolicy implements Serializable {
      */
     private Integer publishStatus;
 
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -80,6 +81,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private  TaOrgMapper  taOrgMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
@@ -278,7 +282,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -289,6 +293,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingAdd(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
+        // 根据orgId查询当前楼盘最大数
+        TaOrg taOrg = taOrgMapper.selectById(orgId);
+        // 查询当前org楼盘总数
+        QueryWrapper<TaBuilding>  taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id",orgId);
+        taBuildingQuery.gt("status",-1);
+        int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getOrgNum()){
+            return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
         if(null!= object.getDate("openingDate")){
@@ -311,13 +325,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
 
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
-            insertImgBatch(buildingImgs, building.getBuildingId());
+            buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
         String tagStr = object.getString("tag");
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
         if (CollectionUtils.isNotEmpty(buildingTags)) {
-            insertTagBatch(buildingTags, building.getBuildingId());
+            buildingTags = insertTagBatch(buildingTags, building.getBuildingId());
         }
 
         // 项目类型
@@ -326,7 +340,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -637,9 +651,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
 
-    int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
-        int rows = 0;
-        for (TaBuildingImg img: imgs){
+    private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
+        return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
             Images.setBuildingId(buildingId);
             Images.setImgType(img.getImgType());
@@ -647,21 +660,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             Images.setOrderNo(Integer.valueOf(img.getOrderNo()));
             Images.setStatus(1);
             Images.setCreateDate(LocalDateTime.now());
-            rows += taBuildingImgMapper.insert(Images);
-        }
+            taBuildingImgMapper.insert(Images);
 
-        return rows;
+            return Images;
+        }).collect(Collectors.toList());
     }
 
-    int insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
-        int rows = 0;
-        for (TaBuildingTag tag:tags){
+    private List<TaBuildingTag> insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
+        return tags.stream().map(tag -> {
             TaBuildingTag btag = new TaBuildingTag();
             btag.setBuildingId(buildingId);
             btag.setTagName(tag.getTagName());
-            rows += taBuildingTagMapper.insert(btag);
-        }
-        return rows;
+            taBuildingTagMapper.insert(btag);
+            return btag;
+        }).collect(Collectors.toList());
     }
 
     int insertApartmentImgBatch(List<TaBuildingImg> imgs, String buildingId, String apartmentId) {

src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java

@@ -72,6 +72,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
@@ -126,6 +127,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
         taNews.setCreateDate(LocalDateTime.now());
         taNews.setStatus(1);
+        taNews.setNewsStatus(1);
         this.save(taNews);
         responseBean.addSuccess(taNews);
         return responseBean;

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -42,7 +42,7 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
-        ORDER BY tbd.create_date DESC
+        ORDER BY tbd.activity_status asc, tbd.create_date DESC
   </select>
 
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

src/main/resources/mapper/TaBuildingMapper.xml

@@ -23,7 +23,7 @@
             <if test="cityId != null and cityId != ''">
                 and  ta_building.city_id =#{cityId}
             </if>
-            <if test="isMain != null and isMain != ''">
+            <if test="isMain != null">
                 and  ta_building.is_main = #{isMain}
             </if>
             <if test="orgId != null">