From 349dea63f3300707acd672bf49d893d2c9423860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Fri, 5 Aug 2022 20:10:25 +0800 Subject: [PATCH] fixcode --- .../java/com/storeroom/annotation/Log.java | 2 + .../storeroom/controller/LogController.java | 22 ++++---- pom.xml | 1 + .../service/impl/DeviceArchivesTagImpl.java | 7 ++- .../device/service/impl/DeviceImpl.java | 50 +++++++------------ 5 files changed, 36 insertions(+), 46 deletions(-) diff --git a/logging/src/main/java/com/storeroom/annotation/Log.java b/logging/src/main/java/com/storeroom/annotation/Log.java index 3266944..abf347e 100644 --- a/logging/src/main/java/com/storeroom/annotation/Log.java +++ b/logging/src/main/java/com/storeroom/annotation/Log.java @@ -10,4 +10,6 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface Log { String value() default ""; + + //int type(); } diff --git a/logging/src/main/java/com/storeroom/controller/LogController.java b/logging/src/main/java/com/storeroom/controller/LogController.java index f20d7b3..fb73d52 100644 --- a/logging/src/main/java/com/storeroom/controller/LogController.java +++ b/logging/src/main/java/com/storeroom/controller/LogController.java @@ -1,6 +1,7 @@ package com.storeroom.controller; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotation.Log; import com.storeroom.service.LogService; import com.storeroom.service.dto.LogQueryCriteria; @@ -28,8 +29,7 @@ public class LogController { @Log("导出数据") @ApiOperation("导出数据") - @GetMapping(value = "/download") - @PreAuthorize("@ys.check()") + @AnonymousGetMapping(value = "/download") public void exportLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException { criteria.setLogType("INFO"); logService.download(logService.queryAll(criteria), response); @@ -37,21 +37,21 @@ public class LogController { @Log("导出错误数据") @ApiOperation("导出错误数据") - @GetMapping(value = "/error/download") - @PreAuthorize("@ys.check()") + @AnonymousGetMapping(value = "/error/download") + // @PreAuthorize("@ys.check()") public void exportErrorLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException { criteria.setLogType("ERROR"); logService.download(logService.queryAll(criteria), response); } - @GetMapping + + @AnonymousGetMapping @ApiOperation("日志查询") - @PreAuthorize("@ys.check()") public ResponseEntity queryLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); } - @GetMapping(value = "/user") + @AnonymousGetMapping(value = "/user") @ApiOperation("用户日志查询") public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); @@ -59,20 +59,19 @@ public class LogController { return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK); } - @GetMapping(value = "/error") + @AnonymousGetMapping(value = "/error") @ApiOperation("错误日志查询") - @PreAuthorize("@ys.check()") public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("ERROR"); return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); } - @GetMapping(value = "/error/{id}") + @AnonymousGetMapping(value = "/error/{id}") @ApiOperation("日志异常详情查询") - @PreAuthorize("@ys.check()") public ResponseEntity queryErrorLogDetail(@PathVariable Long id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } + @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") @ApiOperation("删除所有ERROR日志") @@ -85,7 +84,6 @@ public class LogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") @ApiOperation("删除所有INFO日志") - @PreAuthorize("@ys.check()") public ResponseEntity delAllInfoLog(){ logService.delAllByInfo(); return new ResponseEntity<>(HttpStatus.OK); diff --git a/pom.xml b/pom.xml index 456c30a..3c872a2 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,7 @@ 3.12.0 + org.bgee.log4jdbc-log4j2 diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceArchivesTagImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceArchivesTagImpl.java index a5e4bb6..b3a10e3 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceArchivesTagImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceArchivesTagImpl.java @@ -5,11 +5,14 @@ import com.storeroom.modules.device.domain.DeviceArchivesTag; import com.storeroom.modules.device.repository.DeviceArchivesTagRepository; import com.storeroom.modules.device.repository.DeviceInfoRepository; import com.storeroom.modules.device.service.DeviceArchivesTagService; +import com.storeroom.utils.PageSort; import com.storeroom.utils.PageUtil; import com.storeroom.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -22,7 +25,6 @@ public class DeviceArchivesTagImpl implements DeviceArchivesTagService { private final DeviceArchivesTagRepository deviceArchivesTagRepository; - private final DeviceInfoRepository deviceInfoRepository; @Override public String findDeviceIdByShelfId(String shelfId) { @@ -46,7 +48,8 @@ public class DeviceArchivesTagImpl implements DeviceArchivesTagService { @Override public Object queryTagList(String deviceInfoId, Pageable pageable) { - Page page=deviceArchivesTagRepository.findByDeviceInfoId(deviceInfoId, pageable); + PageRequest pageRequest = PageSort.pageRequest(pageable.getPageNumber(), pageable.getPageSize(), "position", Sort.Direction.ASC); + Page page = deviceArchivesTagRepository.findByDeviceInfoId(deviceInfoId, pageRequest); return PageUtil.toPage(page); } } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index fa17bf2..4e22d3c 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -189,10 +189,6 @@ public class DeviceImpl implements DeviceService { @Transactional(rollbackFor = Exception.class) public void updateDeseCabinet(DeviceInfoDto deviceInfoDto) { DeviceInfo deviceInfo = deviceInfoMapper.toEntity(deviceInfoDto); -// List deviceInfoList = deviceInfoRepository.findByAreaNoAndAndDeviceIpAndAndDevicePort(deviceInfo.getAreaNo(), deviceInfo.getDeviceIp(), deviceInfo.getDevicePort()); -// if (!ObjectUtils.isEmpty(deviceInfoList)) { -// throw new BaseException("区号IP端口不能重复添加设备"); -// } DeviceInfo deviceInfo1 = deviceInfoRepository.findById(deviceInfo.getId()).orElseGet(DeviceInfo::new); if (ObjectUtils.isEmpty(deviceInfo1)) { throw new BaseException("数据不存在"); @@ -217,24 +213,24 @@ public class DeviceImpl implements DeviceService { deviceInfoDto.setId(NanoIdUtils.randomNanoId()); DeviceArchivesTag deviceArchivesTag = new DeviceArchivesTag(); - for (int i = 1; i < deviceInfoDto.getCupboardNo(); i++) { - for (int k = 1; k < deviceInfoDto.getRowNo(); k++) { - for (int n = 1; n < deviceInfoDto.getColumnRowNo(); n++) { - String position = i + "-" + k + "-" + n; - String positionName = i + "柜" + k + "层" + n + "列"; - - deviceArchivesTag.setId(NanoIdUtils.randomNanoId()); - deviceArchivesTag.setPosition(position); - deviceArchivesTag.setPosition_name(positionName); - deviceArchivesTag.setDeviceInfoId(deviceInfoDto.getId()); - deviceArchivesTag.setCupboardNo(i); - deviceArchivesTag.setRowNo(k); - deviceArchivesTag.setColumnRowNo(n); - deviceArchivesTag.setStoreroomCode(deviceInfoDto.getStoreroomCode()); - deviceArchivesTagRepository.save(deviceArchivesTag); - } + // for (int i = 1; i < deviceInfoDto.getCupboardNo(); i++) { + for (int k = 0; k < deviceInfoDto.getRowNo(); k++) { + for (int n = 0; n < deviceInfoDto.getColumnRowNo(); n++) { + String position = deviceInfoDto.getCupboardNo() + "-" + k + "-" + n; + String positionName = deviceInfoDto.getCupboardNo() + "柜" + k + "层" + n + "列"; + + deviceArchivesTag.setId(NanoIdUtils.randomNanoId()); + deviceArchivesTag.setPosition(position); + deviceArchivesTag.setPosition_name(positionName); + deviceArchivesTag.setDeviceInfoId(deviceInfoDto.getId()); + deviceArchivesTag.setCupboardNo(deviceInfoDto.getCupboardNo()); + deviceArchivesTag.setRowNo(k); + deviceArchivesTag.setColumnRowNo(n); + deviceArchivesTag.setStoreroomCode(deviceInfoDto.getStoreroomCode()); + deviceArchivesTagRepository.save(deviceArchivesTag); } } + // } Integer num = deviceInfoRepository.findByMax(); @@ -251,10 +247,6 @@ public class DeviceImpl implements DeviceService { @Override @Transactional(rollbackFor = Exception.class) public void updateRotaryCabinet(DeviceInfoDto deviceInfoDto) { -// List deviceInfoList = deviceInfoRepository.findByDeviceIpAndDevicePort(deviceInfoDto.getDeviceIp(), deviceInfoDto.getDevicePort()); -// if (!ObjectUtils.isEmpty(deviceInfoList)) { -// throw new BaseException("同一IP和端口号下不能重复添加设备"); -// } DeviceInfo deviceInfo = deviceInfoRepository.findById(deviceInfoDto.getId()).orElseGet(DeviceInfo::new); if (ObjectUtils.isEmpty(deviceInfo)) { throw new BaseException("数据不存在"); @@ -296,14 +288,7 @@ public class DeviceImpl implements DeviceService { @Override @Transactional(rollbackFor = Exception.class) public void updateCamera(DeviceInfoDto deviceInfoDto) { -// List deviceInfoList = deviceInfoRepository.findByDeviceIpAndDevicePortAndVideoRouteAndDeviceTypeId(deviceInfoDto.getDeviceIp(), -// deviceInfoDto.getDevicePort(), -// deviceInfoDto.getVideoRoute(), -// deviceInfoDto.getDeviceTypeId()); -// -// if (!ObjectUtils.isEmpty(deviceInfoList)) { -// throw new BaseException("同一IP和端口号下不能重复添加设备"); -// } + DeviceInfo deviceInfo = deviceInfoMapper.toEntity(deviceInfoDto); DeviceInfo deviceInfo1 = deviceInfoRepository.findById(deviceInfo.getId()).orElseGet(DeviceInfo::new); deviceInfo1.setDeviceName(deviceInfo.getDeviceName()); @@ -312,6 +297,7 @@ public class DeviceImpl implements DeviceService { deviceInfo1.setDeviceAccount(deviceInfo.getDeviceAccount()); deviceInfo1.setDevicePassword(deviceInfo.getDevicePassword()); deviceInfo1.setVideoRoute(deviceInfo.getVideoRoute()); + deviceInfo1.setStoreroomCode(deviceInfoDto.getStoreroomCode()); deviceInfoRepository.save(deviceInfo1); }