diff --git a/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java b/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java index 05b3081f..7a66e753 100644 --- a/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java +++ b/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java @@ -31,6 +31,6 @@ public void list() { vo.setSendType(0); vo.setStatus(0); vo.setUserId(Long.valueOf(22)); - sendMessage.sendMessage(null); + sendMessage.sendRegisterMessage(vo); } } diff --git a/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java b/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java index a55669d5..d4725faa 100644 --- a/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java +++ b/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java @@ -1,10 +1,7 @@ package com.geekq.miaosha.dao; -import com.geekq.miaosha.domain.MiaoShaMessage; +import com.geekq.miaosha.domain.MiaoShaMessageInfo; import com.geekq.miaosha.domain.MiaoShaMessageUser; -import com.geekq.miaosha.domain.MiaoshaGoods; -import com.geekq.miaosha.domain.MiaoshaUser; -import com.geekq.miaosha.vo.GoodsVo; import org.apache.ibatis.annotations.*; import java.util.List; @@ -13,13 +10,13 @@ public interface MiaoShaMessageDao { @Select("select * from miaosha_message where messageid = #{messageid} ") - public List listMiaoShaMessage(@Param("messageId") String messageId); + public List listMiaoShaMessage(@Param("messageId") String messageId); @Select("") public List listMiaoShaMessageUser(@Param("messageId") String messageId); - @Insert("insert into miaosha_message (id , messageid ,content , create_time ,status,over_time,message_type ,send_type , goodname , price)" + + @Insert("insert into miaosha_message (id , messageid ,content , create_time ,status,over_time,message_type ,send_type , good_name , price)" + "value (#{id},#{messageId},#{content},#{createTime},#{status},#{overTime},#{messageType},#{sendType},#{goodName},#{price}) ") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") - public void insertMiaoShaMessage(MiaoShaMessage miaoShaMessage); + public void insertMiaoShaMessage(MiaoShaMessageInfo miaoShaMessage); @Insert("insert into miaosha_message_user (id , userid ,messageid , goodid ,orderid)" + "value (#{id},#{userId},#{messageId},#{goodId},#{orderId}) ") diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoShaMessage.java b/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java similarity index 97% rename from src/main/java/com/geekq/miaosha/domain/MiaoShaMessage.java rename to src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java index 53699f1c..15dc539f 100644 --- a/src/main/java/com/geekq/miaosha/domain/MiaoShaMessage.java +++ b/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java @@ -7,7 +7,7 @@ /** * 消息中心主体表 */ -public class MiaoShaMessage implements Serializable { +public class MiaoShaMessageInfo implements Serializable { private Integer id ; diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java b/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java index 337335ad..47261c6a 100644 --- a/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java +++ b/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java @@ -20,6 +20,8 @@ public class MQConfig { public static final String MIAOSHA_MESSAGE = "miaosha_mess"; + public static final String MIAOSHATEST = "miaoshatest"; + public static final String QUEUE = "queue"; public static final String TOPIC_QUEUE1 = "topic.queue1"; public static final String TOPIC_QUEUE2 = "topic.queue2"; diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java b/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java index 1d39dd63..db0f0d7f 100644 --- a/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java +++ b/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java @@ -63,11 +63,12 @@ public void receive(String message) { - @RabbitListener(queues=MQConfig.MIAOSHA_MESSAGE) + @RabbitListener(queues=MQConfig.MIAOSHATEST) public void receiveMiaoShaMessage(Message message, Channel channel) throws IOException { log.info("接受到的消息为:{}",message); + String messRegister = new String(message.getBody(), "UTF-8"); channel.basicAck(message.getMessageProperties().getDeliveryTag(), true); -// MiaoShaMessageVo msm = RedisService.stringToBean((String) message, MiaoShaMessageVo.class); -// messageService.insertMs(msm); + MiaoShaMessageVo msm = RedisService.stringToBean(messRegister, MiaoShaMessageVo.class); + messageService.insertMs(msm); } } diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java b/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java index 8a9965f1..73f9a936 100644 --- a/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java +++ b/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java @@ -44,6 +44,7 @@ public void sendMessage(MiaoshaMessage mm) { public void sendRegisterMessage(MiaoShaMessageVo miaoShaMessageVo) { String msg = RedisService.beanToString(miaoShaMessageVo); log.info("send message:{}" , msg); - rabbitTemplate.convertAndSend(MQConfig.EXCHANGE_TOPIC,"miaosha_*", msg); + rabbitTemplate.convertAndSend(MQConfig.MIAOSHATEST,msg); +// rabbitTemplate.convertAndSend(MQConfig.EXCHANGE_TOPIC,"miaosha_*", msg); } } diff --git a/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java b/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java index c115a0b5..ab8f7b95 100644 --- a/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java +++ b/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java @@ -1,11 +1,16 @@ package com.geekq.miaosha.service; import com.geekq.miaosha.dao.MiaoShaMessageDao; +import com.geekq.miaosha.domain.MiaoShaMessageInfo; import com.geekq.miaosha.domain.MiaoShaMessageUser; +import com.geekq.miaosha.rabbitmq.MiaoshaMessage; +import com.geekq.miaosha.utils.DateTimeUtils; import com.geekq.miaosha.vo.MiaoShaMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; @Service @@ -22,10 +27,20 @@ public List getMessage( String userId ){ } + @Transactional(rollbackFor = Exception.class) public void insertMs(MiaoShaMessageVo miaoShaMessageVo){ MiaoShaMessageUser mu = new MiaoShaMessageUser() ; mu.setUserId(miaoShaMessageVo.getUserId()); mu.setMessageId(miaoShaMessageVo.getMessageId()); messageDao.insertMiaoShaMessageUser(mu); + MiaoShaMessageInfo miaoshaMessage = new MiaoShaMessageInfo(); + miaoshaMessage.setContent(miaoShaMessageVo.getContent()); +// miaoshaMessage.setCreateTime(new Date()); + miaoshaMessage.setStatus(miaoShaMessageVo.getStatus()); + miaoshaMessage.setMessageType(miaoShaMessageVo.getMessageType()); + miaoshaMessage.setSendType(miaoShaMessageVo.getSendType()); + miaoshaMessage.setMessageId(miaoShaMessageVo.getMessageId()); + miaoshaMessage.setCreateTime(new Date()); + messageDao.insertMiaoShaMessage(miaoshaMessage); } } diff --git a/src/main/resources/templates/goods_list.html b/src/main/resources/templates/goods_list.html index 348043f8..2ec39644 100644 --- a/src/main/resources/templates/goods_list.html +++ b/src/main/resources/templates/goods_list.html @@ -21,8 +21,9 @@
-
秒杀商品列表
- +
秒杀商品列表11
+    +
商品名称商品图片商品原价秒杀价库存数量详情