Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
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
曲欣亮
sentinel
Commits
c130f8b5
Commit
c130f8b5
authored
Nov 23, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xx
parent
d906e074
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
572 additions
and
536 deletions
+572
-536
MemberFilmService.java
...in/java/com/egolm/film/api/service/MemberFilmService.java
+113
-0
MemberService.java
src/main/java/com/egolm/film/api/service/MemberService.java
+0
-104
MemberFilmServiceImpl.java
...om/egolm/film/api/service/impl/MemberFilmServiceImpl.java
+425
-0
MemberServiceImpl.java
...va/com/egolm/film/api/service/impl/MemberServiceImpl.java
+1
-407
AdminFirstController.java
...va/com/egolm/film/api/web/admin/AdminFirstController.java
+13
-9
MemberApplyController.java
.../com/egolm/film/api/web/member/MemberApplyController.java
+20
-16
No files found.
src/main/java/com/egolm/film/api/service/MemberFilmService.java
0 → 100644
View file @
c130f8b5
package
com
.
egolm
.
film
.
api
.
service
;
import
java.util.List
;
import
java.util.Map
;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.film.bean.Fc_member_film
;
import
com.egolm.film.bean.Fc_member_film_all
;
import
com.egolm.film.bean.Fc_member_film_director
;
import
com.egolm.film.bean.Fc_member_film_issuer
;
import
com.egolm.film.bean.Fc_member_film_playactor
;
import
com.egolm.film.bean.Fc_member_film_show
;
public
interface
MemberFilmService
{
List
<
Fc_member_film_director
>
queryMemberFilmDirectorList
(
Long
member_film_id
);
List
<
Fc_member_film_issuer
>
queryMemberFilmIssuerList
(
Long
member_film_id
);
List
<
Fc_member_film_playactor
>
queryMemberFilmPlayactorList
(
Long
member_film_id
);
List
<
Fc_member_film_show
>
queryMemberFilmShowList
(
Long
member_film_id
);
void
doApply
(
Integer
member_id
,
Long
member_film_id
);
void
saveMore
(
Fc_member_film_all
more
);
Fc_member_film_all
queryMoreByNo
(
String
no
);
Long
saveMemberFilmType
(
Integer
member_id
,
String
film_type_name
,
String
enroll_type_name
);
void
saveMemberFilmBase
(
Integer
member_id
,
Long
member_film_id
,
String
[]
enroll_type_name_other
,
String
cn_name
,
String
en_name
,
String
intro
);
void
saveMemberFilmInfo
(
Integer
member_id
,
Long
member_film_id
,
String
film_country
,
String
dialogue_lang
,
String
subtitle_lang
,
String
[]
co_production_country
,
String
film_total_time
,
String
completion_date
,
String
show_date
,
String
first_show_date
,
String
first_show_city
,
Integer
is_apply_other_filmfest
,
String
other_filmfest_name
,
String
film_medium
,
String
film_format
,
String
film_format_url
,
String
film_format_passw
,
String
film_format_other
);
void
saveMemberFilmPlayactor
(
Integer
member_id
,
Long
member_film_id
,
String
[]
playactor_type
,
String
[]
playactor_role_name
,
String
[]
playactor_name
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
);
void
saveMemberFilmIssuer
(
Integer
member_id
,
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
[]
issuer_email
,
String
[]
issuer_tel
);
void
saveMemberFilmShow
(
Integer
member_id
,
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
);
void
saveMemberFilmCompany
(
Integer
member_id
,
Long
member_film_id
,
String
film_apply_company
,
String
film_apply_realname
,
String
film_apply_email
,
String
film_apply_tel
,
String
film_apply_mobile
,
String
film_apply_country
);
List
<
Map
<
String
,
Object
>>
queryListAll
(
String
keyword
);
List
<
Map
<
String
,
Object
>>
queryChuShenList
(
String
keyword
,
Integer
state
,
Integer
apply_state
,
String
film_type
,
String
enroll_type
,
String
film_country
,
Page
page
);
void
pass
(
Integer
member_film_id
);
void
reject
(
Integer
member_film_id
);
Fc_member_film
queryMemberFilmById
(
Long
member_film_id
);
}
src/main/java/com/egolm/film/api/service/MemberService.java
View file @
c130f8b5
...
...
@@ -3,14 +3,7 @@ package com.egolm.film.api.service;
import
java.util.List
;
import
java.util.Map
;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.film.bean.Fc_member
;
import
com.egolm.film.bean.Fc_member_film
;
import
com.egolm.film.bean.Fc_member_film_all
;
import
com.egolm.film.bean.Fc_member_film_director
;
import
com.egolm.film.bean.Fc_member_film_issuer
;
import
com.egolm.film.bean.Fc_member_film_playactor
;
import
com.egolm.film.bean.Fc_member_film_show
;
public
interface
MemberService
{
...
...
@@ -36,107 +29,10 @@ public interface MemberService {
boolean
exists
(
String
email
);
Fc_member_film
queryMemberFilmById
(
Long
id
);
List
<
Fc_member_film_director
>
queryMemberFilmDirectorList
(
Long
member_film_id
);
List
<
Fc_member_film_issuer
>
queryMemberFilmIssuerList
(
Long
member_film_id
);
List
<
Fc_member_film_playactor
>
queryMemberFilmPlayactorList
(
Long
member_film_id
);
List
<
Fc_member_film_show
>
queryMemberFilmShowList
(
Long
member_film_id
);
void
doApply
(
Integer
member_id
,
Long
member_film_id
);
void
saveMore
(
Fc_member_film_all
more
);
Fc_member_film_all
queryMoreByNo
(
String
no
);
Long
saveMemberFilmType
(
Integer
member_id
,
String
film_type_name
,
String
enroll_type_name
);
void
saveMemberFilmBase
(
Integer
member_id
,
Long
member_film_id
,
String
[]
enroll_type_name_other
,
String
cn_name
,
String
en_name
,
String
intro
);
void
saveMemberFilmInfo
(
Integer
member_id
,
Long
member_film_id
,
String
film_country
,
String
dialogue_lang
,
String
subtitle_lang
,
String
[]
co_production_country
,
String
film_total_time
,
String
completion_date
,
String
show_date
,
String
first_show_date
,
String
first_show_city
,
Integer
is_apply_other_filmfest
,
String
other_filmfest_name
,
String
film_medium
,
String
film_format
,
String
film_format_url
,
String
film_format_passw
,
String
film_format_other
);
void
saveMemberFilmPlayactor
(
Integer
member_id
,
Long
member_film_id
,
String
[]
playactor_type
,
String
[]
playactor_role_name
,
String
[]
playactor_name
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
);
void
saveMemberFilmIssuer
(
Integer
member_id
,
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
[]
issuer_email
,
String
[]
issuer_tel
);
void
saveMemberFilmShow
(
Integer
member_id
,
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
);
void
saveMemberFilmCompany
(
Integer
member_id
,
Long
member_film_id
,
String
film_apply_company
,
String
film_apply_realname
,
String
film_apply_email
,
String
film_apply_tel
,
String
film_apply_mobile
,
String
film_apply_country
);
boolean
changePasswordByMemberId
(
Integer
member_id
,
String
password
,
String
newPassword
);
Fc_member
getMemberByToken
(
String
token
);
void
updateToken
(
Integer
member_id
,
String
token_string
);
List
<
Map
<
String
,
Object
>>
queryListAll
(
String
keyword
);
List
<
Map
<
String
,
Object
>>
queryChuShenList
(
String
keyword
,
Integer
state
,
Integer
apply_state
,
String
film_type
,
String
enroll_type
,
String
film_country
,
Page
page
);
void
pass
(
Integer
member_film_id
);
void
reject
(
Integer
member_film_id
);
}
src/main/java/com/egolm/film/api/service/impl/MemberFilmServiceImpl.java
0 → 100644
View file @
c130f8b5
This diff is collapsed.
Click to expand it.
src/main/java/com/egolm/film/api/service/impl/MemberServiceImpl.java
View file @
c130f8b5
This diff is collapsed.
Click to expand it.
src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java
View file @
c130f8b5
...
...
@@ -13,6 +13,7 @@ import com.egolm.common.bean.Rjx;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.film.api.service.AdminTokenService
;
import
com.egolm.film.api.service.FilmService
;
import
com.egolm.film.api.service.MemberFilmService
;
import
com.egolm.film.api.service.MemberService
;
import
com.egolm.film.bean.Fc_member_film
;
import
com.egolm.film.bean.Fc_member_film_director
;
...
...
@@ -42,6 +43,9 @@ public class AdminFirstController {
@Autowired
MemberService
memberService
;
@Autowired
MemberFilmService
memberFilmService
;
@Autowired
AdminTokenService
tokenService
;
...
...
@@ -62,7 +66,7 @@ public class AdminFirstController {
index
=
index
==
null
?
1
:
index
;
limit
=
limit
==
null
?
20
:
limit
;
Page
page
=
new
Page
(
index
,
limit
);
List
<
Map
<
String
,
Object
>>
list
=
memberService
.
queryChuShenList
(
keyword
,
state
,
apply_state
,
film_type
,
enroll_type
,
film_country
,
page
);
List
<
Map
<
String
,
Object
>>
list
=
member
Film
Service
.
queryChuShenList
(
keyword
,
state
,
apply_state
,
film_type
,
enroll_type
,
film_country
,
page
);
return
Rjx
.
jsonOk
().
setData
(
list
);
}
...
...
@@ -81,7 +85,7 @@ public class AdminFirstController {
index
=
index
==
null
?
1
:
index
;
limit
=
limit
==
null
?
20
:
limit
;
Page
page
=
new
Page
(
index
,
limit
);
List
<
Map
<
String
,
Object
>>
list
=
memberService
.
queryChuShenList
(
keyword
,
2
,
2
,
film_type
,
enroll_type
,
film_country
,
page
);
List
<
Map
<
String
,
Object
>>
list
=
member
Film
Service
.
queryChuShenList
(
keyword
,
2
,
2
,
film_type
,
enroll_type
,
film_country
,
page
);
return
Rjx
.
jsonOk
().
setData
(
list
);
}
...
...
@@ -95,7 +99,7 @@ public class AdminFirstController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
adminid
=
(
Integer
)
loginToken
.
getId
();
service
.
copyFilm
(
member_film_id
,
adminid
);
memberService
.
pass
(
member_film_id
);
member
Film
Service
.
pass
(
member_film_id
);
return
Rjx
.
jsonOk
();
}
...
...
@@ -106,7 +110,7 @@ public class AdminFirstController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"int"
,
required
=
false
,
name
=
"member_film_id"
,
value
=
"申报影片ID"
),
})
public
Object
reject
(
Integer
member_film_id
)
{
memberService
.
reject
(
member_film_id
);
member
Film
Service
.
reject
(
member_film_id
);
return
Rjx
.
jsonOk
();
}
...
...
@@ -117,11 +121,11 @@ public class AdminFirstController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"long"
,
required
=
true
,
name
=
"member_film_id"
,
value
=
"申报影片ID"
)
})
public
Object
getDetail
(
Long
member_film_id
)
{
Fc_member_film
memberFilm
=
memberService
.
queryMemberFilmById
(
member_film_id
);
List
<
Fc_member_film_director
>
directorList
=
memberService
.
queryMemberFilmDirectorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_issuer
>
issuerList
=
memberService
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
memberService
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
Fc_member_film
memberFilm
=
member
Film
Service
.
queryMemberFilmById
(
member_film_id
);
List
<
Fc_member_film_director
>
directorList
=
member
Film
Service
.
queryMemberFilmDirectorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_issuer
>
issuerList
=
member
Film
Service
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
member
Film
Service
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
member
Film
Service
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
return
Rjx
.
jsonOk
()
.
setData
(
memberFilm
)
...
...
src/main/java/com/egolm/film/api/web/member/MemberApplyController.java
View file @
c130f8b5
...
...
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.service.MemberFilmService
;
import
com.egolm.film.api.service.MemberService
;
import
com.egolm.film.api.service.MemberTokenService
;
import
com.egolm.film.bean.Fc_member_film
;
...
...
@@ -35,6 +36,9 @@ public class MemberApplyController {
@Autowired
private
MemberService
memberService
;
@Autowired
private
MemberFilmService
memberFilmService
;
@Autowired
private
MemberTokenService
tokenService
;
...
...
@@ -52,7 +56,7 @@ public class MemberApplyController {
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
List
<
Map
<
String
,
Object
>>
list
=
null
;
if
(
member_id
.
intValue
()
==
opt_member_id
.
intValue
())
{
list
=
memberService
.
queryListAll
(
keyword
);
list
=
member
Film
Service
.
queryListAll
(
keyword
);
}
else
{
list
=
memberService
.
queryListByMemberID
(
member_id
);
}
...
...
@@ -70,7 +74,7 @@ public class MemberApplyController {
public
Object
saveMemberFilmType
(
String
film_type_name
,
String
enroll_type_name
)
{
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
Long
member_film_id
=
memberService
.
saveMemberFilmType
(
member_id
,
film_type_name
,
enroll_type_name
);
Long
member_film_id
=
member
Film
Service
.
saveMemberFilmType
(
member_id
,
film_type_name
,
enroll_type_name
);
return
Rjx
.
jsonOk
().
set
(
"member_film_id"
,
member_film_id
);
}
...
...
@@ -94,7 +98,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmBase
(
member
Film
Service
.
saveMemberFilmBase
(
member_id
,
member_film_id
,
enroll_type_name_other
,
...
...
@@ -150,7 +154,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmInfo
(
member
Film
Service
.
saveMemberFilmInfo
(
member_id
,
member_film_id
,
film_country
,
...
...
@@ -201,7 +205,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmPlayactor
(
member
Film
Service
.
saveMemberFilmPlayactor
(
member_id
,
member_film_id
,
playactor_type
,
...
...
@@ -236,7 +240,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmIssuer
(
member
Film
Service
.
saveMemberFilmIssuer
(
member_id
,
member_film_id
,
issuer_company
,
...
...
@@ -267,7 +271,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmShow
(
member
Film
Service
.
saveMemberFilmShow
(
member_id
,
member_film_id
,
play_shanghai
,
...
...
@@ -301,7 +305,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
saveMemberFilmCompany
(
member
Film
Service
.
saveMemberFilmCompany
(
member_id
,
member_film_id
,
film_apply_company
,
...
...
@@ -321,11 +325,11 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"long"
,
required
=
true
,
name
=
"member_film_id"
,
value
=
"申报影片ID"
)
})
public
Object
getDetail
(
Long
member_film_id
)
{
Fc_member_film
memberFilm
=
memberService
.
queryMemberFilmById
(
member_film_id
);
List
<
Fc_member_film_director
>
directorList
=
memberService
.
queryMemberFilmDirectorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_issuer
>
issuerList
=
memberService
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
memberService
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
Fc_member_film
memberFilm
=
member
Film
Service
.
queryMemberFilmById
(
member_film_id
);
List
<
Fc_member_film_director
>
directorList
=
member
Film
Service
.
queryMemberFilmDirectorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_issuer
>
issuerList
=
member
Film
Service
.
queryMemberFilmIssuerList
(
memberFilm
.
getId
());
List
<
Fc_member_film_playactor
>
playactorList
=
member
Film
Service
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
member
Film
Service
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
return
Rjx
.
jsonOk
()
.
setData
(
memberFilm
)
...
...
@@ -344,7 +348,7 @@ public class MemberApplyController {
public
Object
doApply
(
Long
member_film_id
)
{
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
memberService
.
doApply
(
member_id
,
member_film_id
);
member
Film
Service
.
doApply
(
member_id
,
member_film_id
);
return
Rjx
.
jsonOk
();
}
...
...
@@ -355,7 +359,7 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_no"
,
value
=
"情报影片编号"
)
})
public
Object
getMore
(
String
film_no
)
{
Fc_member_film_all
more
=
memberService
.
queryMoreByNo
(
film_no
);
Fc_member_film_all
more
=
member
Film
Service
.
queryMoreByNo
(
film_no
);
return
Rjx
.
jsonOk
().
setData
(
more
);
}
...
...
@@ -366,7 +370,7 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"header"
,
dataType
=
"string"
,
name
=
"i18n_language"
),
})
public
Object
saveMore
(
Fc_member_film_all
more
)
{
memberService
.
saveMore
(
more
);
member
Film
Service
.
saveMore
(
more
);
return
Rjx
.
jsonOk
();
}
...
...
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