违章增删改
This commit is contained in:
parent
d612b0dd4f
commit
e81ea39913
|
|
@ -63,7 +63,7 @@ public class SafetyViolationController {
|
||||||
return ServerResponse.createErroe("操作失败");
|
return ServerResponse.createErroe("操作失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping(value = "getSafetyViolationById")
|
@GetMapping(value = "getSafetyViolationById")
|
||||||
@DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理
|
@DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理
|
||||||
@LogAnnotation(operModul = "安全违章", operation = "查询单个数据", operDesc = "系统级事件",operType="查询")
|
@LogAnnotation(operModul = "安全违章", operation = "查询单个数据", operDesc = "系统级事件",operType="查询")
|
||||||
// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" )
|
// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" )
|
||||||
|
|
|
||||||
|
|
@ -42,14 +42,13 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
|
||||||
int i = dao.insertSafetyViolation(bean);
|
int i = dao.insertSafetyViolation(bean);
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
List<FileStorageDto> fileList = bean.getFileList();
|
List<FileStorageDto> fileList = bean.getFileList();
|
||||||
fileList.forEach(item -> {
|
|
||||||
item.setId(2L);
|
|
||||||
item.setSourceId(bean.getId());
|
|
||||||
item.setCreateUser(bean.getCreateUserId());
|
|
||||||
item.setCreateUserName(bean.getCreateUserName());
|
|
||||||
});
|
|
||||||
//照片入库
|
//照片入库
|
||||||
if (!bean.getFileList().isEmpty()) {
|
if (!fileList.isEmpty()) {
|
||||||
|
fileList.forEach(item -> {
|
||||||
|
item.setSourceId(bean.getId());
|
||||||
|
item.setCreateUser(bean.getCreateUserId());
|
||||||
|
item.setCreateUserName(bean.getCreateUserName());
|
||||||
|
});
|
||||||
int j = dao.insertImgPhoto(bean.getFileList());
|
int j = dao.insertImgPhoto(bean.getFileList());
|
||||||
}
|
}
|
||||||
//存入总库 TODO
|
//存入总库 TODO
|
||||||
|
|
@ -62,13 +61,16 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
|
||||||
@Override
|
@Override
|
||||||
public SafetyViolationVo getSafetyViolationById(Long id) {
|
public SafetyViolationVo getSafetyViolationById(Long id) {
|
||||||
SafetyViolationVo bean = dao.getSafetyViolationById(id);
|
SafetyViolationVo bean = dao.getSafetyViolationById(id);
|
||||||
//照片查询
|
if(bean != null){
|
||||||
FileStorageDto fileStorageDto = new FileStorageDto();
|
//照片查询
|
||||||
fileStorageDto.setSourceId(id);
|
FileStorageDto fileStorageDto = new FileStorageDto();
|
||||||
fileStorageDto.setSourceType("1");
|
fileStorageDto.setSourceId(id);
|
||||||
bean.setVioPhotoList(dao.getImgPhotoList(fileStorageDto));
|
fileStorageDto.setSourceType("1");
|
||||||
fileStorageDto.setSourceType("2");
|
bean.setVioPhotoList(dao.getImgPhotoList(fileStorageDto));
|
||||||
bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto));
|
fileStorageDto.setSourceType("2");
|
||||||
|
bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto));
|
||||||
|
}
|
||||||
|
|
||||||
return bean;
|
return bean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,22 +83,26 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
|
||||||
if (num > 0) {
|
if (num > 0) {
|
||||||
List<FileStorageDto> fileList = bean.getFileList();
|
List<FileStorageDto> fileList = bean.getFileList();
|
||||||
List<FileStorageDto> delFileList = bean.getDelFileList();
|
List<FileStorageDto> delFileList = bean.getDelFileList();
|
||||||
fileList.forEach(item -> {
|
|
||||||
item.setSourceId(bean.getId());
|
|
||||||
item.setCreateUser(bean.getUpdateUserId());
|
|
||||||
item.setCreateUserName(bean.getUpdateUserName());
|
|
||||||
});
|
|
||||||
delFileList.forEach(item -> {
|
|
||||||
item.setSourceId(bean.getId());
|
|
||||||
item.setCreateUser(bean.getUpdateUserId());
|
|
||||||
item.setCreateUserName(bean.getUpdateUserName());
|
|
||||||
});
|
|
||||||
//照片入库
|
//照片入库
|
||||||
if (!bean.getFileList().isEmpty()) {
|
if (!fileList.isEmpty()) {
|
||||||
|
fileList.forEach(item -> {
|
||||||
|
item.setSourceId(bean.getId());
|
||||||
|
item.setCreateUser(bean.getUpdateUserId());
|
||||||
|
item.setCreateUserName(bean.getUpdateUserName());
|
||||||
|
});
|
||||||
int j = dao.insertImgPhoto(bean.getFileList());
|
int j = dao.insertImgPhoto(bean.getFileList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//照片删除
|
//照片删除
|
||||||
if (!bean.getDelFileList().isEmpty()) {
|
if (!delFileList.isEmpty()) {
|
||||||
|
delFileList.forEach(item -> {
|
||||||
|
item.setSourceId(bean.getId());
|
||||||
|
item.setCreateUser(bean.getUpdateUserId());
|
||||||
|
item.setCreateUserName(bean.getUpdateUserName());
|
||||||
|
});
|
||||||
int j = dao.delImgPhoto(bean.getDelFileList());
|
int j = dao.delImgPhoto(bean.getDelFileList());
|
||||||
}
|
}
|
||||||
//总库修改 TODO
|
//总库修改 TODO
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@
|
||||||
<insert id="insertImgPhoto">
|
<insert id="insertImgPhoto">
|
||||||
INSERT INTO sys_file_resource
|
INSERT INTO sys_file_resource
|
||||||
(
|
(
|
||||||
id,
|
|
||||||
file_name,
|
file_name,
|
||||||
file_suffix,
|
file_suffix,
|
||||||
file_size,
|
file_size,
|
||||||
|
|
@ -67,7 +66,6 @@
|
||||||
)values
|
)values
|
||||||
<foreach collection="fileList" item="item" separator=",">
|
<foreach collection="fileList" item="item" separator=",">
|
||||||
(
|
(
|
||||||
#{item.id},
|
|
||||||
#{item.fileName},
|
#{item.fileName},
|
||||||
#{item.fileSuffix},
|
#{item.fileSuffix},
|
||||||
#{item.fileSize},
|
#{item.fileSize},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue