From b3bf43d55decf6315bb8192f6f6f78a048cf2f39 Mon Sep 17 00:00:00 2001 From: yiyan Date: Thu, 11 Apr 2019 09:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=BD=93=E5=89=8D=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ifishMQ.iml | 2 + .../user/entity/TblPushUserDevice.java | 50 +++++++++++++++++++ .../user/mapper/TblPushUserDeviceMapper.java | 16 ++++++ .../service/ITblPushUserDeviceService.java | 16 ++++++ .../impl/TblPushUserDeviceServiceImpl.java | 20 ++++++++ .../com/ifish7/mq/push/AliyunPushApi.java | 2 +- .../mq/queues/event/DeviceInfoEvent.java | 1 + .../mq/queues/event/PushNotifcationEvent.java | 2 +- .../IfishPushQueueMessageListener.java | 4 ++ .../ifish7/mq/utils/MybatisCodeGenerator.java | 4 +- .../mapper/user/TblPushUserDeviceMapper.xml | 5 ++ 11 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/ifish7/mq/business/user/entity/TblPushUserDevice.java create mode 100644 src/main/java/com/ifish7/mq/business/user/mapper/TblPushUserDeviceMapper.java create mode 100644 src/main/java/com/ifish7/mq/business/user/service/ITblPushUserDeviceService.java create mode 100644 src/main/java/com/ifish7/mq/business/user/service/impl/TblPushUserDeviceServiceImpl.java create mode 100644 src/main/resources/mapper/user/TblPushUserDeviceMapper.xml diff --git a/ifishMQ.iml b/ifishMQ.iml index c0acc5f..91dccac 100644 --- a/ifishMQ.iml +++ b/ifishMQ.iml @@ -32,6 +32,8 @@ + + diff --git a/src/main/java/com/ifish7/mq/business/user/entity/TblPushUserDevice.java b/src/main/java/com/ifish7/mq/business/user/entity/TblPushUserDevice.java new file mode 100644 index 0000000..ef2b552 --- /dev/null +++ b/src/main/java/com/ifish7/mq/business/user/entity/TblPushUserDevice.java @@ -0,0 +1,50 @@ +package com.ifish7.mq.business.user.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalTime; + +/** + *

+ * + *

+ * + * @author yan.y + * @since 2019-04-11 + */ +@Data +@Accessors(chain = true) +@TableName("tbl_push_user_device") +public class TblPushUserDevice { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Integer pushId; + + /** + * 用户ID + */ + private Integer pushUserId; + + /** + * 设备ID + */ + private String pushDeviceId; + + /** + * 设备绑定时间 + */ + private LocalTime pushBindTime; + + /** + * 设备绑定类型 + */ + private String pushBindType; + + +} diff --git a/src/main/java/com/ifish7/mq/business/user/mapper/TblPushUserDeviceMapper.java b/src/main/java/com/ifish7/mq/business/user/mapper/TblPushUserDeviceMapper.java new file mode 100644 index 0000000..cff2a7e --- /dev/null +++ b/src/main/java/com/ifish7/mq/business/user/mapper/TblPushUserDeviceMapper.java @@ -0,0 +1,16 @@ +package com.ifish7.mq.business.user.mapper; + +import com.ifish7.mq.business.user.entity.TblPushUserDevice; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author yan.y + * @since 2019-04-11 + */ +public interface TblPushUserDeviceMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ifish7/mq/business/user/service/ITblPushUserDeviceService.java b/src/main/java/com/ifish7/mq/business/user/service/ITblPushUserDeviceService.java new file mode 100644 index 0000000..072f708 --- /dev/null +++ b/src/main/java/com/ifish7/mq/business/user/service/ITblPushUserDeviceService.java @@ -0,0 +1,16 @@ +package com.ifish7.mq.business.user.service; + +import com.ifish7.mq.business.user.entity.TblPushUserDevice; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author yan.y + * @since 2019-04-11 + */ +public interface ITblPushUserDeviceService extends IService { + +} diff --git a/src/main/java/com/ifish7/mq/business/user/service/impl/TblPushUserDeviceServiceImpl.java b/src/main/java/com/ifish7/mq/business/user/service/impl/TblPushUserDeviceServiceImpl.java new file mode 100644 index 0000000..6565f6e --- /dev/null +++ b/src/main/java/com/ifish7/mq/business/user/service/impl/TblPushUserDeviceServiceImpl.java @@ -0,0 +1,20 @@ +package com.ifish7.mq.business.user.service.impl; + +import com.ifish7.mq.business.user.entity.TblPushUserDevice; +import com.ifish7.mq.business.user.mapper.TblPushUserDeviceMapper; +import com.ifish7.mq.business.user.service.ITblPushUserDeviceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author yan.y + * @since 2019-04-11 + */ +@Service +public class TblPushUserDeviceServiceImpl extends ServiceImpl implements ITblPushUserDeviceService { + +} diff --git a/src/main/java/com/ifish7/mq/push/AliyunPushApi.java b/src/main/java/com/ifish7/mq/push/AliyunPushApi.java index 99f042a..e635115 100644 --- a/src/main/java/com/ifish7/mq/push/AliyunPushApi.java +++ b/src/main/java/com/ifish7/mq/push/AliyunPushApi.java @@ -39,7 +39,7 @@ public class AliyunPushApi { @Autowired private ITblPushListService pushListService; - public void advancedPush(JSONObject json){ + public void advancedPushAndSavePushList(JSONObject json){ //推送目标： //DEVICE:根据设备推送 diff --git a/src/main/java/com/ifish7/mq/queues/event/DeviceInfoEvent.java b/src/main/java/com/ifish7/mq/queues/event/DeviceInfoEvent.java index 9ea6ef3..7a73450 100644 --- a/src/main/java/com/ifish7/mq/queues/event/DeviceInfoEvent.java +++ b/src/main/java/com/ifish7/mq/queues/event/DeviceInfoEvent.java @@ -61,6 +61,7 @@ public class DeviceInfoEvent { * "macAddress" : "5ccf7f006686", * "deviceIp" : "172.16.119.128", * "hardwareType" : "02", + * "factoryCode" : "2a", * "softwareVersion" : "02" * } * } diff --git a/src/main/java/com/ifish7/mq/queues/event/PushNotifcationEvent.java b/src/main/java/com/ifish7/mq/queues/event/PushNotifcationEvent.java index 91f6e8d..79c691b 100644 --- a/src/main/java/com/ifish7/mq/queues/event/PushNotifcationEvent.java +++ b/src/main/java/com/ifish7/mq/queues/event/PushNotifcationEvent.java @@ -18,6 +18,6 @@ public class PushNotifcationEvent { */ private void deviceNotifcationPlus(JSONObject eventBody){ AliyunPushApi aliyunPushApi = AppBeans.getBean(AliyunPushApi.class); - aliyunPushApi.advancedPush(eventBody); + aliyunPushApi.advancedPushAndSavePushList(eventBody); } } diff --git a/src/main/java/com/ifish7/mq/queues/listener/IfishPushQueueMessageListener.java b/src/main/java/com/ifish7/mq/queues/listener/IfishPushQueueMessageListener.java index 7c86b0d..bcb08a3 100644 --- a/src/main/java/com/ifish7/mq/queues/listener/IfishPushQueueMessageListener.java +++ b/src/main/java/com/ifish7/mq/queues/listener/IfishPushQueueMessageListener.java @@ -1,5 +1,7 @@ package com.ifish7.mq.queues.listener; +import com.alibaba.fastjson.JSON; +import com.ifish7.mq.queues.event.support.PushEventSupport; import lombok.extern.log4j.Log4j; import javax.jms.JMSException; @@ -20,6 +22,8 @@ public class IfishPushQueueMessageListener implements MessageListener { TextMessage tm = (TextMessage) message; try { log.info("Ifish7 - Push : " + tm.getText()); + PushEventSupport dataEventSupport = JSON.parseObject(tm.getText(), PushEventSupport.class); + dataEventSupport.process(); } catch (JMSException e) { log.error(e); } diff --git a/src/main/java/com/ifish7/mq/utils/MybatisCodeGenerator.java b/src/main/java/com/ifish7/mq/utils/MybatisCodeGenerator.java index fe0118c..46c1dfd 100644 --- a/src/main/java/com/ifish7/mq/utils/MybatisCodeGenerator.java +++ b/src/main/java/com/ifish7/mq/utils/MybatisCodeGenerator.java @@ -54,11 +54,11 @@ public class MybatisCodeGenerator { // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://localhost:3306/myfishdb?useUnicode=true&useSSL=false&characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://139.196.24.156:3306/myfishdb?useUnicode=true&useSSL=false&characterEncoding=utf8"); // dsc.setSchemaName("public"); dsc.setDriverName("com.mysql.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("123456"); + dsc.setPassword("ifish7mysql"); mpg.setDataSource(dsc); // 包配置 diff --git a/src/main/resources/mapper/user/TblPushUserDeviceMapper.xml b/src/main/resources/mapper/user/TblPushUserDeviceMapper.xml new file mode 100644 index 0000000..30aae8d --- /dev/null +++ b/src/main/resources/mapper/user/TblPushUserDeviceMapper.xml @@ -0,0 +1,5 @@ + + + + +