Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java

@@ -50,6 +50,9 @@ public class RabbitConstant {
     //门店信息
     public static final String KEY_COMPANY_UPD="company:upd";
 
+
+    public static final String KEY_VCOMPANY_UPD="vcompany:upd";
+
     static {
         exchangeTopicSet = new HashSet<String>() {{
            add(ADMIN_TOPIC);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

@@ -28,6 +28,9 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
     public static final String ORDER_RELATION_QUEUE = "order.relation.queue";
 
 
+    public static final String VEHICLE_COMPANY_QUEUE = "vehicle.company.queue";
+
+
 
     static {
         myQueue = new ArrayList<BindDTO>() {{
@@ -41,6 +44,7 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
             add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));
             //钱包
             add(new BindDTO(WALLET_ADD_QUEUE, ADMIN_TOPIC, KEY_WALLET_ADD));
+            add(new BindDTO(VEHICLE_COMPANY_QUEUE, VEHICLE_TOPIC, KEY_VCOMPANY_UPD));
         }};
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/VehicleCompanyMQHandler.java

+package com.github.wxiaoqi.security.admin.handler;
+
+
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.biz.BaseOrderAcceptDetailedBiz;
+import com.github.wxiaoqi.security.admin.biz.BranchCompanyBiz;
+import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
+import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.ORDER_WATER_QUEUE;
+import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.VEHICLE_COMPANY_QUEUE;
+import static com.xxfc.platform.order.pojo.mq.OrderMQDTO.*;
+
+@Component
+@Slf4j
+public class VehicleCompanyMQHandler {
+
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
+
+
+    @RabbitListener(queues = VEHICLE_COMPANY_QUEUE)
+    public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
+        log.info("公司范围队列 messageJson："+ JSONUtil.parse(message));
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String messageId = message.getMessageProperties().getMessageId();
+                    String msg = new String(message.getBody(), "UTF-8");
+                    BranchCompany branchCompany = JSONUtil.toBean(msg, BranchCompany.class);
+                    branchCompanyBiz.addOrUpd(branchCompany);
+                    executorService.shutdown();
+                    Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
+                    // 手动签收
+                    channel.basicAck(deliveryTag, false);
+                } catch (Exception e) {
+                    log.info("接收到的消息失败");
+                    try {
+                        channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
+                    } catch (IOException i) {
+                        log.error(e.getMessage(), i);
+                    }
+                    log.error(e.getMessage(), e);
+                }
+            }
+        });
+    }
+}

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -117,7 +117,7 @@
     LEFT JOIN   app_user_detail  d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
-    LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
+    LEFT JOIN chw_app.app_version_mark z ON z.mark = d.register_source
     LEFT JOIN
     (
 	SELECT

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -235,7 +235,11 @@ public class  Vehicle {
      * 最后更新里程数
      */
     private Integer mileageLastUpdate;
-
+    /**
+     * 经营分公司（id）
+     */
+    @Column(name = "manage_company_id")
+    private Integer manageCompanyId;
     /**
      * 停车分公司（id）
      */

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -21,7 +21,9 @@ import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.dto.SendMsgDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -69,6 +71,8 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
+
 @Service
 @Slf4j
 public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserRestInterface {
@@ -112,6 +116,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     @Autowired
     VehicleExtensionBiz extensionBiz;
 
+    @Autowired
+    MQSenderFeign mqSenderFeign;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -1612,13 +1619,44 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             }
         }else {
             vehicle.setId(UUID.randomUUID().toString());
+            vehicle.setParkBranchCompanyId(vehicleApply.getSubordinateBranch());
+            vehicle.setManageCompanyId(vehicleApply.getSubordinateBranch());
             insertSelective(vehicle);
             vehicleId=vehicle.getId();
+            setGoodsTypes(vehicle);
+
         }
         return  vehicleId;
     }
 
 
+
+    public  void   setGoodsTypes(Vehicle vehicle){
+        List<Integer> list = mapper.goodTypes(vehicle.getSubordinateBranch());
+        if (list.size() > 0){
+            BranchCompany branchCompany=new BranchCompany();
+            branchCompany.setId(vehicle.getSubordinateBranch());
+            branchCompany.setBusinessScope(StrUtil.join(",", list));
+            sendQueue(branchCompany);
+        }
+
+    }
+
+    public void sendQueue(BranchCompany branchCompany) {
+        try {
+
+            SendMsgDTO sendMsgDTO = new SendMsgDTO() {{
+                setExchange(VEHICLE_TOPIC);
+            }};
+            sendMsgDTO.setJson(JSONUtil.toJsonStr(branchCompany));
+            sendMsgDTO.setRoutKey(KEY_VCOMPANY_UPD);
+            mqSenderFeign.postSendMessage(sendMsgDTO);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+
     public List<VehicleVO> getList(VehicleFindDTO vehicleFindDTO){
         return  mapper.selectList(vehicleFindDTO);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -68,4 +68,8 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     Long countByCompamyId(@Param("commpanyId") Integer commpanyId);
 
     List<VehicleVO> appSelectList(VehicleFindAppDTO vehicleFindAppDTO);
+
+
+    @Select("SELECT goods_type FROM vehicle WHERE subordinate_branch=#{commpanyId} AND is_del=0  GROUP BY goods_type")
+    List<Integer> goodTypes(@Param("commpanyId") Integer commpanyId);
 }
\ No newline at end of file