From 9a50698c4f1a8dc441257ea4ba81945b93d6a20e Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Fri, 28 Feb 2020 22:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhengjie/modules/system/domain/Message.java | 2 +- .../system/repository/MessageRepository.java | 5 +++++ .../modules/system/rest/MessageController.java | 9 +++++++++ .../modules/system/service/dto/MessageDTO.java | 11 ++++++++--- .../system/service/impl/MessageServiceImpl.java | 2 +- .../wms/customerOrder/domain/CustomerOrder.java | 4 ++++ .../service/impl/CustomerOrderServiceImpl.java | 4 +++- eladmin-system/src/main/resources/message.sql | 0 sql/message.sql | 17 +++++++++++++++++ 9 files changed, 48 insertions(+), 6 deletions(-) delete mode 100644 eladmin-system/src/main/resources/message.sql create mode 100644 sql/message.sql diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Message.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Message.java index 8408f4ca..8f01c27f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Message.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Message.java @@ -41,7 +41,7 @@ public class Message implements Serializable { private Long userIdSend; @Column(name = "user_name_send") - private Long userNameSend; + private String userNameSend; @Column(name = "user_id_accept") private Long userIdAccept; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MessageRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MessageRepository.java index 814448e3..995f6885 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MessageRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MessageRepository.java @@ -3,6 +3,8 @@ package me.zhengjie.modules.system.repository; import me.zhengjie.modules.system.domain.Message; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; /** * @author 黄星星 @@ -10,4 +12,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; */ public interface MessageRepository extends JpaRepository, JpaSpecificationExecutor { + @Modifying + @Query(value = "delete from meessage where id = ?1", nativeQuery = true) + void deleteMessageById(long id); } 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 4d5a4d14..30a1b7b3 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 @@ -38,4 +38,13 @@ public class MessageController { messageService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } + + @Log("删除消息") + @ApiOperation(value = "删除消息") + @DeleteMapping(value = "/messagee/{id}") + @PreAuthorize("hasAnyRole('ADMIN','MESSAGE_ALL','MESSAGE_DELETE')") + public ResponseEntity delete(@PathVariable Long id){ + messageService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } } 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 f2391792..d8aab8fd 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 @@ -18,14 +18,17 @@ public class MessageDTO { // 更新时间 private Timestamp updateTime; + // 状态 + private Boolean status; + private Long userIdSend; - private Long userNameSend; + private String userNameSend; private Long userIdAccept; /** - * 消息类型 + * 消息内容 */ private String messContent; @@ -39,7 +42,9 @@ public class MessageDTO { /** * 模块类型 */ - private String moduleType; + private String moduleTypeCode; + + private String moduleTypeName; /** 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 127e80d4..d368a55f 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 @@ -74,7 +74,7 @@ public class MessageServiceImpl implements MessageService { @Override public void delete(Long id) { - + messageRepository.deleteMessageById(id);; } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java index 11de88dc..5b89a316 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java @@ -109,6 +109,10 @@ public class CustomerOrder implements Serializable { @Column(name = "status") private Boolean status; + // 完成状态 + @Column(name = "complete_status") + private Boolean completeStatus; + public void copy(CustomerOrder source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index 0b2b20a5..3878ee64 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -202,6 +202,8 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { customerOrder.setCustomerName(customerInfo.getCustomerName()); + customerOrder.setCompleteStatus(false); + //插入客户订单 customerOrderRepository.save(customerOrder); customerOrder= customerOrderRepository.findByCustomerOrderCodeAndStatusTrue(createCustomerOrderRequest.getCustomerOrderCode()); @@ -245,7 +247,7 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { for(UserDTO userDTO : userDTOList){ Message message = new Message(); message.setUserIdAccept(userDTO.getId()); - String messageContent = MessageModuleType.CUSTOMER_ORDER.getName() + "(" + customerOrderCode + ")"; + String messageContent = MessageModuleType.CUSTOMER_ORDER.getName() + "(" + customerOrderCode + ")" + "新录入"; message.setMessContent(messageContent); message.setModulePath(MessageModulePath.CUSTOMER_ORDER_LIST.getCode()); message.setModuleTypeName(MessageModuleType.CUSTOMER_ORDER.getCode()); diff --git a/eladmin-system/src/main/resources/message.sql b/eladmin-system/src/main/resources/message.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/sql/message.sql b/sql/message.sql new file mode 100644 index 00000000..1c224e7f --- /dev/null +++ b/sql/message.sql @@ -0,0 +1,17 @@ +DROP TABLE IF EXISTS `message`; +CREATE TABLE `message` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `status` tinyint(4) DEFAULT NULL COMMENT '状态', + `user_id_send` bigint(20) DEFAULT NULL COMMENT '发送方id', + `user_name_send` varchar(32) DEFAULT NULL COMMENT '发送方name', + `user_id_accept` bigint(20) DEFAULT NULL COMMENT '接收方id', + `mess_content` varchar(512) DEFAULT NULL COMMENT '消息内容', + `read_status` int(4) DEFAULT NULL COMMENT '阅读状态 0 未读 1 已读', + `module_type_code` varchar(32) DEFAULT NULL COMMENT '模块类别code', + `module_type_name` varchar(32) DEFAULT NULL COMMENT '模块类别name', + `module_path` varchar(214) DEFAULT NULL COMMENT '模块路径', + `init_code` varchar(64) DEFAULT NULL COMMENT '单据编号', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 COMMENT='销售发货单'; \ No newline at end of file