Browse Source

广电报备MQ通信已完成

mac 2 years ago
parent
commit
6ad70f97d9

+ 24 - 21
kxs-common/kxs-common-mq/src/main/java/com/kxs/common/mq/config/RabbitConfiguration.java

@@ -30,7 +30,6 @@ public class RabbitConfiguration {
 	private RabbitMQBeanProcessor rabbitMqBeanProcessor;
 
 	public static final String BIND_PREFIX = "BIND_";
-	public static final String DEAD_PREFIX = "DEAD_";
 
 	/**
 	 * 普通交换机
@@ -83,18 +82,30 @@ public class RabbitConfiguration {
 			// 实例化
 			AbstractMQ amq = (AbstractMQ) ReflectUtil.newInstance(aClass);
 
-			// 注册正常Queue === new Queue(name),  queue名称/bean名称 = mqName
-//			rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(amq.getQueueName(),
-//					BeanDefinitionBuilder.rootBeanDefinition(Queue.class).addConstructorArgValue(amq.getQueueName()).getBeanDefinition());
-			rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(amq.getQueueName(),
-					BeanDefinitionBuilder.genericBeanDefinition(Queue.class, () ->
-						QueueBuilder.durable(amq.getQueueName()).deadLetterExchange(EXCHANGE_DEAD_RANCH)
-								.deadLetterRoutingKey(DEAD_PREFIX + amq.getQueueName()).build()
-					).getBeanDefinition());
-
-			// 为每个队列 注册死信队列
-			rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(DEAD_PREFIX + amq.getQueueName(),
-					BeanDefinitionBuilder.rootBeanDefinition(Queue.class).addConstructorArgValue(DEAD_PREFIX + amq.getQueueName()).getBeanDefinition());
+			// 注册正常Queue 需判断是否有死信队列
+			if(amq.getDeadQueueName() != null){
+				rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(amq.getQueueName(),
+						BeanDefinitionBuilder.genericBeanDefinition(Queue.class, () ->
+								QueueBuilder.durable(amq.getQueueName()).deadLetterExchange(EXCHANGE_DEAD_RANCH)
+										.deadLetterRoutingKey(amq.getDeadQueueName()).build()
+						).getBeanDefinition());
+				//  注册死信队列
+				rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(amq.getDeadQueueName(),
+						BeanDefinitionBuilder.rootBeanDefinition(Queue.class).addConstructorArgValue(amq.getDeadQueueName()).getBeanDefinition());
+
+				//死信队列绑定死信交换机
+				rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(BIND_PREFIX + amq.getDeadQueueName(),
+						BeanDefinitionBuilder.genericBeanDefinition(Binding.class, () ->
+								BindingBuilder.bind(SpringContextHolder.getBean( amq.getDeadQueueName(), Queue.class))
+										.to(deadExchange).with(amq.getDeadQueueName())
+						).getBeanDefinition()
+				);
+			}else{
+				rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(amq.getQueueName(),
+						BeanDefinitionBuilder.genericBeanDefinition(Queue.class, () ->
+								QueueBuilder.durable(amq.getQueueName()).build()
+						).getBeanDefinition());
+			}
 
 			//普通队列
 			if(amq.getMqType() == MQSendTypeEnum.QUEUE){
@@ -126,14 +137,6 @@ public class RabbitConfiguration {
 				);
 			}
 
-			//死信队列绑定死信交换机
-			rabbitMqBeanProcessor.beanDefinitionRegistry.registerBeanDefinition(DEAD_PREFIX + BIND_PREFIX + amq.getQueueName(),
-					BeanDefinitionBuilder.genericBeanDefinition(Binding.class, () ->
-							BindingBuilder.bind(SpringContextHolder.getBean(DEAD_PREFIX + amq.getQueueName(), Queue.class))
-									.to(deadExchange).with(DEAD_PREFIX + amq.getQueueName())
-					).getBeanDefinition()
-			);
-
 		}
 	}
 

+ 14 - 3
kxs-common/kxs-common-mq/src/main/java/com/kxs/common/mq/model/AbstractMQ.java

@@ -12,12 +12,23 @@ import org.springframework.amqp.core.Message;
 public abstract class AbstractMQ {
 
 
-    /** MQ名称 **/
+    /**
+     * MQ队列名称
+     */
     public abstract String getQueueName();
 
-    /** MQ 类型 **/
+    /**
+     * MQ死信队列名称
+     */
+    public abstract String getDeadQueueName();
+
+    /**
+     * MQ 类型
+     */
     public abstract MQSendTypeEnum getMqType();
 
-    /** 构造MQ消息体 String类型 **/
+    /**
+     * 构造MQ消息体 String类型
+     */
     public abstract Message toMessage();
 }

+ 4 - 12
kxs-product/kxs-product-api/pom.xml

@@ -8,18 +8,6 @@
     </parent>
 
     <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>14</source>
-                    <target>14</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <artifactId>kxs-product-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -62,6 +50,10 @@
             <groupId>com.kxs</groupId>
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.kxs</groupId>
+            <artifactId>kxs-common-mq</artifactId>
+        </dependency>
         <!-- excel 导入导出 https://github.com/sky-mesh/excel-spring-boot-starter -->
         <dependency>
             <groupId>com.pig4cloud.excel</groupId>

+ 166 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/amqp/rabbit/RabbitGdActQueueMQ.java

@@ -0,0 +1,166 @@
+package com.kxs.product.api.amqp.rabbit;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.kxs.common.mq.enums.MQSendTypeEnum;
+import com.kxs.common.mq.model.AbstractMQ;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.amqp.core.MessageDeliveryMode;
+import org.springframework.amqp.core.MessageProperties;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+/**
+ * mq 订单普通队列 配置
+ *
+ * @author 没秃顶的码农
+ * @date 2024-04-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class RabbitGdActQueueMQ extends AbstractMQ {
+
+
+    /**
+     * 订单交易队列
+     */
+    public static final String QUEUE_NAME = "QUEUE_GD_ACT_DIVISION";
+
+    /**
+     * 死队列名称
+     */
+    public static final String DEAD_QUEUE_NAME = "DEAD_QUEUE_GD_ACT_DIVISION";
+
+    /**
+     * 内置msg 消息体定义
+     **/
+    private MsgEntity msgEntity;
+
+    /**
+     *  定义Msg消息载体
+     **/
+    @Data
+    public static class MsgEntity {
+
+        /**
+         * 订单号
+         */
+        private String orderNo;
+        /**
+         * 订单创建时间
+         */
+        private String orderCreateTime;
+        /**
+         * 用户选择号码
+         */
+        private String phoneNo;
+        /**
+         * 是否首充(中文):是,否
+         */
+        private String firstCharge;
+        /**
+         * 首充金额(元)
+         */
+        private BigDecimal initialChargeAmount;
+        /**
+         * 省
+         */
+        private String province;
+        /**
+         * 城市
+         */
+        private String city;
+        /**
+         * 商品名称
+         */
+        private String productName;
+        /**
+         * 促销活动名称
+         */
+        private String promotionName;
+        /**
+         * 商品类型名称
+         */
+        private String productTypeName;
+        /**
+         * 实付金额(元)
+         */
+        private BigDecimal paidInAmount;
+        /**
+         * 订单状态(中文):待
+         * 激活、已完成、退款
+         * 中、未知
+         */
+        private String orderStatus;
+        /**
+         * 激活状态(中文):待激活、已激活、未知
+         */
+        private String activationStatusName;
+        /**
+         * 激活时间
+         */
+        private String activationTime;
+        /**
+         * 开卡人工号
+         */
+        private String jobId;
+        /**
+         * SIM 卡号
+         */
+        private String iccId;
+
+    }
+
+    @Override
+    public String getQueueName() {
+
+        return QUEUE_NAME;
+    }
+
+    @Override
+    public String getDeadQueueName() {
+
+        return DEAD_QUEUE_NAME;
+    }
+
+    @Override
+    public MQSendTypeEnum getMqType() {
+
+        return MQSendTypeEnum.QUEUE;
+    }
+
+    @Override
+    public Message toMessage() {
+        String message = JSONObject.toJSONString(msgEntity);
+        // 构建消息体
+        return MessageBuilder.withBody(message.getBytes())
+                .setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN)
+                .setDeliveryMode(MessageDeliveryMode.PERSISTENT)
+                .setMessageId(UUID.randomUUID().toString())
+                .build();
+    }
+
+    /**
+     * 构造发送消息
+     */
+    public static RabbitGdActQueueMQ build(MsgEntity message){
+
+        return new RabbitGdActQueueMQ(message);
+    }
+
+    /**
+     * 解析MQ消息, 一般用于接收MQ消息时
+     */
+    public static MsgEntity parse(String msg){
+        return JSON.parseObject(msg, MsgEntity.class);
+    }
+
+}

