Commit 6335b95e authored by zhuxiang's avatar zhuxiang
Browse files

联调优化

parent d7c66356
......@@ -123,6 +123,13 @@
<version>1.0.0</version>
</dependency>
<!-- 阿里云oss-->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.15.1</version>
</dependency>
</dependencies>
<dependencyManagement>
......
package com.example.operation_platform.controller;
import com.example.operation_platform.util.AliOSSUtils;
import com.platform.controller.BaseController;
import com.platform.exception.BusinessException;
import com.platform.model.resp.Result;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
@RequestMapping("/file")
@RestController
public class UploadController extends BaseController {
@Resource
private AliOSSUtils aliOSSUtils;
@PostMapping("/upload")
public Result<String> uploadFile(@RequestParam("file") MultipartFile multipartFile) {
String url;
try {
url = aliOSSUtils.upload(multipartFile, "OM/");
} catch (IOException e) {
throw new BusinessException("上传文件失败");
}
return Result.data(url);
}
}
......@@ -76,6 +76,15 @@ public class WorkerController extends BaseController {
@PutMapping("/password")
public Result<WorkerEntity> updatePassword(@RequestBody WorkerDTO workerDTO) {
//根据Id查看用户信息
WorkerEntity workerEntity = workerService.getById(workerDTO.getId());
if(workerEntity == null){
return Result.fail("用户信息不存在");
}
if(workerEntity.getPassword().equals(workerDTO.getOldPassword())){
return Result.fail("旧密码不正确");
}
workerEntity.setPassword(workerDTO.getPassword());
workerService.updateById(workerDTO);
return Result.success("密码修改成功");
}
......
......@@ -9,4 +9,6 @@ import lombok.EqualsAndHashCode;
public class WorkerDTO extends WorkerEntity {
private Integer pageNum;
private Integer pageSize;
private String oldPassword;
}
......@@ -23,4 +23,7 @@ public class OperationJobVO extends OperationJob {
private String itemId;
private String operationItems;
private String lon;
private String lat;
}
......@@ -16,4 +16,7 @@ public class PeopleMessageVO {
private Integer id;
private String stationName;
private String robotName;
private String lon;
private String lat;
}
package com.example.operation_platform.util;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
import java.util.UUID;
@Component
public class AliOSSUtils {
@Value("${oss.endPoint}")
private String endpoint;
@Value("${oss.key}")
private String accessKeyId;
@Value("${oss.secret}")
private String accessKeySecret;
@Value("${oss.bucket}")
private String bucketName;
/**
* 实现上传图片到OSS
*/
public String upload(MultipartFile multipartFile,String dir) throws IOException {
// 获取上传的文件的输入流
InputStream inputStream = multipartFile.getInputStream();
// 避免文件覆盖
String originalFilename = multipartFile.getOriginalFilename();
String fileName = dir +UUID.randomUUID().toString() + originalFilename.substring(originalFilename.lastIndexOf("."));
//上传文件到 OSS
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
ossClient.putObject(bucketName, fileName, inputStream);
Date expiration = new Date(System.currentTimeMillis() + 3600 * 596523);
String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
// 关闭ossClient
ossClient.shutdown();
// 把上传到oss的路径返回
return url;
}
/**
* 删除单个图片
*
* @param url
*/
public void deleteImg(String url) {
// 填写文件完整路径。文件完整路径中不能包含Bucket名称。(这里根据自己的地址改)
url = url.replace("http://"+bucketName+"."+endpoint+"/", "");
int index = url.indexOf("?");
url = url.substring(0, index);
// 创建OSSClient实例。
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
// 删除文件或目录。如果要删除目录,目录必须为空。
ossClient.deleteObject(bucketName, url);
// 关闭OSSClient。
ossClient.shutdown();
}
}
......@@ -37,3 +37,9 @@ ruzhou:
accessKeyId: LTAI5t9ynUemSWiT8rTgg1uh
accessKeySecret: biWNg6CI2EEwhXfsTmj4NZuxaWLnaf
signName: 南京如昼信息科技
oss:
key: LTAI5tENboKK5bcuqHfPvEdr
secret: Q006EvMzC63i1ozDiVNxEAxo8eH9zA
endPoint: https://oss-cn-beijing.aliyuncs.com
bucket: manj
\ No newline at end of file
......@@ -89,7 +89,9 @@
tor.contact peopleName,
tp.phone_number softwareNumber,
ta.phone_number hardwareNumber,
tq.phone_number operationNumber
tq.phone_number operationNumber,
tor.lon,
tor.lat
FROM
tb_message tm
LEFT JOIN bs_station tor ON tm.station_id = tor.id
......
......@@ -188,7 +188,9 @@
tp.drone_id AS droneId,
bw.worker_name AS workerName,
tp.tb_run_log_id AS runLogId,
tp.station_id AS stationId
tp.station_id AS stationId,
bs.lon lon,
bs.lat lat
-- 保留操作人员名称
FROM
tb_operation_job top
......@@ -308,6 +310,8 @@
top.id,
tp.operation_type AS operationType,
bs.name AS stationName,
bs.lon,
bs.lat,
-- 合并 robot 和 drone 的 name 到 robotName(优先取 robot)
COALESCE(
br.name, -- 来自 bs_robot 的机器人名称
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment