Merge remote-tracking branch 'origin/master'

authentication/pom.xml

@@ -116,6 +116,53 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.jzg.AuthenticationApplication</mainClass> <!-- 替换为你的主类 -->
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
             </plugin>
         </plugins>
     </build>

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

@@ -25,10 +25,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.entity.RedisToken;
 import com.jzg.entity.SysUploadFiles;
 import com.jzg.entity.SysUser;
-import com.jzg.entity.vo.AppRegisterFormVo;
-import com.jzg.entity.vo.ForgotPasswordFormVo;
-import com.jzg.entity.vo.LoginFormVo;
-import com.jzg.entity.vo.ModifyPassWordFormVo;
+import com.jzg.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.handler.JzgAuthenticationSuccessHandler;
 import com.jzg.mapper.SysUploadFilesMapper;
@@ -288,6 +285,29 @@ public class AuthController extends BaseController {
         return delete ? HttpResult.ok("退出登录成功") : HttpResult.error("退出登录失败");
     }
 
+    @PostMapping("cancel")
+    @Operation(summary = "注销账号")
+    public HttpResult cancel(@RequestBody AppCancelFormVo appCancelFormVo){
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        String authorizationHeader = request.getHeader("Authorization");
+        // 后面加余额校验不能大于0
+        // 校验短信验证码
+        sysUserService.validateSmsCode(appCancelFormVo.getMobile(), appCancelFormVo.getSmsCode());
+        // 物理删除app账号，清空授权登录信息
+        SysUser userById = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile, appCancelFormVo.getMobile()));
+        AssertionUtils.isFail(Objects.isNull(userById),"用户名不存在");
+        SysUserJzgApp appUser = sysUserJzgAppMapper.selectOne(new LambdaQueryWrapper<SysUserJzgApp>()
+                .eq(SysUserJzgApp::getUserId, userById.getId()));
+        appUser.setIsDelete(1);
+        appUser.setAlipay(null);
+        appUser.setOpenId(null);
+        sysUserJzgAppMapper.updateById(appUser);
+        boolean delete = redissonClient.getBucket(authorizationHeader).delete();
+        return delete ? HttpResult.ok("注销账号成功") : HttpResult.error("注销账号失败");
+    }
+
     @PostMapping("changeHeadSculpture")
     @Operation(summary = "修改头像")
     public HttpResult<String> changeHeadSculpture(@RequestSingleParam(value = "id") String id){

authentication/src/main/java/com/jzg/entity/vo/AppCancelFormVo.java

@@ -0,0 +1,17 @@
+package com.jzg.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+@Schema(description = "APP注销账号表单VO")
+public class AppCancelFormVo {
+
+    @Schema(description = "账号")
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    @Schema(description = "短信验证码")
+    private String smsCode;
+}

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -36,9 +36,8 @@ import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Aspect
@@ -136,7 +135,13 @@ public class OperatorTrajectoryAspect {
             return StringUtils.join(arg);
         } else if (arg instanceof String) {
             return String.valueOf(arg);
-        } else if (arg != null) {
+        } else if (arg instanceof String[]){
+            StringBuilder argStrBuilrder = new StringBuilder();
+            for (String s : (String[]) arg) {
+                argStrBuilrder.append(s).append(",");
+            }
+            return argStrBuilrder.substring(0, argStrBuilrder.length() - 1);
+        }else if (arg != null) {
             JSONObject jsonObject = (JSONObject) JSON.toJSON(arg);
             return jsonObject.getString(key);
         }
@@ -148,6 +153,10 @@ public class OperatorTrajectoryAspect {
     public void doBefore(JoinPoint point,  OperatorTrajectory operatorTrajectory){
         Object obj = point.getArgs()[0];
         String id = getId(point,operatorTrajectory.primary());
+        List<String> ids = new ArrayList<>();
+        if (Objects.nonNull(id)){
+            ids = Arrays.stream(id.split(",")).collect(Collectors.toList());
+        }
         if (isRecorded(operatorTrajectory.isRecorded(),obj)){
             return;
         }
@@ -183,24 +192,28 @@ public class OperatorTrajectoryAspect {
                 break;
             //更新
             case "U":
-                beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), id);
-                trajectory.setPrimaryValue(id);
-                if (!Objects.isNull(beforeData)){
-                    trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                for (String s : ids) {
+                    beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), s);
+                    trajectory.setPrimaryValue(s);
+                    if (!Objects.isNull(beforeData)) {
+                        trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                    }
+                    trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData, operatorName));
+                    operatorTrajectoryService.save(trajectory);
                 }
-                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
-                operatorTrajectoryService.save(trajectory);
                 break;
             //删除
             case "D":
-                beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), id);
-                trajectory.setPrimaryValue(id);
-                trajectory.setBeforeJson(JSON.toJSONString(beforeData));
-                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
-                operatorTrajectoryService.save(trajectory);
-                break;
-                default:
-                    log.warn("Unsupported operator type: {}", operatorTrajectory.type());
+                for (String s : ids) {
+                    beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), s);
+                    trajectory.setPrimaryValue(s);
+                    trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                    trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData, operatorName));
+                    operatorTrajectoryService.save(trajectory);
+                    break;
+                }
+            default:
+                log.warn("Unsupported operator type: {}", operatorTrajectory.type());
 
         }
         // 用于验证上下文

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

