Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
1d962ee1
Commit
1d962ee1
authored
Apr 06, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
da1d6639
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
10 deletions
+18
-10
LearningContentBoardMapper.java
...gy/chnmuseum/party/mapper/LearningContentBoardMapper.java
+10
-6
Asset.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
+4
-0
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+1
-1
FileUploadController.java
.../chnmuseum/party/web/controller/FileUploadController.java
+3
-3
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
1d962ee1
...
@@ -34,7 +34,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -34,7 +34,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
@Select
(
"SELECT t.* FROM "
+
@Select
(
"SELECT t.* FROM "
+
"("
+
"("
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name
, eb.cover exhibition_board_cover
FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
...
@@ -42,7 +42,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -42,7 +42,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.organ_code = #{organCode} "
+
"and lc.organ_code = #{organCode} "
+
"UNION ALL "
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name
, eb.cover exhibition_board_cover
FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and eb.id = a.ref_item_id "
...
@@ -52,7 +52,9 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -52,7 +52,9 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lc.organ_code = #{organCode} "
+
"and lc.organ_code = #{organCode} "
+
"UNION "
+
"UNION "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover "
+
"FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
...
@@ -60,7 +62,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -60,7 +62,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+
"and lc.organ_code like CONCAT(#{organCode},'%') "
+
"and lc.organ_code like CONCAT(#{organCode},'%') "
+
"UNION ALL "
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name
, eb.cover exhibition_board_cover
FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and eb.id = a.ref_item_id "
...
@@ -70,14 +72,16 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -70,14 +72,16 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lc.organ_code = #{organCode} "
+
"and lc.organ_code = #{organCode} "
+
"UNION "
+
"UNION "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and vc.id = a.ref_item_id "
+
"and lc.applicable_scope = 'ALL_PLAT'"
+
"and lc.applicable_scope = 'ALL_PLAT'"
+
"UNION ALL "
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover "
+
"FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and eb.id = a.ref_item_id "
...
...
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
View file @
1d962ee1
...
@@ -93,4 +93,8 @@ public class Asset implements Serializable {
...
@@ -93,4 +93,8 @@ public class Asset implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
exhibitionBoardName
;
private
String
exhibitionBoardName
;
@ApiModelProperty
(
"展板图片"
)
@TableField
(
exist
=
false
)
private
String
exhibitionBoardCover
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
1d962ee1
...
@@ -370,7 +370,7 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -370,7 +370,7 @@ public class ChinaMobileRestApiController extends BaseController {
return
getResult
(
page
);
return
getResult
(
page
);
}
}
@ApiOperation
(
value
=
"展板详情
页面查询"
,
notes
=
"展板详情页面
查询"
)
@ApiOperation
(
value
=
"展板详情
查询"
,
notes
=
"展板详情
查询"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"boardId"
,
value
=
"展板ID"
,
dataType
=
"String"
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"boardId"
,
value
=
"展板ID"
,
dataType
=
"String"
,
paramType
=
"query"
),
@ApiImplicitParam
(
name
=
"language"
,
value
=
"语言"
,
dataType
=
"String"
,
paramType
=
"query"
)
@ApiImplicitParam
(
name
=
"language"
,
value
=
"语言"
,
dataType
=
"String"
,
paramType
=
"query"
)
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java
View file @
1d962ee1
...
@@ -46,7 +46,7 @@ public class FileUploadController extends BaseController {
...
@@ -46,7 +46,7 @@ public class FileUploadController extends BaseController {
private
static
final
String
[]
IMAGE_TYPE
=
new
String
[]{
"JPG"
,
"JPEG"
,
"PNG"
,
"BMP"
,
"WBMP"
};
private
static
final
String
[]
IMAGE_TYPE
=
new
String
[]{
"JPG"
,
"JPEG"
,
"PNG"
,
"BMP"
,
"WBMP"
};
private
static
final
String
[]
AUDIO_TYPE
=
new
String
[]{
"MP3"
,
"AAC"
,
"WMA"
,
"FLAC"
,
"RM"
,
"OGG"
};
private
static
final
String
[]
AUDIO_TYPE
=
new
String
[]{
"MP3"
,
"AAC"
,
"WMA"
,
"FLAC"
,
"RM"
,
"OGG"
};
private
static
final
String
[]
VIDEO_TYPE
=
new
String
[]{
"MP4"
,
"FLV"
};
private
static
final
String
[]
VIDEO_TYPE
=
new
String
[]{
"MP4"
,
"FLV"
};
private
static
final
String
[]
DOC_TYPE
=
new
String
[]{
"PDF"
,
"
TXT"
,
"
DOC"
,
"DOCX"
,
"PPT"
,
"PPTX"
,
"XLS"
,
"XLSX"
};
private
static
final
String
[]
DOC_TYPE
=
new
String
[]{
"PDF"
,
"DOC"
,
"DOCX"
,
"PPT"
,
"PPTX"
,
"XLS"
,
"XLSX"
};
private
static
final
String
[]
DATUM_TYPE
=
ArrayUtil
.
addAll
(
DOC_TYPE
,
IMAGE_TYPE
,
VIDEO_TYPE
);
private
static
final
String
[]
DATUM_TYPE
=
ArrayUtil
.
addAll
(
DOC_TYPE
,
IMAGE_TYPE
,
VIDEO_TYPE
);
@Resource
@Resource
...
@@ -151,7 +151,7 @@ public class FileUploadController extends BaseController {
...
@@ -151,7 +151,7 @@ public class FileUploadController extends BaseController {
language
=
LanguageEnum
.
UYG
.
name
();
language
=
LanguageEnum
.
UYG
.
name
();
}
}
final
FileInfo
fileInfo
=
FastDFSUtils
.
getFileInfo
(
fileUrl
);
final
FileInfo
fileInfo
=
FastDFSUtils
.
getFileInfo
(
fileUrl
);
final
LocalDateTime
createTime
=
TimeUtils
.
getDateTimeOfTimestamp
(
fileInfo
.
getCreateTime
());
final
LocalDateTime
createTime
=
TimeUtils
.
getDateTimeOfTimestamp
(
fileInfo
.
getCreateTime
()
*
1000
);
asset
.
setFileSize
(
fileInfo
.
getFileSize
());
asset
.
setFileSize
(
fileInfo
.
getFileSize
());
asset
.
setFileUrl
(
fileUrl
);
asset
.
setFileUrl
(
fileUrl
);
asset
.
setFileCat
(
FileCatEnum
.
EXHIBITION_BOARD_DATUM
.
name
());
asset
.
setFileCat
(
FileCatEnum
.
EXHIBITION_BOARD_DATUM
.
name
());
...
@@ -295,7 +295,7 @@ public class FileUploadController extends BaseController {
...
@@ -295,7 +295,7 @@ public class FileUploadController extends BaseController {
}
}
String
fileUrl
=
FastDFSUtils
.
uploadFile
(
file
.
getInputStream
(),
file
.
getSize
(),
originalFilename
,
metaDataSet
);
String
fileUrl
=
FastDFSUtils
.
uploadFile
(
file
.
getInputStream
(),
file
.
getSize
(),
originalFilename
,
metaDataSet
);
final
FileInfo
fileInfo
=
FastDFSUtils
.
getFileInfo
(
fileUrl
);
final
FileInfo
fileInfo
=
FastDFSUtils
.
getFileInfo
(
fileUrl
);
final
LocalDateTime
createTime
=
TimeUtils
.
getDateTimeOfTimestamp
(
fileInfo
.
getCreateTime
());
final
LocalDateTime
createTime
=
TimeUtils
.
getDateTimeOfTimestamp
(
fileInfo
.
getCreateTime
()
*
1000
);
final
long
fileSize
=
fileInfo
.
getFileSize
();
final
long
fileSize
=
fileInfo
.
getFileSize
();
final
Asset
asset
=
Asset
.
builder
()
final
Asset
asset
=
Asset
.
builder
()
.
fileName
(
originalFilename
)
.
fileName
(
originalFilename
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment