Commit a04fea10a48827d4bbdda20f2a4dfab4af48095a
1 parent
b9741b6b
删除实体类临时auditor字段，启动数据库updater字段
Showing
14 changed files
with
46 additions
and
92 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
| ... | ... | @@ -23,13 +23,13 @@ public class ShenheApplication extends SpringBootServletInitializer { |
| 23 | 23 | private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2"; |
| 24 | 24 | private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login"; |
| 25 | 25 | //本机的名称 |
| 26 | - private static final String SERVER_NAME = "http://test.shen.cnlive.com:82"; | |
| 26 | + private static final String SERVER_NAME = "http://test.shen.cnlive.com"; | |
| 27 | 27 | |
| 28 | 28 | //登录入口 |
| 29 | - private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login"; | |
| 29 | + private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com/users/login"; | |
| 30 | 30 | |
| 31 | 31 | //登出 |
| 32 | - private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout"; | |
| 32 | + private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com/users/logout"; | |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | /** | ... | ... |
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
| ... | ... | @@ -81,19 +81,19 @@ public class CommentsController { |
| 81 | 81 | if (!list.isEmpty()) { |
| 82 | 82 | for (ShyComments comment : list) { |
| 83 | 83 | if (comment.getState() != CommonConst.AUDIT_INTT) { |
| 84 | - String auditor = "白名单"; | |
| 84 | + String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater())? "白名单":comment.getUpdater(); | |
| 85 | 85 | String auditor_id = comment.getAuditor_id(); |
| 86 | 86 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 87 | 87 | ShyUsers user = new ShyUsers(); |
| 88 | 88 | user.setUser_id(auditor_id); |
| 89 | 89 | user = usersService.select(user); |
| 90 | 90 | if (CommonUtils.isNotNull(user)) { |
| 91 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername(); | |
| 92 | - String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail(); | |
| 93 | - auditor = userName + email; | |
| 91 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 92 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | |
| 93 | + updater = userName ; | |
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | - comment.setAuditor(auditor); | |
| 96 | + comment.setUpdater(updater); | |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | } | ... | ... |
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| ... | ... | @@ -128,19 +128,19 @@ public class VideosController { |
| 128 | 128 | if (!list.isEmpty()) { |
| 129 | 129 | for (ShyVideos videos : list) { |
| 130 | 130 | if (videos.getState() != CommonConst.AUDIT_INTT) { |
| 131 | - String auditor =CommonUtils.isEmpty(videos.getAuditor()) || "null".equals(videos.getAuditor())? "白名单":videos.getAuditor(); | |
| 131 | + String updater =CommonUtils.isEmpty(videos.getUpdater()) || "null".equals(videos.getUpdater())? "白名单":videos.getUpdater(); | |
| 132 | 132 | String auditor_id = videos.getAuditor_id(); |
| 133 | 133 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 134 | 134 | ShyUsers user = new ShyUsers(); |
| 135 | 135 | user.setUser_id(auditor_id); |
| 136 | 136 | user = usersService.select(user); |
| 137 | 137 | if (CommonUtils.isNotNull(user)) { |
| 138 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername(); | |
| 139 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 140 | - auditor = userName + email; | |
| 138 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 139 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | |
| 140 | + updater = userName; | |
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | - videos.setAuditor(auditor); | |
| 143 | + videos.setUpdater(updater); | |
| 144 | 144 | } |
| 145 | 145 | //显示spid简称 |
| 146 | 146 | ShySites shySites = sitesService.findspidDescByspid(videos.getSpid()); |
| ... | ... | @@ -260,7 +260,7 @@ public class VideosController { |
| 260 | 260 | if (spid == 0) spid = null; |
| 261 | 261 | List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId); |
| 262 | 262 | String fileName = "点播数据"; |
| 263 | - String auditor = "";//审核员名字 | |
| 263 | + String updater = "";//审核员名字 | |
| 264 | 264 | String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核 |
| 265 | 265 | XSSFWorkbook wb = new XSSFWorkbook(); |
| 266 | 266 | ServletOutputStream out = null; |
| ... | ... | @@ -316,20 +316,20 @@ public class VideosController { |
| 316 | 316 | cell = row.createCell(5);//列 |
| 317 | 317 | /* 审核员需要做处理*/ |
| 318 | 318 | if (shyVideosList.get(i).getState() != CommonConst.AUDIT_INTT) { |
| 319 | - auditor = "白名单"; | |
| 319 | + updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater())? "白名单":shyVideosList.get(i).getUpdater(); | |
| 320 | 320 | String auditor_id = shyVideosList.get(i).getAuditor_id(); |
| 321 | 321 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 322 | 322 | ShyUsers user = new ShyUsers(); |
| 323 | 323 | user.setUser_id(auditor_id); |
| 324 | 324 | user = usersService.select(user); |
| 325 | 325 | if (CommonUtils.isNotNull(user)) { |
| 326 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername(); | |
| 327 | - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 328 | - auditor = userName + email; | |
| 326 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 327 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | |
| 328 | + updater = userName ; | |
| 329 | 329 | } |
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | - cell.setCellValue(auditor); | |
| 332 | + cell.setCellValue(updater); | |
| 333 | 333 | cell = row.createCell(6);//列 |
| 334 | 334 | cell.setCellValue(shyVideosList.get(i).getMsg()); |
| 335 | 335 | cell = row.createCell(7);//列 | ... | ... |
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
| ... | ... | @@ -114,12 +114,6 @@ public class ShyComments { |
| 114 | 114 | */ |
| 115 | 115 | private String receive_user_id; |
| 116 | 116 | |
| 117 | - /** | |
| 118 | - * 审核员 | |
| 119 | - */ | |
| 120 | - @Transient | |
| 121 | - private String auditor; | |
| 122 | - | |
| 123 | 117 | |
| 124 | 118 | /** |
| 125 | 119 | * @return id |
| ... | ... | @@ -537,12 +531,5 @@ public class ShyComments { |
| 537 | 531 | this.receive_user_id = receive_user_id; |
| 538 | 532 | } |
| 539 | 533 | |
| 540 | - public String getAuditor() { | |
| 541 | - return auditor; | |
| 542 | - } | |
| 543 | - | |
| 544 | - public void setAuditor(String auditor) { | |
| 545 | - this.auditor = auditor; | |
| 546 | - } | |
| 547 | 534 | |
| 548 | 535 | } |
| 549 | 536 | \ No newline at end of file | ... | ... |
src/main/java/com/cnlive/shenhe/entity/ShyFilter.java deleted
100644 → 0
| 1 | -package com.cnlive.shenhe.entity; | |
| 2 | - | |
| 3 | -/** | |
| 4 | - * 数美过滤图片地址 | |
| 5 | - * @author liwei | |
| 6 | - * | |
| 7 | - */ | |
| 8 | -public class ShyFilter { | |
| 9 | - | |
| 10 | - private String imageUrl; | |
| 11 | - | |
| 12 | - public String getImageUrl() { | |
| 13 | - return imageUrl; | |
| 14 | - } | |
| 15 | - | |
| 16 | - public void setImageUrl(String imageUrl) { | |
| 17 | - this.imageUrl = imageUrl; | |
| 18 | - } | |
| 19 | - | |
| 20 | - | |
| 21 | - | |
| 22 | -} | |
| 23 | 0 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
| ... | ... | @@ -134,9 +134,6 @@ public class ShyVideos { |
| 134 | 134 | private String avsample_msg; |
| 135 | 135 | |
| 136 | 136 | @Transient |
| 137 | - private String auditor; | |
| 138 | - | |
| 139 | - @Transient | |
| 140 | 137 | private String spid_desc; |
| 141 | 138 | |
| 142 | 139 | |
| ... | ... | @@ -638,14 +635,6 @@ public class ShyVideos { |
| 638 | 635 | this.avsample_msg = avsample_msg; |
| 639 | 636 | } |
| 640 | 637 | |
| 641 | - public String getAuditor() { | |
| 642 | - return auditor; | |
| 643 | - } | |
| 644 | - | |
| 645 | - public void setAuditor(String auditor) { | |
| 646 | - this.auditor = auditor; | |
| 647 | - } | |
| 648 | - | |
| 649 | 638 | public String getSpid_desc() { |
| 650 | 639 | return spid_desc; |
| 651 | 640 | } | ... | ... |
src/main/java/com/cnlive/shenhe/job/VideosJob.java
| ... | ... | @@ -60,7 +60,7 @@ public class VideosJob { |
| 60 | 60 | List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos); |
| 61 | 61 | if (shyVideosList.size() > 0) { |
| 62 | 62 | for (ShyVideos video : shyVideosList) { |
| 63 | - video.setAuditor("白名单"); | |
| 63 | + video.setUpdater("白名单"); | |
| 64 | 64 | //更新点播和审核的视频状态 |
| 65 | 65 | videosService.updateDianboAndShenhe(video,3); |
| 66 | 66 | } | ... | ... |
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
| ... | ... | @@ -75,7 +75,7 @@ public class CommentsServiceImpl { |
| 75 | 75 | return shyCommentsMapper.updateByPrimaryKeySelective(shyComments); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - public PageInfo<ShyComments> getPage(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, String states, Boolean receive, String auditor, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) { | |
| 78 | + public PageInfo<ShyComments> getPage(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, String states, Boolean receive, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) { | |
| 79 | 79 | Example example = new Example(ShyComments.class); |
| 80 | 80 | Example.Criteria criteria = example.createCriteria(); |
| 81 | 81 | if (CommonUtils.isNotEmpty(orderByClause)) { |
| ... | ... | @@ -90,8 +90,8 @@ public class CommentsServiceImpl { |
| 90 | 90 | if (CommonUtils.isNotEmpty(content)) { |
| 91 | 91 | criteria.andLike("comment_content", "%" + content + "%"); |
| 92 | 92 | } |
| 93 | - if (CommonUtils.isNotEmpty(auditor)) { | |
| 94 | - criteria.andEqualTo("auditor", auditor); | |
| 93 | + if (CommonUtils.isNotEmpty(updater)) { | |
| 94 | + criteria.andEqualTo("updater", updater); | |
| 95 | 95 | } |
| 96 | 96 | if (CommonUtils.isNotNull(spid)) { |
| 97 | 97 | criteria.andEqualTo("spid", spid); |
| ... | ... | @@ -127,17 +127,17 @@ public class CommentsServiceImpl { |
| 127 | 127 | public ShyComments getDetailsComment(Integer id) { |
| 128 | 128 | ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id); |
| 129 | 129 | if (comment.getState() != CommonConst.AUDIT_INTT) { |
| 130 | - String auditorName = "白名单"; | |
| 130 | + String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater())? "白名单":comment.getUpdater(); | |
| 131 | 131 | String auditor_id = comment.getAuditor_id(); |
| 132 | 132 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 133 | 133 | ShyUsers user = new ShyUsers(); |
| 134 | 134 | user.setUser_id(auditor_id); |
| 135 | 135 | user = shyUsersMapper.selectOne(user); |
| 136 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername(); | |
| 137 | - String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail(); | |
| 138 | - auditorName = userName + email; | |
| 136 | + String email = CommonUtils.isEmpty(user.getEmail())|| "null".equals(user.getEmail()) ? "" : user.getEmail(); | |
| 137 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); | |
| 138 | + updater = userName ; | |
| 139 | 139 | } |
| 140 | - comment.setAuditor(auditorName); | |
| 140 | + comment.setUpdater(updater); | |
| 141 | 141 | } |
| 142 | 142 | return comment; |
| 143 | 143 | } | ... | ... |
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
| ... | ... | @@ -93,12 +93,12 @@ public class VideosServiceImpl { |
| 93 | 93 | return true; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - public int updateVideo(Integer id, String auditor_id,String auditor, Integer state, String msg) { | |
| 96 | + public int updateVideo(Integer id, String auditor_id,String updater, Integer state, String msg) { | |
| 97 | 97 | ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id); |
| 98 | 98 | shyVideos.setAuditor_id(auditor_id); |
| 99 | 99 | shyVideos.setState(state); |
| 100 | 100 | shyVideos.setMsg(msg); |
| 101 | - shyVideos.setAuditor(auditor); | |
| 101 | + shyVideos.setUpdater(updater); | |
| 102 | 102 | return shyVideosMapper.updateByPrimaryKeySelective(shyVideos); |
| 103 | 103 | } |
| 104 | 104 | |
| ... | ... | @@ -154,17 +154,17 @@ public class VideosServiceImpl { |
| 154 | 154 | public ShyVideos getDetailsContent(Integer id) { |
| 155 | 155 | ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id); |
| 156 | 156 | if (shyVideos.getState() != CommonConst.AUDIT_INTT) { |
| 157 | - String auditorName = "白名单"; | |
| 157 | + String updater = CommonUtils.isEmpty(shyVideos.getUpdater()) || "null".equals(shyVideos.getUpdater())? "白名单":shyVideos.getUpdater(); | |
| 158 | 158 | String auditor_id = shyVideos.getAuditor_id(); |
| 159 | 159 | if (CommonUtils.isNotEmpty(auditor_id)) { |
| 160 | 160 | ShyUsers user = new ShyUsers(); |
| 161 | 161 | user.setUser_id(auditor_id); |
| 162 | 162 | user = shyUsersMapper.selectOne(user); |
| 163 | - String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername(); | |
| 164 | - String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail(); | |
| 165 | - auditorName = userName + email; | |
| 163 | + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail())? "" : user.getEmail(); | |
| 164 | + String userName = CommonUtils.isEmpty(user.getUsername()) ? email: user.getUsername(); | |
| 165 | + updater = userName; | |
| 166 | 166 | } |
| 167 | - shyVideos.setAuditor(auditorName); | |
| 167 | + shyVideos.setUpdater(updater); | |
| 168 | 168 | } |
| 169 | 169 | return shyVideos; |
| 170 | 170 | } |
| ... | ... | @@ -289,7 +289,7 @@ public class VideosServiceImpl { |
| 289 | 289 | */ |
| 290 | 290 | public int videoFilter(Integer cid,String channel){ |
| 291 | 291 | ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(cid); |
| 292 | - shyVideos.setAuditor("自动审核"); | |
| 292 | + shyVideos.setUpdater("自动审核"); | |
| 293 | 293 | Integer plat = shyVideos.getPlat(); |
| 294 | 294 | String yuming = ""; |
| 295 | 295 | if (plat == CommonConst.QINIU_PLAT) { |
| ... | ... | @@ -343,13 +343,13 @@ public class VideosServiceImpl { |
| 343 | 343 | shenheState=CommonConst.AUDIT_SUCCESS; |
| 344 | 344 | } |
| 345 | 345 | //修改审核云的视频状态 |
| 346 | - int i = videosService.updateVideo(video.getId(), null,video.getAuditor(), shenheState, result.getString("msg")); | |
| 346 | + int i = videosService.updateVideo(video.getId(), null,video.getUpdater(), shenheState, result.getString("msg")); | |
| 347 | 347 | if (i != 1) { |
| 348 | 348 | logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id()); |
| 349 | 349 | } |
| 350 | 350 | return i; |
| 351 | 351 | } else { |
| 352 | - videosService.updateVideo(video.getId(), null,video.getAuditor(), CommonConst.AUDIT_CALLBACK_FAIL, result.getString("msg")); | |
| 352 | + videosService.updateVideo(video.getId(), null,video.getUpdater(), CommonConst.AUDIT_CALLBACK_FAIL, result.getString("msg")); | |
| 353 | 353 | logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg")); |
| 354 | 354 | } |
| 355 | 355 | ... | ... |
src/main/resources/application.properties
| ... | ... | @@ -34,7 +34,7 @@ spring.thymeleaf.cache=false |
| 34 | 34 | |
| 35 | 35 | mybatis.mapper-locations=classpath:mapping/*.xml |
| 36 | 36 | mybatis.type-aliases-package=com.cnlive.shenhe.entity |
| 37 | -server.port=82 | |
| 37 | +server.port=80 | |
| 38 | 38 | |
| 39 | 39 | sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser |
| 40 | 40 | sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae | ... | ... |
src/main/resources/templates/page/comment.html
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | </div> |
| 205 | 205 | <div class="fht-cell"></div> |
| 206 | 206 | </th> |
| 207 | - <th style="text-align: center; width: 6%; " data-field="auditor" | |
| 207 | + <th style="text-align: center; width: 6%; " data-field="updater" | |
| 208 | 208 | tabindex="0"> |
| 209 | 209 | <div class="th-inner ">审核员</div> |
| 210 | 210 | <div class="fht-cell"></div> |
| ... | ... | @@ -264,7 +264,7 @@ |
| 264 | 264 | <td style="text-align: center; width: 15%;" |
| 265 | 265 | th:text="${comment.comment_title}"> |
| 266 | 266 | </td> |
| 267 | - <td style="text-align: center; width: 6%;" th:text="${comment.auditor}"> | |
| 267 | + <td style="text-align: center; width: 6%;" th:text="${comment.updater}"> | |
| 268 | 268 | 发布 |
| 269 | 269 | openadmin9@cnlive.com |
| 270 | 270 | </td> | ... | ... |
src/main/resources/templates/page/commentDetail.html
| ... | ... | @@ -140,9 +140,9 @@ |
| 140 | 140 | </div> |
| 141 | 141 | |
| 142 | 142 | <div class="form-group"> |
| 143 | - <label for="auditor" class="control-label col-sm-2">审核员:</label> | |
| 143 | + <label for="updater" class="control-label col-sm-2">审核员:</label> | |
| 144 | 144 | <div class="col-sm-10"> |
| 145 | - <h5 th:text="${comment.auditor}">发布 | |
| 145 | + <h5 th:text="${comment.updater}">发布 | |
| 146 | 146 | openadmin9@cnlive.com</h5> |
| 147 | 147 | </div> |
| 148 | 148 | </div> | ... | ... |
src/main/resources/templates/page/video.html
| ... | ... | @@ -163,7 +163,7 @@ |
| 163 | 163 | <div class="fht-cell"></div> |
| 164 | 164 | </th> |
| 165 | 165 | <!--<th style="text-align: center; width: 10%; " data-field="video_cover_img" tabindex="0"><div class="th-inner ">点播封面图</div><div class="fht-cell"></div></th>--> |
| 166 | - <th style="text-align: center; width: 6%; " data-field="auditor" | |
| 166 | + <th style="text-align: center; width: 6%; " data-field="updater" | |
| 167 | 167 | tabindex="0"> |
| 168 | 168 | <div class="th-inner ">审核员</div> |
| 169 | 169 | <div class="fht-cell"></div> |
| ... | ... | @@ -202,7 +202,7 @@ |
| 202 | 202 | <!--<td style="text-align: center; width: 10%;">--> |
| 203 | 203 | <!--<div width="160px" height="90px"><img th:src="@{${video.video_poster}}" width="160px" alt="封面图"></div>--> |
| 204 | 204 | <!--</td>--> |
| 205 | - <td style="text-align: center; width: 6%;" th:text="${video.auditor}">审核员 | |
| 205 | + <td style="text-align: center; width: 6%;" th:text="${video.updater}">审核员 | |
| 206 | 206 | </td> |
| 207 | 207 | <td style="text-align: center; width: 3%;" |
| 208 | 208 | th:text="${video.video_priority=='1'?'是':'否'}">是 | ... | ... |
src/main/resources/templates/page/videoDetail.html
| ... | ... | @@ -167,7 +167,7 @@ |
| 167 | 167 | <div class="form-group "> |
| 168 | 168 | <label for="auditor_id" class="control-label col-sm-3">审核员:</label> |
| 169 | 169 | <div class="col-sm-9 "> |
| 170 | - <h5 id="auditor_id" th:text="${video.auditor}">系统审核 </h5> | |
| 170 | + <h5 id="auditor_id" th:text="${video.updater}">系统审核 </h5> | |
| 171 | 171 | </div> |
| 172 | 172 | </div> |
| 173 | 173 | ... | ... |