ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -183,13 +183,17 @@ } } } List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells); TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson(); treeSelectWellJson.setWellList(tree); treeSelectWellJson.setCount0(count0); treeSelectWellJson.setCount1(count1); treeSelectWellJson.setCount2(count2); return Results.succeed(treeSelectWellJson); if(treeDeptWells.size()>0){ List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells); TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson(); treeSelectWellJson.setWellList(tree); treeSelectWellJson.setCount0(count0); treeSelectWellJson.setCount1(count1); treeSelectWellJson.setCount2(count2); return Results.succeed(treeSelectWellJson); }else { return Results.error("无匹配数据"); } } else { //错误提示 return Results.error((String) mapResult.get("errmsg")); ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -369,7 +369,7 @@ SysUser sysUser = sysUserService.selectUserById(usersId); Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap(); if(deptPositionMap.isEmpty()){ return Results.succeed(); return Results.succeed("31平台无车辆位置返回"); }else { // return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId"))); return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString())); ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -1,5 +1,6 @@ package com.ruoyi.sy.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -87,19 +88,22 @@ String syURL = sysConfigService.getSYURL(); Map<String,Object> map = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser); List list1 = (List) map.get("list"); JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0))); String carPlate = (String) jsonObject.get("carPlate"); carVo.setCarPlate(carPlate); String drvName = (String) jsonObject.get("drvName"); carVo.setDrvName(drvName); String drvPhone = (String) jsonObject.get("drvPhone"); carVo.setDrvPhone(drvPhone); carLockVo.setCar(carVo); if(list1.size()>0){ JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0))); String carPlate = (String) jsonObject.get("carPlate"); carVo.setCarPlate(carPlate); String drvName = (String) jsonObject.get("drvName"); carVo.setDrvName(drvName); String drvPhone = (String) jsonObject.get("drvPhone"); carVo.setDrvPhone(drvPhone); } String rtu = carVo.getRtu(); carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu)); ArdSyCarRtu ardSyCarRtu = ardSyCarRtuService.one(carId); carVo.setInstallType(ardSyCarRtu.getInstallType()); carVo.setUnloadType(ardSyCarRtu.getUnloadType()); carLockVo.setCar(carVo); return AjaxResult.success(carLockVo); }
@@ -30,4 +30,6 @@ private Integer drct; @TableField(value = "is_alarm") private Integer isAlarm; @TableField(exist = false) private Boolean isLock; } ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
@@ -53,4 +53,6 @@ AjaxResult lockIng(String carId); Boolean isLock(String carId); } ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
@@ -4,9 +4,11 @@ import com.ruoyi.sy.domain.ArdAccessFence; import com.ruoyi.sy.domain.ArdSyCar; import com.ruoyi.sy.mapper.ArdAccessFenceMapper; import com.ruoyi.sy.mapper.ArdSyCarLockMapper; import com.ruoyi.sy.mapper.ArdSyCarMapper; import com.ruoyi.sy.param.OilWallParam; import com.ruoyi.sy.service.ArdAccessFenceService; import com.ruoyi.sy.service.ArdSyCarLockService; import com.ruoyi.sy.vo.CarVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +23,8 @@ private ArdAccessFenceMapper ardAccessFenceMapper; @Autowired private ArdSyCarMapper carMapper; @Autowired private ArdSyCarLockService lockService; @Override public int access(ArdAccessFence ardAccessFence) { @@ -61,6 +65,7 @@ ArdAccessFence ardAccessFence = list.get(i); // ardAccessFence.setCarModel(url+ardAccessFence.getCarModel()); ardAccessFence.setCarModel(ardAccessFence.getCarModel()); ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId())); } return list; } ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -416,6 +416,23 @@ } @Override public Boolean isLock(String carId) { QueryWrapper<ArdSyCarRtu> queryWrapperRtu = new QueryWrapper<>(); queryWrapperRtu.eq("car_id",carId); ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapperRtu); if(ardSyCarRtu!=null){ List<ArdSyCarLock> ardSyCarLocks = lockMapper.lockList(ardSyCarRtu.getId()); if(ardSyCarLocks.size()>0){ return true; }else { return false; } }else { return false; } } //车辆列表封装 public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){ ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -718,7 +718,11 @@ Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31); Map<String, Object> result0 = new HashMap(); //result0 = sYClient.getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId")); result0 = getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId")); try { result0 = getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId")); } catch (Exception e) { return Results.error("查询历史数据数量过多导致超时，请缩小范围查询！"); } List<Map<String, Object>> list = (List<Map<String, Object>>) result0.get("list"); if (list.isEmpty()) { return Results.succeed();
