结构重构

hx-common/client-util/pom.xml

@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
+            <artifactId>common-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-common/common-file/pom.xml

@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
+            <artifactId>common-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-common/common-rocketmq/pom.xml

@@ -27,6 +27,16 @@
             <artifactId>common-rocketmq-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/feign/RocketmqApi.java

@@ -2,7 +2,6 @@ package com.fjhx.rocketmq.feign;
 
 import com.fjhx.myapp.application.feign.IRocketmqApi;
 import com.fjhx.rocketmq.service.RocketMqService;
-import org.springblade.core.tenant.annotation.NonDS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -13,7 +12,6 @@ import java.util.List;
 /**
  * 节日、生日模板 feign api
  */
-@NonDS
 @RestController
 public class RocketmqApi implements IRocketmqApi {
 
@@ -22,6 +20,7 @@ public class RocketmqApi implements IRocketmqApi {
 
     /**
      * 发送消息
+     *
      * @param topic
      * @param tag
      * @param key
@@ -39,6 +38,6 @@ public class RocketmqApi implements IRocketmqApi {
                             @RequestParam("userIds") List<String> userIds,
                             @RequestParam("content") String content,
                             @RequestParam("msgType") Integer msgType) {
-        rocketMqService.send(topic,tag,key,busiId,userIds,content,msgType);
+        rocketMqService.send(topic, tag, key, busiId, userIds, content, msgType);
     }
 }

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.java

@@ -1,7 +1,8 @@
 package com.fjhx.rocketmq.message.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.message.MessageNotice;
+import com.fjhx.myapp.application.entity.MessageNotice;
+
 
 /**
  * <p>

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java

@@ -1,7 +1,7 @@
 package com.fjhx.rocketmq.message.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.message.MessageNotice;
+import com.fjhx.myapp.application.entity.MessageNotice;
 
 /**
  * <p>

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/impl/StockMessageServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.rocketmq.message.service.impl;
 
-import com.fjhx.message.MessageNotice;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.myapp.application.entity.MessageNotice;
 import com.fjhx.rocketmq.message.mapper.StockMessageMapper;
 import com.fjhx.rocketmq.message.service.StockMessageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java

@@ -1,6 +1,6 @@
 package com.fjhx.rocketmq.producer;
 
-import com.fjhx.rocketmq.Message;
+import com.fjhx.myapp.application.entity.Message;
 import com.fjhx.rocketmq.service.RocketMqService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java

@@ -1,12 +1,12 @@
 package com.fjhx.rocketmq.service.Impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.message.MessageNotice;
-import com.fjhx.myapp.application.entity.enums.MsgSourceEnum;
-import com.fjhx.rocketmq.Message;
+import com.fjhx.myapp.application.entity.Message;
+import com.fjhx.myapp.application.entity.MessageNotice;
+import com.fjhx.myapp.application.enums.MsgSourceEnum;
 import com.fjhx.rocketmq.message.service.StockMessageService;
 import com.fjhx.rocketmq.service.RocketMqService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.rocketmq.client.producer.SendCallback;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -35,44 +35,49 @@ public class RocketMqServiceImpl implements RocketMqService {
 
     @Autowired
     private StockMessageService stockMessageService;
+
     /**
      * 普通消息
+     *
      * @param msg
      */
     @Override
     public void send(Message msg) {
-        System.err.println("send发送消息:"+msg);
+        System.err.println("send发送消息:" + msg);
         rocketMQTemplate.send(msg.getTopic() + ":" + msg.getTag(),
                 MessageBuilder.withPayload(msg.getContent()).build());
     }
 
     /**
      * 异步消息
+     *
      * @param msg
      */
     @Override
     public void asyncSend(Message msg) {
-        System.err.println("asyncSend发送消息:"+msg);
+        System.err.println("asyncSend发送消息:" + msg);
         rocketMQTemplate.asyncSend(msg.getTopic() + ":" + msg.getTag(), msg.getContent(),
                 new SendCallback() {
                     @Override
                     public void onSuccess(SendResult sendResult) {
-                        System.err.println("事物消息发送成功:"+sendResult.getTransactionId());
+                        System.err.println("事物消息发送成功:" + sendResult.getTransactionId());
                     }
+
                     @Override
                     public void onException(Throwable throwable) {
-                        System.err.println("mqMsg={"+msg+"}消息发送失败:");
+                        System.err.println("mqMsg={" + msg + "}消息发送失败:");
                     }
                 });
     }
 
     /**
      * 单项消息
+     *
      * @param msg
      */
     @Override
     public void syncSendOrderly(Message msg) {
-        System.err.println("syncSendOrderly发送消息:"+msg);
+        System.err.println("syncSendOrderly发送消息:" + msg);
         rocketMQTemplate.sendOneWay(msg.getTopic() + ":" + msg.getTag(), msg.getContent());
     }
 
@@ -80,22 +85,23 @@ public class RocketMqServiceImpl implements RocketMqService {
      * 同步消息
      */
     public void syncSend(Message msg) {
-        System.err.println("同步消息:"+msg);
-        SendResult sendMessage = rocketMQTemplate.syncSend(msg.getTopic() + ":" + msg.getTag(),  msg.getContent());
+        System.err.println("同步消息:" + msg);
+        SendResult sendMessage = rocketMQTemplate.syncSend(msg.getTopic() + ":" + msg.getTag(), msg.getContent());
         System.out.println(sendMessage);
     }
 
     /**
      * 通用发送消息
+     *
      * @param busiId  业务id
      * @param userIds 接受用户id集合
      * @param content 内容
      * @param msgType 消息类型
      */
     @Override
-    public void send(String topic,String tag,String key,String busiId, List<String> userIds, String content, Integer msgType) {
+    public void send(String topic, String tag, String key, String busiId, List<String> userIds, String content, Integer msgType) {
         List<MessageNotice> notices = new ArrayList<>();
-        if (CollectionUtils.isEmpty(userIds)) {
+        if (ObjectUtil.isEmpty(userIds)) {
             return;
         }
         for (String userId : userIds) {

hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/RocketMqService.java

@@ -1,6 +1,6 @@
 package com.fjhx.rocketmq.service;
 
-import com.fjhx.rocketmq.Message;
+import com.fjhx.myapp.application.entity.Message;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
@@ -10,14 +10,17 @@ import java.util.List;
  * @DATE:2022/7/15 23:34
  */
 public interface RocketMqService {
+
     /**
      * 同步发送消息
      */
     void send(Message mqMsg);
+
     /**
      * 异步发送消息，异步返回消息结果
      */
     void asyncSend(Message mqMsg);
+
     /**
      * 单向发送消息，不关心返回结果，容易消息丢失，适合日志收集、不精确统计等消息发送;
      */
@@ -25,23 +28,23 @@ public interface RocketMqService {
 
     /**
      * 同步消息
+     *
      * @param mqMsg
      */
     void syncSend(Message mqMsg);
 
 
     /**
-     *
-     * @param topic 主题
-     * @param tag 消息类型
-     * @param key key值
+     * @param topic   主题
+     * @param tag     消息类型
+     * @param key     key值
      * @param busiId  业务id
      * @param userIds 接受用户id集合
      * @param content 内容
      * @param msgType 消息类型
      */
     @Async
-    void send(String topic,String tag,String key,String busiId, List<String> userIds, String content, Integer msgType);
+    void send(String topic, String tag, String key, String busiId, List<String> userIds, String content, Integer msgType);
 
 
 }

hx-common/common-socket/src/main/java/com/fjhx/consumer/ConsumerService.java

@@ -1,7 +1,7 @@
 package com.fjhx.consumer;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.enums.MsgSourceEnum;
+import com.fjhx.myapp.application.enums.MsgSourceEnum;
 import com.fjhx.notice.service.ISendNoticeService;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;

hx-common/common-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java

@@ -2,7 +2,7 @@ package com.fjhx.notice.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.entity.MessageNotice;
+import com.fjhx.myapp.application.entity.MessageNotice;
 import com.fjhx.notice.service.ISendNoticeService;
 import com.fjhx.websocket.service.IWebSocketService;
 import org.springblade.system.user.entity.User;

hx-common/pom.xml

@@ -78,7 +78,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>service-file-api</artifactId>
+                <artifactId>common-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/rocketmq/Message.java → hx-service-api/common-rocketmq-api/src/main/java/com/fjhx/myapp/application/entity/Message.java

@@ -1,4 +1,4 @@
-package com.fjhx.rocketmq;
+package com.fjhx.myapp.application.entity;
 
 import lombok.Data;
 

hx-common/common-socket/src/main/java/com/fjhx/entity/MessageNotice.java → hx-service-api/common-rocketmq-api/src/main/java/com/fjhx/myapp/application/entity/MessageNotice.java

@@ -1,7 +1,7 @@
-package com.fjhx.entity;
+package com.fjhx.myapp.application.entity;
 
 import com.fjhx.base.BasicEntity;
-import com.fjhx.enums.MessageNoticeEnum;
+import com.fjhx.myapp.application.enums.MessageNoticeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.redis.core.index.Indexed;

hx-common/common-socket/src/main/java/com/fjhx/enums/MessageNoticeEnum.java → hx-service-api/common-rocketmq-api/src/main/java/com/fjhx/myapp/application/enums/MessageNoticeEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.enums;
+package com.fjhx.myapp.application.enums;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;

hx-common/common-socket/src/main/java/com/fjhx/enums/MsgSourceEnum.java → hx-service-api/common-rocketmq-api/src/main/java/com/fjhx/myapp/application/enums/MsgSourceEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.enums;
+package com.fjhx.myapp.application.enums;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/Pager.java

@@ -4,12 +4,13 @@ import java.io.Serializable;
 
 /**
  * 分页
+ *
  * @Author:caozj
  * @DATE:2022/7/12 17:36
  */
 public class Pager implements Serializable {
 
-    private static final long serialVersionUID = -4781129496475920388L;
+    private static final long serialVersionUID = 4781129496475920388L;
 
     // 当前页
     private int pageNum;
@@ -36,8 +37,8 @@ public class Pager implements Serializable {
     /**
      * 分页
      *
-     * @param pageNum 当前页
-     * @param pageSize    显示数
+     * @param pageNum  当前页
+     * @param pageSize 显示数
      */
     public Pager(int pageNum, int pageSize) {
         if (pageNum <= 0) {

hx-service/iot-management/pom.xml

@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
+            <artifactId>common-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service/iot-production/pom.xml

@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
+            <artifactId>common-file-api</artifactId>
         </dependency>
 
         <dependency>

hx-service/pom.xml

@@ -77,7 +77,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>service-file-api</artifactId>
+                <artifactId>common-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>