other2.0
/
collector_gm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

初始化

Browse Source
master
linjj 4 months ago
parent 473e2887cd
commit 7d0784d89d
6 changed files with 75 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/example/duplicate/controller/TaskController.java
Unescape Escape View File

@ -181,6 +181,10 @@ public class TaskController {
log.info(format + "文件MD5码不能为空不能为空！"); log.info(format + "文件MD5码不能为空不能为空！");
return CommonResult.failed("文件MD5码不能为空不能为空"); return CommonResult.failed("文件MD5码不能为空不能为空");
} }
if (StringUtils.isBlank(dto.getSoleKey())) {
log.info(format + "SoleKey值不能为空！");
return CommonResult.failed("文件MD5码不能为空不能为空");
}
} }
if (fileUpload.size() != files.length) { if (fileUpload.size() != files.length) {
log.info(format + "文件上传参数为空！"); log.info(format + "文件上传参数为空！");

2
src/main/java/com/example/duplicate/controller/param/ArchiveDetailDto.java
Unescape Escape View File

@ -28,6 +28,8 @@ public class ArchiveDetailDto {
private String serialNumber; private String serialNumber;
//扩展字段 //扩展字段
private String C1; private String C1;
//扩展唯一标识
private String SoleKey;
} }

2
src/main/java/com/example/duplicate/controller/param/FileUpload.java
Unescape Escape View File

@ -26,5 +26,7 @@ public class FileUpload {
private String SerialNumber; private String SerialNumber;
//采集器id标识 //采集器id标识
private String C1; private String C1;
//唯一主键
private String SoleKey;
} }

4
src/main/java/com/example/duplicate/controller/param/updateTaskDto.java
Unescape Escape View File