+ 0 - 4
kxs-product/kxs-product-biz/pom.xml

@@ -79,10 +79,6 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-json</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.kxs</groupId>
-            <artifactId>kxs-common-mq</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

+ 0 - 9
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsGdService.java

@@ -13,15 +13,6 @@ import java.util.List;
 public interface KxsGdService {
 
 
-    /**
-     * 查询开卡订单数据
-     *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @param pageNo
-     * @param pageSize
-     */
-    List<GdQueryOrderRes.GdQueryOrder> queryCardOrders(String startTime, String endTime, int pageNo, int pageSize);
 
     /**
      * 匹配 广电 开卡数据

+ 22 - 14
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -7,10 +7,12 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kxs.common.core.exception.GlobalCustomerException;
+import com.kxs.common.mq.handlers.IMQSender;
 import com.kxs.product.api.model.KxsGdReport;
 import com.kxs.product.api.req.gd.GdQueryCardOrderReq;
 import com.kxs.product.api.res.gd.GdCommRes;
 import com.kxs.product.api.res.gd.GdQueryOrderRes;
+import com.kxs.product.api.amqp.rabbit.RabbitGdActQueueMQ;
 import com.kxs.product.biz.config.RsaProperties;
 import com.kxs.product.biz.constant.enums.GdReportEnum;
 import com.kxs.product.biz.mapper.KxsGdReportMapper;
@@ -39,8 +41,11 @@ public class KxsGdServiceImpl implements KxsGdService {
 
     private final KxsGdReportMapper kxsGdReportMapper;
 
+    private final IMQSender mqSender;
+
     @Async("getAsyncExecutor")
-    public void checkGdAsyncData(String startTime, String endTime){
+    @Override
+    public void checkGdAsyncData(String startTime, String endTime) {
         int pageNo = 1;
         int pageSize = 50;
 
@@ -48,28 +53,30 @@ public class KxsGdServiceImpl implements KxsGdService {
             List<GdQueryOrderRes.GdQueryOrder> list = this.queryCardOrders(startTime, endTime, pageNo, pageSize);
             if (list.isEmpty()) {
                 pageNo = -1;
-            }else{
+            } else {
                 for (GdQueryOrderRes.GdQueryOrder gdQueryOrder : list) {
-                    if("已激活".equals(gdQueryOrder.getActivationStatusName())){
+                    if ("已激活".equals(gdQueryOrder.getActivationStatusName())) {
                         KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
-                                        .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
+                                .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
+                                .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
                                 .eq(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                        if(kxsGdReport != null){
+                        if (kxsGdReport != null) {
                             kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
-                                            .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
-                                            .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                            //TODO 调用激活接口
-
+                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
+                            //发送广电激活MQ消息
+                            RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
+                            BeanUtil.copyProperties(gdQueryOrder, msgEntity);
+                            mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
                         }
                     }
                 }
                 pageNo++;
             }
-        }while (pageNo != -1);
+        } while (pageNo != -1);
 
     }
 
-    @Override
     public List<GdQueryOrderRes.GdQueryOrder> queryCardOrders(String startTime, String endTime, int pageNo, int pageSize) {
 
         try {
@@ -93,10 +100,11 @@ public class KxsGdServiceImpl implements KxsGdService {
                     .timeout(50000)//超时,毫秒
                     .execute().body();
             Optional.ofNullable(response).orElseThrow(() -> new GlobalCustomerException("调用接口失败"));
-            GdCommRes<GdQueryOrderRes> commRes = JSONUtil.toBean(response, new TypeReference<GdCommRes<GdQueryOrderRes>>() {}, true);
-            if(commRes.getResultCode() == 1){
+            GdCommRes<GdQueryOrderRes> commRes = JSONUtil.toBean(response, new TypeReference<GdCommRes<GdQueryOrderRes>>() {
+            }, true);
+            if (commRes.getResultCode() == 1) {
                 return commRes.getData().getRecords();
-            }else{
+            } else {
                 throw new GlobalCustomerException(commRes.getErrorDesc());
             }
 

+ 0 - 12
kxs-store/kxs-store-api/pom.xml

@@ -59,16 +59,4 @@
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>14</source>
-                    <target>14</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

+ 4 - 12
kxs-system/kxs-system-api/pom.xml

@@ -49,17 +49,9 @@
             <groupId>com.kxs</groupId>
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.kxs</groupId>
+            <artifactId>kxs-common-mq</artifactId>
+        </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>14</source>
-                    <target>14</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

+ 12 - 4
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/amqp/rabbit/RabbitOrderQueueMQ.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/amqp/rabbit/RabbitOrderQueueMQ.java

@@ -1,10 +1,9 @@
-package com.kxs.system.biz.amqp.rabbit;
+package com.kxs.system.api.amqp.rabbit;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kxs.common.mq.enums.MQSendTypeEnum;
 import com.kxs.common.mq.model.AbstractMQ;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,8 +16,6 @@ import org.springframework.amqp.core.MessageProperties;
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import static io.lettuce.core.pubsub.PubSubOutput.Type.message;
-
 /**
  * mq 订单普通队列 配置
  *
@@ -37,6 +34,11 @@ public class RabbitOrderQueueMQ extends AbstractMQ {
      */
     public static final String QUEUE_NAME = "QUEUE_ORDER_DIVISION";
 
+    /**
+     * 死信队列名称
+     */
+    public static final String DEAD_QUEUE_NAME = "DEAD_QUEUE_ORDER_DIVISION";
+
     /**
      * 内置msg 消息体定义
      **/
@@ -76,6 +78,12 @@ public class RabbitOrderQueueMQ extends AbstractMQ {
         return QUEUE_NAME;
     }
 
+    @Override
+    public String getDeadQueueName() {
+
+        return DEAD_QUEUE_NAME;
+    }
+
     @Override
     public MQSendTypeEnum getMqType() {
 

+ 0 - 4
kxs-system/kxs-system-biz/pom.xml

@@ -75,10 +75,6 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.kxs</groupId>
-            <artifactId>kxs-common-mq</artifactId>
-        </dependency>
         <!--多数据源-->
         <dependency>
             <groupId>com.baomidou</groupId>

+ 21 - 3
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/amqp/RabbitOrderQueueListener.java → kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/amqp/rabbit/RabbitOrderQueueListener.java

@@ -1,7 +1,8 @@
-package com.kxs.system.biz.amqp;
+package com.kxs.system.biz.amqp.rabbit;
 
 import com.kxs.common.mq.config.RabbitConfiguration;
-import com.kxs.system.biz.amqp.rabbit.RabbitOrderQueueMQ;
+import com.kxs.product.api.amqp.rabbit.RabbitGdActQueueMQ;
+import com.kxs.system.api.amqp.rabbit.RabbitOrderQueueMQ;
 import com.kxs.system.biz.service.KxsCampService;
 import com.rabbitmq.client.Channel;
 import lombok.RequiredArgsConstructor;
@@ -55,7 +56,7 @@ public class RabbitOrderQueueListener {
 	 *
 	 * @param message 消息
 	 */
-	@RabbitListener(queues = RabbitConfiguration.DEAD_PREFIX + RabbitOrderQueueMQ.QUEUE_NAME)
+	@RabbitListener(queues = RabbitOrderQueueMQ.DEAD_QUEUE_NAME)
 	@RabbitHandler
 	public void onDeadMessage(String msg, Message message, Channel channel){
 		log.info("死信队列Payload: " + RabbitOrderQueueMQ.parse(msg));
@@ -66,4 +67,21 @@ public class RabbitOrderQueueListener {
 
         }
     }
+
+//	/**
+//	 * 监听死信 队列的处理器
+//	 *
+//	 * @param message 消息
+//	 */
+//	@RabbitListener(queues = RabbitGdActQueueMQ.QUEUE_NAME)
+//	@RabbitHandler
+//	public void onGdMessage(String msg, Message message, Channel channel){
+//		log.info("广电报备队列Payload: " + RabbitGdActQueueMQ.parse(msg));
+//        try {
+//			RabbitGdActQueueMQ.MsgEntity parse = RabbitGdActQueueMQ.parse(msg);
+//        } catch (Exception e) {
+//			log.error(e.getMessage(), e);
+//
+//        }
+//    }
 }

+ 1 - 1
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsCampService.java

@@ -8,7 +8,7 @@ import com.kxs.system.api.model.KxsCamp;
 import com.kxs.system.api.vo.admin.CampUserExcelVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampGetByIdVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampPageVO;
-import com.kxs.system.biz.amqp.rabbit.RabbitOrderQueueMQ;
+import com.kxs.system.api.amqp.rabbit.RabbitOrderQueueMQ;
 import org.springframework.validation.BindingResult;
 
 import java.util.List;

+ 1 - 7
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampServiceImpl.java

@@ -2,32 +2,27 @@ package com.kxs.system.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.constant.enums.ErrorTypeEnum;
-import com.kxs.common.core.constant.enums.LeaderTypeEnum;
 import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
-import com.kxs.common.core.util.SysUtils;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.feign.RemoteKxsProductService;
-import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
 import com.kxs.system.api.feign.RemoteOldService;
 import com.kxs.system.api.model.KxsCampUser;
 import com.kxs.system.api.vo.admin.CampUserExcelVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampGetByIdVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampPageVO;
-import com.kxs.system.biz.amqp.rabbit.RabbitOrderQueueMQ;
+import com.kxs.system.api.amqp.rabbit.RabbitOrderQueueMQ;
 import com.kxs.system.biz.constant.enums.CampStatusEnum;
 import com.kxs.system.biz.constant.enums.SysErrorTypeEnum;
 import com.kxs.system.biz.mapper.KxsCampMapper;
@@ -35,7 +30,6 @@ import com.kxs.system.api.model.KxsCamp;
 import com.kxs.system.biz.service.KxsCampService;
 import com.kxs.system.biz.service.KxsCampUserService;
 import com.kxs.user.api.feign.RemoteKxsUserService;
-import com.kxs.user.api.model.KxsLeader;
 import com.kxs.user.api.model.KxsUser;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import lombok.RequiredArgsConstructor;

+ 0 - 12
kxs-user/kxs-user-api/pom.xml

@@ -8,18 +8,6 @@
     </parent>
 
     <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>14</source>
-                    <target>14</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <artifactId>kxs-user-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>