github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

产品搜索

pull/451/head
starrysky 2020-03-02 05:55:37 +08:00
parent a9e892842b
commit 89feab2385
6 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MessageController.java
View File

@ -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("删除消息")

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/MessageService.java
View File

@ -23,6 +23,6 @@ public interface MessageService {
Object queryAll(MessageCriteria criteria);
void update(Message resources);
MessageDTO update(Message resources);
}

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MessageDTO.java
View File

@ -57,4 +57,6 @@ public class MessageDTO {
* 单据编号
*/
private String initCode;
private Integer completeStatus;
}

17
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MessageServiceImpl.java
View File

@ -43,7 +43,14 @@ public class MessageServiceImpl implements MessageService {
@Override
public MessageDTO findById(long id) {
return null;
Optional<Message> 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<Message> 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;
}
}

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductInfoQueryCriteria.java
View File

@ -10,4 +10,8 @@ import me.zhengjie.annotation.Query;
*/
@Data
public class ProductInfoQueryCriteria {
private Long productSeriesId;
private String productCode;
}

12
eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductInfoServiceImpl.java
View File

@ -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{