From b555bdde876199ea4d3f2f9126f20f6e94b3e890 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期一, 12 七月 2021 22:30:14 +0800
Subject: [PATCH] 社区新闻大类设置隐藏与显示过滤条件
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
old mode 100644
new mode 100755
index 43fcb83..7ea003d
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -42,7 +42,6 @@
import java.util.Date;
import java.util.List;
-
@RestController
@RequestMapping(value = "/roomRenovation")
public class RoomRenovationApi {
@@ -153,15 +152,23 @@
RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
roomRenovationPo.setStartTime(roomRenovationPo.getStartTime() + " 00:00:00");
roomRenovationPo.setEndTime(roomRenovationPo.getEndTime() + " 23:59:59");
- //濡傛灉鐘舵�佷负瑁呬慨涓紝鍒欐埧灞嬬姸鎬佹敼涓鸿淇腑锛涘鏋滅姸鎬佷负楠屾敹鎴愬姛锛屽垯鎴垮眿鐘舵�佹敼涓哄凡瑁呬慨
- if (roomRenovationPo.getState().equals("3000")) {
+ //濡傛灉鐘舵�佷负瑁呬慨涓�佸緟楠屾敹锛屽垯鎴垮眿鐘舵�佹敼涓鸿淇腑锛涘鏋滅姸鎬佷负楠屾敹鎴愬姛锛屽垯鎴垮眿鐘舵�佹敼涓哄凡瑁呬慨锛涘鏋滀负寰呭鏍搞�佸鏍稿け璐ャ�侀獙鏀跺け璐ワ紝鍒欐埧灞嬬姸鎬佹敼涓哄凡浜ゆ埧
+ if (roomRenovationPo.getState().equals("3000") || roomRenovationPo.getState().equals("4000")) {
RoomDto roomDto = new RoomDto();
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓鸿淇腑
roomDto.setState("2009");
updateRoomRenovationBMOImpl.update(roomRenovationPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
- } else if (roomRenovationPo.getState().equals("")) {
+ } else if (roomRenovationPo.getState().equals("1000") || roomRenovationPo.getState().equals("2000")
+ || roomRenovationPo.getState().equals("5000")) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(roomRenovationPo.getRoomId());
+ //鎴垮眿鐘舵�佸彉涓哄凡浜ゆ埧
+ roomDto.setState("2003");
+ updateRoomRenovationBMOImpl.update(roomRenovationPo);
+ return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationPo.getState().equals("6000")) {
RoomDto roomDto = new RoomDto();
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓哄凡瑁呬慨
@@ -319,15 +326,8 @@
if (!StringUtil.isEmpty(videoName)) {
//21000琛ㄧず瑁呬慨瑙嗛
fileRelPo.setRelTypeCd("21000");
- FileDto fileDto = new FileDto();
- fileDto.setCommunityId("-1");
- fileDto.setContext(videoName);
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setSuffix("mp4");
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- fileRelPo.setFileRealName(fileName);
- fileRelPo.setFileSaveName(fileName);
+ fileRelPo.setFileRealName(videoName);
+ fileRelPo.setFileSaveName(videoName);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
}
RoomRenovationRecordPo roomRenovationRecord = new RoomRenovationRecordPo();
@@ -352,6 +352,14 @@
roomDto.setRoomId(roomRenovationPo.getRoomId());
//鎴垮眿鐘舵�佸彉涓鸿淇腑
roomDto.setState("2009");
+ //鏇存柊瑁呬慨淇℃伅
+ updateRoomRenovationBMOImpl.update(roomRenovationPo);
+ return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationPo.getState().equals("2000")) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(roomRenovationPo.getRoomId());
+ //鎴垮眿鐘舵�佸彉涓哄凡浜ゆ埧
+ roomDto.setState("2003");
//鏇存柊瑁呬慨淇℃伅
updateRoomRenovationBMOImpl.update(roomRenovationPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
@@ -438,6 +446,13 @@
roomDto.setState("2005");
saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationDetailPo.getState().equals("6000")) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(reqJson.getString("roomId"));
+ //鐘舵�佸彉涓哄凡浜ゆ埧
+ roomDto.setState("2003");
+ saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
+ return updateRoomRenovationBMOImpl.updateRoom(roomDto);
} else {
return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
}
--
Gitblit v1.8.0