Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
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
周健威
rs-cloud-platform
Commits
30051eb3
Commit
30051eb3
authored
Apr 26, 2024
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
caa70521
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
CommonBaseController.java
...ub/wxiaoqi/security/common/rest/CommonBaseController.java
+5
-0
RscpStorageJson.java
...upyuns/platform/rs/datacenter/entity/RscpStorageJson.java
+1
-1
RscpMonitorimageController.java
...atform/rs/datacenter/rest/RscpMonitorimageController.java
+1
-1
RscpStorageJsonController.java
...latform/rs/datacenter/rest/RscpStorageJsonController.java
+3
-3
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java
View file @
30051eb3
package
com
.
github
.
wxiaoqi
.
security
.
common
.
rest
;
import
cn.hutool.core.util.StrUtil
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -37,4 +38,8 @@ public class CommonBaseController {
public
String
getCurrentUserId
(){
return
BaseContextHandler
.
getUserID
();
}
public
Integer
getCurrentUserIdInt
(){
return
StrUtil
.
isBlank
(
getCurrentUserId
())
?
null
:
Integer
.
valueOf
(
getCurrentUserId
());
}
}
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpStorageJson.java
View file @
30051eb3
...
...
@@ -45,7 +45,7 @@ public class RscpStorageJson implements java.io.Serializable {
/** json文本 */
@ApiModelProperty
(
value
=
"用户Id"
)
private
String
userId
;
private
Integer
userId
;
@ApiModelProperty
(
value
=
"逻辑删除"
)
...
...
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMonitorimageController.java
View file @
30051eb3
...
...
@@ -24,7 +24,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
List
<
RscpMonitorimage
>
list
=
baseBiz
.
selectByWeekend
(
w
->
{
w
.
andEqualTo
(
RscpMonitorimage:
:
getStatus
,
2
);
return
w
;
},
"
create_time asc
"
);
},
"
{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[]},\"properties\":{\"id\":\"\",\"val\":\"\",\"marker\":{},\"subType\":\"Circle\",\"radius\":100}}
"
);
return
ObjectRestResponse
.
succ
(
list
);
}
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpStorageJsonController.java
View file @
30051eb3
...
...
@@ -48,10 +48,10 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz
AssertUtils
.
isBlank
(
rscpStorageJson
);
AssertUtils
.
isBlank
(
rscpStorageJson
.
getContextJson
());
rscpStorageJson
.
setUserId
(
getCurrentUserId
());
rscpStorageJson
.
setUserId
(
getCurrentUserId
Int
());
//判断会否存在
List
<
RscpStorageJson
>
dbList
=
baseBiz
.
selectList
(
new
RscpStorageJson
(){{
setUserId
(
getCurrentUserId
());
setUserId
(
getCurrentUserId
Int
());
setIsDel
(
SYS_FALSE
);
}});
...
...
@@ -72,7 +72,7 @@ public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz
//判断会否存在
List
<
RscpStorageJson
>
dbList
=
baseBiz
.
selectList
(
new
RscpStorageJson
(){{
setUserId
(
getCurrentUserId
());
setUserId
(
getCurrentUserId
Int
());
// setId(rscpStorageJson.getId());
setIsDel
(
SYS_FALSE
);
}});
...
...
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