@@ -3,11 +3,13 @@ package com.jzg.commons.config;
 import io.minio.MinioClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 //只有在引用 minio的依赖时才会加载配置类
+@ConditionalOnProperty(name = "minio.url")
 @ConditionalOnClass(MinioClient.class)
 public class MinioConfig {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/ApiType.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/ApiType.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/ExpenseRequestUrl.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/ExpenseRequestUrl.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/InsuranceEnum.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/InsuranceEnum.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/InsuranceImageEnum.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/InsuranceImageEnum.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/PolicyPrintType.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/PolicyPrintType.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/ProductsType.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/ProductsType.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/QuoteRuleCategory.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/QuoteRuleCategory.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/QuoteRuleGroup.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/base/QuoteRuleGroup.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.base;
+package com.jzg.commons.constants.quote.enums.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/BiVehicleUseCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/BiVehicleUseCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/CarKindCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/CarKindCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/CarKindDetailIdCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/CarKindDetailIdCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/CarNatureCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/CarNatureCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/EnergyTypeCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/EnergyTypeCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/KindCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/KindCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/LicenseColorCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/LicenseColorCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/LicenseKindCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/LicenseKindCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/PropertyCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/PropertyCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/RiskCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/RiskCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/VehicleUseCode.java → commons/src/main/java/com/jzg/commons/constants/quote/enums/quote/VehicleUseCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.constant.enums.quote;
+package com.jzg.commons.constants.quote.enums.quote;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/costsorrule/src/main/java/com/jzg/costsorrule/model/ValidateSchemeRuleVo.java → commons/src/main/java/com/jzg/commons/entity/costs/vo/ValidateSchemeRuleVo.java

@@ -1,16 +1,13 @@
-package com.jzg.costsorrule.model;
+package com.jzg.commons.entity.costs.vo;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.gson.JsonObject;
 import com.jzg.commons.entity.po.SysDict;
 import com.jzg.commons.entity.scheme.po.PtlSchemeRulesAttrLink;
 import com.jzg.commons.entity.scheme.vo.SchemeRuleFilterVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.redisson.api.RFunction;
 import org.redisson.api.RList;
 import org.redisson.api.RedissonClient;
 

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

@@ -1,13 +1,16 @@
 package com.jzg.commons.entity.dto;
 
-import com.jzg.commons.entity.po.SysMessageTemplate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
 
 @Schema(description = "消息表新增dto")
 @Data
+@NoArgsConstructor
 public class MessageAddParam {
 
     /** 消息标题 */
@@ -21,14 +24,9 @@ public class MessageAddParam {
     @NotNull(message = "消息内容不能为空")
     private String content;
 
-    /** 模版编号 */
-    @Schema(description = "模版id")
-    @NotNull(message = "模版id不能为空")
-    private String tplId;
-
-    /** 模版编号 */
-    @Schema(description = "模版编号")
-    @NotNull(message = "模版编号不能为空")
+    /** 消息内容 */
+    @Schema(description = "模板code")
+    @NotNull(message = "模板code不能为空")
     private String tplCode;
 
     /**
@@ -36,13 +34,12 @@ public class MessageAddParam {
      */
     @Schema(description = "接收方")
     @NotNull(message = "接收方不能为空")
-    private String receive;
+    private List<String> receive;
 
-    public MessageAddParam(String content, SysMessageTemplate template) {
+    public MessageAddParam(String title, String content, List<String> receive,String tplCode) {
+        this.title = title;
         this.content = content;
-        this.tplCode = template.getTplCode();
-        this.title = template.getTplName();
-        this.tplId = template.getId();
-        this.receive = template.getReceive();
+        this.receive = receive;
+        this.tplCode = tplCode;
     }
 }

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

@@ -10,12 +10,29 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MessageCodeEnum {
 
-    /**测试模板1提醒*/
-    TEMPLATE_1("template_1","测试模板1"),
-    /**测试模板2提醒*/
-    TEMPLATE_2("template_2","测试模板2"),
-    /**补录订单提交审核提醒*/
-    TEMPLATE_3("template_3","补录订单提交审核");
+    /**待核保消息*/
+    TEMPLATE_1("template_1","待核保消息"),
+    /**核保中消息*/
+    TEMPLATE_2("template_2","核保中消息"),
+    /**人工处理中消息*/
+    TEMPLATE_3("template_3","人工处理中消息"),
+    /**核保失败消息*/
+    TEMPLATE_4("template_4","核保失败消息"),
+    /**待缴费消息*/
+    TEMPLATE_5("template_5","待缴费消息"),
+    /**已承保 & 未下载电子保单 消息*/
+    TEMPLATE_6("template_6","已承保 & 未下载电子保单 消息"),
+    /**已承保 & 已下载电子保单 消息*/
+    TEMPLATE_7("template_7","已承保 & 已下载电子保单 消息"),
+    /**订单已关闭 消息*/
+    TEMPLATE_8("template_8","订单已关闭 消息"),
+    /**补录订单待审核 消息*/
+    TEMPLATE_9("template_9","补录订单待审核 消息"),
+    /**补录订单审核通过 消息*/
+    TEMPLATE_10("template_10","补录订单审核通过 消息"),
+    /**发布通知消息(新增业务员) 消息*/
+    TEMPLATE_11("template_11","发布通知消息(新增业务员) 消息"),
+    ;
 
     private final String code;
 

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

@@ -10,6 +10,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MessageSourceEnum {
 
+    ORDERSTATUS("orderStatus", "订单状态变更"),
+    ADDISSUEUSER("addIssueUser", "业务员新增"),
     ORDERREVIEW("orderReview", "补录订单审核");
 
     private final String code;

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

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

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

@@ -10,7 +10,9 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MessageTypeEnum {
 
-    ORDER("ORDER", "订单类型");
+    ORDER("ORDER", "订单类型"),
+    USER("USER", "用户类型"),
+    ;
 
     private final String code;
 

commons/src/main/java/com/jzg/commons/entity/log/InsOrdersLogVo.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.log;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.constants.quote.enums.quote.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -221,14 +222,14 @@ public class InsOrdersLogVo {
     private String purchasePrice;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarNatureCode
+     * @see CarNatureCode
      * 使用性质代码
      */
     @Schema(description = "使用性质代码")
     private String carNatureCode;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.VehicleUseCode
+     * @see VehicleUseCode
      * 车辆用途代码
      */
     @Schema(description = "车辆用途代码")
@@ -243,38 +244,38 @@ public class InsOrdersLogVo {
     private String carTypeCode;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarKindCode
+     * @see CarKindCode
      * 车辆种类代码
      */
     @Schema(description = "车辆种类代码")
     private String carKindCode;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.EnergyTypeCode
+     * @see EnergyTypeCode
      * 能源种类代码
      */
     @Schema(description = "能源种类代码")
     private String energyTypeCode;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.PropertyCode
+     * @see PropertyCode
      * 所属性质代码
      */
     @Schema(description = "所属性质代码")
     private String propertyCode;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.LicenseColorCode
+     * @see LicenseColorCode
      * 号牌颜色代码
      */
     @Schema(description = "号牌颜色代码")
     private String licenseColorCode;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarKindDetailIdCode
+     * @see CarKindDetailIdCode
      * 车种明细
      */
     @Schema(description = "车种明细")
     private String carKindDetailIdCode;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.LicenseKindCode
+     * @see LicenseKindCode
      * 号牌种类
      */
     @Schema(description = "号牌种类")

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

@@ -28,10 +28,6 @@ public class SysMessage extends BaseModel {
     @Schema(description = "消息内容")
     private String content;
 
-    /** 模版编号 */
-    @Schema(description = "模版id")
-    private String tplId;
-
     /** 模版编号 */
     @Schema(description = "模版编号")
     private String tplCode;

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

@@ -53,10 +53,6 @@ public class SysMessageTemplate extends BaseModel {
     @Schema(description = "跳转页面")
     private String linkUrl;
 
-    /** 接收方 */
-    @Schema(description = "接收方")
-    private String receive;
-
     /** 是否启用 0 启用 1禁用 */
     @Schema(description = "是否启用 0 启用 1禁用")
     private Integer isEnable;

commons/src/main/java/com/jzg/commons/entity/quote/vo/CarInfoVo.java

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.quote.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.constants.quote.enums.quote.*;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -12,7 +13,6 @@ import org.springframework.util.StringUtils;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.format.DateTimeFormatter;
-import java.util.Objects;
 
 /**
  * @description: 车辆信息
@@ -90,7 +90,7 @@ public class CarInfoVo implements Serializable {
     private String purchasePrice;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarNatureCode
+     * @see CarNatureCode
      * 使用性质代码
      */
     @Schema(description = "使用性质代码")
@@ -103,7 +103,7 @@ public class CarInfoVo implements Serializable {
     private String carNatureName;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.VehicleUseCode
+     * @see VehicleUseCode
      * 车辆用途代码
      */
     @Schema(description = "车辆用途代码")
@@ -123,7 +123,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "车辆类型名称")
     private String carTypeName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarKindCode
+     * @see CarKindCode
      * 车辆种类代码
      */
     @Schema(description = "车辆种类代码")
@@ -132,7 +132,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "车辆种类名称")
     private String carKindName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.EnergyTypeCode
+     * @see EnergyTypeCode
      * 能源种类代码
      */
     @Schema(description = "能源种类代码")
@@ -141,7 +141,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "能源种类名称")
     private String energyTypeName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.PropertyCode
+     * @see PropertyCode
      * 所属性质代码
      */
     @Schema(description = "所属性质代码")
@@ -150,7 +150,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "所属性质名称")
     private String propertyName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.LicenseColorCode
+     * @see LicenseColorCode
      * 号牌颜色代码
      */
     @Schema(description = "号牌颜色代码")
@@ -159,7 +159,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "号牌颜色名称")
     private String licenseColorName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.CarKindDetailIdCode
+     * @see CarKindDetailIdCode
      * 车种明细
      */
     @Schema(description = "车种明细")
@@ -168,7 +168,7 @@ public class CarInfoVo implements Serializable {
     @Schema(description = "车种明细")
     private String carKindDetailIdName;
     /**
-     * @see com.jzg.quotation.commons.constant.enums.quote.LicenseKindCode
+     * @see LicenseKindCode
      * 号牌种类
      */
     @Schema(description = "号牌种类")

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/QuoteVo.java

@@ -1,13 +1,12 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo;
 
 
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.util.IDCardUtils;
-import com.jzg.quotation.commons.constant.enums.quote.RiskCode;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
+import com.jzg.commons.constants.quote.enums.quote.RiskCode;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/DownloadPolicyResultVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/DownloadPolicyResultVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/DownloadPolicyVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/DownloadPolicyVo.java

@@ -1,10 +1,9 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import com.jzg.commons.entity.orders.po.InsOrdersRisk;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/InsuranceUploadImageVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/InsuranceUploadImageVo.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/OrderStatusResultVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/OrderStatusResultVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/OrderStatusVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/OrderStatusVo.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import lombok.Data;
 
 /**

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/PaymentLinkResultsVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/PaymentLinkResultsVo.java

@@ -1,13 +1,16 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @description: 支付链接返回结果
  * @author quchen
  * @date 2025/4/1 14:50
  */
-
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class PaymentLinkResultsVo {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/PaymentLinkVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/PaymentLinkVo.java

@@ -1,10 +1,10 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import lombok.Data;
 
 import java.util.List;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteEchoVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -1,13 +1,14 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
+import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.commons.entity.scheme.vo.PtlAgreementInsCompanyVo;
-import com.jzg.quotation.commons.constant.enums.quote.RiskCode;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
+import com.jzg.commons.constants.quote.enums.quote.RiskCode;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteResultsVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteResultsVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UnderwritingResultsVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/UnderwritingResultsVo.java

@@ -1,8 +1,9 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -13,6 +14,10 @@ import java.io.Serializable;
 
 @Data
 public class UnderwritingResultsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2027171793273844446L;
+
     /**
      * 交互唯一订单
      */

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UnderwritingVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/UnderwritingVo.java

@@ -1,9 +1,9 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
 
 import com.jzg.commons.entity.orders.po.*;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.underwriting.SpecialAppointmentsVo;
+import com.jzg.commons.entity.quote.vo.underwriting.SpecialAppointmentsVo;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UploadImageVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/UploadImageVo.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
+package com.jzg.commons.entity.quote.vo.aggregated;
 
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.image.ImageVo;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.image.ImageVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/base/LoginBase.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/base/LoginBase.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.base;
+package com.jzg.commons.entity.quote.vo.base;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/base/OrderBase.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -1,7 +1,11 @@
-package com.jzg.quotation.commons.entity.vo.base;
+package com.jzg.commons.entity.quote.vo.base;
 
+import com.jzg.commons.constants.quote.enums.base.ApiType;
+import com.jzg.commons.constants.quote.enums.base.ProductsType;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
+import com.jzg.commons.exception.SystemException;
 import lombok.Data;
+import org.springframework.util.StringUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -43,13 +47,15 @@ public class OrderBase implements Serializable {
     private AttributionInformationVo attributionInformationVo;
 
     /**
-     * @see com.jzg.quotation.commons.constant.enums.base.ProductsType
+     * @see ProductsType
      * 产品代码
      */
     private String productId;
 
+    private String productsCode;
+
     /**
-     * @see com.jzg.quotation.commons.constant.enums.base.ApiType
+     * @see ApiType
      * 请求方式
      */
     private Integer apiType;
@@ -63,4 +69,17 @@ public class OrderBase implements Serializable {
      * 协议id 或 账号id
      */
     private String agreementId;
+
+    /**
+     * 获取保险公司编码
+     */
+    public String fetchCompanyCode() {
+        if(!StringUtils.hasLength(this.insuranceCompanyCode)) {
+            throw new SystemException("保险公司编码不能为空");
+        }
+        // 使用正则表达式匹配字符串开头的英文字符部分
+        String regex = "^[A-Z]+";
+        return this.insuranceCompanyCode.matches(regex) ? this.insuranceCompanyCode : this.insuranceCompanyCode.replaceAll("(?i).*?([A-Z]+).*", "$1");
+    }
+
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/base/R.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/base/R.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.base;
+package com.jzg.commons.entity.quote.vo.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/identify/ReinsuranceCaptchaVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/identify/ReinsuranceCaptchaVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.identify;
+package com.jzg.commons.entity.quote.vo.identify;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/identify/SliderCaptchaVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/identify/SliderCaptchaVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.identify;
+package com.jzg.commons.entity.quote.vo.identify;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/image/ImageVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/image/ImageVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.image;
+package com.jzg.commons.entity.quote.vo.image;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/image/InsuranceImageVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/image/InsuranceImageVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.image;
+package com.jzg.commons.entity.quote.vo.image;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -28,7 +28,14 @@ public class InsuranceImageVo {
      * 影像类型名称
      */
     private String imageType;
-
+    /**
+     * 保司影像类型
+     */
+    private String insuranceImageCode;
+    /**
+     * 保司影像名称
+     */
+    private String insuranceImageType;
     /**
      * 影像base64 影像类型
      */

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/image/RecognitionRequest.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/image/RecognitionRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.image;
+package com.jzg.commons.entity.quote.vo.image;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/image/RecognitionResponse.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/image/RecognitionResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.image;
+package com.jzg.commons.entity.quote.vo.image;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersAdd.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersAdd.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.orders;
+package com.jzg.commons.entity.quote.vo.orders;
 
 
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
@@ -6,7 +6,7 @@ import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersEnd.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersEnd.java

@@ -1,11 +1,11 @@
-package com.jzg.quotation.commons.entity.vo.orders;
+package com.jzg.commons.entity.quote.vo.orders;
 
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -1,11 +1,11 @@
-package com.jzg.quotation.commons.entity.vo.orders;
+package com.jzg.commons.entity.quote.vo.orders;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/underwriting/SpecialAppointmentsVo.java → commons/src/main/java/com/jzg/commons/entity/quote/vo/underwriting/SpecialAppointmentsVo.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.commons.entity.vo.underwriting;
+package com.jzg.commons.entity.quote.vo.underwriting;
 
 
 import lombok.AllArgsConstructor;

commons/src/main/java/com/jzg/commons/entity/vo/EsmInsCompanyReq.java

@@ -21,6 +21,9 @@ public class EsmInsCompanyReq implements Serializable {
     @Schema(description = "parentId")
     private String parentId;
 
+    @Schema(description = "系统code")
+    private String systemCode;
+
 }
 
 

commons/src/main/java/com/jzg/commons/util/MinioUtils.java

@@ -9,6 +9,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -29,6 +30,7 @@ import java.util.*;
 @Slf4j
 @Component
 @ConditionalOnClass(MinioClient.class)
+@ConditionalOnBean(MinioClient.class)
 public class MinioUtils {
 
     private static MinioClient minioClient;

commons/src/main/java/com/jzg/commons/util/StringUtils.java

@@ -780,7 +780,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
      * @return
      */
     public static String replaceContent(String content, Map<String, Object> valuesMap) {
-        StrSubstitutor strSubstitutor = new StrSubstitutor(valuesMap);
+        StrSubstitutor strSubstitutor = new StrSubstitutor(valuesMap, "%", "%");
         return strSubstitutor.replace(content);
     }
 }

gateway/pom.xml

@@ -46,6 +46,53 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.jzg.GateWayApplication</mainClass> <!-- 替换为你的主类 -->
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
             </plugin>
         </plugins>
     </build>

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -18,7 +18,6 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://localhost:9000");
         corsConfiguration.addAllowedOrigin("http://localhost:9001");
         corsConfiguration.addAllowedOrigin("http://127.0.0.1:9000");
-        corsConfiguration.addAllowedOrigin("http://127.0.0.1:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.149:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.253:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.69:9000");
@@ -30,13 +29,12 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9001");
-        corsConfiguration.addAllowedOrigin("http://192.168.0.55:9000");
-        corsConfiguration.addAllowedOrigin("http://192.168.0.55:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.106:8001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.106:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.106:9000");
-        corsConfiguration.addAllowedOrigin("http://192.168.0.18:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.115:8080");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.18:9000");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.18:9001");
         // 允许的方法
         corsConfiguration.addAllowedMethod("*");
         // 允许的头信息
@@ -54,4 +52,4 @@ public class CorsConfig {
     }
 
 
-}
+}

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

@@ -1,4 +1,9 @@
 spring:
+  minio:
+    url: http://192.168.0.250:9000
+    access-key: v7Zb8XhyLcYNcSHlxvyK
+    secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
+    bucket-name: jzg
   cloud:
     nacos:
       server-addr: 192.168.0.250:8848
@@ -28,7 +33,7 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**,/operatorTrajectory/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**,/operatorTrajectory/**,/messageTemplate/**,/message/**
 
         - id: summary_route
           uri: http://localhost:9898/

platform/pom.xml

@@ -92,6 +92,53 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.jzg.PlatFormApplication</mainClass> <!-- 替换为你的主类 -->
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
             </plugin>
         </plugins>
     </build>

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

@@ -2,6 +2,7 @@ package com.jzg.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -9,6 +10,7 @@ import com.jzg.commons.entity.dto.EsmInsCompanyAdd;
 import com.jzg.commons.entity.dto.EsmInsCompanyEnd;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyReq;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyVo;
@@ -21,6 +23,7 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.constants.ManagementSourceEnum;
 import com.jzg.mapper.SysUploadFilesMapper;
 import com.jzg.service.EsmInsCompanyService;
+import com.jzg.service.SysSystemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +33,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * ---------------------------
@@ -289,14 +294,26 @@ public class EsmInsCompanyController extends BaseController {
 //    }
 
 
+    @Autowired
+    SysSystemService sysSystemService;
+
     @Operation(summary = "获取顶级保险公司列表")
     @GetMapping(value = "/gainTopList")
-    public HttpResult<List<EsmInsCompanyResVo>> gainTopList(@RequestParam String type) {
+    public HttpResult<List<EsmInsCompanyResVo>> gainTopList(@RequestParam String type,@RequestParam(required = false) String systemCode) {
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper<>();
         lqw.eq(EsmInsCompany::getParentId, "0");
         lqw.orderByAsc(EsmInsCompany::getOrderNum);
         lqw.eq(StringUtils.isNotEmpty(type), EsmInsCompany::getType, type);
         List<EsmInsCompany> list = esmInsCompanyService.list(lqw);
+        if(Objects.nonNull(systemCode)) {
+            SysSystemBusPermsVo perms = sysSystemService.getBusPerms(systemCode);
+            if (perms.getQuoteCompany() == 2) {
+                List<String> quoteCompanyList = perms.getQuoteCompanyList();
+                if (!CollectionUtils.isEmpty(quoteCompanyList)) {
+                    list = list.stream().filter(r -> quoteCompanyList.contains(r.getId())).collect(Collectors.toList());
+                }
+            }
+        }
         List<EsmInsCompanyResVo> esmInsCompanyResVos = BeanUtil.copyToList(list, EsmInsCompanyResVo.class);
         return HttpResult.ok(esmInsCompanyResVos);
     }

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

@@ -218,11 +218,16 @@ public class SysSystemController {
 
     @GetMapping("/getBusPerms")
     @Operation(summary = "获取租户业务权限")
-    public HttpResult getBusPerms(String systemCode) {
+    public HttpResult<SysSystemBusPermsVo> getBusPerms(String systemCode) {
         return HttpResult.ok(sysSystemService.getBusPerms(systemCode));
     }
 
-
+    // 根据租户获取保司信息
+    @GetMapping("/getUserCompany")
+    @Operation(summary = "根据租户获取保司信息")
+    public HttpResult getUserCompany(String systemCode) {
+        return HttpResult.ok(sysSystemService.getUserCompany(systemCode));
+    }
     //endregion
 
 }

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

@@ -3,6 +3,7 @@ package com.jzg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.SysSystemParam;
+import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,6 +34,8 @@ public interface SysSystemMapper extends BaseMapper<SysSystem> {
      * @return
      */
     List<SysSystemVo> queryList(@Param("sysSystemVo") SysSystemParam param);
+
+    List<EsmInsCompany> getCompanyList(@Param("companyIds") List<String> companyIds);
 }
 
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.SysSystemAddParam;
 import com.jzg.commons.entity.dto.SysSystemEditParam;
 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;
@@ -174,5 +175,12 @@ public interface SysSystemService extends IService<SysSystem> {
      */
     SysSystemBusPermsVo getBusPerms(String systemCode);
 
+    /**
+     * 根据租户配置获取保司列表
+     * @param systemCode
+     * @return
+     */
+    List<EsmInsCompany> getUserCompany(String systemCode);
+
     //endregion
 }

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.entity.system.po.SysSystemBusPerms;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyReq;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyVo;
@@ -14,7 +16,9 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.mapper.EsmInsCompanyMapper;
+import com.jzg.mapper.SysSystemBusPermsMapper;
 import com.jzg.service.EsmInsCompanyService;
+import com.jzg.service.SysSystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -22,6 +26,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -44,6 +49,9 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
 //        return esmInsCompanies;
 //    }
 
+    @Autowired
+    SysSystemService sysSystemService;
+
     @Override
     public List<EsmInsCompanyVo> findTree(EsmInsCompanyReq req) {
         List<EsmInsCompanyVo> allList  = baseMapper.findTree(req);
@@ -53,6 +61,15 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         List<EsmInsCompanyVo> list;
         list = allList.stream().filter(r -> r.getParentId().equalsIgnoreCase("0")).collect(Collectors.toList());
         findChildren(list, allList);
+        if(Objects.nonNull(req.getSystemCode())) {
+            SysSystemBusPermsVo perms = sysSystemService.getBusPerms(req.getSystemCode());
+            if (perms.getQuoteCompany() == 2) {
+                List<String> quoteCompanyList = perms.getQuoteCompanyList();
+                if (!CollectionUtils.isEmpty(quoteCompanyList)) {
+                    list = list.stream().filter(r -> quoteCompanyList.contains(r.getId())).collect(Collectors.toList());
+                }
+            }
+        }
         return list;
     }
 

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

@@ -546,6 +546,17 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return sysSystemBusPermsVo;
     }
 
+    @Override
+    public List<EsmInsCompany> getUserCompany(String systemCode) {
+        SysSystemBusPermsVo busPerms = getBusPerms(systemCode);
+        List<String> companyIds = new ArrayList<>();
+        if(busPerms.getQuoteCompany() == 2){
+            companyIds = busPerms.getQuoteCompanyList();
+        }
+        List<EsmInsCompany> companyList = baseMapper.getCompanyList(companyIds);
+        return companyList;
+    }
+
 }
 
 

platform/src/main/resources/application.yml

@@ -52,6 +52,7 @@ tenant:
     - sys_system_bus_perms
     - ptl_agreement_attribution_dept
     - qr_barcode_config
+    - ptl_scheme_info
   ignoreLoginNames:
 
   ignoreFunction:

platform/src/main/resources/mapper/SysSystemMapper.xml

@@ -79,4 +79,37 @@
         </where>
         ORDER BY create_time DESC
     </select>
+
+    <select id="getCompanyList" resultType="com.jzg.commons.entity.po.EsmInsCompany">
+        SELECT
+            eic.id,
+            eic.code,
+            eic.company_code,
+            eic.name,
+            eic.parent_id,
+            eic.name_simple,
+            eic.remark,
+            eic.order_num,
+            eic.cn_name,
+            eic.type,
+            count(psi.id) as count,
+            suf.file_name as logo
+        FROM
+            esm_ins_company eic
+                left join sys_upload_files suf on eic.logo = suf.id
+                left join ptl_scheme ps on eic.id = ps.company_id
+                left join ptl_scheme_info psi on ps.id = psi.scheme_id
+        WHERE
+            eic.parent_id = 0
+          AND
+            eic.is_delete = 0
+        <if test="companyIds != null and companyIds.size() > 0">
+            and eic.id in
+            <foreach collection="companyIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by eic.id
+        order by count desc
+    </select>
 </mapper>

pom.xml

@@ -254,29 +254,6 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/spring.handlers</resource>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/spring.schemas</resource>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

tenant/costsorrule/pom.xml

@@ -29,10 +29,54 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.jzg.costsorrule.CostsOrRuleApplication</mainClass>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.jzg.costsorrule.CostsOrRuleApplication</mainClass> <!-- 替换为你的主类 -->
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
         </plugins>
     </build>
 </project>

tenant/costsorrule/src/main/java/com/jzg/costsorrule/controller/RuleController.java

@@ -8,7 +8,7 @@ import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.scheme.po.PtlSchemeRulesAttrLink;
 import com.jzg.costsorrule.mapper.PtlAgreementUndwrtRulesAttrMapper;
 import com.jzg.costsorrule.model.RuleAttrLinkVo;
-import com.jzg.costsorrule.model.ValidateSchemeRuleVo;
+import com.jzg.commons.entity.costs.vo.ValidateSchemeRuleVo;
 import com.jzg.costsorrule.service.RuleService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/CostsService.java

@@ -1,8 +1,8 @@
 package com.jzg.costsorrule.service;
 
 import com.jzg.costsorrule.model.RuleAttrLinkVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 import java.util.List;
 

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/impl/CostsServiceImpl.java

@@ -1,14 +1,12 @@
 package com.jzg.costsorrule.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.costsorrule.mapper.PtlAgreementUndwrtRulesAttrMapper;
 import com.jzg.costsorrule.model.RuleAttrLinkVo;
 import com.jzg.costsorrule.service.CostsService;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.commons.entity.quote.vo.KindInfoVo;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

tenant/insurance/quotation-ansheng/src/main/java/com/jzg/ansheng/crawler/build/AnShengCrawlerQuoteResultsVoBuild.java

@@ -6,8 +6,8 @@ import com.jzg.ansheng.crawler.entity.response.AnShengCrawlerCalculatePremiumApp
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.commons.component.ConversionOfQuoteInformation;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 import java.util.List;
 

tenant/insurance/quotation-ansheng/src/main/java/com/jzg/ansheng/crawler/entity/request/AnShengCrawlerCalculatePremiumApplyMessage.java

@@ -6,7 +6,7 @@ import com.jzg.ansheng.crawler.entity.response.AnShengCrawlerSearchVehicleByVinR
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-ansheng/src/main/java/com/jzg/ansheng/crawler/service/impl/AnShengCrawlerLoginServiceImpl.java

@@ -6,7 +6,7 @@ import com.jzg.ansheng.crawler.entity.request.AnShengCrawlerCheckVerificationReq
 import com.jzg.ansheng.crawler.entity.request.AnShengCrawlerVerifyRequest;
 import com.jzg.ansheng.crawler.entity.response.AnShengCrawlerVerifyResponse;
 import com.jzg.ansheng.crawler.service.AnShengCrawlerLoginService;
-import com.jzg.quotation.commons.entity.vo.identify.SliderCaptchaVo;
+import com.jzg.commons.entity.quote.vo.identify.SliderCaptchaVo;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;

tenant/insurance/quotation-ansheng/src/main/java/com/jzg/ansheng/crawler/service/impl/AnShengCrawlerRequestImpl.java

@@ -11,10 +11,11 @@ import com.jzg.ansheng.crawler.entity.response.*;
 import com.jzg.ansheng.crawler.service.AnShengCrawlerLoginService;
 import com.jzg.ansheng.crawler.service.AnShengCrawlerOrderService;
 import com.jzg.ansheng.crawler.service.AnShengCrawlerRequest;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.quotation.commons.entity.vo.aggregated.*;
-import com.jzg.quotation.commons.entity.vo.base.LoginBase;
+import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/build/BoHaiApiQuoteResultsVoBuild.java

@@ -4,8 +4,8 @@ import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.bohai.api.entity.response.QuotationResponse;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 import java.util.List;
 import java.util.Map;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/component/BoHaiRequestApiComponent.java

@@ -12,7 +12,7 @@ import com.jzg.quotation.bohai.api.properties.BohaiApiConfigurationProperties;
 import com.jzg.quotation.bohai.api.util.BoHaiEncrypted;
 import com.jzg.quotation.bohai.api.util.SignatureUtils;
 import com.jzg.quotation.commons.component.RequestComponent;
-import com.jzg.quotation.commons.constant.enums.base.InsuranceEnum;
+import com.jzg.commons.constants.quote.enums.base.InsuranceEnum;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.utils.InsuranceLog;
 import lombok.RequiredArgsConstructor;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/entity/request/ImageUploadRequest.java

@@ -3,7 +3,7 @@ package com.jzg.quotation.bohai.api.entity.request;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.bohai.api.constant.enums.DocumentClass;
 import com.jzg.quotation.bohai.api.entity.BoHaiConfigureParameters;
-import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/entity/request/QuotationRequest.java

@@ -9,8 +9,8 @@ import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.bohai.api.constant.enums.Coverages;
 import com.jzg.quotation.bohai.api.entity.BoHaiConfigureParameters;
 import com.jzg.quotation.commons.constant.InsuranceTypeCorrespondence;
-import com.jzg.quotation.commons.constant.enums.quote.KindCode;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.constants.quote.enums.quote.KindCode;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/entity/request/VehicleConfirmationReqeust.java

@@ -12,7 +12,7 @@ import com.jzg.quotation.bohai.api.constant.enums.InvoiceType;
 import com.jzg.quotation.bohai.api.entity.BoHaiConfigureParameters;
 import com.jzg.quotation.bohai.api.entity.response.VehicleTypeQueryResponse;
 import com.jzg.quotation.bohai.api.entity.vo.PersonAreaVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/service/BoHaiApiOrderService.java

@@ -3,7 +3,7 @@ package com.jzg.quotation.bohai.api.service;
 import com.jzg.quotation.bohai.api.entity.po.BoHaiApiOrder;
 import com.jzg.quotation.bohai.api.entity.response.GenerateOrderNoResponse;
 import com.jzg.quotation.bohai.api.entity.response.QuotationResponse;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 /**
  * @description: 渤海财险 mongodb操作数据

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/service/impl/BoHaiApiOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.jzg.quotation.bohai.api.entity.response.GenerateOrderNoResponse;
 import com.jzg.quotation.bohai.api.entity.response.QuotationResponse;
 import com.jzg.quotation.bohai.api.repository.BoHaiApiOrderRepository;
 import com.jzg.quotation.bohai.api.service.BoHaiApiOrderService;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/service/impl/BoHaiApiRequestImpl.java

@@ -4,6 +4,7 @@ import com.jzg.commons.constants.InsuranceRisk;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import com.jzg.commons.entity.quote.vo.*;
+import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.bohai.api.build.BoHaiApiQuoteResultsVoBuild;
@@ -20,13 +21,11 @@ import com.jzg.quotation.bohai.api.service.BoHaiApiRequest;
 import com.jzg.quotation.bohai.api.util.StringSubStringUtils;
 import com.jzg.quotation.commons.annotation.QuoteApiService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.quotation.commons.entity.vo.aggregated.*;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.DateUtil;
 import lombok.RequiredArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/build/ChengTaiAPIQuoteResultsVoBuild.java

@@ -5,9 +5,9 @@ import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.TaxInfoVo;
 import com.jzg.quotation.chengtai.api.entity.constants.ResponseCode;
 import com.jzg.quotation.chengtai.api.entity.response.InsurePremiumResponse;
-import com.jzg.quotation.commons.constant.enums.quote.KindCode;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.constants.quote.enums.quote.KindCode;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 import java.util.ArrayList;
 import java.util.List;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/constants/enums/ImageTypeEnum.java

@@ -1,6 +1,6 @@
 package com.jzg.quotation.chengtai.api.entity.constants.enums;
 
-import com.jzg.quotation.commons.constant.enums.base.InsuranceImageEnum;
+import com.jzg.commons.constants.quote.enums.base.InsuranceImageEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/InsurePremiumRequest.java

@@ -14,7 +14,7 @@ import com.jzg.quotation.chengtai.api.entity.constants.enums.TaxConditionCodeEnu
 import com.jzg.quotation.chengtai.api.entity.response.CarInfoResponse;
 import com.jzg.quotation.chengtai.api.entity.response.QueryCarActualValueResponse;
 import com.jzg.quotation.commons.constant.InsuranceTypeCorrespondence;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/QueryCarActualValueRequest.java

@@ -5,7 +5,7 @@ import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.chengtai.api.entity.constants.PlateType;
 import com.jzg.quotation.chengtai.api.entity.response.CarInfoResponse;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/SubmitVerifyRequest.java

@@ -8,7 +8,7 @@ import com.jzg.commons.util.IDCardUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.chengtai.api.entity.constants.enums.RiskCodeEnum;
 import com.jzg.quotation.chengtai.api.entity.po.ChengTaiApiOrder;
-import com.jzg.quotation.commons.entity.vo.aggregated.UnderwritingVo;
+import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/UploadFileRequest.java

@@ -2,8 +2,8 @@ package com.jzg.quotation.chengtai.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.chengtai.api.entity.constants.enums.ImageTypeEnum;
-import com.jzg.quotation.commons.constant.enums.base.InsuranceImageEnum;
-import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
+import com.jzg.commons.constants.quote.enums.base.InsuranceImageEnum;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

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

@@ -2,7 +2,7 @@ package com.jzg.quotation.chengtai.api.service;
 
 import com.jzg.quotation.chengtai.api.entity.po.ChengTaiApiOrder;
 import com.jzg.quotation.chengtai.api.entity.response.InsurePremiumResponse;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 public interface ChengTaiCrawlerOrderService {
 

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

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.http.HttpUtils;
@@ -24,9 +26,8 @@ import com.jzg.quotation.chengtai.api.service.ChengTaiApiRequest;
 import com.jzg.quotation.chengtai.api.service.ChengTaiCrawlerOrderService;
 import com.jzg.quotation.commons.annotation.QuoteApiService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.quotation.commons.entity.vo.aggregated.*;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.DateTimeUtil;