Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
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
micro_app
gk
Commits
b8e83f37
Commit
b8e83f37
authored
Dec 15, 2022
by
chenlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多路线权限控制
parent
c6b441b6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
6 deletions
+37
-6
Road.java
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Road.java
+3
-0
RoadMapper.java
...com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadMapper.java
+8
-0
RoadMapper.xml
.../com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadMapper.xml
+10
-0
RoadService.java
...a/com/dlbridge/jadp/plugins/cmpt/service/RoadService.java
+5
-0
RoadController.java
...va/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java
+5
-1
road.jsp
src/main/webapp/WEB-INF/views/cmpt/road.jsp
+6
-5
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Road.java
View file @
b8e83f37
...
@@ -38,6 +38,9 @@ public class Road {
...
@@ -38,6 +38,9 @@ public class Road {
@ApiModelProperty
(
value
=
"路线ID"
,
notes
=
"路线ID"
)
@ApiModelProperty
(
value
=
"路线ID"
,
notes
=
"路线ID"
)
private
int
pathId
=-
1
;
private
int
pathId
=-
1
;
@ApiModelProperty
(
value
=
"是否支持多路线"
,
notes
=
"是否支持多路线"
)
private
String
isMultiRoute
;
@ApiModelProperty
(
value
=
"路线名称"
,
notes
=
"路线名称"
)
@ApiModelProperty
(
value
=
"路线名称"
,
notes
=
"路线名称"
)
private
String
pathName
;
private
String
pathName
;
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadMapper.java
View file @
b8e83f37
...
@@ -6,6 +6,7 @@ import com.dlbridge.jadp.plugins.cmpt.bean.RoadGpsPoint;
...
@@ -6,6 +6,7 @@ import com.dlbridge.jadp.plugins.cmpt.bean.RoadGpsPoint;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
public
interface
RoadMapper
{
public
interface
RoadMapper
{
...
@@ -28,4 +29,11 @@ public interface RoadMapper {
...
@@ -28,4 +29,11 @@ public interface RoadMapper {
void
deleteGps
(
Integer
roadId
,
Integer
pathId
);
void
deleteGps
(
Integer
roadId
,
Integer
pathId
);
void
countDownload
(
Integer
roadId
);
void
countDownload
(
Integer
roadId
);
/**
* 查询小程序赛事是否支持多路线
* @param cmptId 赛事ID
* @return 配置信息
*/
Map
<
String
,
String
>
getMultiRouteInfo
(
Integer
cmptId
);
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadMapper.xml
View file @
b8e83f37
...
@@ -89,4 +89,14 @@
...
@@ -89,4 +89,14 @@
update gk_road set times = times+1
update gk_road set times = times+1
where road_id = #{roadId}
where road_id = #{roadId}
</update>
</update>
<select
id=
"getMultiRouteInfo"
resultType=
"java.util.Map"
>
SELECT b.cmptName, concat(b.createUserId,'') createUserId, IFNULL(c.partner_id,'') partnerId
,IFNULL(c.is_multi_route, '1') isMultiRoute
FROM common.neucmpt a
LEFT JOIN raceenroll.competition b ON a.gCmptId = b.cmptId
LEFT JOIN gksite.gk_app_info c ON c.user_id = b.createUserId
WHERE 1 = 1
AND a.gtCmptId = #{cmptId}
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RoadService.java
View file @
b8e83f37
...
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
...
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
@Service
@Service
@Log4j2
@Log4j2
...
@@ -125,4 +126,8 @@ public class RoadService {
...
@@ -125,4 +126,8 @@ public class RoadService {
public
void
countDownload
(
Integer
roadId
)
{
public
void
countDownload
(
Integer
roadId
)
{
roadMapper
.
countDownload
(
roadId
);
roadMapper
.
countDownload
(
roadId
);
}
}
public
Map
<
String
,
String
>
getMultiRouteInfo
(
Integer
cmptId
){
return
roadMapper
.
getMultiRouteInfo
(
cmptId
);
}
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java
View file @
b8e83f37
...
@@ -24,6 +24,7 @@ import java.time.LocalDateTime;
...
@@ -24,6 +24,7 @@ import java.time.LocalDateTime;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
@Log4j2
@Log4j2
@Controller
@Controller
...
@@ -55,7 +56,10 @@ public class RoadController {
...
@@ -55,7 +56,10 @@ public class RoadController {
log
.
info
(
"RoadController getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
log
.
info
(
"RoadController getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
}
}
}
}
Map
<
String
,
String
>
multiMap
=
roadService
.
getMultiRouteInfo
(
cmptId
);
for
(
Road
road
:
list
){
road
.
setIsMultiRoute
(
multiMap
.
get
(
"isMultiRoute"
));
}
mv
.
addObject
(
"list"
,
list
);
mv
.
addObject
(
"list"
,
list
);
mv
.
setViewName
(
"cmpt/road"
);
mv
.
setViewName
(
"cmpt/road"
);
return
mv
;
return
mv
;
...
...
src/main/webapp/WEB-INF/views/cmpt/road.jsp
View file @
b8e83f37
...
@@ -85,11 +85,12 @@
...
@@ -85,11 +85,12 @@
<span
class=
"edit-road"
></span>
<span
class=
"edit-road"
></span>
<span
class=
"edit-text "
name=
"name"
>
路线编辑
</span>
<span
class=
"edit-text "
name=
"name"
>
路线编辑
</span>
</div>
</div>
<div
class=
"divhorizontal divhorizontal-item3 add-new"
>
<c:if
test=
"
${
item
.
isMultiRoute
==
'1'
}
"
>
<span
class=
"edit-road"
></span>
<div
class=
"divhorizontal divhorizontal-item3 add-new"
>
<span
class=
"edit-text "
name=
"name"
>
新增路线
</span>
<span
class=
"edit-road"
></span>
</div>
<span
class=
"edit-text "
name=
"name"
>
新增路线
</span>
<%-- <span class="btn right del">删除</span>--%>
</div>
</c:if>
</div>
</div>
</c:forEach>
</c:forEach>
</c:when>
</c:when>
...
...
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