Bladeren bron

share poster

胡轶钦 5 jaren geleden
bovenliggende
commit
b905dd1bec

+ 11
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Bestand weergeven

@@ -15,6 +15,8 @@ import com.huiju.estateagents.mapper.TaBuildingMapper;
15 15
 import com.huiju.estateagents.mapper.TaPersonMapper;
16 16
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
17 17
 import com.huiju.estateagents.service.ITaSaveService;
18
+import com.huiju.estateagents.service.TaPosterService;
19
+import com.huiju.estateagents.service.TaShareContentService;
18 20
 import org.springframework.beans.factory.annotation.Autowired;
19 21
 import org.springframework.beans.propertyeditors.CustomDateEditor;
20 22
 import org.springframework.stereotype.Service;
@@ -58,6 +60,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
58 60
     @Autowired
59 61
     private ITaSaveService iTaSaveService;
60 62
 
63
+    @Autowired
64
+    private TaPosterService taPosterService;
65
+
66
+    @Autowired
67
+    private TaShareContentService taShareContentService;
68
+
61 69
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
62 70
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
63 71
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空,false反之
@@ -114,6 +122,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
114 122
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)
115 123
         for (TaBuildingDynamic taBuildingDynamic:records){
116 124
             setExtendInfo(taBuildingDynamic, taPerson);
125
+
117 126
         }
118 127
         HashMap<String, Object> map = new HashMap<>();
119 128
         map.put("list", records);
@@ -288,6 +297,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
288 297
         taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
289 298
         int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
290 299
         taBuildingDynamic.setCount(applyCount);
300
+        taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
301
+        taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(),CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
291 302
 
292 303
         // 是否收藏
293 304
         TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());

+ 10
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Bestand weergeven

@@ -13,6 +13,8 @@ import com.huiju.estateagents.entity.*;
13 13
 import com.huiju.estateagents.mapper.*;
14 14
 import com.huiju.estateagents.service.ITaBuildingService;
15 15
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
16
+import com.huiju.estateagents.service.TaPosterService;
17
+import com.huiju.estateagents.service.TaShareContentService;
16 18
 import jodd.util.CollectionUtil;
17 19
 import org.apache.commons.collections.CollectionUtils;
18 20
 import org.checkerframework.checker.units.qual.A;
@@ -68,6 +70,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
68 70
     @Autowired
69 71
     private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
70 72
 
73
+    @Autowired
74
+    private TaPosterService taPosterService;
75
+
76
+    @Autowired
77
+    private TaShareContentService taShareContentService;
78
+
71 79
 
72 80
     @Override
73 81
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
@@ -116,6 +124,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
116 124
         buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
117 125
         List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
118 126
         building.setBuildingProjectType(taBuildingProjectTypes);
127
+        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
128
+        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
119 129
 
120 130
         return ResponseBean.success(building);
121 131
     }

+ 11
- 4
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java Bestand weergeven

@@ -16,9 +16,7 @@ import com.huiju.estateagents.exception.EstaException;
16 16
 import com.huiju.estateagents.mapper.TaFavorMapper;
17 17
 import com.huiju.estateagents.mapper.TaNewsMapper;
18 18
 import com.huiju.estateagents.mapper.TaSaveMapper;
19
-import com.huiju.estateagents.service.ITaBuildingService;
20
-import com.huiju.estateagents.service.ITaNewsService;
21
-import com.huiju.estateagents.service.ITaNewsTypeService;
19
+import com.huiju.estateagents.service.*;
22 20
 import org.checkerframework.checker.units.qual.A;
23 21
 import org.springframework.beans.factory.annotation.Autowired;
24 22
 import org.springframework.stereotype.Service;
@@ -52,6 +50,12 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
52 50
     @Autowired
53 51
     private TaSaveMapper taSaveMapper;
54 52
 
53
+    @Autowired
54
+    private TaPosterService taPosterService;
55
+
56
+    @Autowired
57
+    private TaShareContentService taShareContentService;
58
+
55 59
 
56 60
     @Override
57 61
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
@@ -89,7 +93,10 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
89 93
         if (null == newsId) {
90 94
             responseBean.addError("编号不能为空!");
91 95
         }
92
-        responseBean.addSuccess(this.getById(newsId));
96
+        TaNews data = this.getById(newsId);
97
+        data.setPosters(taPosterService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
98
+        data.setShareContents(taShareContentService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
99
+        responseBean.addSuccess(data);
93 100
         return  responseBean;
94 101
     }
95 102
 

+ 19
- 8
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Bestand weergeven

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
7 7
 import com.baomidou.mybatisplus.core.metadata.IPage;
8 8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9 9
 import com.huiju.estateagents.base.ResponseBean;
10
+import com.huiju.estateagents.center.taUser.entity.TaUser;
11
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
10 12
 import com.huiju.estateagents.common.CommConstant;
11 13
 import com.huiju.estateagents.common.DateUtils;
12 14
 import com.huiju.estateagents.common.MD5Utils;
@@ -14,10 +16,8 @@ import com.huiju.estateagents.common.StringUtils;
14 16
 import com.huiju.estateagents.entity.*;
15 17
 import com.huiju.estateagents.event.EventBus;
16 18
 import com.huiju.estateagents.mapper.*;
17
-import com.huiju.estateagents.service.ITaPersonService;
19
+import com.huiju.estateagents.service.*;
18 20
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
19
-import com.huiju.estateagents.service.ITaPointsRecordsService;
20
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
21 21
 import org.springframework.beans.factory.annotation.Autowired;
22 22
 import org.springframework.context.ApplicationContext;
23 23
 import org.springframework.stereotype.Service;
@@ -76,6 +76,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
76 76
     @Autowired
77 77
     private ITaPointsRecordsService pointsRecordsService;
78 78
 
79
+    @Autowired
80
+    private ITaUserService taUserService;
81
+
82
+    @Autowired
83
+    private TaPosterService taPosterService;
84
+
85
+    @Autowired
86
+    private TaShareContentService taShareContentService;
87
+
79 88
 
80 89
     @Resource
81 90
     private ApplicationContext applicationContext;
@@ -225,13 +234,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
225 234
                 buildings.add(b.getBuildingId());
226 235
             }
227 236
         }
228
-
237
+        TaUser user = taUserService.getById(person.getUserId());
229 238
         Map<String, Object> result = new HashMap<>();
230 239
         result.put("id", person.getPersonId());
231
-        result.put("name", person.getName());
232
-        result.put("company", person.getCompany());
233
-        result.put("department", person.getDepartment());
234
-        result.put("picture", person.getPhoto());
240
+        result.put("name", user.getUserName());
241
+        result.put("company", user.getOrgName());
242
+        result.put("department", user.getDepartment());
243
+        result.put("picture", user.getAvatar());
235 244
         result.put("hotNum", person.getHotNum());
236 245
         result.put("likeNum", person.getLikeNum());
237 246
         result.put("pvNum", person.getPvNum());
@@ -244,6 +253,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
244 253
         result.put("projects", buildings);
245 254
         result.put("address", person.getAddress());
246 255
         result.put("personTags",person.getPersonTags());
256
+        result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
257
+        result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
247 258
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
248 259
         saveQueryWrapper.eq("tagert_type", "card");
249 260
         saveQueryWrapper.eq("person_id",personId);