From c14ba09f8c5e08d976f0954e29ed60296348102d Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期二, 02 一月 2024 14:59:28 +0800 Subject: [PATCH] 三一车辆配置文件加入开关提交 --- ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 351 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 202 insertions(+), 149 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java index 0d49fa6..c9cb84e 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java +++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java @@ -1,33 +1,35 @@ package com.ruoyi.sy.controller; -import java.text.Collator; -import java.util.*; +import java.io.UnsupportedEncodingException; +import java.text.SimpleDateFormat; import java.util.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson2.JSON; -import com.ruoyi.client.ARDCarGPSLogInClient; -import com.ruoyi.client.ARDCarSYGPSClient; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; +import com.ruoyi.sy.param.ArdSyCarParam; +import com.ruoyi.sy.vo.ArdSyCarVo; import com.ruoyi.sy.domain.ArdSyUser; +import com.ruoyi.sy.gps31.PositionContainer; import com.ruoyi.sy.gps31.PushClientImplAlarm; import com.ruoyi.sy.gps31.PushClientImplPosition; import com.ruoyi.sy.service.IArdSyUserService; -import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.common.core.domain.entity.SysConfig; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.utils.forest.RongCloudClient; import com.ruoyi.utils.forest.SYClient; -import com.ruoyi.utils.httpclient.SYCarClient; import com.ruoyi.utils.result.Results; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.codec.digest.DigestUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,10 +40,7 @@ import com.ruoyi.sy.domain.ArdSyCar; import com.ruoyi.sy.service.IArdSyCarService; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.web.multipart.MultipartFile; - -import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS; /** * 涓変竴杞﹁締Controller @@ -66,22 +65,31 @@ @Autowired private IArdSyUserService iArdSyUserService; + @Autowired + private ISysUserService sysUserService; + + @Autowired + private ISysDeptService sysDeptService; + @Resource private SYClient sYClient; private ArdSyCarController ardSyCarController; + + @Value("${syCar.enabled}") + private Boolean syCarEnabled; @PostConstruct public void init(){ ardSyCarController = this; ardSyCarController.sysConfigService = this.sysConfigService; ardSyCarController.iArdSyUserService = this.iArdSyUserService; - SysConfig config = new SysConfig(); config.setConfigKey("syCarPT"); List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config); String syURL = ""; - if(sysConfigResult.size() == 0){ + //if(sysConfigResult.size() == 0){ + if(!syCarEnabled){//涓変竴杞﹁締鍔犲叆寮�鍏� return; }else{ syURL = sysConfigResult.get(0).getConfigValue(); @@ -89,6 +97,10 @@ String ip = syURL.split(":")[1].replace("//", ""); List<ArdSyUser> ardSyUserList = iArdSyUserService.selectSyUser(); //杞﹁締瀹炴椂浣嶇疆绾跨▼ + if(ardSyUserList.size()==0) + { + return; + } PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword()); Thread pushClientImplPositionThread = new Thread(pushClientImplPosition); pushClientImplPositionThread.start(); @@ -102,7 +114,6 @@ } }; carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤 - //杞﹁締瀹炴椂浣嶇疆绾跨▼ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword()); Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm); @@ -114,11 +125,13 @@ */ @PreAuthorize("@ss.hasPermi('sy:syCar:list')") @GetMapping("/list") - public TableDataInfo list(ArdSyCar ardSyCar) + @ApiOperation("鏌ヨ涓変竴杞﹁締鍒楄〃") + public AjaxResult list(ArdSyCarParam ardSyCarParam) { - startPage(); - List<ArdSyCar> list = ardSyCarService.selectArdSyCarList(ardSyCar); - return getDataTable(list); + PageHelper.startPage(ardSyCarParam.getPageNum(),ardSyCarParam.getPageSize()); + String userId = SecurityUtils.getUserId(); + Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId); + return ardSyCarService.ardSyCarList(ardSyCarParam,result); } /** @@ -210,7 +223,7 @@ /** * 鑾峰彇鏈寕鎺ユ潈闄愮殑涓変竴杞﹁締 */ - @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')") @PostMapping("/getArdSyCarNoRight") @ApiOperation("鑾峰彇鏈寕鎺ユ潈闄愮殑涓変竴杞﹁締") public Map<String,Object> getArdSyCarNoRight(){ @@ -228,7 +241,7 @@ /** * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締 */ - @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')") @PostMapping("/getArdSyCarAll") @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締") public Map<String,Object> getArdSyCarAll(){ @@ -246,7 +259,7 @@ /** * 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷 */ - @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')") @PostMapping("/getAllCarModel") @ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷") public Map<String,Object> getAllCarModel(){ @@ -279,50 +292,12 @@ public Map<String,Object> allListByUser(){ String usersId = SecurityUtils.getUserId(); ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); - Map<String,Object> result0 = new HashMap(); - //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁 - if(ardSyUser!=null){ - //31鐢ㄦ埛鍚嶅瘑鐮� - String username31 = ardSyUser.getUserId(); - String password31 = ardSyUser.getPassword(); - //鏌ヨ鍦板潃 - Map<String, String> result = logInMap.get(Integer.parseInt(usersId)); - String syURL = sysConfigService.getSYURL(); - Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31); - result = new HashMap(); - result.put("userId", username31); - result.put("sessionId", (String) result1.get("sessionId")); - try { - result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));// - } catch (Exception e) { - Map<String,Object> map = new HashMap(); - map.put("rspCode", 0); - map.put("list", new ArrayList()); - return map; - } - int online = 0; - for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){ - Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId")); - List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList"); - for(Map<String,Object> m : carList){ - if(((String) m.get("stateCn")).contains("鍦ㄧ嚎")){ - online = online + 1; - }else{ - continue; - } - } - for(Map<String,Object> m : (List<Map<String,Object>>) result0.get("list")){ - if(((String) m.get("teamId")).equals(((String) map.get("teamId")))){ - map.put("count", Integer.parseInt((String) m.get("carNum"))); - } - } - map.put("online", online); - online = 0; - } - }else { - result0.put("鍒楄〃涓虹┖锛�","鏃犲叧鑱旇处鍙凤紒"); - } - return result0; + String syURL = sysConfigService.getSYURL(); + //鏍规嵁userId鏌ヨ閮ㄩ棬Id + SysUser sysUser = sysUserService.selectUserById(usersId); + //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId + List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId()); + return ardSyCarService.allListByUser(ardSyUser,syURL,usersId,deptList); } @PreAuthorize("@ss.hasPermi('sy:syCar:carList')") @@ -330,99 +305,177 @@ @ApiOperation("鏍规嵁teamId鑾峰彇杞﹁締鍒楄〃") public Results getCarList(@RequestBody Map<String,String> map){ String usersId = SecurityUtils.getUserId(); - Map<String, String> result = logInMap.get(Integer.parseInt(usersId)); - String teamId = map.get("teamId"); - String syURL = sysConfigService.getSYURL(); ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String syURL = sysConfigService.getSYURL(); + String teamId = map.get("teamId"); //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁 if(ardSyUser!=null) { - //31鐢ㄦ埛鍚嶅瘑鐮� - String username31 = ardSyUser.getUserId(); - String password31 = ardSyUser.getPassword(); - Map<String, Object> userMap = ARDCarGPSLogInClient.loginIn(syURL,username31, password31); - result = new HashMap(); - result.put("userId", username31); - result.put("sessionId", (String) userMap.get("sessionId")); - } - //鏌ヨ璇eamId涓嬬殑杞﹁締鏁版嵁 - Map<String,Object> carList31 = new HashMap(); - try { - carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, result.get("userId"),result.get("sessionId")); - } catch (Exception e) { - Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId)); - if(m == null){ - Results.error("褰撳墠鐧诲綍鐢ㄦ埛鏈寕鎺ヨ溅杈嗘潈闄�"); + //鏌ヨ鍑�31鐨勮溅杈嗘暟鎹� + List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId); + if(list.isEmpty()){ + return Results.succeed(new ArrayList()); } - Map<String,Object> map0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password")); - carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, (String) m.get("userId"),(String) map0.get("sessionId")); + //鏍规嵁userId鏌ヨ閮ㄩ棬Id + SysUser sysUser = sysUserService.selectUserById(usersId); + //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId + List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId()); + //鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑杞﹁締鍒楄〃骞惰祴鍊� + return Results.succeed(ardSyCarService.carIdByDeptList(deptList,list)); + }else { + return Results.error("鍒楄〃涓虹┖锛佹棤鍏宠仈璐﹀彿锛�"); } - //鎷垮埌杞﹁締鏁版嵁 - List<Map<String,String>> list = (List) carList31.get("list"); - List<String> carIdList = new ArrayList(); - //鎵�鏈塩arId - for(Map<String,String> m : list){ - carIdList.add(m.get("carId")); - } - if(carIdList.size() == 0){ - Map<String,Object> map0 = new HashMap(); - map0.put("list", new ArrayList()); - map0.put("rspCode", "1"); - return Results.succeed(); - } - //娣诲姞杞﹁締灞炴�� - for(Map<String,String> m : list){ - switch (m.get("state")) { - case "1": - m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break; - case "2": - m.put("carState", "绂荤嚎-娆犺垂");break; - case "3": - m.put("carState", "绂荤嚎");break; - case "4": - m.put("carState", "绂荤嚎-鎶ヨ");break; - case "5": - m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break; - case "6": - m.put("carState", "鍦ㄧ嚎-娆犺垂");break; - case "7": - m.put("carState", "鍦ㄧ嚎-琛岄┒");break; - case "8": - m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break; - case "9": - m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break; - case "10": - m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break; - case "11": - m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break; - case "12": - m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break; - case "13": - m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break; - default: - break; - } - } -// for(Map<String,String> m : list0){ -// for(Map<String,String> ma : list1){ -// if(m.get("carId").equals(ma.get("carId"))){ -// m.put("stateCn", ma.get("carState")); -// } -// } -// } -// Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() { -// @Override -// public int compare(Map<String, Object> o1, Map<String, Object> o2) { -// Comparator<Object> com = Collator.getInstance(java.util.Locale.CHINA); -// return com.compare(o2.get("stateCn"), o1.get("stateCn")); -// } -// }); - return Results.succeed(list); } - @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')") - @GetMapping("/carListById/{id}") +// @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')") + @PostMapping("/carListById/{id}") @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃") public Results carListById(@PathVariable String id){ return ardSyCarService.carListById(id); } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getCarGPSHistory')") + @PostMapping("getCarGPSHistory") + @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇鍘嗗彶杞ㄨ抗") + public Results getCarGPSTrack(@RequestBody Map<String,String> map) { + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String syURL = sysConfigService.getSYURL(); + return ardSyCarService.getCarGPSTrack(map,syURL, ardSyUser); + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyUserByUsersId')") + @PostMapping("getArdSyUserByUsersId") + @ApiOperation("鑾峰彇涓変竴骞冲彴瀵瑰簲鐢ㄦ埛鍚嶅瘑鐮�") + public Results getArdSyUserByUsersId() { + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + Map<String,Object> map = new HashMap<>(); + if(ardSyUser==null){ + return Results.succeed(); + }else { + map.put("userId",ardSyUser.getUserId()); + map.put("password",ardSyUser.getPassword()); + map.put("passwords",DigestUtils.md5Hex(ardSyUser.getPassword())); + } + return Results.succeed(map); + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarPositionByRight')") + @PostMapping("getSDKCarPositionByRight") + @ApiOperation("鑾峰彇閮ㄩ棬鏉冮檺涓嬫墍鏈夎溅杈嗕綅缃�") + public Results getSDKCarPositionByRight(){ + String usersId = SecurityUtils.getUserId(); + //鏍规嵁userId鏌ヨ閮ㄩ棬Id + SysUser sysUser = sysUserService.selectUserById(usersId); + Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap(); + if(deptPositionMap.isEmpty()){ + return Results.succeed(); + }else { +// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId"))); + return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString())); + } + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getCarNearPositionByCarId')") + @PostMapping("getCarNearPositionByCarId") + @ApiOperation("鑾峰彇鍗曚釜杞﹁締浣嶇疆") + public Results getCarNearPositionByCarId(@RequestBody Map<String,String> map){ + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String carId = map.get("carId"); + String syURL = sysConfigService.getSYURL(); + return Results.succeed(ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser)); + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:chaseCarByCarId')") + @PostMapping("chaseCarByCarId") + @ApiOperation("鏍规嵁杞﹁締涓婚敭杩借釜杞﹁締") + public Results chaseCarByCarId(@RequestBody Map<String,String> map){ + String usersId = SecurityUtils.getUserId(); + String carId = map.get("carId"); + String cycle = map.get("cycle"); + return ardSyCarService.chaseCarByCarId(usersId,carId,cycle); + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getExistTraceByCarIdAndMonth')") + @PostMapping("getExistTraceByCarIdAndMonth") + @ApiOperation("鏍规嵁杞﹁締涓婚敭鍙婃湀浠芥煡璇㈣建杩瑰瓨鍦�") + public Results getExistTraceByCarIdAndMonth(@RequestBody Map<String,String> map){ + String userId = SecurityUtils.getUserId(); + String carId = map.get("carId"); + String time = map.get("time"); + return ardSyCarService.getExistTraceByCarIdAndMonth(userId,carId,time); + } + + @GetMapping("getCarPicture") + @ApiOperation("娓呮筏鑾峰彇鐓х墖") + public AjaxResult getCarNearPositionByCarId(String carId) throws UnsupportedEncodingException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + Date currentTime = new Date(); + long tenSeconds = 1000L; + Date beforeTenSeconds = new Date(currentTime.getTime() - tenSeconds); + String startTime = sdf.format(beforeTenSeconds); + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String syURL = sysConfigService.getSYURL(); + String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser); + System.out.println("sessionId:"+sessionId); + //鑾峰彇鎽勫儚閫氶亾淇℃伅 + Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,sessionId); + String vs = ""; + try { + //鎻愬彇閫氶亾淇℃伅 + Map<String,Object> map = ((List<Map<String,Object>>)result.get("list")).get(0); + Map<String, Object> videos = (Map<String, Object>) JSON.parse((String) map.get("videos")); + System.out.println("閫氶亾锛�"+videos); + vs = (String) videos.get("vs"); + } catch (Exception e) { + return AjaxResult.error("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒"); + } + //绛涢�夐�氶亾淇℃伅 + String[] vsArray = vs.split(","); + List<String> channelList = new ArrayList<>(); + for (int i = 0; i < vsArray.length; i++) { + channelList.add(vsArray[i].substring(0,1)); + } + //鎷嶇収 + Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(ardSyUser.getUserId(),syURL,sessionId,carId,channelList); + System.out.println("鎷嶇収锛�"+sendCmdMap); + //鑾峰彇鐓х墖 + Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,sessionId,startTime); + System.out.println("鑾峰彇鐓х墖锛�"+photoMap); + return AjaxResult.success(photoMap); + } + + @GetMapping("getVideo") + @ApiOperation("娓呮筏鑾峰彇瑙嗛") + public AjaxResult getVideo(String carId){ + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String syURL = sysConfigService.getSYURL(); + Map<String,Object> video = ardSyCarService.getVideo(syURL,carId,ardSyUser); + return AjaxResult.success(video); + } + + @GetMapping("getThreeOne") + @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃") + public AjaxResult getThreeOne() { + return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo")); + } + + @PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')") + @PostMapping("getAlarmHPfmCountDetail") + @ApiOperation("鏍规嵁杞﹁締鍜屾椂闂存鏌ヨ鎶ヨ鍘嗗彶璁板綍璇︽儏") + public AjaxResult getAlarmHPfmCountDetail(@RequestBody Map<String,String> map){ + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String carId = map.get("carId"); + String startTime = map.get("startTime"); + String endTime = map.get("endTime"); + String syURL = sysConfigService.getSYURL(); + String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser); + Map<String, Object> mapDetail = ardSyCarService.getAlarmHPfmCountDetail(sessionId,usersId,carId,startTime,endTime,syURL); + return AjaxResult.success(mapDetail); + } + } -- Gitblit v1.9.3