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
77dcedf8
Commit
77dcedf8
authored
Oct 12, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化申报接口
parent
1eb17e57
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
314 additions
and
58 deletions
+314
-58
MemberApplyController.java
...java/com/egolm/film/api/member/MemberApplyController.java
+86
-11
MemberService.java
...java/com/egolm/film/api/member/service/MemberService.java
+66
-23
MemberServiceImpl.java
...egolm/film/api/member/service/impl/MemberServiceImpl.java
+162
-24
No files found.
src/main/java/com/egolm/film/api/member/MemberApplyController.java
View file @
77dcedf8
...
@@ -89,8 +89,28 @@ public class MemberApplyController {
...
@@ -89,8 +89,28 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_medium"
,
value
=
"影片色彩"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_medium"
,
value
=
"影片色彩"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_format"
,
value
=
"样片规格"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_format"
,
value
=
"样片规格"
),
})
})
public
Object
saveMemberFilmInfo
(
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
film_medium
,
String
film_format
)
{
public
Object
saveMemberFilmInfo
(
memberService
.
saveMemberFilmInfo
(
member_film_id
,
film_country
,
dialogue_lang
,
subtitle_lang
,
co_production_country
,
film_total_time
,
completion_date
,
show_date
,
film_medium
,
film_format
);
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
film_medium
,
String
film_format
)
{
memberService
.
saveMemberFilmInfo
(
member_film_id
,
film_country
,
dialogue_lang
,
subtitle_lang
,
co_production_country
,
film_total_time
,
completion_date
,
show_date
,
film_medium
,
film_format
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
@@ -108,8 +128,24 @@ public class MemberApplyController {
...
@@ -108,8 +128,24 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
true
,
name
=
"playactor_intro"
,
value
=
"演职员简介"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
true
,
name
=
"playactor_intro"
,
value
=
"演职员简介"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"is_play_shanghai"
,
value
=
"演职员作品是否参加过上海电影节"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"is_play_shanghai"
,
value
=
"演职员作品是否参加过上海电影节"
),
})
})
public
Object
saveMemberFilmPlayactor
(
Long
member_film_id
,
String
[]
playactor_type
,
String
[]
playactor_name
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
)
{
public
Object
saveMemberFilmPlayactor
(
memberService
.
saveMemberFilmPlayactor
(
member_film_id
,
playactor_type
,
playactor_name
,
playactor_film_nums
,
playactor_country
,
playactor_birthday
,
playactor_intro
,
is_play_shanghai
);
Long
member_film_id
,
String
[]
playactor_type
,
String
[]
playactor_name
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
)
{
memberService
.
saveMemberFilmPlayactor
(
member_film_id
,
playactor_type
,
playactor_name
,
playactor_film_nums
,
playactor_country
,
playactor_birthday
,
playactor_intro
,
is_play_shanghai
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
@@ -124,8 +160,18 @@ public class MemberApplyController {
...
@@ -124,8 +160,18 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"issuer_email"
,
value
=
"发行方Email"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"issuer_email"
,
value
=
"发行方Email"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"issuer_tel"
,
value
=
"发行方电话"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"issuer_tel"
,
value
=
"发行方电话"
),
})
})
public
Object
saveMemberFilmIssuer
(
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
[]
issuer_email
,
String
[]
issuer_tel
)
{
public
Object
saveMemberFilmIssuer
(
memberService
.
saveMemberFilmIssuer
(
member_film_id
,
issuer_company
,
issuer_contacts
,
issuer_email
,
issuer_tel
);
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
[]
issuer_email
,
String
[]
issuer_tel
)
{
memberService
.
saveMemberFilmIssuer
(
member_film_id
,
issuer_company
,
issuer_contacts
,
issuer_email
,
issuer_tel
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
@@ -140,8 +186,18 @@ public class MemberApplyController {
...
@@ -140,8 +186,18 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
true
,
name
=
"show_filmfest_type"
,
value
=
"参与类型"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
true
,
name
=
"show_filmfest_type"
,
value
=
"参与类型"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"show_filmfest_intro"
,
value
=
"简介(获奖或报名奖项等)"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"array"
,
allowMultiple
=
true
,
required
=
false
,
name
=
"show_filmfest_intro"
,
value
=
"简介(获奖或报名奖项等)"
),
})
})
public
Object
saveMemberFilmShow
(
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
)
{
public
Object
saveMemberFilmShow
(
memberService
.
saveMemberFilmShow
(
member_film_id
,
play_shanghai
,
show_filmfest
,
show_filmfest_type
,
show_filmfest_intro
);
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
)
{
memberService
.
saveMemberFilmShow
(
member_film_id
,
play_shanghai
,
show_filmfest
,
show_filmfest_type
,
show_filmfest_intro
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
@@ -157,8 +213,22 @@ public class MemberApplyController {
...
@@ -157,8 +213,22 @@ public class MemberApplyController {
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_apply_mobile"
,
value
=
"申报手机"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_apply_mobile"
,
value
=
"申报手机"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_apply_country"
,
value
=
"申报国家"
),
@ApiImplicitParam
(
paramType
=
"query"
,
dataType
=
"string"
,
required
=
true
,
name
=
"film_apply_country"
,
value
=
"申报国家"
),
})
})
public
Object
saveMemberFilmCompany
(
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
)
{
public
Object
saveMemberFilmCompany
(
memberService
.
saveMemberFilmCompany
(
member_film_id
,
film_apply_company
,
film_apply_realname
,
film_apply_email
,
film_apply_tel
,
film_apply_mobile
,
film_apply_country
);
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
)
{
memberService
.
saveMemberFilmCompany
(
member_film_id
,
film_apply_company
,
film_apply_realname
,
film_apply_email
,
film_apply_tel
,
film_apply_mobile
,
film_apply_country
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
@@ -172,7 +242,12 @@ public class MemberApplyController {
...
@@ -172,7 +242,12 @@ public class MemberApplyController {
List
<
Fc_member_film_issuer
>
issuerList
=
memberService
.
queryMemberFilmIssuerList
(
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_playactor
>
playactorList
=
memberService
.
queryMemberFilmPlayactorList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
List
<
Fc_member_film_show
>
showList
=
memberService
.
queryMemberFilmShowList
(
memberFilm
.
getId
());
return
Rjx
.
jsonOk
().
setData
(
memberFilm
).
set
(
"directorList"
,
directorList
).
set
(
"issuerList"
,
issuerList
).
set
(
"playactorList"
,
playactorList
).
set
(
"showList"
,
showList
);
return
Rjx
.
jsonOk
()
.
setData
(
memberFilm
)
.
set
(
"directorList"
,
directorList
)
.
set
(
"issuerList"
,
issuerList
)
.
set
(
"playactorList"
,
playactorList
)
.
set
(
"showList"
,
showList
);
}
}
@ResponseBody
@ResponseBody
...
...
src/main/java/com/egolm/film/api/member/service/MemberService.java
View file @
77dcedf8
...
@@ -12,9 +12,9 @@ import com.egolm.film.bean.Fc_member_film_playactor;
...
@@ -12,9 +12,9 @@ import com.egolm.film.bean.Fc_member_film_playactor;
import
com.egolm.film.bean.Fc_member_film_show
;
import
com.egolm.film.bean.Fc_member_film_show
;
public
interface
MemberService
{
public
interface
MemberService
{
Fc_member
getMemberByEmail
(
String
email
);
Fc_member
getMemberByEmail
(
String
email
);
void
changePassword
(
Integer
id
,
String
newPassword
);
void
changePassword
(
Integer
id
,
String
newPassword
);
void
saveMember
(
Fc_member
member
);
void
saveMember
(
Fc_member
member
);
...
@@ -23,10 +23,16 @@ public interface MemberService {
...
@@ -23,10 +23,16 @@ public interface MemberService {
void
mergeMember
(
Fc_member
member
);
void
mergeMember
(
Fc_member
member
);
void
updateMember
(
Integer
id
,
String
email
,
String
realname
,
String
address
,
String
company
,
String
tel
);
void
updateMember
(
Integer
id
,
String
email
,
String
realname
,
String
address
,
String
company
,
String
tel
);
List
<
Map
<
String
,
Object
>>
queryListByMemberID
(
Integer
member_id
);
List
<
Map
<
String
,
Object
>>
queryListByMemberID
(
Integer
member_id
);
boolean
exists
(
String
email
);
boolean
exists
(
String
email
);
Fc_member_film
queryMemberFilmById
(
Long
id
);
Fc_member_film
queryMemberFilmById
(
Long
id
);
...
@@ -39,32 +45,69 @@ public interface MemberService {
...
@@ -39,32 +45,69 @@ public interface MemberService {
List
<
Fc_member_film_show
>
queryMemberFilmShowList
(
Long
member_film_id
);
List
<
Fc_member_film_show
>
queryMemberFilmShowList
(
Long
member_film_id
);
void
doApply
(
Integer
member_id
,
Long
member_film_id
);
void
doApply
(
Integer
member_id
,
Long
member_film_id
);
void
saveMore
(
Fc_member_film_all
more
);
void
saveMore
(
Fc_member_film_all
more
);
Fc_member_film_all
queryMoreByNo
(
String
no
);
Fc_member_film_all
queryMoreByNo
(
String
no
);
Long
saveMemberFilmType
(
Long
member_film_id
,
String
film_type_name
,
String
enroll_type_name
);
Long
saveMemberFilmType
(
Long
member_film_id
,
String
film_type_name
,
String
enroll_type_name
);
void
saveMemberFilmBase
(
Long
member_film_id
,
String
[]
enroll_type_name_other
,
String
cn_name
,
String
en_name
,
void
saveMemberFilmBase
(
Long
member_film_id
,
String
[]
enroll_type_name_other
,
String
cn_name
,
String
en_name
,
String
intro
);
String
intro
);
void
saveMemberFilmInfo
(
Long
member_film_id
,
String
film_country
,
String
dialogue_lang
,
String
subtitle_lang
,
void
saveMemberFilmInfo
(
String
[]
co_production_country
,
String
film_total_time
,
String
completion_date
,
String
show_date
,
Long
member_film_id
,
String
film_medium
,
String
film_format
);
String
film_country
,
String
dialogue_lang
,
void
saveMemberFilmPlayactor
(
Long
member_film_id
,
String
[]
playactor_type
,
String
[]
playactor_name
,
String
subtitle_lang
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
co_production_country
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
);
String
film_total_time
,
String
completion_date
,
void
saveMemberFilmIssuer
(
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
show_date
,
String
[]
issuer_email
,
String
[]
issuer_tel
);
String
film_medium
,
String
film_format
);
void
saveMemberFilmShow
(
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
);
void
saveMemberFilmPlayactor
(
Long
member_film_id
,
void
saveMemberFilmCompany
(
Long
member_film_id
,
String
film_apply_company
,
String
film_apply_realname
,
String
[]
playactor_type
,
String
film_apply_email
,
String
film_apply_tel
,
String
film_apply_mobile
,
String
film_apply_country
);
String
[]
playactor_name
,
String
[]
playactor_film_nums
,
String
[]
playactor_country
,
String
[]
playactor_birthday
,
String
[]
playactor_intro
,
Integer
[]
is_play_shanghai
);
void
saveMemberFilmIssuer
(
Long
member_film_id
,
String
[]
issuer_company
,
String
[]
issuer_contacts
,
String
[]
issuer_email
,
String
[]
issuer_tel
);
void
saveMemberFilmShow
(
Long
member_film_id
,
String
play_shanghai
,
String
[]
show_filmfest
,
String
[]
show_filmfest_type
,
String
[]
show_filmfest_intro
);
void
saveMemberFilmCompany
(
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
);
}
}
src/main/java/com/egolm/film/api/member/service/impl/MemberServiceImpl.java
View file @
77dcedf8
This diff is collapsed.
Click to expand it.
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