From 89feab23856d74d55934ee486cd59e2ea936c17e Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Mon, 2 Mar 2020 05:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/rest/MessageController.java | 11 ++++++----- .../modules/system/service/MessageService.java | 2 +- .../modules/system/service/dto/MessageDTO.java | 2 ++ .../system/service/impl/MessageServiceImpl.java | 17 ++++++++++++++--- .../service/dto/ProductInfoQueryCriteria.java | 4 ++++ .../bd/service/impl/ProductInfoServiceImpl.java | 12 ++++++++++++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MessageController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MessageController.java index 401b50ee..b5949045 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MessageController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MessageController.java @@ -6,6 +6,7 @@ import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.modules.system.domain.Message; import me.zhengjie.modules.system.service.MessageService; import me.zhengjie.modules.system.service.dto.MessageCriteria; +import me.zhengjie.modules.system.service.dto.MessageDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -30,12 +31,12 @@ public class MessageController { return new ResponseEntity(messageService.queryAll(criteria), HttpStatus.OK); } - @Log("修改消息") - @PutMapping(value = "/message") + @Log("查看消息") + @GetMapping(value = "/message/{id}") // @PreAuthorize("hasAnyRole('ADMIN','MESSAGE_ALL','MESSAGE_EDIT')") - public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Message resources){ - messageService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); + public ResponseEntity findById(@PathVariable Long id){ + MessageDTO messageDTO = messageService.findById(id); + return new ResponseEntity(messageDTO, HttpStatus.OK); } @Log("删除消息") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MessageService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MessageService.java index 974be8bc..fbaf18ad 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MessageService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MessageService.java @@ -23,6 +23,6 @@ public interface MessageService { Object queryAll(MessageCriteria criteria); - void update(Message resources); + MessageDTO update(Message resources); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MessageDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MessageDTO.java index d8aab8fd..29f62926 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MessageDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MessageDTO.java @@ -57,4 +57,6 @@ public class MessageDTO { * 单据编号 */ private String initCode; + + private Integer completeStatus; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MessageServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MessageServiceImpl.java index 67a246b6..2c5e353e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MessageServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MessageServiceImpl.java @@ -43,7 +43,14 @@ public class MessageServiceImpl implements MessageService { @Override public MessageDTO findById(long id) { - return null; + Optional messageOptional = messageRepository.findById(id); + Message message = messageOptional.get(); + message.setStatus(false); + messageRepository.save(message); + + MessageDTO messageDTO = messageMapper.toDto(message); + messageDTO.setCompleteStatus(1); + return messageDTO; } @Override @@ -88,7 +95,7 @@ public class MessageServiceImpl implements MessageService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); - + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime")),criteriaBuilder.desc(root.get("createTime"))); if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ @@ -103,10 +110,14 @@ public class MessageServiceImpl implements MessageService { } @Override - public void update(Message resources) { + public MessageDTO update(Message resources) { Optional messageOptional = messageRepository.findById(resources.getId()); Message message = messageOptional.get(); message.setStatus(false); messageRepository.save(resources); + + MessageDTO messageDTO = messageMapper.toDto(message); + messageDTO.setCompleteStatus(1); + return messageDTO; } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductInfoQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductInfoQueryCriteria.java index 9f61d141..8c08a7fc 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductInfoQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductInfoQueryCriteria.java @@ -10,4 +10,8 @@ import me.zhengjie.annotation.Query; */ @Data public class ProductInfoQueryCriteria { + + private Long productSeriesId; + + private String productCode; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductInfoServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductInfoServiceImpl.java index 42b69c52..97544549 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductInfoServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductInfoServiceImpl.java @@ -81,6 +81,18 @@ public class ProductInfoServiceImpl implements ProductInfoService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + String productCode = criteria.getProductCode(); + if(!StringUtils.isEmpty(productCode)){ + Predicate productCodePredicate = criteriaBuilder.equal(root.get("productCode"), productCode); + targetPredicateList.add(productCodePredicate); + } + + Long productSeriesId = criteria.getProductSeriesId(); + if(null != productSeriesId){ + Predicate productCodePredicate = criteriaBuilder.equal(root.get("productSeriesId"), productSeriesId); + targetPredicateList.add(productCodePredicate); + } + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{