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
5cfc86f6
Commit
5cfc86f6
authored
Sep 02, 2021
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.redis先修改为不同,原因两边序列化方式不一致
2.pom 依赖库整理 3.巡检app升级bug修改
parent
a9fd265c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
26 deletions
+14
-26
RedisKey.java
...java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java
+1
-1
CheckController.java
...amos/maintenance/business/controller/CheckController.java
+1
-0
CheckServiceImpl.java
...s/maintenance/business/service/impl/CheckServiceImpl.java
+2
-2
PlanController.java
...ejoin/amos/patrol/business/controller/PlanController.java
+0
-0
CheckServiceImpl.java
...n/amos/patrol/business/service/impl/CheckServiceImpl.java
+4
-3
pom.xml
pom.xml
+6
-20
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java
View file @
5cfc86f6
...
...
@@ -42,7 +42,7 @@ public class RedisKey {
* @return String
*/
public
static
String
buildReginKey
(
String
userId
,
String
token
)
{
return
"
region
_"
+
userId
+
"_"
+
token
;
return
"
biz
_"
+
userId
+
"_"
+
token
;
}
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java
View file @
5cfc86f6
...
...
@@ -532,6 +532,7 @@ public class CheckController extends AbstractBaseController {
return
ResponseHelper
.
buildResponse
(
CheckRecordOrderByEnum
.
getEnumList
());
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"/设备设施维保记录分页列表"
,
notes
=
"外部接口装备和者水源使用"
)
@GetMapping
(
value
=
"page/{originalId}/list"
)
public
ResponseModel
getCheckListByOriginalId
(
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java
View file @
5cfc86f6
...
...
@@ -437,8 +437,8 @@ public class CheckServiceImpl implements ICheckService {
List
<
DaoCriteria
>
criterias
=
new
ArrayList
<>();
DaoCriteria
daoCriteria
=
new
DaoCriteria
();
daoCriteria
.
setOperator
(
QueryOperatorEnum
.
EQUAL
.
getName
());
daoCriteria
.
setPropertyName
(
"
original
Id"
);
daoCriteria
.
setValue
(
originalId
);
daoCriteria
.
setPropertyName
(
"
point
Id"
);
daoCriteria
.
setValue
(
point
.
getId
()
);
criterias
.
add
(
daoCriteria
);
BaseQuerySpecification
<
Check
>
spec
=
new
BaseQuerySpecification
<>(
criterias
);
Sort
.
Order
idOrder
=
new
Sort
.
Order
(
Sort
.
Direction
.
DESC
,
"id"
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @
5cfc86f6
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @
5cfc86f6
...
...
@@ -253,11 +253,12 @@ public class CheckServiceImpl implements ICheckService {
check
.
setCheckTime
(
DateUtil
.
getLongDate
(
requestParam
.
getCheckTime
()));
check
.
setUploadTime
(
new
Date
());
check
.
setOrgCode
(
requestParam
.
getOrgCode
());
check
.
setUserId
(
user
.
getUserId
()
.
toString
()
);
check
.
setUserId
(
user
.
getUserId
());
check
.
setUserName
(
user
.
getRealName
());
// Department dep = user.getDepartment();
if
(
departmentModel
!=
null
)
{
if
(
departmentModel
!=
null
&&
departmentModel
.
getSequenceNbr
()
!=
null
)
{
check
.
setDepId
(
departmentModel
.
getSequenceNbr
().
toString
());
}
if
(
departmentModel
!=
null
)
{
check
.
setDepName
(
departmentModel
.
getDepartmentName
());
}
check
.
setCheckMode
(
requestParam
.
getCheckMode
());
...
...
pom.xml
View file @
5cfc86f6
...
...
@@ -256,29 +256,15 @@
</dependencyManagement>
<repositories>
<repository>
<id>
spring-snapshots
</id>
<url>
http://172.16.1.6:8081/nexus/content/repositories/spring.io/
</url>
<id>
Releases
</id>
<name>
Releases
</name>
<url>
http://172.16.1.6:8081/nexus/content/repositories/releases/
</url>
</repository>
<repository>
<id>
nexu
s
</id>
<name>
Team Nexus Repository
</name>
<url>
http://172.16.1.6:8081/nexus/content/
groups/public
</url>
<id>
Snapshot
s
</id>
<name>
Snapshots
</name>
<url>
http://172.16.1.6:8081/nexus/content/
repositories/snapshots/
</url>
</repository>
<repository>
<id>
maven-public
</id>
<name>
maven-public
</name>
<url>
http://172.16.1.6:8081/nexus/content/repositories/maven-public/
</url>
</repository>
<!-- <repository> -->
<!-- <id>maven-public1</id> -->
<!-- <name>maven-public</name> -->
<!-- <url>http://repo.typroject.org:8081/repository/maven-public/</url> -->
<!-- </repository> -->
<!-- <repository> -->
<!-- <id>maven-snapshot</id> -->
<!-- <name>maven-snapshot</name> -->
<!-- <url>http://repo.typroject.org:8081/repository/maven-snapshots/</url> -->
<!-- </repository> -->
</repositories>
<modules>
...
...
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