From 82f8f0065a27acf9f7e1558b04fa75ce68a7fa50 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 17:05:30 +0800
Subject: [PATCH] 31
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 79 +++++++++++++++------------------------
1 files changed, 31 insertions(+), 48 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 3513118..feaa81f 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,7 +1,6 @@
package com.ruoyi.sy.controller;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.PostConstruct;
@@ -14,7 +13,8 @@
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.ArdSyCarVo;
+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;
@@ -29,6 +29,7 @@
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.*;
@@ -39,12 +40,11 @@
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;
/**
* 涓変竴杞﹁締Controller
- *
+ *
* @author ard
* @date 2023-06-26
*/
@@ -76,6 +76,9 @@
private ArdSyCarController ardSyCarController;
+ @Value("${syCar.enabled}")
+ private Boolean syCarEnabled;
+
@PostConstruct
public void init(){
ardSyCarController = this;
@@ -85,7 +88,8 @@
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();
@@ -109,8 +113,8 @@
ardSyCarService.sendArdSyCarPosition();
}
};
- carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
- //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ //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();
@@ -122,46 +126,12 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ涓変竴杞﹁締鍒楄〃")
- public AjaxResult list(ArdSyCar ardSyCar)
+ public AjaxResult list(ArdSyCarParam ardSyCarParam)
{
- if(ardSyCar.getPageNum()==null || ardSyCar.getPageNum() == 0){
- ardSyCar.setPageNum(1);
- }
- if(ardSyCar.getPageSize()==null || ardSyCar.getPageSize() == 0){
- ardSyCar.setPageSize(10);
- }
- PageHelper.startPage(ardSyCar.getPageNum(),ardSyCar.getPageSize());
- List<ArdSyCar> list = ardSyCarService.selectArdSyCarList(ardSyCar);
+ PageHelper.startPage(ardSyCarParam.getPageNum(),ardSyCarParam.getPageSize());
String userId = SecurityUtils.getUserId();
Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
- List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
- if(((String)result.get("code")).equals("200")){
- List<Map<String,Object>> list1 = (List<Map<String, Object>>) result.get("data");
- for (int i = 0; i < list.size(); i++) {
- ArdSyCar ardSyCar1 = list.get(i);
- String carId = ardSyCar1.getCarId();
- for (int j = 0; j < list1.size(); j++) {
- String carId31 = (String) list1.get(j).get("carId");
- if(carId.equals(carId31)){
- ArdSyCarVo ardSyCarVo = new ArdSyCarVo();
- ardSyCarVo.setId(ardSyCar1.getId());
- ardSyCarVo.setCarId(carId);
- ardSyCarVo.setCarBrand(ardSyCar1.getCarBrand());
- ardSyCarVo.setCarModel(ardSyCar1.getCarModel());
- ardSyCarVo.setCarPicture(ardSyCar1.getCarPicture());
- ardSyCarVo.setCarType(ardSyCar1.getCarType());
- ardSyCarVo.setDeptId(ardSyCar1.getDeptId());
- ardSyCarVo.setRemark(ardSyCar1.getRemark());
- ardSyCarVo.setCarPlate((String) list1.get(j).get("carPlate"));
- ardSyCarVoList.add(ardSyCarVo);
- break;
- }
- }
- }
- return AjaxResult.success(new PageInfo<>(ardSyCarVoList));
- }else {
- return AjaxResult.success(new PageInfo<>(list));
- }
+ return ardSyCarService.ardSyCarList(ardSyCarParam,result);
}
/**
@@ -218,7 +188,7 @@
*/
@PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @DeleteMapping("/{ids}")
@ApiOperation("鍒犻櫎涓変竴杞﹁締")
public AjaxResult remove(@PathVariable String[] ids)
{
@@ -356,7 +326,7 @@
}
}
-// @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+ // @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
@PostMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
public Results carListById(@PathVariable String id){
@@ -399,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.error("31骞冲彴鏃犺溅杈嗕綅缃繑鍥�");
}else {
// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));
@@ -490,7 +460,7 @@
@GetMapping("getThreeOne")
@ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃")
public AjaxResult getThreeOne() {
- return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
+ return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.getSYVideo());
}
@PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')")
@@ -508,4 +478,17 @@
return AjaxResult.success(mapDetail);
}
+ @GetMapping("/getOnlineSYCarPosition")
+ @ApiOperation("鍗曞叺绔煡鐪嬪凡閫氳繃瀹℃壒鐨勫湪绾夸笁涓�杞﹁締浣嶇疆")
+ public AjaxResult getOnlineSYCarPosition() {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ Map<String,Object> result = ardSyCarService.getOnlineSYCarPosition(soilderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
}
--
Gitblit v1.9.3