From 70e428a02ebd913af53c88bc18e794938312c537 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 15:21:24 +0800
Subject: [PATCH] 31车辆接口逻辑优化整合
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 140 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 130 insertions(+), 10 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 6677a8f..045accc 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,19 +1,26 @@
package com.ruoyi.sy.controller;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+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.domain.ArdSyUser;
+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.system.service.ISysConfigService;
-import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.forest.SYClient;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.bytedeco.javacv.CanvasFrame;
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,8 +32,6 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -45,6 +50,61 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+
+ @Autowired
+ private IArdSyUserService iArdSyUserService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
+
+ @Resource
+ private SYClient sYClient;
+
+ private ArdSyCarController ardSyCarController;
+
+ @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){
+ return;
+ }else{
+ syURL = sysConfigResult.get(0).getConfigValue();
+ }
+ String ip = syURL.split(":")[1].replace("//", "");
+ List<ArdSyUser> ardSyUserList = iArdSyUserService.selectSyUser();
+ //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
+ pushClientImplPositionThread.start();
+
+ Date date = new Date();
+ Timer carPositionTimer = new Timer();//瀹氭椂鎺ㄩ�佸疄鏃朵綅缃�
+ TimerTask carPositionTask =new TimerTask(){
+ @Override
+ public void run(){
+ ardSyCarService.sendArdSyCarPosition();
+ }
+ };
+ carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
+
+ //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
+ pushClientImplAlarmThread.start();
+ }
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -113,6 +173,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
+ @ApiOperation("鍒犻櫎涓変竴杞﹁締")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(ardSyCarService.deleteArdSyCarByIds(ids));
@@ -136,7 +197,9 @@
return error("涓変竴杞﹁締url娌℃湁褰曞叆");
}else{
syURL = sysConfigResult.get(0).getConfigValue();
- Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
+ //Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
+ String passwordMd5 = DigestUtils.md5Hex(password);
+ Map<String,Object> result = sYClient.logIn(syURL,passwordMd5,userId);
return success(result);
}
}
@@ -150,6 +213,24 @@
public Map<String,Object> getArdSyCarNoRight(){
String userId = SecurityUtils.getUserId();
Map<String,Object> result = ardSyCarService.getArdSyCarNoRight(userId);
+ if(((String)result.get("code")).equals("500")){
+ return error((String) result.get("data"));
+ }else if(((String)result.get("code")).equals("200")){
+ return success(result.get("data"));
+ }else{
+ return error("");
+ }
+ }
+
+ /**
+ * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
+ @PostMapping("/getArdSyCarAll")
+ @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締")
+ public Map<String,Object> getArdSyCarAll(){
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
if(((String)result.get("code")).equals("500")){
return error((String) result.get("data"));
}else if(((String)result.get("code")).equals("200")){
@@ -180,7 +261,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:uploadCarPicture')")
@PostMapping("/uploadCarPicture")
@ApiOperation("涓婁紶杞﹁締鍥剧墖")
- public Map<String,Object> uploadCarPicture(@RequestParam("id") String id,@RequestParam("carPicture") MultipartFile carPicture){
+ public Map<String,Object> uploadCarPicture(@RequestParam(value = "id",required = false,defaultValue = "") String id,@RequestParam("carPicture") MultipartFile carPicture){
try{
String result = ardSyCarService.uploadCarPicture(id,carPicture);
return success(result);
@@ -189,4 +270,43 @@
}
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:allListByUser')")
+ @PostMapping("allListByUser")
+ @ApiOperation("鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃")
+ public Map<String,Object> allListByUser(){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.allListByUser(ardSyUser,syURL,usersId);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
+ @PostMapping("carList")
+ @ApiOperation("鏍规嵁teamId鑾峰彇杞﹁締鍒楄〃")
+ public Results getCarList(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ String teamId = map.get("teamId");
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null) {
+ //鏌ヨ鍑�31鐨勮溅杈嗘暟鎹�
+ List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
+ //鏍规嵁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("鍒楄〃涓虹┖锛佹棤鍏宠仈璐﹀彿锛�");
+ }
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+ @GetMapping("/carListById/{id}")
+ @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
+ public Results carListById(@PathVariable String id){
+ return ardSyCarService.carListById(id);
+ }
}
--
Gitblit v1.9.3