bug修改

authentication/src/main/java/com/jzg/config/SecurityConfig.java

@@ -93,7 +93,8 @@ public class SecurityConfig {
         http.authorizeHttpRequests(auth -> auth
                         .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**", "/favicon.ico",
                                 "/auth/login","/auth/captchaById","/auth/register","/sendSmsCode","/appLogin","/smsCodeLogin","/auth/publicKeyExchange","/appAuth/smsCodeLogin","/send/sendSmsCode",
-                                "/appAuth/appLogin","/auth/sendSmsCode","/auth/forgotPassword","/appAuth/partnerAppLogin").permitAll()
+                                "/appAuth/appLogin","/auth/sendSmsCode","/auth/forgotPassword","/appAuth/partnerAppLogin",
+                                "/supplementOrder/getOrderDetail","/dict/get").permitAll()
                         .anyRequest().authenticated()  // 其他接口需认证
                 )
 //                .formLogin((form) -> form

authentication/src/main/java/com/jzg/filter/TokenAuthenticationFilter.java

@@ -51,6 +51,8 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
         doList.add("/auth/forgotPassword");
         doList.add("/appAuth/partnerAppLogin");
         doList.add("/system/sysListAccountLinking");
+        doList.add("/supplementOrder/getOrderDetail");
+        doList.add("/dict/get");
         String path = request.getRequestURI();
         for (String pattern : doList) {
             // 使用正则表达式匹配  .* 匹配所有以 pattern 开头的路径

commons/src/main/java/com/jzg/commons/config/DataPermissionInterceptor.java

@@ -58,10 +58,12 @@ public class DataPermissionInterceptor implements MultiDataPermissionHandler {
     }
 
     private boolean shouldIgnoreTable(String sql) throws JSQLParserException {
-        for (String table : dataScopeProperties.getTables()) {
-            String regex = "(?i)\\b" + table + "\\b"; // (?i) 忽略大小写，\\b 表示单词边界
-            if (sql.matches(".*" + regex + ".*")) {
-                return true;
+        if(dataScopeProperties.getTables() != null) {
+            for (String table : dataScopeProperties.getTables()) {
+                String regex = "(?i)\\b" + table + "\\b"; // (?i) 忽略大小写，\\b 表示单词边界
+                if (sql.matches(".*" + regex + ".*")) {
+                    return true;
+                }
             }
         }
         return false;

commons/src/main/java/com/jzg/commons/entity/enums/MessageCodeEnum.java

@@ -34,6 +34,8 @@ public enum MessageCodeEnum {
     TEMPLATE_11("template_11","发布通知消息(新增业务员) 消息"),
     /**发布通知消息(新增业务员) 消息*/
     TEMPLATE_12("template_12","发布通知消息(新增合伙人) 消息"),
+
+    TEMPLATE_13("template_13","发布抽奖消息"),
     ;
 
     private final String code;

commons/src/main/java/com/jzg/commons/entity/enums/MessageSourceEnum.java

@@ -12,7 +12,8 @@ public enum MessageSourceEnum {
 
     ORDERSTATUS("orderStatus", "订单状态变更"),
     ADDISSUEUSER("addIssueUser", "业务员新增"),
-    ORDERREVIEW("orderReview", "补录订单审核");
+    ORDERREVIEW("orderReview", "补录订单审核"),
+    LOTTERY("lottery","抽奖次数");
 
     private final String code;
 

commons/src/main/java/com/jzg/commons/entity/enums/MessageTopicEnum.java

@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum MessageTopicEnum {
 
     ROCKET_ORDER("rocket_order", "订单主题"),
-    ROCKET_USER("rocket_user", "用户主题");
+    ROCKET_USER("rocket_user", "用户主题"),
+    ROCKET_SYSTEM("rocket_system","系统主题");
 
     private final String code;
 

commons/src/main/java/com/jzg/commons/entity/enums/MessageTypeEnum.java

@@ -12,6 +12,7 @@ public enum MessageTypeEnum {
 
     ORDER("ORDER", "订单类型"),
     USER("USER", "用户类型"),
+    LOTTERY("LOTTERY","抽奖类型")
     ;
 
     private final String code;

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -87,6 +87,8 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
     @Autowired
     SysUserService sysUserService;
+    @Autowired
+    private SysSystemMapper sysSystemMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -570,6 +572,12 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         if(Objects.nonNull(busOne)){
             sysSystemBusPerms.setId(busOne.getId());
         }
+
+        // 同步 账号互通
+        SysSystem sysSystem = sysSystemMapper.selectOne(new LambdaQueryWrapper<SysSystem>().eq(SysSystem::getSysCode, sysSystemBusPermsVo.getSystemCode()));
+        sysSystem.setAccountLinking(sysSystemBusPerms.getAccountLinking());
+        sysSystemMapper.insertOrUpdate(sysSystem);
+
         sysSystemBusPermsMapper.insertOrUpdate(sysSystemBusPerms);
         sysSystemBusPermsVo.setId(sysSystemBusPermsVo.getId());
         List<SysSystemBusPermsLink> sysSystemBusPermsLink = SysSystemBusPermsLink.getSystemBusPermsLink(sysSystemBusPermsVo);

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/service/impl/ChengTaiApiRequestImpl.java

@@ -30,6 +30,7 @@ import com.jzg.quotation.commons.annotation.QuoteApiService;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.quotation.commons.entity.DetectLoginRequest;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.TimeProcessing;
@@ -438,6 +439,11 @@ public class ChengTaiApiRequestImpl implements ChengTaiApiRequest {
         return orderStatusResultVo;
     }
 
+    @Override
+    public boolean detectLogin(DetectLoginRequest detectLoginRequest) {
+        return false;
+    }
+
     @Data
     static class CheckCodeResp {
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/crawler/service/impl/ChengTaiCrawlerRequestImpl.java

@@ -25,6 +25,7 @@ import com.jzg.quotation.chengtai.crawler.utils.CarDepreciationCalculator;
 import com.jzg.quotation.chengtai.crawler.utils.ZipImageExample;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
+import com.jzg.quotation.commons.entity.DetectLoginRequest;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.TimeProcessing;
@@ -268,4 +269,14 @@ public class ChengTaiCrawlerRequestImpl implements ChengTaiCrawlerRequest {
 
         return new OrderStatusResultVo();
     }
+
+    @Override
+    public boolean detectLogin(DetectLoginRequest detectLoginRequest) {
+        try {
+            chengTaiCrawlerQuoteProcessService.login(detectLoginRequest.getUsername(), detectLoginRequest.getPassword());
+            return true;
+        } catch (Exception ignored) {
+            throw new SystemException("登录失败");
+        }
+    }
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/DetectLoginRequest.java

@@ -3,6 +3,9 @@ package com.jzg.quotation.commons.entity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author Administrator
+ */
 @Data
 @NoArgsConstructor
 public class DetectLoginRequest {

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/build/GuoRenCrawlerQuoteResultsVoBuild.java

@@ -6,21 +6,19 @@ import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.constants.quote.enums.quote.KindCode;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
-import com.jzg.commons.util.StringUtils;
-import com.jzg.quotation.guoren.api.constant.enums.GuoRenRiskCode;
-import com.jzg.quotation.guoren.api.entity.Response.PremiumResponse;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerBaseResponse;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerCalculationPremiumData;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerProposalNoSaveData;
-import me.chanjar.weixin.mp.bean.card.BaseInfo;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+/**
+ * @author Administrator
+ */
 public final class GuoRenCrawlerQuoteResultsVoBuild {
 
     public static QuoteResultsVo buildQuoteResultsVo(QuoteVo quoteVo, GuoRenCrawlerCalculationPremiumData calculationPremium, GuoRenCrawlerProposalNoSaveData proposalNoSave) {
@@ -71,13 +69,13 @@ public final class GuoRenCrawlerQuoteResultsVoBuild {
         //光博评分
         scoreJson.add(new JSONObject()
                 .fluentPut("scoreName", "交强光博分")
-                .fluentPut("scoreKey", "score")
+                .fluentPut("scoreKey", "jqScore")
                 .fluentPut("score", calculationPremium.getCi().getPrpTmainRate().getBillcomeGroup()));
 
         if (calculationPremium.getBi().getPrpTmainRate() != null) {
             scoreJson.add(new JSONObject()
                     .fluentPut("scoreName", "商业光博分")
-                    .fluentPut("scoreKey", "score")
+                    .fluentPut("scoreKey", "syScore")
                     .fluentPut("score", calculationPremium.getBi().getPrpTmainRate().getBillcomeGroup()));
         }
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/consumer/message/LotteryMessage.java

@@ -0,0 +1,59 @@
+package com.jzg.quotation.summary.consumer.message;
+
+import com.jzg.commons.entity.po.SysMessageTemplate;
+import com.jzg.domain.BaseMessage;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 订单消息模板
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class LotteryMessage extends BaseMessage {
+
+
+    /**
+     * 发送时间
+     */
+    private LocalDateTime sendTime;
+
+    /**
+     * 发送标题
+     */
+    private String title;
+
+    /**
+     * 发送内容
+     */
+    private String body;
+
+    /**
+     * 接收用户
+     */
+    private String receiverUser;
+
+    /**
+     * 跳转链接
+     */
+    private String linkUrl;
+
+    /**
+     * token鉴权
+     */
+    private String token;
+
+    /**
+     * 模板code
+     */
+    private String tplCode;
+
+
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/consumer/template/LotteryMessageTemplate.java

@@ -0,0 +1,34 @@
+package com.jzg.quotation.summary.consumer.template;
+
+
+import com.jzg.commons.entity.enums.MessageTopicEnum;
+import com.jzg.commons.entity.enums.MessageTypeEnum;
+import com.jzg.quotation.summary.consumer.message.LotteryMessage;
+import com.jzg.templete.RocketMQEnhanceTemplate;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.stereotype.Component;
+
+
+import java.time.LocalDateTime;
+
+/**
+ * @author dongxin
+ * 抽奖类发送消息模板工具类
+ */
+@Component
+public class LotteryMessageTemplate extends RocketMQEnhanceTemplate {
+
+
+
+    public LotteryMessageTemplate(RocketMQTemplate template) {
+        super(template);
+    }
+
+    public SendResult addLottery(String userId) {
+        LotteryMessage message = new LotteryMessage();
+        message.setReceiverUser(userId);
+        SendResult result = send(MessageTopicEnum.ROCKET_SYSTEM.getCode(), MessageTypeEnum.LOTTERY.getCode(), message);
+        return result;
+    }
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/consumer/template/OrderMessageTemplate.java

@@ -4,10 +4,8 @@ import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.enums.MessageSourceEnum;
 import com.jzg.commons.entity.enums.MessageTopicEnum;
 import com.jzg.commons.entity.enums.MessageTypeEnum;
-import com.jzg.commons.entity.po.SysMessageTemplate;
 import com.jzg.quotation.summary.consumer.message.OrderMessage;
 import com.jzg.templete.RocketMQEnhanceTemplate;
-import jakarta.validation.constraints.NotNull;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.stereotype.Component;

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKCarModel.java

@@ -139,4 +139,9 @@ public class TKCarModel extends UnknownFieldEntity implements CarModelsFilter {
         }
         return replacementValue1;
     }
+
+    @Override
+    public String getSeatCount(){
+        return null;
+    }
 }

tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/entity/response/TaiPingCrawlerBrandNameQueryData.java

@@ -632,6 +632,10 @@ public class TaiPingCrawlerBrandNameQueryData implements Serializable {
         @JsonProperty("thirdRunRoute")
         private String thirdRunRoute;
 
+        @Override
+        public String getSeatCount(){
+            return String.valueOf(seatCount);
+        }
 
     }
 }

tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/service/impl/TaipingCrawlerRequestImpl.java

@@ -6,6 +6,7 @@ import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
+import com.jzg.quotation.commons.entity.DetectLoginRequest;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.taiping.crawler.build.TaiPingCrawlerQuoteResultsVoBuild;
 import com.jzg.quotation.taiping.crawler.component.TaiPingCrawlerCacheComponent;
@@ -127,4 +128,9 @@ public class TaipingCrawlerRequestImpl implements TaipingCrawlerRequest {
         return null;
     }
 
+    @Override
+    public boolean detectLogin(DetectLoginRequest detectLoginRequest) {
+        return false;
+    }
+
 }