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
66cc3427
Commit
66cc3427
authored
Dec 10, 2022
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
巡检bug
parent
7d2513a2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
AppServiceImpl.java
...oin/amos/patrol/business/service/impl/AppServiceImpl.java
+11
-11
CheckInputMapper.xml
...-patrol/src/main/resources/db/mapper/CheckInputMapper.xml
+1
-1
pointMapper.xml
...ystem-patrol/src/main/resources/db/mapper/pointMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/AppServiceImpl.java
View file @
66cc3427
...
...
@@ -131,17 +131,17 @@ public class AppServiceImpl implements IAppService {
if
(
taskCount
>
0
)
{
havetoDoList
.
add
(
"planPatrol"
);
}
JSONObject
respBody
=
remoteWorkFlowService
.
pageTask
(
userId
,
Integer
.
parseInt
(
YesOrNoEnum
.
YES
.
getCode
()));
JSONArray
taskJsonList
=
respBody
.
getJSONArray
(
"data"
);
List
<
JSONObject
>
taskList
=
JSONObject
.
parseArray
(
taskJsonList
.
toJSONString
(),
JSONObject
.
class
);
List
<
String
>
bussinessKeys
=
new
ArrayList
<>();
for
(
JSONObject
json
:
taskList
)
{
bussinessKeys
.
add
(
json
.
getString
(
"businessKey"
));
}
Integer
dangerCount
=
latentDangerMapper
.
countByStatus
(
bussinessKeys
);
if
(
dangerCount
>
0
){
havetoDoList
.
add
(
"waitHandle"
);
}
//
JSONObject respBody = remoteWorkFlowService.pageTask(userId,Integer.parseInt(YesOrNoEnum.YES.getCode()));
//
JSONArray taskJsonList = respBody.getJSONArray("data");
//
List<JSONObject> taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
//
List<String> bussinessKeys = new ArrayList<>();
//
for (JSONObject json : taskList) {
//
bussinessKeys.add(json.getString("businessKey"));
//
}
//
Integer dangerCount = latentDangerMapper.countByStatus(bussinessKeys);
//
if(dangerCount > 0){
//
havetoDoList.add("waitHandle");
//
}
return
havetoDoList
;
}
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/CheckInputMapper.xml
View file @
66cc3427
...
...
@@ -132,7 +132,7 @@
AND amos_org_code IS NOT NULL
AND biz_org_type = 'COMPANY'
and is_delete = 0
) cou ON cou.b
iz_org_c
ode = ci.org_code ]]>
) cou ON cou.b
zOrgC
ode = ci.org_code ]]>
<where>
<if
test=
"id != null"
>
ci.id = #{id}
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml
View file @
66cc3427
...
...
@@ -942,7 +942,7 @@
AND p.offline = 1
AND ( select COUNT(p_point_inputitem.id) FROM p_point_inputitem where p_point_inputitem.point_id =p.id) >0
<if
test=
"orgCode != null and orgCode != ''"
>
AND p.biz_org_code LIKE concat("%", #{orgCode}, "%")
</if>
<if
test=
"startTime !=null and startTime != ''"
>
AND p.last_update_time
<![CDATA[>= ]]>
STR_TO_DATE(#{startTime}, '%Y-%m-%d')
</if
>
<!-- <if test="startTime !=null and startTime != ''">AND p.last_update_time <![CDATA[>= ]]> STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if>--
>
</select>
<select
id=
"getPoints"
resultType=
"Map"
>
SELECT
...
...
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