Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
53b35b13
Commit
53b35b13
authored
Mar 09, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
c676c83e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
RedissonConfig.java
...java/com/yeejoin/amos/boot/biz/config/RedissonConfig.java
+1
-1
TopographyController.java
.../yeejoin/equipmanage/controller/TopographyController.java
+1
-1
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedissonConfig.java
View file @
53b35b13
package
com
.
yeejoin
.
amos
.
boot
.
biz
.
config
;
package
com
.
yeejoin
.
amos
.
boot
.
biz
.
config
;
import
com.sun.org.apache.regexp.internal.RE
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.redisson.Redisson
;
import
org.redisson.Redisson
;
import
org.redisson.api.RedissonClient
;
import
org.redisson.api.RedissonClient
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @
53b35b13
...
@@ -801,7 +801,7 @@ public class TopographyController extends AbstractBaseController {
...
@@ -801,7 +801,7 @@ public class TopographyController extends AbstractBaseController {
if
(
x
.
getNameKey
().
equals
(
iotDataVO
.
getKey
()))
{
if
(
x
.
getNameKey
().
equals
(
iotDataVO
.
getKey
()))
{
dataVO
.
setId
(
x
.
getId
());
dataVO
.
setId
(
x
.
getId
());
dataVO
.
setName
(
x
.
getIndexName
());
dataVO
.
setName
(
x
.
getIndexName
());
dataVO
.
setValue
(
x
.
getValue
());
dataVO
.
setValue
(
iotDataVO
.
getValue
());
dataVO
.
setUnit
(
x
.
getIndexUnitName
());
dataVO
.
setUnit
(
x
.
getIndexUnitName
());
try
{
try
{
//Date date = DateUtils.dateParse(String.valueOf(timeList.get(j-1).getValue()), DateUtils.DATE_TIME_T_PATTERN);
//Date date = DateUtils.dateParse(String.valueOf(timeList.get(j-1).getValue()), DateUtils.DATE_TIME_T_PATTERN);
...
...
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