解决合并冲突

README.md

@@ -1,14 +1,27 @@
-authentication      授权服务
-commons             公共类
-gateway             网关
-platform            总控项目
+# 项目介绍
 
 
+## 微服务介绍
+
+| 序号 | 服务名                               | 端口号  | 备注        | 是否必须启动 |
+|:---|:----------------------------------|:-----|:----------|:-------|
+| 1  | authentication                    | 8081 | 认证服务      | 是      |
+| 2  | commons                           |      | 公共类       | 否      |
+| 3  | gateway                           | 8001 | 网关        | 是      |
+| 4  | platform                          | 8087 | 总控项目      | 是      |
+| 5  | consoleStatistics                 | 8086 |           | 是      |
+| 6  | tenant--costsorrule               | 8085 |           | 是      |
+| 7  | tenant-organization               | 8085 |           | 是      |
+| 8  | tenant-insurance-xxx              | xxx  | 对接不同的保险公司 | 否      |
+| 9  | rocketmq                          |      |           | 否      |
+| 10 | operation-Backend                 | xxx  | 前端：平台管理系统 | 否      |
+| 11 | tenant-Platform                   | xxx  | 前端：租户系统   | 否      |
 
-通过gateway网关转发其他服务项目   后期加入nacos 使用服务名支持负载均衡、服务健康状态管理
 
 
+## 其它
 
+通过gateway网关转发其他服务项目   后期加入nacos 使用服务名支持负载均衡、服务健康状态管理
 
 轨迹添加
 Service层 需要继承HistoryDataService  实现getHistoryData方法   更新与删除操作需要获取历史的数据

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

@@ -29,6 +29,8 @@ import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -46,6 +48,8 @@ import java.util.stream.Collectors;
 
 public class JzgAuthenticationProvider implements AuthenticationProvider {
 
+    private static final Logger log = LoggerFactory.getLogger(JzgAuthenticationProvider.class);
+
     private UserDetailsService userDetailsService;
 
     private SysUserService sysUserService;
@@ -251,6 +255,7 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
                 .collect(Collectors.toList());
         //APP 是手机端，不进行权限校验
         if(!authorities.stream().anyMatch(x->x.getSystem().equals(system)) && !username.equals("admin") && !StringUtils.equals("APP",system) & !appLogin){
+            log.info("没有权限访问系统。system=[{}],username=[{}],appLogin=[{}]",system, username,appLogin);
             throw new SystemException("没有权限访问系统");
         }
         SysUserJzgVo jzgUserInfo = new SysUserJzgVo();

authentication/src/main/java/com/jzg/controller/AuthController.java

@@ -4,8 +4,8 @@ import cn.hutool.core.util.HexUtil;
 import cn.hutool.crypto.BCUtil;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.asymmetric.SM2;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.annotation.IgnoreTenant;
@@ -15,7 +15,6 @@ import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.PasswordUtils;
-import com.jzg.commons.util.sm.Sm2Util;
 import com.jzg.config.JzgTokenService;
 import com.jzg.config.JzgUserDetailsService;
 import com.jzg.config.JzgUsernamePasswordAuthenticationToken;
@@ -43,21 +42,14 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-import org.bouncycastle.util.encoders.Hex;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -69,9 +61,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.security.*;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
@@ -138,6 +128,7 @@ public class AuthController extends BaseController {
     @PostMapping("/login")
     @IgnoreTenant
     public void login(@RequestBody LoginFormVo loginFormVo) throws ServletException, IOException {
+        log.info("登录接口。loginFormVo=[{}]", JSONUtil.toJsonStr(loginFormVo));
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
 

authentication/src/main/java/com/jzg/handler/JzgAuthenticationSuccessHandler.java

@@ -65,9 +65,7 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
         String token = tokenService.generateToken(username);
         // 生成 JWT Token
         tokenService.saveToken(username,token,JSONObject.toJSONString(redisToken));
-
         logger.info(username+"登录成功");
-
         // 设置响应内容类型为 JSON
         response.setContentType("application/json");
         JSONObject json = new JSONObject();
@@ -78,12 +76,9 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
         json.put("msg","login success");
         json.put("data",data);
         json.put("type","1");
-//        json.put("code",200);
-//        json.put("msg","login success");
 //        json.put("data",token);
         // 将 Token 返回给前端
         response.getWriter().write(json.toJSONString());
-
         // 确保状态码为 200 OK，不进行重定向
         response.setStatus(HttpServletResponse.SC_OK);
     }

authentication/src/main/resources/application-dev.yml

@@ -1,8 +1,4 @@
-server:
-  port: 8081
 spring:
-  application:
-    name: jzg-auth
   cloud:
     nacos:
       server-addr: 192.168.5.250:8848
@@ -21,7 +17,6 @@ spring:
       - nacos:minio
 config:
   sso: 0
-
 seata:
   enabled: true
   application-id: ${spring.application.name}
@@ -50,8 +45,6 @@ wechat:
       app:
         componentAppId: wx612ca90988c46947
         componentSecret: 75b7d4cda453b2075dec23f849278bc0
-
-
 feign:
   client:
     jzg-partner:

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -43,6 +43,7 @@ public class BaseController {
      */
     private void valiedToken(String token){
         if (Objects.isNull(token) || Objects.isNull(redissonClient.getBucket(token).get())) {
+            log.info("登录信息过期。 token=[{}]",token);
             throw new TokenExpireException("用户登录信息过期");
         }
     }

commons/src/main/java/com/jzg/commons/core/base/StateResult.java

@@ -1,4 +1,5 @@
 package com.jzg.commons.core.base;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

commons/src/main/java/com/jzg/commons/entity/agreement/po/PtlAgreementAttribution.java

@@ -1,4 +1,5 @@
 package com.jzg.commons.entity.agreement.po;
+
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,6 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+
 /**
  * @author quchen
  * @date 2025/2/18 11:09

commons/src/main/java/com/jzg/commons/entity/agreement/po/PtlInsAttributionTemplate.java

@@ -5,20 +5,17 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.jzg.commons.entity.agreement.vo.PtlInsAttributionTemplateSaveVo;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import org.apache.ibatis.type.JdbcType;
-
 import java.io.Serializable;
 
 /**
  * 保险公司归属信息模板配置
  *
- * @TableName ptl_ins_attribution_template
+ * ptl_ins_attribution_template
  */
 @Data
 @Schema(description = "保险公司归属信息模板配置")

commons/src/main/java/com/jzg/commons/entity/dto/JyxConfigAdd.java

@@ -5,8 +5,6 @@ import com.jzg.commons.entity.po.JyxBlame;
 import com.jzg.commons.entity.po.jyxSetting;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.math.BigDecimal;

commons/src/main/java/com/jzg/commons/entity/po/EsmInsCompany.java

@@ -1,4 +1,5 @@
 package com.jzg.commons.entity.po;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -369,27 +369,32 @@ public class QuoteEchoVo extends QuoteVo {
 
         //费用处理
         this.costs = new OrdersCostsVo();
-        this.costs.setCiPremium(insOrdersVo.getInsOrdersCosts().getJqPremium());
-        this.costs.setBiPremium(insOrdersVo.getInsOrdersCosts().getSyPremium());
-        this.costs.setNiPremium(insOrdersVo.getInsOrdersCosts().getJyPremium());
-        this.costs.setVvTax(insOrdersVo.getInsOrdersCosts().getTaxPremium());
-        this.costs.setSumPremium(insOrdersVo.getInsOrdersCosts().getSumPremium());
-        this.costs.setCiRatio(insOrdersVo.getInsOrdersCosts().getJqRatio());
-        this.costs.setBiRatio(insOrdersVo.getInsOrdersCosts().getSyRatio());
+        if(insOrdersVo.getInsOrdersCosts() != null){
+            this.costs.setCiPremium(insOrdersVo.getInsOrdersCosts().getJqPremium());
+            this.costs.setBiPremium(insOrdersVo.getInsOrdersCosts().getSyPremium());
+            this.costs.setNiPremium(insOrdersVo.getInsOrdersCosts().getJyPremium());
+            this.costs.setVvTax(insOrdersVo.getInsOrdersCosts().getTaxPremium());
+            this.costs.setSumPremium(insOrdersVo.getInsOrdersCosts().getSumPremium());
+            this.costs.setCiRatio(insOrdersVo.getInsOrdersCosts().getJqRatio());
+            this.costs.setBiRatio(insOrdersVo.getInsOrdersCosts().getSyRatio());
+        }
 
         //保单号信息
         this.policy = new OrdersPolicyVo();
-        this.policy.setCiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJqApplyNo());
-        this.policy.setCiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJqPolicyNo());
-        this.policy.setBiApplyNumber(insOrdersVo.getInsOrdersPolicy().getSyApplyNo());
-        this.policy.setBiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getSyPolicyNo());
-        this.policy.setNiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJyApplyNo());
-        this.policy.setNiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJyPolicyNo());
-        this.policy.setCiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJqUrl());
-        this.policy.setBiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getSyUrl());
-        this.policy.setNiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJyUrl());
-        this.policy.setCiPolicySignUrl(insOrdersVo.getInsOrdersPdfUrl().getJqSignUrl());
-
+        if(insOrdersVo.getInsOrdersPolicy() != null){
+            this.policy.setCiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJqApplyNo());
+            this.policy.setCiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJqPolicyNo());
+            this.policy.setBiApplyNumber(insOrdersVo.getInsOrdersPolicy().getSyApplyNo());
+            this.policy.setBiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getSyPolicyNo());
+            this.policy.setNiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJyApplyNo());
+            this.policy.setNiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJyPolicyNo());
+        }
+        if(insOrdersVo.getInsOrdersPdfUrl() != null){
+            this.policy.setCiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJqUrl());
+            this.policy.setBiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getSyUrl());
+            this.policy.setNiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJyUrl());
+            this.policy.setCiPolicySignUrl(insOrdersVo.getInsOrdersPdfUrl().getJqSignUrl());
+        }
 
         //评分信息
         this.scoreVo = new QuoteResultsVo.ScoreVo();

commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java

@@ -1,9 +1,7 @@
 package com.jzg.commons.exception;
 
-import cn.hutool.core.util.StrUtil;
 import com.jzg.commons.core.page.HttpResult;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.List;
-import java.util.Set;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {

consoleStatistics/src/main/java/com/jzg/console/controller/ReportUploadExcelTaskController.java

@@ -15,7 +15,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
@@ -23,9 +22,9 @@ import java.nio.charset.StandardCharsets;
 
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/16 11:15
+ *  @version 1.0
+ *  @author hxl
+ *  @date 2025/9/16 11:15
  *  @Description: 导出任务中心
  */
 @Slf4j

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportUploadExcelTaskServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.console.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +11,8 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.console.mapper.ReportUploadExcelTaskMapper;
 import com.jzg.console.service.ReportUploadExcelTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
@@ -21,6 +24,8 @@ import org.springframework.stereotype.Service;
 public class ReportUploadExcelTaskServiceImpl extends ServiceImpl<ReportUploadExcelTaskMapper, ReportUploadExcelTask>
     implements ReportUploadExcelTaskService {
 
+    private static final Logger log = LoggerFactory.getLogger(ReportUploadExcelTaskServiceImpl.class);
+
     /**
      *  @version
      *  @author: hxl
@@ -29,6 +34,7 @@ public class ReportUploadExcelTaskServiceImpl extends ServiceImpl<ReportUploadEx
      */
     @Override
     public IPage<ReportUploadExcelTaskDto> getPageTaskList(ReportUploadExcelTaskVo reportUploadExcelTaskVo) {
+        log.info("查询：reportUploadExcelTaskVo=[{}]", JSONUtil.toJsonStr(reportUploadExcelTaskVo));
         if (StringUtils.isBlank(reportUploadExcelTaskVo.getUploadUserId())) {
             throw new SystemException("用户id不能为空");
         }

consoleStatistics/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8086
 spring:
   cloud:
     nacos:

consoleStatistics/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8086
 spring:
   cloud:
     nacos:

consoleStatistics/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8086
 spring:
   application:
     name: jzg-console

gateway/src/main/java/com/jzg/filter/AuthFilter.java

@@ -35,7 +35,7 @@ public class AuthFilter implements GlobalFilter {
                 // 发生异常时记录日志（ERROR级别）
                 .doOnError(e -> {
                     long cost = Duration.between(Instant.now(), Instant.now()).toMillis();
-                    log.error("【Gateway请求异常】 请求地址：{} , 耗时: {}ms, 异常信息:{} ",path,cost, e);
+                    log.error("【Gateway请求异常】 请求地址：{} , 耗时: {}ms, 异常信息",path,cost, e);
                 });
     }
 

gateway/src/main/resources/application-dev.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://192.168.5.250:6379
+      password: 123456
+      database: 0
   minio:
     url: http://192.168.0.250:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application-prod.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://xxx:xxx
+      password: xxx
+      database: 0
   minio:
     url: http://172.24.144.227:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application-test.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://xxx:xxx
+      password: xxx
+      database: 0
   minio:
     url: http://test-api.baoxianzhanggui.com
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application.yml

@@ -8,12 +8,12 @@ spring:
     allow-bean-definition-overriding: true
   application:
     name: jzg-gateway
-  redis:
-    redisson:
-      address: redis://172.24.144.227:6379
-      password: 123456
-      database: 0
-
+#  redis:
+#    redisson:
+##      address: redis://172.24.144.227:6379
+##      password: 123456
+##      database: 0
+#
 #      address: redis://192.168.5.250:6379
 #      password: 123456
 #      database: 0

partner/pom.xml

@@ -24,7 +24,6 @@
             <artifactId>commons</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
         <!-- 负载均衡器 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

partner/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8087
 spring:
   cloud:
     nacos:

partner/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8087
 spring:
   cloud:
     nacos:

partner/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9083
 spring:
   cloud:
     nacos:

partner/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8087
 spring:
   application:
     name: jzg-partner

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -228,6 +228,4 @@ public class SysSystemController {
     public HttpResult getUserCompany(String systemCode) {
         return HttpResult.ok(sysSystemService.getUserCompany(systemCode));
     }
-    //endregion
-
 }

platform/src/main/java/com/jzg/mapper/PtlAgreementMapper.java

@@ -9,5 +9,13 @@ import java.util.List;
 @Mapper
 public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
 
-    public List<PtlAgreement> getUserAgreementByCompanyIds(String deptId, List<String> companyIds);
+    /**
+     * 查询租户下可用的协议
+     *
+     * @param deptId 租户序号
+     * @param companyIds 保司序号集
+     * @author lipf
+     * @date 2026/3/31 9:55
+     */
+    List<PtlAgreement> getUserAgreementByCompanyIds(String deptId, List<String> companyIds);
 }

platform/src/main/java/com/jzg/mapper/PtlAgreementUrlMapper.java

@@ -3,7 +3,6 @@ package com.jzg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.agreement.po.PtlAgreementUrl;
-import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionQueryVo;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementUrlVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

platform/src/main/java/com/jzg/service/PtlAgreementService.java

@@ -9,10 +9,11 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 根据用户的机构与保司 获取可报价的协议
-     * @param deptId
-     * @param companyIds
-     * @return
+     *
+     * @param deptId 租户编码
+     * @param companyIds 保司id信息
+     * @return List<PtlAgreement> 不同保司的协议
      */
-    public List<PtlAgreement> getUserAgreementByCompanyIds(String deptId, List<String> companyIds);
+    List<PtlAgreement> getUserAgreementByCompanyIds(String deptId, List<String> companyIds);
 
 }

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -8,7 +8,6 @@ import com.jzg.commons.entity.dto.SysSystemParam;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysConfig;
 import com.jzg.commons.entity.po.SysSystem;
-import com.jzg.commons.entity.po.SysSystemPerms;
 import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
@@ -157,10 +156,6 @@ public interface SysSystemService extends IService<SysSystem> {
      */
     boolean deleteByIds(List<String> ids);
 
-
-
-    //region 租户业务权限配置
-
     /**
      * 保存租户业务权限
      * @param sysSystemBusPermsVo
@@ -177,10 +172,8 @@ public interface SysSystemService extends IService<SysSystem> {
 
     /**
      * 根据租户配置获取保司列表
-     * @param systemCode
-     * @return
+     * @param systemCode 租户编码
+     * @return List<EsmInsCompany>
      */
     List<EsmInsCompany> getUserCompany(String systemCode);
-
-    //endregion
 }

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

@@ -1,6 +1,7 @@
 package com.jzg.service.impl;
 
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
@@ -20,12 +21,13 @@ import com.jzg.mapper.EsmInsCompanyMapper;
 import com.jzg.mapper.EsmInsCompanyTenantSortMapper;
 import com.jzg.service.EsmInsCompanyService;
 import com.jzg.service.SysSystemService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -36,6 +38,8 @@ import java.util.stream.Collectors;
 public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, EsmInsCompany>
         implements EsmInsCompanyService {
 
+    private static final Logger log = LoggerFactory.getLogger(EsmInsCompanyServiceImpl.class);
+
 //    @Override
 //    public EsmInsCompany isOpen(String company) {
 //        LambdaQueryWrapper<EsmInsCompany> wrapper = new LambdaQueryWrapper<>();
@@ -57,6 +61,7 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
 
     @Override
     public List<EsmInsCompanyVo> findTree(EsmInsCompanyReq req) {
+        log.info("查询保险公司信息：req=[{}]", JSONUtil.toJsonStr(req));
         List<EsmInsCompanyVo> allList  = baseMapper.findTree(req);
         if (CollectionUtils.isEmpty(allList)){
             return new ArrayList<>(0);

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

@@ -14,7 +14,6 @@ import com.jzg.commons.entity.po.JyxConfig;
 import com.jzg.commons.entity.po.jyxSetting;
 import com.jzg.commons.entity.vo.JyxConfigVo;
 import com.jzg.commons.util.AssertionUtils;
-import com.jzg.commons.util.ConvertUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.constants.ConstantsParent;
 import com.jzg.mapper.JyxConfigMapper;
@@ -27,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -177,13 +175,11 @@ public class JyxConfigServiceImpl extends ServiceImpl<JyxConfigMapper, JyxConfig
                     .filter(vo -> !ConstantsParent.PARENT_ID_ROOT.equals(vo.getParentId()))
                     .collect(Collectors.groupingBy(vo -> String.valueOf(vo.getParentId()), Collectors.mapping(Function.identity(), Collectors.toList())));
             List<JyxConfigVo> configVos = jyxConfigVos.stream().filter(parentConfig -> ConstantsParent.PARENT_ID_ROOT.equals(parentConfig.getParentId())).collect(Collectors.toList());
-            configVos.forEach(parentConfig -> {
-                parentConfig.setChildren(childrenMap.getOrDefault(String.valueOf(parentConfig.getId()), Collections.emptyList()));
-            });
+            configVos.forEach(parentConfig -> parentConfig.setChildren(childrenMap.getOrDefault(String.valueOf(parentConfig.getId()), Collections.emptyList())));
             return configVos;
         } catch (Exception e) {
             // 记录日志或进行其他异常处理
-            e.printStackTrace();
+            log.error("执行jyxList方法异常",e);
             return Collections.emptyList();
         }
     }
@@ -226,8 +222,7 @@ public class JyxConfigServiceImpl extends ServiceImpl<JyxConfigMapper, JyxConfig
 
     @Override
     public List<JyxConfigVo> selectMainInsurance(String company) {
-        List<JyxConfigVo> jyxConfigVos = jyxConfigMapper.selectMainInsurance(company);
-        return jyxConfigVos;
+        return jyxConfigMapper.selectMainInsurance(company);
     }
 
 

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

@@ -1,9 +1,12 @@
 package com.jzg.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.mapper.PtlAgreementMapper;
 import com.jzg.service.PtlAgreementService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,8 +18,20 @@ import java.util.List;
 
 @Service
 public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, PtlAgreement> implements PtlAgreementService {
+
+    private static final Logger log = LoggerFactory.getLogger(PtlAgreementServiceImpl.class);
+
+    /**
+     * 根据用户的机构与保司 获取可报价的协议
+     *
+     * @param deptId 租户编码
+     * @param companyIds 保司id信息
+     * @return List<PtlAgreement> 不同保司的协议
+     */
     @Override
     public List<PtlAgreement> getUserAgreementByCompanyIds(String deptId, List<String> companyIds) {
-        return baseMapper.getUserAgreementByCompanyIds(deptId,companyIds);
+        List<PtlAgreement> userAgreementByCompanyIds = baseMapper.getUserAgreementByCompanyIds(deptId, companyIds);
+        log.info("租户[{}]匹配到[{}]个公司的[{}]个协议", deptId, CollUtil.size(companyIds), CollUtil.size(userAgreementByCompanyIds));
+        return userAgreementByCompanyIds;
     }
 }

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

@@ -3,9 +3,7 @@ package com.jzg.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.agreement.po.PtlAgreementAttribution;
 import com.jzg.commons.entity.agreement.po.PtlAgreementUrl;
-import com.jzg.commons.entity.agreement.po.PtlInsAttributionTemplate;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementUrlVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.mapper.PtlAgreementUrlMapper;
@@ -52,14 +50,13 @@ public class PtlAgreementUrlServiceImpl extends ServiceImpl<PtlAgreementUrlMappe
         if (Objects.isNull(ptlAgreementUrl)) {
             return false;
         }
-        removeById(ptlAgreementUrl);
+        super.removeById(ptlAgreementUrl);
         return true;
     }
 
     @Override
     public Page<PtlAgreementUrl> getAgreementUrlList(Page page,PtlAgreementUrlVo ptlAgreementUrlVo) {
-        Page<PtlAgreementUrl> ptlAgreementUrlPage = ptlAgreementUrlMapper.getAgreementUrlList(page, ptlAgreementUrlVo);
-        return ptlAgreementUrlPage;
+        return ptlAgreementUrlMapper.getAgreementUrlList(page, ptlAgreementUrlVo);
     }
 
     @Override

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

@@ -1,8 +1,6 @@
 package com.jzg.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.PtlApiType;
 import com.jzg.commons.core.page.HttpResult;
@@ -88,7 +86,6 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
                 AssertionUtils.isSucceed(b, "保险公司api请求插入失败");
             }
         });
-
         return true;
     }
 

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

@@ -2,6 +2,7 @@ package com.jzg.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +28,8 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.*;
 import com.jzg.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,6 +48,7 @@ import java.util.stream.Collectors;
 public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem>
     implements SysSystemService {
 
+    private static final Logger log = LoggerFactory.getLogger(SysSystemServiceImpl.class);
     @Autowired
     private SysRolePermsMapper sysRolePermsMapper;
     @Autowired
@@ -104,7 +108,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         wrapper.eq(SysRolePerms::getRoleId,roles.get(0).getId());
         sysRolePermsMapper.delete(wrapper);
 
-        List<SysSystemPermsVo.PermsVo> permsList = JSON.parseArray(permsStr,SysSystemPermsVo.PermsVo.class);;
+        List<SysSystemPermsVo.PermsVo> permsList = JSON.parseArray(permsStr,SysSystemPermsVo.PermsVo.class);
         return this.savePerms(permsList, roles.get(0).getId());
     }
 
@@ -161,8 +165,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                 .like(SysRole::getName,"管理员");
         List<SysRole> roles = sysRoleMapper.selectList(queryWrapper);
         List<SysRolePerms> sysSystemPerms = sysRolePermsMapper.getByRoleId(roles.get(0).getId());
-        List<String> permsIds = sysSystemPerms.stream().map(SysRolePerms::getPermsId).collect(Collectors.toList());
-        return permsIds;
+        return sysSystemPerms.stream().map(SysRolePerms::getPermsId).collect(Collectors.toList());
     }
 
     @Override
@@ -268,8 +271,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
     @Override
     public List<SysSystemVo> queryList(SysSystemParam param) {
-        List<SysSystemVo> sysList = baseMapper.queryList(param);
-        return sysList;
+        return baseMapper.queryList(param);
     }
 
     @Override
@@ -379,7 +381,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                 .eq(SysConfig::getSystemCode, SystemConstants.SYSTEM_PLATFORM.getCode()));
         this.saveConfig(configs.get(0), sysSystem.getSysCode());
 
-        List<SysSystemPermsVo.PermsVo> permsList = JSON.parseArray(configs.get(0).getSysPerms(),SysSystemPermsVo.PermsVo.class);;
+        List<SysSystemPermsVo.PermsVo> permsList = JSON.parseArray(configs.get(0).getSysPerms(),SysSystemPermsVo.PermsVo.class);
 
         this.savePerms(permsList, role.getId());
         // 租户绑定管理员信息
@@ -488,13 +490,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @Transactional(rollbackFor = Exception.class)
     public void upAndDown(UpAndDownVo upAndDownVo) {
         if(YesNoEnum.YES.equals(upAndDownVo.getOpType())) {
-            upAndDownVo.getIds().forEach(id->{
-                reDeploy(Convert.toStr(id));
-            });
+            upAndDownVo.getIds().forEach(id-> reDeploy(Convert.toStr(id)));
         } else {
-            upAndDownVo.getIds().forEach(id->{
-                unDeploy(Convert.toStr(id));
-            });
+            upAndDownVo.getIds().forEach(id-> unDeploy(Convert.toStr(id)));
         }
     }
 
@@ -571,9 +569,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         sysSystemBusPermsLinkMapper.delete(new LambdaQueryWrapper<SysSystemBusPermsLink>()
                 .eq(SysSystemBusPermsLink::getPermsId, sysSystemBusPermsVo.getId())
         );
-        sysSystemBusPermsLink.forEach(link->{
-            link.setPermsId(sysSystemBusPerms.getId());
-        });
+        sysSystemBusPermsLink.forEach(link-> link.setPermsId(sysSystemBusPerms.getId()));
         sysSystemBusPermsLinkMapper.insert(sysSystemBusPermsLink);
         return true;
     }
@@ -588,15 +584,18 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
         List<SysSystemBusPermsLink> sysSystemBusPermsLinks = sysSystemBusPermsLinkMapper.selectList(new LambdaQueryWrapper<SysSystemBusPermsLink>()
                 .eq(SysSystemBusPermsLink::getPermsId, sysSystemBusPerms.getId()));
-
-        SysSystemBusPermsVo sysSystemBusPermsVo = new SysSystemBusPermsVo(sysSystemBusPerms,sysSystemBusPermsLinks);
-
-        return sysSystemBusPermsVo;
+        return new SysSystemBusPermsVo(sysSystemBusPerms,sysSystemBusPermsLinks);
     }
 
     @Autowired
     SysUserJzgInfoService sysUserJzgInfoService;
 
+    /**
+     * 根据租户获取保司信息
+     * @param systemCode 租户代码
+     * @author lipf
+     * @date 2026/3/25 17:07
+     */
     @Override
     public List<EsmInsCompany> getUserCompany(String systemCode) {
         SysSystemBusPermsVo busPerms = getBusPerms(systemCode);
@@ -605,31 +604,34 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
             companyIds = busPerms.getQuoteCompanyList();
         }
         List<EsmInsCompany> companyList = new ArrayList<>();
-//        if(!companyIds.isEmpty()) {
         companyList = baseMapper.getCompanyList(companyIds);
-//        }
-        System.out.printf("------------------------------------------------------------1");
+        log.info("租户代码[{}]匹配到保险公司[{}]个。",systemCode, CollUtil.size(companyList));
+        //log.debug("匹配到的保险公司分别是[{}]", JSONUtil.toJsonStr(companyList));
         // 根据用户权限获取 可使用的协议
-        List<String> companyIdList = companyList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<String> companyIdList = companyList.stream().map(EsmInsCompany::getId).collect(Collectors.toList());
         String userDeptId = baseController.getUserDeptId();
         if (StringUtils.isEmpty(userDeptId)){
             SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(baseController.getUserId(), systemCode);
             userDeptId = userByUserId.getDeptId();
         }
-        System.out.printf("------------------------------------------------------------2");
         List<PtlAgreement> userAgreement = ptlAgreementService.getUserAgreementByCompanyIds(userDeptId, companyIdList);
+        log.info("租户[{}],userDeptId= [{}] 匹配保险公司的协议[{}]个", systemCode, userDeptId, CollUtil.size(userAgreement));
 
         Map<String, List<PtlAgreement>> groupedMap = userAgreement.stream()
                 .collect(Collectors.groupingBy(PtlAgreement::getCompanyId));
-        System.out.printf("------------------------------------------------------------3");
+        log.info("租户[{}]匹配到的协议按照保司分类，分为[{}]个", systemCode, CollUtil.size(groupedMap));
+        log.info("groupedMap.keys = [{}]", JSONUtil.toJsonPrettyStr(groupedMap.keySet()));
+        var ids = companyList.stream().map(EsmInsCompany::getId).toList();
+        log.info("ids=[{}]",JSONUtil.toJsonStr(ids));
         companyList.forEach(company->{
             if(groupedMap.containsKey(company.getId())){
                 company.setAgreements(groupedMap.get(company.getId()));
             }
         });
 
-        companyList = companyList.stream().filter(x -> Objects.nonNull(x.getAgreements()) && x.getAgreements().size() > 0).collect(Collectors.toList());
+        companyList = companyList.stream().filter(x -> Objects.nonNull(x.getAgreements()) && !x.getAgreements().isEmpty()).collect(Collectors.toList());
 
+        log.info("租户匹配到的保司个数[{}]",CollUtil.size(companyList));
         return companyList;
     }
 

tenant/costsorrule/src/main/java/com/jzg/costsorrule/client/QuoteClient.java

@@ -1,16 +1,10 @@
 package com.jzg.costsorrule.client;
 
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.InsFeeOrdersParam;
-import com.jzg.commons.entity.po.InsFeeOrders;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
-
 @FeignClient(name = "jzg-insurance")
 public interface QuoteClient {
 
@@ -23,7 +17,5 @@ public interface QuoteClient {
      * @return
      */
     @GetMapping(value = "/newCarJudgeRules/compareNewCar")
-    public HttpResult compareNewCar(@RequestParam("registerDate") String registerDate, @RequestParam("companyId") String companyId, @RequestParam("vehicleType") String vehicleType);
-
-
+    HttpResult compareNewCar(@RequestParam("registerDate") String registerDate, @RequestParam("companyId") String companyId, @RequestParam("vehicleType") String vehicleType);
 }

tenant/costsorrule/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8085
 spring:
   application:
     name: jzg-costsorrule

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/build/BoHaiCrawlerQuoteResultsVoBuild.java

@@ -5,14 +5,11 @@ 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.quotation.bohai.api.entity.response.QuotationResponse;
 import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerQuotationResponse;
 import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerQuotationResponse2;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * @description: 渤海财险爬虫报价结果构建器

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/po/BoHaiCrawlerOrder.java

@@ -8,12 +8,12 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
 
 /**
- * @description: 渤海财险爬虫订单实体
- * @author:
- * @date:
+ * 渤海财险爬虫订单实体
+ *
+ * @author
+ * @date
  **/
 @Data
 @Document(collection = "bohai.crawler.order")

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/BoHaiCrawlerBaseRequest.java

@@ -1,11 +1,7 @@
 package com.jzg.quotation.bohai.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.bohai.api.entity.BoHaiConfigureParameters;
-import com.jzg.quotation.bohai.api.entity.request.BoHaiBaseRequest;
 import com.jzg.quotation.bohai.crawler.entity.BoHaiCrawlerConfigureParameters;
-import com.jzg.quotation.bohai.crawler.util.DESEncryption;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.util.ObjectUtils;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/BoHaiCrawlerImageUploadRequestDto.java

@@ -1,15 +1,11 @@
 package com.jzg.quotation.bohai.crawler.entity.request;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
-import com.jzg.quotation.bohai.api.entity.BoHaiConfigureParameters;
-import com.jzg.quotation.bohai.api.entity.request.BoHaiBaseRequest;
-import com.jzg.quotation.bohai.api.entity.request.ImageUploadRequest;
 import com.jzg.quotation.bohai.crawler.entity.BoHaiCrawlerConfigureParameters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/BoHaiCrawlerQuotationRequest2.java

@@ -1,12 +1,7 @@
 package com.jzg.quotation.bohai.crawler.entity.request;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
-import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quotation.bohai.crawler.entity.BoHaiCrawlerConfigureParameters;
-import com.jzg.quotation.bohai.enums.dictionary.Risk;
 import lombok.Data;
-import javax.swing.plaf.nimbus.State;
 import java.util.List;
 
 /**

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/response/BoHaiCrawlerCarResponse.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.bohai.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.bohai.crawler.entity.request.quote.CarModelDataDTO;
 import com.jzg.quotation.commons.filter.CarModelsFilter;
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/service/impl/BoHaiCrawlerOrderServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.bohai.crawler.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.bohai.crawler.entity.po.BoHaiCrawlerOrder;
-import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerQuotationResponse;
 import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerQuotationResponse2;
 import com.jzg.quotation.bohai.crawler.repository.BoHaiCrawlerOrderRepository;
 import com.jzg.quotation.bohai.crawler.service.BoHaiCrawlerOrderService;
@@ -12,13 +11,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 
 /**
- * @description: 渤海财险爬虫订单服务实现
- * @author:
- * @date:
+ * 渤海财险爬虫订单服务实现
+ *
  **/
 @Service
 @RequiredArgsConstructor

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -1,7 +1,5 @@
 package com.jzg.quotation.commons.component;
 
-import com.alibaba.fastjson.parser.Feature;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson2.JSON;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.config.WebClientConfig;
@@ -23,7 +21,6 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -84,8 +81,7 @@ public class RequestComponent {
                 return webClientConfig.clientBuilder();
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            log.info("创建安全WebClient失败，使用默认WebClient", e);
+            log.error("创建安全WebClient失败，使用默认WebClient", e);
         }
         return webClient;
     }
@@ -101,7 +97,6 @@ public class RequestComponent {
                 return webClientConfig.clientBuilder1();
             }
         } catch (Exception e) {
-            e.printStackTrace();
             log.info("创建安全WebClient失败，使用默认WebClient", e);
         }
         return webClient;
