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
c4158d0d
Commit
c4158d0d
authored
Nov 11, 2021
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加扫描mapper文件路径
修改报错代码
parent
0891565c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
93 deletions
+1
-93
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+0
-91
AmosTzsApplication.java
...zs/src/main/java/com/yeejoin/amos/AmosTzsApplication.java
+1
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
c4158d0d
...
...
@@ -17,9 +17,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDetailParamDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferParamDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto
;
...
...
@@ -656,93 +654,4 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
return
AlertFeedbackStatusEnum
.
toList
();
}
public
Object
forceDispatchTaskDispatch
(){
// for (PowerTransferParamDto powerTransferParamDto : params) {
// if("car".equals(powerTransferParamDto.getType())) {
// forceDispatchTaskDispatchOnCar(powerTransferParamDto);
// }else if("monitor".equals(powerTransferParamDto.getType())) {
// forceDispatchTaskDispatchOnMonitor(powerTransferParamDto);
// }else if("fristAid".equals(powerTransferParamDto.getType())) {
// forceDispatchTaskDispatchOnFristAid(powerTransferParamDto);
// }
// }
return
null
;
}
public
Object
forceDispatchTaskDispatchOnMonitor
(
PowerTransferParamDto
params
)
{
return
params
;
}
public
Object
forceDispatchTaskDispatchOnFristAid
(
PowerTransferParamDto
params
)
{
return
params
;
}
public
Object
forceDispatchTaskDispatchOnCar
(
PowerTransferParamDto
params
)
{
//获取车辆的id
String
[]
isdStrings
=
params
.
getIdValue
().
split
(
","
);
List
<
Long
>
idsList
=
new
ArrayList
<
Long
>();
for
(
String
carId
:
isdStrings
)
{
ResponseModel
<
Map
<
String
,
Object
>>
carResponseModel
=
equipFeignClient
.
selectOneById
(
Long
.
parseLong
(
carId
));
Map
<
String
,
Object
>
carResultMap
=
carResponseModel
.
getResult
();
if
(
carResultMap
==
null
||
carResultMap
.
isEmpty
()
||
!
carResultMap
.
containsKey
(
"teamId"
))
{
continue
;
}
String
teamId
=
carResultMap
.
get
(
"teamId"
).
toString
();
List
<
PowerTransferDetailParamDto
>
detailParamDtos
=
params
.
getDetail
();
for
(
PowerTransferDetailParamDto
dto
:
detailParamDtos
)
{
if
(
"DD"
.
equals
(
dto
.
getType
()))
{
}
}
// // 首先判斷当前的队伍是支队还是大队
// FireTeam fireTeam = iFireTeamService.getById(Long.parseLong(teamId));
// Long parentTeamId = fireTeam.getParent();
// if (parentTeamId !=null) {//父级节点的team存在,说明当前team是大队,不是支队
// //大队岗位
//
// //获取总队的人员信息
// String parentTeamIdString = Long.toString(parentTeamId);
// List<Map<String, Object>> parentUserIdsList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId("carId",
// "teamId", "userId", DateUtils.getDateNowShortStr(), "dutyCar", carId, parentTeamIdString);
// parentUserIdsList.stream().forEach(i->{
// String userId = i.get("userId").toString();
// idsList.add(Long.parseLong(userId));
// });
// //获取支队的人员信息
// List<Map<String, Object>> userIdsList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId("carId",
// "teamId", "userId", DateUtils.getDateNowShortStr(), "dutyCar", carId, teamId);
//
// userIdsList.stream().forEach(i->{
// String userId = i.get("userId").toString();
// idsList.add(Long.parseLong(userId));
// });
//
//
// }else {
// //支队岗位
//
// }
//
}
return
params
;
}
}
amos-boot-system-tzs/src/main/java/com/yeejoin/amos/AmosTzsApplication.java
View file @
c4158d0d
...
...
@@ -42,8 +42,7 @@ import java.net.UnknownHostException;
"org.typroject.tyboot.face.*.orm.dao*"
,
"org.typroject.tyboot.core.auth.face.orm.dao*"
,
"org.typroject.tyboot.component.*.face.orm.dao*"
,
"com.yeejoin.amos.boot.module.*.api.mapper"
,
"com.yeejoin.amos.boot.module.*.*.api.mapper"
,
"com.yeejoin.amos.boot.module.**.api.mapper"
,
"com.yeejoin.amos.boot.biz.common.dao.mapper"
})
@ComponentScan
(
basePackages
=
{
"org.typroject"
,
"com.yeejoin.amos"
})
public
class
AmosTzsApplication
{
...
...
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