Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RuoYi-Vue-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
AI算法平台
RuoYi-Vue-master
Commits
d9a3063f
Commit
d9a3063f
authored
Oct 12, 2023
by
周昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、添加摄像头归属单位字段
parent
9042b8c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/AlgorithmCameraBase.java
.../java/com/ruoyi/algorithm/domain/AlgorithmCameraBase.java
+12
-0
ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmCameraListDto.java
...om/ruoyi/algorithm/domain/dto/AlgorithmCameraListDto.java
+3
-0
ruoyi-admin/src/main/resources/mapper/system/AlgorithmCameraBaseMapper.xml
...ain/resources/mapper/system/AlgorithmCameraBaseMapper.xml
+7
-1
No files found.
ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/AlgorithmCameraBase.java
View file @
d9a3063f
...
...
@@ -30,6 +30,10 @@ public class AlgorithmCameraBase extends BaseEntity
@Excel
(
name
=
"排序"
)
private
Long
sort
;
/** 归属矿场 */
@Excel
(
name
=
"归属矿场"
)
private
String
belong
;
/** 帐号状态(0正常 */
@Excel
(
name
=
"帐号状态"
,
readConverterExp
=
"帐号状态(0正常"
)
private
String
status
;
...
...
@@ -92,6 +96,14 @@ public class AlgorithmCameraBase extends BaseEntity
return
delFlag
;
}
public
String
getBelong
()
{
return
belong
;
}
public
void
setBelong
(
String
belong
)
{
this
.
belong
=
belong
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
...
...
ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmCameraListDto.java
View file @
d9a3063f
...
...
@@ -26,6 +26,9 @@ public class AlgorithmCameraListDto {
/** 排序 */
private
Long
sort
;
/** 归属矿场 */
private
String
belong
;
/** 状态 */
private
String
status
;
}
ruoyi-admin/src/main/resources/mapper/system/AlgorithmCameraBaseMapper.xml
View file @
d9a3063f
...
...
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"cameraName"
column=
"camera_name"
/>
<result
property=
"rtsp"
column=
"rtsp"
/>
<result
property=
"sort"
column=
"sort"
/>
<result
property=
"belong"
column=
"belong"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
<result
property=
"createBy"
column=
"create_by"
/>
...
...
@@ -26,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"sort"
column=
"sort"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"belong"
column=
"belong"
/>
</resultMap>
<sql
id=
"selectAlgorithmCameraBaseVo"
>
select id, camera_name, rtsp, sort, status, del_flag, create_by, create_time, update_by, update_time, remark from algorithm_camera_base
select id, camera_name, rtsp, sort,
belong,
status, del_flag, create_by, create_time, update_by, update_time, remark from algorithm_camera_base
</sql>
<select
id=
"selectAlgorithmCameraBaseList"
parameterType=
"AlgorithmCameraBase"
resultMap=
"AlgorithmCameraBaseResult"
>
...
...
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.nick_name,
acb.create_time,
acb.sort,
acb.belong
acb.`status`
FROM
algorithm_camera_base acb
...
...
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"cameraName != null"
>
camera_name,
</if>
<if
test=
"rtsp != null"
>
rtsp,
</if>
<if
test=
"sort != null"
>
sort,
</if>
<if
test=
"belong != null"
>
belong,
</if>
<if
test=
"status != null"
>
status,
</if>
<if
test=
"delFlag != null"
>
del_flag,
</if>
<if
test=
"createBy != null"
>
create_by,
</if>
...
...
@@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"cameraName != null"
>
#{cameraName},
</if>
<if
test=
"rtsp != null"
>
#{rtsp},
</if>
<if
test=
"sort != null"
>
#{sort},
</if>
<if
test=
"belong != null"
>
#{belong},
</if>
<if
test=
"status != null"
>
#{status},
</if>
<if
test=
"delFlag != null"
>
#{delFlag},
</if>
<if
test=
"createBy != null"
>
#{createBy},
</if>
...
...
@@ -112,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"cameraName != null"
>
camera_name = #{cameraName},
</if>
<if
test=
"rtsp != null"
>
rtsp = #{rtsp},
</if>
<if
test=
"sort != null"
>
sort = #{sort},
</if>
<if
test=
"belong != null"
>
belong = #{belong},
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"delFlag != null"
>
del_flag = #{delFlag},
</if>
<if
test=
"createBy != null"
>
create_by = #{createBy},
</if>
...
...
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