@@ -168,12 +163,10 @@ public class RequestComponent {
         StringBuilder sb = new StringBuilder(baseUrl);
         if (!params.isEmpty()) {
             sb.append("?");
-            params.forEach((key, values) -> {
-                values.forEach(value -> sb.append(key)
-                        .append("=")
-                        .append(URLEncoder.encode(value, StandardCharsets.UTF_8))
-                        .append("&"));
-            });
+            params.forEach((key, values) -> values.forEach(value -> sb.append(key)
+                    .append("=")
+                    .append(URLEncoder.encode(value, StandardCharsets.UTF_8))
+                    .append("&")));
             sb.deleteCharAt(sb.length() - 1); // 移除末尾多余的&
         }
         return sb.toString();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -2,9 +2,6 @@ package com.jzg.quotation.summary.aop.aspect;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jzg.commons.constants.ProductsType;
-import com.jzg.commons.constants.quote.enums.quote.CarKindCode;
-import com.jzg.commons.constants.quote.enums.quote.CarNatureCode;
 import com.jzg.commons.constants.quote.enums.quote.EnergyTypeCode;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -25,18 +22,13 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
-import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
@@ -73,11 +65,6 @@ public class QuoteVerificationAspect {
 
     private final BaseController baseController;
 
-
-    @Autowired
-    private RedissonClient redissonClient;
-
-
     @AfterReturning(pointcut = "@annotation(com.jzg.quotation.summary.aop.QuoteVerification)", returning = "result")
     public void doAfter(HttpResult<QuoteResultsVo> result) {
         if (result.getCode() == 200) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/CarModelController.java

@@ -46,6 +46,7 @@ public class  CarModelController {
     @PostMapping(value = "/modelsQuery")
     @Operation(description = "车型查询接口")
     public HttpResult<List<CarModelDTO>> modelsQuery(@RequestBody ModelsQueryQueryVo modelsQueryQueryVo) {
+        // 从 modelName 字符串中移除所有的中文字符
         String filtered = modelsQueryQueryVo.getModelName().replaceAll("[\\u4e00-\\u9fa5]", "");
         if("".equals(filtered)){
             throw new SystemException("品牌型号不能为纯中文");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -27,12 +27,10 @@ import com.jzg.commons.entity.vo.InsCompanyClauseVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.exception.TokenExpireException;
 import com.jzg.commons.util.AssertionUtils;
-import com.jzg.commons.util.MinioUtils;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.service.QuotationBaseService;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
-import com.jzg.quotation.hengbang.crawler.service.HengBangCrawlerRequest;
 import com.jzg.quotation.summary.aop.AuditVerification;
 import com.jzg.quotation.summary.aop.OrderOperationLog;
 import com.jzg.quotation.summary.aop.QuoteVerification;
@@ -41,18 +39,15 @@ import com.jzg.quotation.summary.constants.QuoteNumberConstant;
 import com.jzg.quotation.summary.converter.QuoteInfoConverter;
 import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.jzg.quotation.summary.factory.CompanyFactory;
-import com.jzg.quotation.summary.mapper.SysUploadFilesMapper;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import com.jzg.quotation.zhongmei.crawler.service.ZhongMeiCrawlerRequest;
-import io.minio.MinioClient;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -116,15 +111,6 @@ public class UnifyOrderManager {
     @Autowired
     OrderStateListener orderStateListener;
 
-    @Autowired
-    MinioClient minioClient;
-
-    @Autowired
-    MinioUtils minioUtils;
-
-    @Autowired
-    SysUploadFilesMapper sysUploadFilesMapper;
-
     @Autowired
     InsOrdersPdfUrlService insOrdersPdfUrlService;
 
@@ -134,15 +120,6 @@ public class UnifyOrderManager {
     @Autowired
     InsFeeOrdersService insFeeOrdersService;
 
-    @Value("${minio.bucket-name}")
-    private String bucketName;
-
-    @Autowired
-    private InsOrdersTrackService insOrdersTrackService;
-
-    @Autowired
-    private HengBangCrawlerRequest hengBangCrawlerRequest;
-
     @Autowired
     private ZhongMeiCrawlerRequest zhongMeiCrawlerRequest;
     @Autowired
@@ -658,7 +635,6 @@ public class UnifyOrderManager {
             if (usedAmount.compareTo(availableAmount) > 0) {
                 AssertionUtils.isFail(true, "权益金额不足！");
             }
-
         }
     }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -44,12 +44,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class CompanyFactory {
 
-    @Autowired
-    private SysQuoteConfigService sysQuoteConfigService;
-
-    @Autowired
-    private SysQuoteRedisService sysQuoteRedisService;
-
     @Autowired
     private MinioClient minioClient;
 
@@ -58,10 +52,6 @@ public class CompanyFactory {
 
     @Autowired
     private InsOrdersService insOrdersService;
-
-    @Autowired
-    private InsOrdersKindService insOrdersKindService;
-
     @Autowired
     private InsOrdersRiskService insOrdersRiskService;
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteDispatchDecorator.java

@@ -89,7 +89,7 @@ public class QuoteDispatchDecorator {
             //协议调度
             return target.quote(quoteVo);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("执行quote方法异常", e);
             throw new RuntimeException(e);
         }
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/SysQueryVehicleConfigMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
+ * 针对表【sys_query_vehicle_config(车型查询配置信息)】的数据库操作Mapper
+ *
  * @author Administrator
  * @description 针对表【sys_query_vehicle_config(车型查询配置信息)】的数据库操作Mapper
  * @createDate 2024-08-16 10:20:52

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/SysQueryVehicleConfigService.java

@@ -58,7 +58,7 @@ public interface SysQueryVehicleConfigService extends BaseIService<SysQueryVehic
      * 通过类型查看开启的配置信息
      *
      * @param type 类型
-     * @return
+     * @return SysQueryVehicleConfigDTO
      */
     SysQueryVehicleConfigDTO getByType(String type);
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersQrcodeServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.summary.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
-import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
@@ -41,7 +40,6 @@ public class InsOrdersQrcodeServiceImpl extends ServiceImpl<InsOrdersQrcodeMappe
 
     private final InsOrdersExternalFeeService insOrdersExternalFeeService;
     private final OrgClient orgClient;
-    private final BaseController baseController;
 
     @Override
     public InsOrdersQrcode getOneOrSave(InsOrders orders) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -128,10 +128,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Autowired
     private InsOrdersCarInfoMapper insOrdersCarInfoMapper;
-
-    @Autowired
-    private InsOrdersCarInfoService insOrdersCarInfoService;
-
     @Autowired
     private InsOrdersTrackService trackService;
 

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/component/ZiJinApiRequestComponent.java

@@ -15,7 +15,6 @@ import org.redisson.Redisson;
 import org.redisson.api.RLock;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
-import org.redisson.client.codec.StringCodec;
 import org.redisson.config.Config;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -275,7 +274,6 @@ public class ZiJinApiRequestComponent {
      * 对接三方渠道验车链接接口
      *
      * @param sendCheckCarLinkRequest 紫金财险 对接三方渠道验车链接接口 入参实体
-     * @return 出参实体
      */
     public void sendCheckCarLink(SendCheckCarLinkRequest sendCheckCarLinkRequest, HttpHeaders httpHeaders) {
         requestUrl(ziJinApiProperties.getSendCheckCarLink(), sendCheckCarLinkRequest, BaseResponse.class, httpHeaders);

tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -5,13 +5,12 @@ import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchQuery;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 @FeignClient(name="${spring.application.name:jzg-organization}")
 public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")
-    public HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery);
+    HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery);
 
 
 }

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java

@@ -53,5 +53,4 @@ public interface QuoteClient {
     @GetMapping(value = "/supplementOrder/changeSupplementOrder")
     HttpResult changeSupplementOrder(@RequestParam("orderNo") String orderNo);
 
-
 }

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -5,8 +5,6 @@ import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
-import com.jzg.commons.entity.po.PtlAgreementCostType;
-import com.jzg.commons.entity.vo.CostListVo;
 import com.jzg.commons.entity.vo.CostsListVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostTypeVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostVo;
@@ -104,8 +102,7 @@ public class PtlAgreementCostController {
     @Operation(summary = "费用管理分页列表")
     @PostMapping("pageList")
     public HttpResult<CostManagementVo> pageList(@RequestBody PtlAgreementCostParam costParam){
-        HttpResult httpResult = ptlAgreementCostService.pageList(costParam);
-        return httpResult;
+        return ptlAgreementCostService.pageList(costParam);
     }
 
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementCostMapper.java

@@ -27,7 +27,4 @@ public interface PtlAgreementCostMapper extends BaseMapper<PtlAgreementCost> {
 
     Page<CostManagementVo> pageList(Page page,@Param("costParam") PtlAgreementCostParam costParam);
 
-
-//    PtlAgreementCostVo selectById(@Param("id") Long id);
-
 }

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementCostService.java

@@ -33,6 +33,4 @@ public interface PtlAgreementCostService extends IService<PtlAgreementCost> {
 
     HttpResult pageList(PtlAgreementCostParam costParam);
 
-
-
 }

tenant/organization/src/main/java/com/jzg/organization/service/PtlSchemeService.java

@@ -2,14 +2,10 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
-import com.jzg.commons.entity.po.SysArea;
 import com.jzg.commons.entity.scheme.po.PtlScheme;
 import com.jzg.commons.entity.scheme.vo.*;
-import com.jzg.commons.entity.vo.AgreementRulesVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
-import com.jzg.commons.entity.vo.SysAreaVo;
 
 import java.util.List;
 
@@ -74,7 +70,7 @@ public interface PtlSchemeService extends IService<PtlScheme> {
      * @param schemeRuleFilterVo
      * @return
      */
-    public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo);
+    List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo);
 
     /**
      * 获取方案结果

tenant/organization/src/main/java/com/jzg/organization/service/SysOrganizationUserLinkService.java

@@ -1,7 +1,6 @@
 package com.jzg.organization.service;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.DeleteAssociatedUsers;

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -191,7 +191,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
             List<RuleConditionsVerify> verifies = BeanUtil.copyToList(ptlAgreementCostVo.getRuleConditions(), RuleConditionsVerify.class);
             if (ObjectUtil.equals(verifies,ruleConditionsVerifies)){
                 return true;
-            };
+            }
         }
         return false;
     }
@@ -324,7 +324,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
     }
 
     @Override
-    public HttpResult pageList(PtlAgreementCostParam costParam) {
+    public HttpResult<Page<CostManagementVo>> pageList(PtlAgreementCostParam costParam) {
         Page<CostManagementVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
         costManagementVoPage.getRecords().forEach(item->{
             if(item.getCostRules() != null && !item.getCostRules().equals("")){

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -16,7 +16,6 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.client.EsmInsCompanyClient;
-import com.jzg.organization.mapper.PtlAgreementCostExternalMapper;
 import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserMapper;
@@ -67,10 +66,6 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Autowired
     private PtlAgreementCostTypeService agreementCostTypeService;
-
-    @Autowired
-    private PtlAgreementUndwrtRulesAttrService agreementUndwrtRulesAttrService;
-
     @Autowired
     private PtlAgreementUndwrtRulesAttrLinkService agreementUndwrtRulesAttrLinkService;
 
@@ -198,7 +193,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("无法获取到保险公司信息");
         }
         // code生成规则 系统code + 保险公司code + 时间戳
-        ptlAgreement.setAgreementCode(sysCode + companyCode + +System.currentTimeMillis());
+        ptlAgreement.setAgreementCode(sysCode + companyCode + System.currentTimeMillis());
         ptlAgreement.setSerialNumber(0);
         ptlAgreement.setIsExternal(0);
         ptlAgreement.setIsEnable(YesNoEnum.NO.getCode()); // 启用
@@ -260,8 +255,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     public List<AgreementUserVo> getUserByDeptId(String deptId, String searchValue) {
-        List<AgreementUserVo> userVoList = userMapper.getUserByDeptId(deptId,searchValue);
-        return userVoList;
+        return userMapper.getUserByDeptId(deptId,searchValue);
     }
 
     @Override
@@ -294,13 +288,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     public void upAndDown(UpAndDownVo upAndDownVo) {
         if(YesNoEnum.YES.equals(upAndDownVo.getOpType())) {
-            upAndDownVo.getIds().forEach(id->{
-                reDeploy(Convert.toStr(id));
-            });
+            upAndDownVo.getIds().forEach(id-> reDeploy(Convert.toStr(id)));
         } else {
-            upAndDownVo.getIds().forEach(id->{
-                unDeploy(Convert.toStr(id));
-            });
+            upAndDownVo.getIds().forEach(id-> unDeploy(Convert.toStr(id)));
         }
     }
 
@@ -326,7 +316,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         PtlAgreement agreement = getById(param.getId());
         // 获取保险公司信息
         HttpResult<EsmInsCompany> result = companyClient.findById(agreement.getCompanyId());
-        String companyCode = "";
+        String companyCode;
         if(result.getCode() == 200 && Objects.nonNull(result.getData())){
             companyCode = result.getData().getCompanyCode();
         }else{
@@ -337,7 +327,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         BeanUtils.copyProperties(agreement,newAgreement);
         newAgreement.setId(null);
         newAgreement.setAgreementTitle(LocalDateTime.now().getSecond() + agreement.getAgreementTitle());
-        newAgreement.setAgreementCode(sysCode + companyCode + +System.currentTimeMillis());
+        newAgreement.setAgreementCode(sysCode + companyCode + System.currentTimeMillis());
         newAgreement.setAuditStatus(0);
         newAgreement.setIsEnable(0);
         save(newAgreement);
@@ -475,7 +465,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("无法获取到保险公司信息");
         }
         // code生成规则 系统code + 保险公司code + 时间戳
-        ptlAgreement.setAgreementCode(sysCode + companyCode + +System.currentTimeMillis());
+        ptlAgreement.setAgreementCode(sysCode + companyCode + System.currentTimeMillis());
         ptlAgreement.setSerialNumber(0);
         ptlAgreement.setIsExternal(1);
         ptlAgreement.setIsEnable(YesNoEnum.NO.getCode()); // 启用
@@ -512,19 +502,17 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     public List<PtlAgreement> getByCompanyId(String companyId,String systemCode) {
-        List<PtlAgreement> byCompanyId = baseMapper.getByCompanyId(companyId);
-        return byCompanyId;
+        return baseMapper.getByCompanyId(companyId);
     }
 
     @Override
     public List<PtlAgreement> getContactAgreement(String companyId) {
-        List<PtlAgreement> agreements = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()
+        return baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()
                 .eq(PtlAgreement::getIsExternal,1)
                 .eq(PtlAgreement::getIsDelete,0)
                 .le(PtlAgreement::getStartDate, LocalDateTime.now())
                 .ge(PtlAgreement::getEndDate, LocalDateTime.now())
                 .eq(PtlAgreement::getCompanyId, companyId));
-        return agreements;
     }
 
     @Override

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesAttrServiceImpl.java

@@ -12,7 +12,6 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrMapper;
-import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesDictService;
 import org.redisson.api.RList;
@@ -32,10 +31,6 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
 
     @Autowired
     PtlAgreementUndwrtRulesDictService ptlAgreementUndwrtRulesDictService;
-
-    @Autowired
-    PtlAgreementUndwrtRulesAttrLinkService agreementUndwrtRulesAttrLinkService;
-
     @Autowired
     RedissonClient redissonClient;
     private PtlAgreementUndwrtRulesAttrQueryVo ptlAgreementUndwrtRulesAttrQueryVo;
@@ -47,8 +42,6 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
     public List<PtlAgreementUndwrtRulesAttr> getUndwrtRulesAttrList() {
         this.ptlAgreementUndwrtRulesAttrQueryVo = ptlAgreementUndwrtRulesAttrQueryVo;
         try {
-
-
             // 获取属性列表
             List<PtlAgreementUndwrtRulesAttr> list = this.list();
             if (CollectionUtils.isEmpty(list)) {
@@ -61,6 +54,7 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
             initializeAttributes(list, dictMap);
             return list;
         } catch (Exception e) {
+            log.error("获取协议明细发生异常.", e);
             // 处理异常
             throw new RuntimeException("Error occurred while processing getUndwrtRulesAttrList", e);
         }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesDictServiceImpl.java

@@ -1,7 +1,5 @@
 package com.jzg.organization.service.impl;
-import com.google.common.collect.Lists;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDict;
@@ -12,8 +10,6 @@ import com.jzg.organization.service.PtlAgreementUndwrtRulesDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -40,6 +36,4 @@ public class PtlAgreementUndwrtRulesDictServiceImpl extends ServiceImpl<PtlAgree
         }
         return list;
     }
-
-
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -12,11 +12,9 @@ import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
 import com.jzg.commons.entity.vo.AgreementRulesVo;
 import com.jzg.commons.entity.vo.CostListVo;
-import com.jzg.commons.entity.vo.PtlAgreementCostVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrLinkMapper;
-import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrMapper;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesMapper;
 import com.jzg.organization.service.PtlAgreementCostService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
@@ -24,11 +22,9 @@ import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,6 +30,8 @@ import com.jzg.organization.client.OrgClient;
 import com.jzg.organization.mapper.*;
 import com.jzg.organization.service.*;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -40,6 +44,7 @@ import java.util.stream.Collectors;
 @Service
 public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme> implements PtlSchemeService {
 
+    private static final Logger log = LoggerFactory.getLogger(PtlSchemeServiceImpl.class);
     @Value("${minio.bucket-name}")
     private String bucketName;
 
@@ -70,9 +75,6 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     RedissonClient redissonClient;
 
-    @Autowired
-    private PtlAgreementService agreementService;
-
     @Autowired
     PtlAgreementDispatchService ptlAgreementDispatchService;
 
@@ -162,11 +164,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         //获取商业险
         List<PtlSchemeInsuranceVo> ptlSchemeInsurances = ptlSchemeInsuranceMapper.getSchemeInsurance(ptlSchemeInfo.getId());
-        ptlSchemeInsurances.forEach(item -> {
-            item.getOptionVos().forEach(option -> {
-                item.getOptionId().add(option.getOptionId());
-            });
-        });
+        ptlSchemeInsurances.forEach(item -> item.getOptionVos().forEach(option -> {
+            item.getOptionId().add(option.getOptionId());
+        }));
         List<PtlSchemeInsuranceVo> ptlSchemeInsurancesNew = new ArrayList<>();
         Map<String, PtlSchemeInsuranceVo> insuranceMap = new HashMap<>();
 
@@ -202,9 +202,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<PtlAgreementUndwrtRulesAttr> agreementRulesVo = rulesGet(ptlScheme.getCompanyId(), ptlScheme.getId());
 
         //拼装返回数据
-        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfo, ptlSchemeInsurancesNew, ptlSchemeInsuranceDrivingIntentions, ptlSchemeRulesAttrLinks, agreementRulesVo);
-
-        return vo;
+        return new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfo, ptlSchemeInsurancesNew, ptlSchemeInsuranceDrivingIntentions, ptlSchemeRulesAttrLinks, agreementRulesVo);
     }
 
     @Override
@@ -236,11 +234,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
             //获取商业险
             List<PtlSchemeInsuranceVo> ptlSchemeInsurances = ptlSchemeInsuranceMapper.getSchemeInsurance(ptlSchemeInfo.getId());
-            ptlSchemeInsurances.forEach(item -> {
-                item.getOptionVos().forEach(option -> {
-                    item.getOptionId().add(option.getOptionId());
-                });
-            });
+            ptlSchemeInsurances.forEach(item -> item.getOptionVos().forEach(option -> {
+                item.getOptionId().add(option.getOptionId());
+            }));
             scheme.setSchemeInsuranceList(ptlSchemeInsurances);
 
             //获取驾意险
@@ -256,15 +252,12 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<PtlAgreementUndwrtRulesAttr> agreementRulesVo = rulesGet(ptlScheme.getCompanyId(), ptlScheme.getId());
 
         //拼装返回数据
-        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfos, schemes, ptlSchemeRulesAttrLinks, agreementRulesVo);
-
-        return vo;
+        return new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfos, schemes, ptlSchemeRulesAttrLinks, agreementRulesVo);
     }
 
     @Override
     public Page<PtlSchemeVo> getSchemePage(Page page, PtlSchemeVo ptlSchemeVo) {
-        Page<PtlSchemeVo> schemePage = ptlSchemeMapper.getSchemePage(page, ptlSchemeVo);
-        return schemePage;
+        return ptlSchemeMapper.getSchemePage(page, ptlSchemeVo);
     }
 
     @Override
@@ -323,11 +316,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     BaseController baseController;
 
-    @Autowired
-    PtlAgreementDeptService ptlAgreementDeptService;
-
     @Override
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo) {
+        log.info("租户匹配保司以及保司下的协议等信息。 schemeRuleFilterVo=[{}]", JSONUtil.toJsonStr(schemeRuleFilterVo));
         //如果用户租户code为App  则使用参数传来的租户code
         String systemCode = "";
         if ("APP".equals(baseController.getUserSystemCode())) {
@@ -337,8 +328,11 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         }
         //根据权限获取所有保司
         HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
+        log.info("租户[{}]有权限的保司有[{}]个", systemCode, CollUtil.size(companyListResult.getData()));
         AssertionUtils.isFail(companyListResult.getCode() != 200, companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
+        log.info("根据权限获取到的保司个数是[{}].systemCode=[{}],systemCode=[{}]", CollUtil.size(companyList),systemCode,systemCode);
+        AssertionUtils.isFail(companyList.isEmpty(), "没有可报价的保险公司");
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getEnergyType, schemeRuleFilterVo.getCarInfo().getEnergyTypeCode())
@@ -356,8 +350,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .in(PtlSchemeRulesAttrLink::getSchemeId, ptlSchemeIds));
 
         // 将规则根据schemeId聚合转换成Map
-        Map<String, List<PtlSchemeRulesAttrLink>> ptlSchemeRulesAttrLinkMap = ptlSchemeRulesAttrLinks.stream()
-                .collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
+//        Map<String, List<PtlSchemeRulesAttrLink>> ptlSchemeRulesAttrLinkMap = ptlSchemeRulesAttrLinks.stream()
+//                .collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
 
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
@@ -485,16 +479,13 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         SchemeResultVo schemeResultVo = new SchemeResultVo();
         //基础方案
-        List<SchemeResultVo.SchemeVo> schemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("1")).collect(Collectors.toList());
+        List<SchemeResultVo.SchemeVo> schemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("1")).toList();
 
         List<SchemeResultVo.SchemeInfoVo> allInfo = new ArrayList<>();
 
-        schemeVo.forEach(scheme -> {
-            scheme.getInfos().forEach(item -> {
-                allInfo.add(item);
-            });
-
-        });
+        schemeVo.forEach(scheme -> scheme.getInfos().forEach(item -> {
+            allInfo.add(item);
+        }));
 
         schemeResultVo.setSchemes(allInfo);
         //把基础方案的商业险的value 赋值

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -1,7 +1,6 @@
 package com.jzg.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.DeleteAssociatedUsers;
@@ -11,10 +10,6 @@ import com.jzg.organization.mapper.SysOrganizationUserLinkServiceMapper;
 import com.jzg.organization.service.SysOrganizationUserLinkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
 
 @Service
 public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizationUserLinkServiceMapper, SysOrganizationUserLink> implements SysOrganizationUserLinkService{

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -62,7 +62,6 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
 
     @Autowired
     private BaseController baseController;
-
     @Autowired
     private SysDeptMapper sysDeptMapper;
 
@@ -323,14 +322,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         }
     }
 
-
     /**
      * 邀请成为分销员
      *
      * @param param
      * @return
      */
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public InvitationVo distributorInvite(InvitationAddParam param) {

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -91,9 +91,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private EsmUserReferrerService esmUserReferrerService;
 
-    @Autowired
-    private EsmUserReferrerMapper esmUserReferrerMapper;
-
     @Autowired
     private SysUserJzgInfoBankCardRecordService sysUserJzgInfoBankCardRecordService;
     @Qualifier("baseController")
@@ -199,9 +196,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //检查用户的业务员数量
         List<SysUserJzgInfo> list = sysUserJzgInfoService.list(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getLeaderId, originalUserId));
-        list.forEach(item -> {
-            item.setLeaderId(userTransferVo.getTransferUserId());
-        });
+        list.forEach(item -> item.setLeaderId(userTransferVo.getTransferUserId()));
         return sysUserJzgInfoService.updateBatchById(list);
     }
 
@@ -1275,7 +1270,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserVo.setLeaderName(userJzgInfo.getLeaderName());
         }
         SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
-        String sysUserId = "";
+        String sysUserId;
         if (Objects.isNull(sysUser)){
             // 如果手机号为新号 重新生成SysUser 设置默认密码
             SysUser sysUser1 = new SysUser(sysUserVo.getMobile(), sysUserVo.getMobile(), sysUserVo.getIdentity(), sysUserVo.getIdentityTimeStart(), sysUserVo.getIdentityTimeEnd(), sysUserVo.getPassword());

tenant/organization/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8084
 spring:
   application:
     name: jzg-organization