diff --git a/src/main/java/com/bonus/imgTool/ImgToolApplication.java b/src/main/java/com/bonus/imgTool/ImgToolApplication.java index a149e74..7272b43 100644 --- a/src/main/java/com/bonus/imgTool/ImgToolApplication.java +++ b/src/main/java/com/bonus/imgTool/ImgToolApplication.java @@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.socket.config.annotation.EnableWebSocket; /** @@ -17,6 +18,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocket; @EnableFormValidator @EnableWebSocket @MapperScan("com.bonus.imgTool.*.mapper,com.bonus.imgTool.*.dao") +@EnableTransactionManagement public class ImgToolApplication { public static void main(String[] args) { diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java index c20fee0..a743cc2 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/CoordinatePhotoController.java @@ -46,7 +46,7 @@ public class CoordinatePhotoController { */ @PostMapping(value = "/deleteCoordinatePhoto") @DecryptAndVerify(decryptedClass = CoordinatePhotoReqVo.class) - @LogAnnotation(operModul = "协调照片--删除", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "协调照片--删除", operation = "查询照片", operDesc = "系统级事件",operType="删除") public ServerResponse deleteCoordinatePhoto(EncryptedReq data) { return coordinatePhotoService.deleteCoordinatePhoto(data.getData()); } @@ -58,7 +58,7 @@ public class CoordinatePhotoController { */ @PostMapping(value = "/addCoordinatePhoto") @DecryptAndVerify(decryptedClass = CoordinatePhotoVo.class) - @LogAnnotation(operModul = "协调照片--新增", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "协调照片--新增", operation = "查询照片", operDesc = "系统级事件",operType="新增") public ServerResponse addCoordinatePhoto(EncryptedReq data) { return coordinatePhotoService.addCoordinatePhoto(data.getData()); } @@ -70,8 +70,20 @@ public class CoordinatePhotoController { */ @PostMapping(value = "/updateCoordinatePhoto") @DecryptAndVerify(decryptedClass = CoordinatePhotoVo.class) - @LogAnnotation(operModul = "协调照片--修改", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "协调照片--修改", operation = "查询照片", operDesc = "系统级事件",operType="修改") public ServerResponse updateCoordinatePhoto(EncryptedReq data) { return coordinatePhotoService.updateCoordinatePhoto(data.getData()); } + + /** + * 协调照片--详情 + * @param data + * @return + */ + @PostMapping(value = "/getCoordinatePhotoById") + @DecryptAndVerify(decryptedClass = CoordinatePhotoReqVo.class) + @LogAnnotation(operModul = "协调照片--详情", operation = "查询照片", operDesc = "系统级事件",operType="详情") + public ServerResponse getCoordinatePhotoById(EncryptedReq data) { + return coordinatePhotoService.getCoordinatePhotoById(data.getData()); + } } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/ImportantMatterController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/ImportantMatterController.java index c293abf..7aa9b95 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/controller/ImportantMatterController.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/ImportantMatterController.java @@ -46,7 +46,7 @@ public class ImportantMatterController { */ @PostMapping(value = "/deleteImportantMatter") @DecryptAndVerify(decryptedClass = ImportantMatterReqVo.class) - @LogAnnotation(operModul = "重要事项及宣传照片--删除", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "重要事项及宣传照片--删除", operation = "查询照片", operDesc = "系统级事件",operType="删除") public ServerResponse deleteImportantMatter(EncryptedReq data) { return importantMatterService.deleteImportantMatter(data.getData()); } @@ -58,7 +58,7 @@ public class ImportantMatterController { */ @PostMapping(value = "/addImportantMatter") @DecryptAndVerify(decryptedClass = ImportantMatterVo.class) - @LogAnnotation(operModul = "重要事项及宣传照片--新增", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "重要事项及宣传照片--新增", operation = "查询照片", operDesc = "系统级事件",operType="新增") public ServerResponse addImportantMatter(EncryptedReq data) { return importantMatterService.addImportantMatter(data.getData()); } @@ -70,8 +70,20 @@ public class ImportantMatterController { */ @PostMapping(value = "/updateImportantMatter") @DecryptAndVerify(decryptedClass = ImportantMatterVo.class) - @LogAnnotation(operModul = "重要事项及宣传照片--修改", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "重要事项及宣传照片--修改", operation = "查询照片", operDesc = "系统级事件",operType="修改") public ServerResponse updateImportantMatter(EncryptedReq data) { return importantMatterService.updateImportantMatter(data.getData()); } + + /** + * 重要事项及宣传照片--详情 + * @param data + * @return + */ + @PostMapping(value = "/getImportantMatterById") + @DecryptAndVerify(decryptedClass = ImportantMatterReqVo.class) + @LogAnnotation(operModul = "重要事项及宣传照片--详情", operation = "查询照片", operDesc = "系统级事件",operType="详情") + public ServerResponse getImportantMatterById(EncryptedReq data) { + return importantMatterService.getImportantMatterById(data.getData()); + } } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java index 4282a74..70a97ba 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/controller/SafetyMeasuresController.java @@ -45,7 +45,7 @@ public class SafetyMeasuresController { */ @PostMapping(value = "/deleteSafetyMeasures") @DecryptAndVerify(decryptedClass = SafetyMeasuresReqVo.class) - @LogAnnotation(operModul = "安全措施落实-删除", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "安全措施落实-删除", operation = "查询照片", operDesc = "系统级事件",operType="删除") public ServerResponse deleteSafetyMeasures(EncryptedReq data) { return safetyMeasuresService.deleteSafetyMeasures(data.getData()); } @@ -57,7 +57,7 @@ public class SafetyMeasuresController { */ @PostMapping(value = "/addSafetyMeasures") @DecryptAndVerify(decryptedClass = SafetyMeasuresVo.class) - @LogAnnotation(operModul = "安全措施落实-新增", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "安全措施落实-新增", operation = "查询照片", operDesc = "系统级事件",operType="新增") public ServerResponse addSafetyMeasures(EncryptedReq data) { return safetyMeasuresService.addSafetyMeasures(data.getData()); } @@ -68,8 +68,20 @@ public class SafetyMeasuresController { */ @PostMapping(value = "/updateSafetyMeasures") @DecryptAndVerify(decryptedClass = SafetyMeasuresVo.class) - @LogAnnotation(operModul = "安全措施落实-修改", operation = "查询照片", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "安全措施落实-修改", operation = "查询照片", operDesc = "系统级事件",operType="修改") public ServerResponse updateSafetyMeasures(EncryptedReq data) { return safetyMeasuresService.updateSafetyMeasures(data.getData()); } + + /** + * 安全措施落实详情 + * @param data + * @return + */ + @PostMapping(value = "/getSafetyMeasuresById") + @DecryptAndVerify(decryptedClass = SafetyMeasuresReqVo.class) + @LogAnnotation(operModul = "安全措施落实-详情", operation = "查询照片", operDesc = "系统级事件",operType="详情") + public ServerResponse getSafetyMeasuresById(EncryptedReq data) { + return safetyMeasuresService.getSafetyMeasuresById(data.getData()); + } } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterVo.java index 9b5efb4..493b577 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterVo.java @@ -47,7 +47,7 @@ public class ImportantMatterVo { /** * 时间 */ - private Date time; + private String time; /** * 标题 diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java index 9df67ba..0fa7af6 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresVo.java @@ -52,7 +52,7 @@ public class SafetyMeasuresVo { /** * 检查时间 */ - private Date checkDate; + private String checkDate; /** * 检查地点 diff --git a/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java index 133da15..af2b6e0 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/CoordinatePhotoMapper.java @@ -13,4 +13,6 @@ public interface CoordinatePhotoMapper { void addCoordinatePhoto(CoordinatePhotoVo data); void updateCoordinatePhoto(CoordinatePhotoVo data); + + CoordinatePhotoVo getCoordinatePhotoById(Long id); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/mapper/ImportantMatterMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/ImportantMatterMapper.java index dc49996..38f0d6d 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/mapper/ImportantMatterMapper.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/ImportantMatterMapper.java @@ -16,4 +16,6 @@ public interface ImportantMatterMapper { void addImportantMatter(ImportantMatterVo data); void updateImportantMatter(ImportantMatterVo data); + + ImportantMatterVo getImportantMatterById(Long id); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java index 0a27172..1bd41d3 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/mapper/SafetyMeasuresMapper.java @@ -14,4 +14,6 @@ public interface SafetyMeasuresMapper { void addSafetyMeasures(SafetyMeasuresVo data); void updateSafetyMeasures(SafetyMeasuresVo data); + + SafetyMeasuresVo getSafetyMeasuresById(Long id); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java b/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java index 868dc2b..b2f254c 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/CoordinatePhotoService.java @@ -12,4 +12,6 @@ public interface CoordinatePhotoService { ServerResponse addCoordinatePhoto(CoordinatePhotoVo data); ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data); + + ServerResponse getCoordinatePhotoById(CoordinatePhotoReqVo data); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/ImportantMatterService.java b/src/main/java/com/bonus/imgTool/imageUpload/service/ImportantMatterService.java index f004d4e..2a77971 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/ImportantMatterService.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/ImportantMatterService.java @@ -12,4 +12,6 @@ public interface ImportantMatterService { ServerResponse addImportantMatter(ImportantMatterVo data); ServerResponse updateImportantMatter(ImportantMatterVo data); + + ServerResponse getImportantMatterById(ImportantMatterReqVo data); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java b/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java index 2583e49..a4413e1 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/SafetyMeasuresService.java @@ -12,4 +12,6 @@ public interface SafetyMeasuresService { ServerResponse addSafetyMeasures(SafetyMeasuresVo data); ServerResponse updateSafetyMeasures(SafetyMeasuresVo data); + + ServerResponse getSafetyMeasuresById(SafetyMeasuresReqVo data); } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index e5abdb8..c775136 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.util.Date; @@ -24,7 +25,6 @@ import java.util.List; @Service @Slf4j -@Transactional public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { @Resource @@ -49,7 +49,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { List list = coordinatePhotoMapper.getCoordinatePhotoList(data); //获取图片信息 for (CoordinatePhotoVo coordinatePhotoVo : list) { - List sysFileResourceList = sysFileResourceService.getSysFileResourceList(coordinatePhotoVo.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(coordinatePhotoVo.getId(),"4"); coordinatePhotoVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); @@ -66,6 +66,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse deleteCoordinatePhoto(CoordinatePhotoReqVo data) { try { coordinatePhotoMapper.deleteCoordinatePhoto(data); @@ -74,6 +75,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { return ServerResponse.createSuccess(); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("删除失败"); } } @@ -84,6 +86,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse addCoordinatePhoto(CoordinatePhotoVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -102,9 +105,11 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { //存入综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + comprehensiveQueryVo.setUploadType("4"); synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("删除失败"); } return ServerResponse.createSuccess(); @@ -116,6 +121,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -136,10 +142,24 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("修改失败"); } return ServerResponse.createSuccess(); } + @Override + public ServerResponse getCoordinatePhotoById(CoordinatePhotoReqVo data) { + try { + CoordinatePhotoVo coordinatePhotoVo = coordinatePhotoMapper.getCoordinatePhotoById(data.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(coordinatePhotoVo.getId(),"4"); + coordinatePhotoVo.setSysFileResourceList(sysFileResourceList); + return ServerResponse.createSuccess(coordinatePhotoVo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询失败"); + } + } + } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index e7067ae..a65cddc 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -23,7 +23,6 @@ import java.util.List; @Service @Slf4j -@Transactional public class ImportantMatterServiceImpl implements ImportantMatterService { @Resource @@ -47,7 +46,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { List list = importantMatterMapper.getImportantMatterList(data); //获取图片信息 for (ImportantMatterVo importantMatterVo : list) { - List sysFileResourceList = sysFileResourceService.getSysFileResourceList(importantMatterVo.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(importantMatterVo.getId(),"5"); importantMatterVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); @@ -64,6 +63,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse deleteImportantMatter(ImportantMatterReqVo data) { try { importantMatterMapper.deleteImportantMatter(data); @@ -82,6 +82,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse addImportantMatter(ImportantMatterVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -99,6 +100,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { //存入综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + comprehensiveQueryVo.setUploadType("5"); synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); @@ -113,6 +115,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse updateImportantMatter(ImportantMatterVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -138,4 +141,23 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { } return ServerResponse.createSuccess(); } + + /** + * 重要事项及宣传照片--详情 + * @param data + * @return + */ + @Override + public ServerResponse getImportantMatterById(ImportantMatterReqVo data) { + try { + ImportantMatterVo importantMatterVo = importantMatterMapper.getImportantMatterById(data.getId()); + //获取图片信息 + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(importantMatterVo.getId(),"5"); + importantMatterVo.setSysFileResourceList(sysFileResourceList); + return ServerResponse.createSuccess(importantMatterVo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询失败"); + } + } } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index e696cb6..b0b8e9b 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.util.Date; @@ -24,7 +25,6 @@ import java.util.List; @Slf4j @Service -@Transactional public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { @Resource @@ -48,7 +48,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { List list = safetyMeasuresMapper.getSafetyMeasuresList(data); //获取图片信息 for (SafetyMeasuresVo safetyMeasuresVo : list) { - List sysFileResourceList = sysFileResourceService.getSysFileResourceList(safetyMeasuresVo.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(safetyMeasuresVo.getId(),"3"); safetyMeasuresVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); @@ -65,6 +65,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse deleteSafetyMeasures(SafetyMeasuresReqVo data) { try { safetyMeasuresMapper.deleteSafetyMeasures(data); @@ -73,6 +74,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { return ServerResponse.createSuccess(); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("删除失败"); } } @@ -83,6 +85,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse addSafetyMeasures(SafetyMeasuresVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -102,12 +105,14 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { //存入综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + comprehensiveQueryVo.setUploadType("3"); synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("删除失败"); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return ServerResponse.createErroe("新增失败"); } - return ServerResponse.createSuccess(); + return ServerResponse.createSuccess("新增成功"); } /** @@ -116,6 +121,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public ServerResponse updateSafetyMeasures(SafetyMeasuresVo data) { try { Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0; @@ -139,8 +145,22 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("修改失败"); } - return ServerResponse.createSuccess(); + return ServerResponse.createSuccess("修改成功"); + } + + @Override + public ServerResponse getSafetyMeasuresById(SafetyMeasuresReqVo data) { + try { + SafetyMeasuresVo safetyMeasuresVo = safetyMeasuresMapper.getSafetyMeasuresById(data.getId()); + List sysFileResourceList = sysFileResourceService.getSysFileResourceList(safetyMeasuresVo.getId(),"3"); + safetyMeasuresVo.setSysFileResourceList(sysFileResourceList); + return ServerResponse.createSuccess(safetyMeasuresVo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("查询失败"); + } } } diff --git a/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java b/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java index aff8ef8..1a04571 100644 --- a/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java +++ b/src/main/java/com/bonus/imgTool/system/dao/SysFileResourceDao.java @@ -10,7 +10,7 @@ public interface SysFileResourceDao { void deleteFileResource(Long id); - List getSysFileResourceList(Long id); + List getSysFileResourceList(Long id, String uploadType); void addSysFileResource(SysFileResourceVo sysFileResourceVo); } diff --git a/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java b/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java index 159aaa6..deeab61 100644 --- a/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java +++ b/src/main/java/com/bonus/imgTool/system/service/SysFileResourceService.java @@ -6,7 +6,7 @@ import com.bonus.imgTool.system.vo.SysFileResourceVo; import java.util.List; public interface SysFileResourceService { - List getSysFileResourceList(Long id); + List getSysFileResourceList(Long id, String uploadType); void deleteFileResource(Long id); diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java index d9c3f5b..bc2301e 100644 --- a/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/system/service/impl/SysFileResourceServiceImpl.java @@ -20,8 +20,8 @@ public class SysFileResourceServiceImpl implements SysFileResourceService { private SysFileResourceDao sysFileResourceDao; @Override - public List getSysFileResourceList(Long id) { - return sysFileResourceDao.getSysFileResourceList(id); + public List getSysFileResourceList(Long id, String uploadType) { + return sysFileResourceDao.getSysFileResourceList(id, uploadType); } @Override diff --git a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml index 847f20e..953effc 100644 --- a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml +++ b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml @@ -79,10 +79,14 @@ and gx_id = #{gxId} and ( - check_user_name like concat('%', #{keyWord}, '%') or - check_desc like concat('%', #{keyWord}, '%') or - check_place like concat('%', #{keyWord}, '%') or + build_before_desc like concat('%', #{keyWord}, '%') or + build_under_desc like concat('%', #{keyWord}, '%') or + build_after_desc like concat('%', #{keyWord}, '%') ) + diff --git a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml index 3f9cab5..05d86ab 100644 --- a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml +++ b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml @@ -76,10 +76,13 @@ and gx_id = #{gxId} and ( - check_user_name like concat('%', #{keyWord}, '%') or - check_desc like concat('%', #{keyWord}, '%') or - check_place like concat('%', #{keyWord}, '%') or + title like concat('%', #{keyWord}, '%') or + content like concat('%', #{keyWord}, '%') ) + diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml index dd7c735..99e354a 100644 --- a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -18,7 +18,7 @@ create_user_id, create_time, create_user_name, - update_user_id, + update_user_id, update_user_name, update_time, data_source, @@ -38,7 +38,7 @@ #{createUserId}, #{createTime}, #{createUserName}, - #{updateUserid}, + #{updateUserid}, #{updateUserName}, #{updateTime}, #{dataSource}, @@ -82,9 +82,13 @@ and ( check_user_name like concat('%', #{keyWord}, '%') or check_desc like concat('%', #{keyWord}, '%') or - check_place like concat('%', #{keyWord}, '%') or + check_place like concat('%', #{keyWord}, '%') ) + diff --git a/src/main/resources/mappers/system/SysFileResourceMapper.xml b/src/main/resources/mappers/system/SysFileResourceMapper.xml index 12b114f..e2a3fcc 100644 --- a/src/main/resources/mappers/system/SysFileResourceMapper.xml +++ b/src/main/resources/mappers/system/SysFileResourceMapper.xml @@ -29,7 +29,7 @@ #{compressFilePath}, #{watermarkFilePath}, #{fileType}, - #{sourceId}, + #{sourceId}, #{uploadType}, #{sourceType}, #{sourceTypeName}, @@ -45,7 +45,7 @@ where source_id = #{id}