Skip to content

C
car-reptiles
Commit e89670b1 by landerliang@163.com
Options

完成文件上传功能

parent 3097b14e
Showing with 77 additions and 4 deletions
car-reptiles-system/src/main/java/me/zhengjie/modules/system/constants/MyConstants.java
...@@ -16,4 +16,37 @@ public class MyConstants { ...@@ -16,4 +16,37 @@ public class MyConstants {
*/ */
public static final String USER_TOKEN_CONTEXT_KEY = "user-token"; public static final String USER_TOKEN_CONTEXT_KEY = "user-token";
//////// 约定的上传检测报告的其他文件以 车牌号 + 文件名称的后缀 .jpg 来扫描
/**
* 车牌号文件后缀
*/
public static final String CARNUM_SUFFIX = "_1.jpg";
/**
* 身份证文件名后缀
*/
public static final String IDCARD_SUFFIX = "_2.jpg";
/**
* 申请表文件后缀
*/
public static final String APPLY_SUFFIX = "_3.jpg";
/**
* 维修凭证文件后缀
*/
/*public static final String CERTIFICATE_SUFFIX = "_4.jpg";*/
/**
* 行驶证1文件后缀
*/
public static final String DRIVER_SUFFIX1 = "_4.jpg";
/**
* 行驶证2文件后缀
*/
public static final String DRIVER_SUFFIX2 = "_5.jpg";
} }
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportDetailsReqVo.java
...@@ -17,6 +17,15 @@ public class ReportDetailsReqVo { ...@@ -17,6 +17,15 @@ public class ReportDetailsReqVo {
@ApiModelProperty("检测报告编码") @ApiModelProperty("检测报告编码")
private String reportNum; private String reportNum;
@ApiModelProperty("业务流水key")
private String businessKey;
@ApiModelProperty("唯一字符串")
private String uniqueString;
private String vehicleId;
@ApiModelProperty("开始时间") @ApiModelProperty("开始时间")
private Date startTime; private Date startTime;
......
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportPdfVo.java
package me.zhengjie.modules.system.domain.vo.report; package me.zhengjie.modules.system.domain.vo.report;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -29,6 +30,14 @@ public class ReportPdfVo { ...@@ -29,6 +30,14 @@ public class ReportPdfVo {
@ApiModelProperty("关联的检测报告编号") @ApiModelProperty("关联的检测报告编号")
private String reportNum; private String reportNum;
@ApiModelProperty("业务流水key")
private String businessKey;
@ApiModelProperty("唯一字符串")
private String uniqueString;
private String vehicleId;
@ApiModelProperty("车牌号") @ApiModelProperty("车牌号")
private String carNum; private String carNum;
......
car-reptiles-system/src/main/java/me/zhengjie/modules/system/rest/ReportController.java
...@@ -110,6 +110,13 @@ public class ReportController { ...@@ -110,6 +110,13 @@ public class ReportController {
return ResultVo.success(reportService.findCurrentDeptSignature()); return ResultVo.success(reportService.findCurrentDeptSignature());
} }
@ApiOperation("上传当前检测报告")
@GetMapping("/uploadCurrent/{reportPdfId}")
public ResultVo uploadCurrentReport(@PathVariable Integer reportPdfId){
AssertUtil.isNotNull(reportPdfId,"缺少参数reportPdfId");
reportService.uploadReport(reportPdfId,null);
return ResultVo.success();
}
@ApiOperation("上传报告") @ApiOperation("上传报告")
@PostMapping("/upload") @PostMapping("/upload")
...@@ -134,6 +141,9 @@ public class ReportController { ...@@ -134,6 +141,9 @@ public class ReportController {
@ApiOperation("检测报告详情") @ApiOperation("检测报告详情")
public ResultVo<ReportPdfVo> signatureReport(@RequestBody ReportDetailsReqVo detailsReqVo){ public ResultVo<ReportPdfVo> signatureReport(@RequestBody ReportDetailsReqVo detailsReqVo){
AssertUtil.isNotBlank(detailsReqVo.getCarNum(),"缺少参数车牌号"); AssertUtil.isNotBlank(detailsReqVo.getCarNum(),"缺少参数车牌号");
AssertUtil.isNotBlank(detailsReqVo.getBusinessKey(),"缺少参数businessKey");
AssertUtil.isNotBlank(detailsReqVo.getUniqueString(),"缺少参数uniqueString");
AssertUtil.isNotBlank(detailsReqVo.getVehicleId(),"缺少参数vehicleId");
AssertUtil.isNotBlank(detailsReqVo.getReportNum(),"缺少参数检测报告编号"); AssertUtil.isNotBlank(detailsReqVo.getReportNum(),"缺少参数检测报告编号");
AssertUtil.isNotNull(detailsReqVo.getStartTime(),"缺少参数开始检测时间"); AssertUtil.isNotNull(detailsReqVo.getStartTime(),"缺少参数开始检测时间");
AssertUtil.isNotNull(detailsReqVo.getEndTime(),"缺少参数检测结束时间"); AssertUtil.isNotNull(detailsReqVo.getEndTime(),"缺少参数检测结束时间");
......
car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java
...@@ -132,7 +132,7 @@ public class ReportService { ...@@ -132,7 +132,7 @@ public class ReportService {
List<String> filePath=new ArrayList<>(); List<String> filePath=new ArrayList<>();
try { try {
int i =0; /*int i =0;
for (MultipartFile file : files) { for (MultipartFile file : files) {
String reportPath = carReportUtil.getReportPath(reportPdfVo.getReportNum() + "_" + i , ".jpg"); String reportPath = carReportUtil.getReportPath(reportPdfVo.getReportNum() + "_" + i , ".jpg");
if(FileUtil.exist(reportPath)){ if(FileUtil.exist(reportPath)){
...@@ -141,10 +141,12 @@ public class ReportService { ...@@ -141,10 +141,12 @@ public class ReportService {
FileUtil.writeBytes(file.getBytes(),reportPath); FileUtil.writeBytes(file.getBytes(),reportPath);
filePath.add(reportPath); filePath.add(reportPath);
i++; i++;
} }*/
carReportUtil.uploadReport(currUserDept.getEpAccount(),currUserDept.getEpPassword(),reportPdfVo,filePath); //carReportUtil.uploadReport(currUserDept.getEpAccount(),currUserDept.getEpPassword(),reportPdfVo);
carReportUtil.uploadReportPost(currUserDept.getEpAccount(),currUserDept.getEpPassword(),reportPdfVo);
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getLocalizedMessage());
} finally { } finally {
//删除刚才保存的文件 //删除刚才保存的文件
filePath.forEach(path -> { filePath.forEach(path -> {
...@@ -248,6 +250,9 @@ public class ReportService { ...@@ -248,6 +250,9 @@ public class ReportService {
reportPdfVo.setReportNum(detailsReqVo.getReportNum()); reportPdfVo.setReportNum(detailsReqVo.getReportNum());
reportPdfVo.setCreateTime(DateUtil.date()); reportPdfVo.setCreateTime(DateUtil.date());
reportPdfVo.setReportName(name); reportPdfVo.setReportName(name);
reportPdfVo.setVehicleId(detailsReqVo.getVehicleId());
reportPdfVo.setUniqueString(detailsReqVo.getUniqueString());
reportPdfVo.setBusinessKey(detailsReqVo.getBusinessKey());
reportPdfMapper.insert(reportPdfVo); reportPdfMapper.insert(reportPdfVo);
} else { } else {
reportPdfVo.setCarNum(detailsReqVo.getCarNum()); reportPdfVo.setCarNum(detailsReqVo.getCarNum());
...@@ -255,6 +260,9 @@ public class ReportService { ...@@ -255,6 +260,9 @@ public class ReportService {
reportPdfVo.setReportNum(detailsReqVo.getReportNum()); reportPdfVo.setReportNum(detailsReqVo.getReportNum());
reportPdfVo.setCreateTime(DateUtil.date()); reportPdfVo.setCreateTime(DateUtil.date());
reportPdfVo.setReportName(name); reportPdfVo.setReportName(name);
reportPdfVo.setUniqueString(detailsReqVo.getUniqueString());
reportPdfVo.setVehicleId(detailsReqVo.getVehicleId());
reportPdfVo.setBusinessKey(detailsReqVo.getBusinessKey());
reportPdfMapper.updateById(reportPdfVo); reportPdfMapper.updateById(reportPdfVo);
} }
......
car-reptiles-system/src/main/resources/config/application.yml
...@@ -75,6 +75,7 @@ reptiles: ...@@ -75,6 +75,7 @@ reptiles:
#环保检索配置 #环保检索配置
like: like:
host: http://10.48.21.198:8899/ host: http://10.48.21.198:8899/
uploadFileUrl: http://10.48.21.198:8899/uploadFile/UploadFileData/SaveUploadVIMFiles
url: http://10.48.21.198:8899/businesscom/common/DataAndPhotoPageQuery url: http://10.48.21.198:8899/businesscom/common/DataAndPhotoPageQuery
inspectReportUrl: http://10.48.21.198:8899/Addins_NanNing/Template/InspectionReport_GasMethod_NN.aspx inspectReportUrl: http://10.48.21.198:8899/Addins_NanNing/Template/InspectionReport_GasMethod_NN.aspx
...@@ -82,6 +83,9 @@ like: ...@@ -82,6 +83,9 @@ like:
kinggrid: kinggrid:
url: http://sign.kinggrid.com/OfficeServer.jsp url: http://sign.kinggrid.com/OfficeServer.jsp
#上传检测报告其他文件的存放目录
uploadFilePath: C:\\reptiles\\uploadPicture\\
#签章服务的url #签章服务的url
signature: signature:
carSignature: carSignature:
......
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