Commit 0bade3d2 authored by tangwei's avatar tangwei

修改bug

parent daf27b76
...@@ -29,5 +29,5 @@ public interface IDutyCarService extends IDutyCommonService { ...@@ -29,5 +29,5 @@ public interface IDutyCarService extends IDutyCommonService {
* @return * @return
*/ */
JSONObject isFireCarDriver(); JSONObject isFireCarDriver();
int getDutyCarCount(Long carId);
} }
...@@ -108,7 +108,8 @@ public class CommandController extends BaseController { ...@@ -108,7 +108,8 @@ public class CommandController extends BaseController {
IDataDictionaryService dataDictionaryService; IDataDictionaryService dataDictionaryService;
@Autowired @Autowired
IFireChemicalService fireChemicalService; IFireChemicalService fireChemicalService;
@Autowired
IDutyCarService dutyCarService;
@Autowired @Autowired
IFireExpertsService fireExpertsService; IFireExpertsService fireExpertsService;
...@@ -1065,6 +1066,9 @@ public class CommandController extends BaseController { ...@@ -1065,6 +1066,9 @@ public class CommandController extends BaseController {
if (e.get("carState").equals("在位")){ if (e.get("carState").equals("在位")){
e.put("carState",FireCarStatusEnum.执勤.getName()); e.put("carState",FireCarStatusEnum.执勤.getName());
} }
e.put("longitude",116.423762);
e.put("latitude",39.511552);
String sequenceNbr = e.get("sequenceNbr").toString(); String sequenceNbr = e.get("sequenceNbr").toString();
//同步力量调派车辆任务状态 //同步力量调派车辆任务状态
alertFormValue.stream().forEach(v->{ alertFormValue.stream().forEach(v->{
...@@ -1083,7 +1087,14 @@ public class CommandController extends BaseController { ...@@ -1083,7 +1087,14 @@ public class CommandController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "车辆资源详情", notes = "车辆资源详情") @ApiOperation(httpMethod = "GET", value = "车辆资源详情", notes = "车辆资源详情")
public ResponseModel<Map<String,Object>> getCarDetailById(Long id ) { public ResponseModel<Map<String,Object>> getCarDetailById(Long id ) {
ResponseModel<Map<String, Object>> date= equipFeignClient.getCarDetailById(id); ResponseModel<Map<String, Object>> date= equipFeignClient.getCarDetailById(id);
return ResponseHelper.buildResponse(date!=null?date.getResult():null);
Map<String, Object> map= date!=null?date.getResult():null;
if(map!=null){
int num =0;
num = iDutyCarService.getDutyCarCount(id);
map.put("personNum",num);
}
return ResponseHelper.buildResponse(map);
} }
......
...@@ -218,8 +218,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa ...@@ -218,8 +218,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
} }
return detailList; return detailList;
} }
@Override
public Object getDutyCarCount(String carId) { public int getDutyCarCount(Long carId) {
List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(), List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(),
this.getGroupCode(), "carId", "carName", "teamName","result.carId"); this.getGroupCode(), "carId", "carName", "teamName","result.carId");
int count =0; int count =0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment