From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 248 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 241 insertions(+), 7 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 3e801e1..3ecae28 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,16 +1,27 @@
package com.ruoyi.sy.controller;
-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.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.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.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.*;
@@ -22,8 +33,7 @@
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;
/**
* 三一车辆Controller
@@ -41,6 +51,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();
+ }
/**
* 查询三一车辆列表
@@ -83,8 +148,11 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:add')")
@Log(title = "三一车辆", businessType = BusinessType.INSERT)
@PostMapping
+ @ApiOperation("新增三一车辆")
public AjaxResult add(@RequestBody ArdSyCar ardSyCar)
{
+ String id = IdUtils.simpleUUID();
+ ardSyCar.setId(id);
return toAjax(ardSyCarService.insertArdSyCar(ardSyCar));
}
@@ -94,6 +162,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:edit')")
@Log(title = "三一车辆", businessType = BusinessType.UPDATE)
@PutMapping
+ @ApiOperation("修改三一车辆")
public AjaxResult edit(@RequestBody ArdSyCar ardSyCar)
{
return toAjax(ardSyCarService.updateArdSyCar(ardSyCar));
@@ -105,6 +174,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));
@@ -128,7 +198,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);
}
}
@@ -151,4 +223,166 @@
}
}
+ /**
+ * 获取全部的三一车辆
+ */
+ @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")){
+ return success(result.get("data"));
+ }else{
+ return error("");
+ }
+ }
+
+ /**
+ * 获取全部车辆模型
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
+ @PostMapping("/getAllCarModel")
+ @ApiOperation("获取全部车辆模型")
+ public Map<String,Object> getAllCarModel(){
+ try{
+ List<Map<String,String>> result = ardSyCarService.getAllCarModel();
+ return toAjaxList(result);
+ } catch(Exception e){
+ return toAjaxList(new ArrayList());
+ }
+ }
+
+ /**
+ * 上传车辆图片
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:uploadCarPicture')")
+ @PostMapping("/uploadCarPicture")
+ @ApiOperation("上传车辆图片")
+ 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);
+ } catch(Exception e){
+ return error("");
+ }
+ }
+
+ @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);
+ if(list.isEmpty()){
+ return Results.succeed(new ArrayList());
+ }
+ //根据userId查询部门Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //根据当前deptId或者当前及所属下级的所有deptId
+ 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')")
+ @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());
+ }
+ 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 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);
+ }
}
--
Gitblit v1.9.3