@ -28,10 +28,10 @@ public class updateTaskDto {
@ApiModelProperty(value="备注",name="pinResult", required=true) @ApiModelProperty(value="备注",name="pinResult", required=true)
private String pinResult; private String pinResult;
@ApiModelProperty(value="异常信息",name="errorInfo", required=true) @ApiModelProperty(value="异常信息",name="errorInfo", required=false)
private String errorInfo; private String errorInfo;
@ApiModelProperty(value="异常信息",name="errorImage", required=true) @ApiModelProperty(value="异常信息图片",name="errorImage",required=false)
private String errorImage; private String errorImage;

105
src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java
Unescape Escape View File

@ -171,6 +171,7 @@ public class TaskServiceImpl implements TaskService {
try { try {
//根据患者masterId，collectId删除 //根据患者masterId，collectId删除
boolean stactic = archiveDetailMapper.delFileBySource(masterId, collectId); boolean stactic = archiveDetailMapper.delFileBySource(masterId, collectId);
log.info("删除接口调用");
if (stactic) { if (stactic) {
return CommonResult.success("删除成功,masterId:" + masterId+"删除分类："+collectId); return CommonResult.success("删除成功,masterId:" + masterId+"删除分类："+collectId);
} }
@ -222,60 +223,68 @@ public class TaskServiceImpl implements TaskService {
@Override @Override
public Boolean fileUpload(MultipartFile file, FileUpload dto) { public Boolean fileUpload(MultipartFile file, FileUpload dto) {
//使用yyyyMMddHHmmssSSS格式作为文件名
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String newDate = format.format(date);
//文件更新时间
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//文件保存目录
String filePathdir = savePath + File.separatorChar + dto.getMasterid();
File filePath = new File(filePathdir);
//判断文件夹是否存在不存在创建文件夹
if (!filePath.exists()) {
filePath.mkdirs();
}
//文件地址
String saveFilePath = filePathdir + File.separatorChar + newDate + ".pdf";
try { try {
file.transferTo(new File(saveFilePath)); //使用yyyyMMddHHmmssSSS格式作为文件名
} catch (IOException e) { Date date = new Date();
log.info("保存文件失败流水号：" + dto.getSubassort()); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS");
return false; String newDate = format.format(date);
} //文件更新时间
try { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//判断文件表是否存在流水号存则更新 //文件保存目录
List<ArchiveDetailDto> archiveDetailList = archiveDetailMapper.getDetailBySerialNumber(dto.getSubassort()); String filePathdir = savePath + File.separatorChar + dto.getMasterid();
if (!CollectionUtils.isEmpty(archiveDetailList)) { File filePath = new File(filePathdir);
for (ArchiveDetailDto details : archiveDetailList) { //判断文件夹是否存在不存在创建文件夹
//存在删除对应记录 if (!filePath.exists()) {
if (archiveDetailMapper.deleteByPrimaryKey(details.getId())) { filePath.mkdirs();
File file1 = new File(details.getPdfPath()); }
try { //文件地址
file1.delete(); // 删除照片 String saveFilePath = filePathdir + File.separatorChar + newDate + ".pdf";
} catch (Exception e) { try {
e.printStackTrace(); file.transferTo(new File(saveFilePath));
} catch (IOException e) {
log.info("保存文件失败流水号：" + dto.getSubassort());
return false;
}
try {
//判断文件表是否存在流水号存则更新
List<ArchiveDetailDto> archiveDetailList = archiveDetailMapper.getDetailBySerialNumber(dto.getSoleKey());
if (!CollectionUtils.isEmpty(archiveDetailList)) {
log.info("保存文件接口存在删除记录：" + dto.getSubassort());
for (ArchiveDetailDto details : archiveDetailList) {
//存在删除对应记录
if (archiveDetailMapper.deleteByPrimaryKey(details.getId())) {
log.info("保存文件接口存在删除记录：" + dto.getSubassort());
File file1 = new File(details.getPdfPath());
try {
file1.delete(); // 删除照片
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
} }
} //保存文件表
//保存文件表 ArchiveDetailDto archiveDetail = new ArchiveDetailDto();
ArchiveDetailDto archiveDetail = new ArchiveDetailDto(); archiveDetail.setId(newDate);
archiveDetail.setId(newDate); archiveDetail.setPdfPath(saveFilePath);
archiveDetail.setPdfPath(saveFilePath); archiveDetail.setMasterid(dto.getMasterid());
archiveDetail.setMasterid(dto.getMasterid()); archiveDetail.setUploaddatetime(dateFormat.format(new Date()));
archiveDetail.setUploaddatetime(dateFormat.format(new Date())); archiveDetail.setAssortid(dto.getAssortid());
archiveDetail.setAssortid(dto.getAssortid()); archiveDetail.setSource(dto.getSource());
archiveDetail.setSource(dto.getSource()); archiveDetail.setSubassort(dto.getSubassort());
archiveDetail.setSubassort(dto.getSubassort()); archiveDetail.setTitle(dto.getTitle());
archiveDetail.setTitle(dto.getTitle()); archiveDetail.setFlag("0");
archiveDetail.setFlag("0"); archiveDetail.setC1(dto.getC1());
archiveDetail.setC1(dto.getC1()); archiveDetail.setSoleKey(dto.getSoleKey());
if (archiveDetailMapper.insertSel(archiveDetail)) { if (archiveDetailMapper.insertSel(archiveDetail)) {
return true; return true;
}
} catch (Exception e) {
log.error("异常处理：" + e.getMessage(),e);
return false;
} }
} catch (Exception e) { } catch (Exception e) {
return false; log.error("异常处理：" + e.getMessage(),e);
} }
return false; return false;
} }

9
src/main/resources/mapper/ArchiveDetailMapper.xml
Unescape Escape View File

@ -37,6 +37,9 @@
<if test="C1 != null"> <if test="C1 != null">
C1, C1,
</if> </if>
<if test="SoleKey != null">
SoleKey,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<!--<if test="id != null and id!=''">--> <!--<if test="id != null and id!=''">-->
@ -72,6 +75,10 @@
<if test="C1 != null"> <if test="C1 != null">
#{C1,jdbcType=NVARCHAR}, #{C1,jdbcType=NVARCHAR},
</if> </if>
<if test="SoleKey != null">
#{SoleKey,jdbcType=NVARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<delete id="deleteByPrimaryKey"> <delete id="deleteByPrimaryKey">
@ -84,6 +91,6 @@
</delete> </delete>
<select id="getDetailBySerialNumber" resultType="com.example.duplicate.controller.param.ArchiveDetailDto"> <select id="getDetailBySerialNumber" resultType="com.example.duplicate.controller.param.ArchiveDetailDto">
select * from archive_detail where Subassort=#{serialNumber} select * from archive_detail where SoleKey=#{serialNumber}
</select> </select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save