违章增删改

src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java

@@ -63,7 +63,7 @@ public class SafetyViolationController {
 		return ServerResponse.createErroe("操作失败");
 	}
 
-	@PostMapping(value = "getSafetyViolationById")
+	@GetMapping(value = "getSafetyViolationById")
 	@DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理
 	@LogAnnotation(operModul = "安全违章", operation = "查询单个数据", operDesc = "系统级事件",operType="查询")
 //	@PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" )

src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java

@@ -42,14 +42,13 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
         int i = dao.insertSafetyViolation(bean);
         if (i > 0) {
             List<FileStorageDto> fileList = bean.getFileList();
+            //照片入库
+            if (!fileList.isEmpty()) {
                 fileList.forEach(item -> {
-                item.setId(2L);
                     item.setSourceId(bean.getId());
                     item.setCreateUser(bean.getCreateUserId());
                     item.setCreateUserName(bean.getCreateUserName());
                 });
-            //照片入库
-            if (!bean.getFileList().isEmpty()) {
                 int j = dao.insertImgPhoto(bean.getFileList());
             }
             //存入总库 TODO
@@ -62,6 +61,7 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
     @Override
     public SafetyViolationVo getSafetyViolationById(Long id) {
         SafetyViolationVo bean = dao.getSafetyViolationById(id);
+        if(bean != null){
             //照片查询
             FileStorageDto fileStorageDto = new FileStorageDto();
             fileStorageDto.setSourceId(id);
@@ -69,6 +69,8 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
             bean.setVioPhotoList(dao.getImgPhotoList(fileStorageDto));
             fileStorageDto.setSourceType("2");
             bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto));
+        }
+
         return bean;
     }
 
@@ -81,22 +83,26 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
         if (num > 0) {
             List<FileStorageDto> fileList = bean.getFileList();
             List<FileStorageDto> delFileList = bean.getDelFileList();
+
+            //照片入库
+            if (!fileList.isEmpty()) {
                 fileList.forEach(item -> {
                     item.setSourceId(bean.getId());
                     item.setCreateUser(bean.getUpdateUserId());
                     item.setCreateUserName(bean.getUpdateUserName());
                 });
+                int j = dao.insertImgPhoto(bean.getFileList());
+            }
+
+
+
+            //照片删除
+            if (!delFileList.isEmpty()) {
                 delFileList.forEach(item -> {
                     item.setSourceId(bean.getId());
                     item.setCreateUser(bean.getUpdateUserId());
                     item.setCreateUserName(bean.getUpdateUserName());
                 });
-            //照片入库
-            if (!bean.getFileList().isEmpty()) {
-                int j = dao.insertImgPhoto(bean.getFileList());
-            }
-            //照片删除
-            if (!bean.getDelFileList().isEmpty()) {
                 int j = dao.delImgPhoto(bean.getDelFileList());
             }
             //总库修改 TODO

src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml

@@ -51,7 +51,6 @@
 	<insert id="insertImgPhoto">
 		INSERT INTO sys_file_resource
 		(
-		 id,
 		file_name,
 		file_suffix,
 		file_size,
@@ -67,7 +66,6 @@
 		)values
 		<foreach collection="fileList" item="item" separator=",">
 			(
-			 #{item.id},
 			 #{item.fileName},
 			 #{item.fileSuffix},
 			 #{item.fileSize},