Merge remote-tracking branch 'origin/master'

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

@@ -119,6 +119,9 @@ public class PtlAgreementCostEnd {
         @Schema(description = "加投比例")
         private BigDecimal addThrow;
 
+        @Schema(description = "留点比例")
+        private BigDecimal keepPointRatio;
+
     }
 
 }

gateway/src/main/java/com/jzg/GateWayApplication.java

@@ -1,16 +1,26 @@
 package com.jzg;
 
+import com.jzg.factory.MultiPathRoutePredicateFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Bean;
 
 @EnableDiscoveryClient
 @SpringBootApplication(exclude ={DataSourceAutoConfiguration.class},scanBasePackages = "com.jzg")
 public class GateWayApplication {
 
+
+
+
     public static void main(String[] args) {
         SpringApplication.run(GateWayApplication.class, args);
     }
 
+
+    @Bean
+    public MultiPathRoutePredicateFactory multiPathPredicateFactory() {
+        return new MultiPathRoutePredicateFactory();
+    }
 }

gateway/src/main/java/com/jzg/factory/MultiPathRoutePredicateFactory.java

@@ -0,0 +1,37 @@
+package com.jzg.factory;
+import lombok.Getter;
+import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+@Component
+public class MultiPathRoutePredicateFactory extends AbstractRoutePredicateFactory<MultiPathRoutePredicateFactory.Config> {
+    private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+
+    public MultiPathRoutePredicateFactory() {
+        super(Config.class);
+    }
+
+    @Getter
+    public static class Config {
+        private List<String> paths;
+
+        public void setPaths(List<String> paths) {
+            this.paths = paths;
+        }
+    }
+
+    @Override
+    public Predicate<ServerWebExchange> apply(Config config) {
+        return exchange -> {
+            String path = exchange.getRequest().getURI().getPath();
+            boolean match = config.getPaths().stream()
+                    .anyMatch(pattern -> antPathMatcher.match(pattern, path));
+            return match;
+        };
+    }
+}

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

@@ -13,40 +13,109 @@ spring:
         import-check:
           enabled: false
         file-extension: yaml
-        namespace: 1096345e-2a2d-4307-8025-ee1b669e127b
+        namespace: ba488f58-c785-49b4-9c02-b5d9b8a965a5
         group: DEFAULT_GROUP
       discovery:
-        namespace: 1096345e-2a2d-4307-8025-ee1b669e127b
+        namespace: ba488f58-c785-49b4-9c02-b5d9b8a965a5
 
     gateway:
       routes:
         - id: auth_route
           uri: http://localhost:8081/
           predicates:
-            - Path=/auth/**,/send/sendSmsCode,/appAuth/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /auth/**
+                  - /send/sendSmsCode
+                  - /appAuth/**
 
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/attribution/**,/manager/attributionTemplate/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /userRole/**
+                  - /system/**
+                  - /file/**
+                  - /user/**
+                  - /esmInsCompany/**
+                  - /jyxConfig/**
+                  - /qrBarcode/**
+                  - /sysDept/**
+                  - /manager/**
 
         - 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/**,/messageTemplate/**,/message/**,/appUser/**,/userBankCard/**,/accountCard/**,/account/**,/amountAuditing/**,/userAccount/**,/receivable/**,/sysDistributionSetting/**,/organization/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /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/**
+                  - /ptlAgreementCostExternal/**
+                  - /operatorTrajectory/**
+                  - /messageTemplate/**
+                  - /appUser/**
+                  - /userBankCard/**
+                  - /receivable/**
+                  - /ptlAgreementDispatch/**
 
         - id: summary_route
           uri: http://localhost:9898/
           predicates:
-            - Path= /order/identify/** ,/supplementOrder/**,/order/carModel/**,/unify/**,/order/taskImages/**,/order/qrCode/**,/orderTrack/**,/feeAudit/**,/adjust/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /order/identify/**
+                  - /supplementOrder/**
+                  - /order/carModel/**
+                  - /unify/**
+                  - /order/taskImages/**
+                  - /order/qrCode/**
+                  - /orderTrack/**
+                  - /feeAudit/**
+                  - /adjust/**
 
         - id: costsorrule_route
           uri: http://localhost:8085/
           predicates:
-            - Path=/validate/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /validate/**
 
         #控制台添加网关
         - id: console_route
           uri: http://localhost:8086/
           predicates:
-            - Path=/console/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /console/**

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

@@ -1,7 +1,12 @@
 spring:
+  minio:
+    url: http://192.168.0.250:9000
+    access-key: v7Zb8XhyLcYNcSHlxvyK
+    secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
+    bucket-name: jzg
   cloud:
     nacos:
-      server-addr: 172.24.144.223:8848
+      server-addr: 192.168.0.250:8848
       username: nacos
       password: nacos
       config:
@@ -16,23 +21,86 @@ spring:
     gateway:
       routes:
         - id: auth_route
-          uri: http://172.24.144.223:9081/
+          uri: http://192.168.0.250:8081/
           predicates:
-            - Path=/auth/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /auth/**
+                  - /send/sendSmsCode
+                  - /appAuth/**
 
         - id: platform_route
-          uri: http://172.24.144.223:9083/
+          uri: http://192.168.0.250:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/**,
+            - name: MultiPath
+              args:
+                paths:
+                - /userRole/**
+                - /system/**
+                - /file/**
+                - /user/**
+                - /esmInsCompany/**
+                - /jyxConfig/**
+                - /qrBarcode/**
+                - /sysDept/**
+                - /manager/**
 
         - id: tenant_route
-          uri: http://172.24.144.223:9084/
+          uri: http://192.168.0.250:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,,/pltAgreement/**,/agreementRules/**,/poster/**,/agreement/**,/ptl/areaLicense/**,/ptlAgreementCost/**,/scheme/**,/ptlAgreementCostExternal/**,/plt/areaLicense/**,/organization/**
-        #数据报表
-        - id: console_route
-          uri: http://172.24.144.223:9085/
-          predicates:
-            - Path=/console/**
+            - name: MultiPath
+              args:
+                paths:
+                  - /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://192.168.0.250:9898/
+          predicates:
+            - name: MultiPath
+              args:
+                paths:
+                  - /order/identify/**
+                  - /supplementOrder/**
+                  - /order/carModel/**
+                  - /unify/**
+                  - /order/taskImages/**
+                  - /order/qrCode/**
 
+        - id: costsorrule_route
+          uri: http://192.168.0.250:8085/
+          predicates:
+            - name: MultiPath
+              args:
+                paths:
+                  - /validate/**

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

@@ -115,23 +115,26 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
         });
         SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
         sysRoleDataScope.setRoleId(sysRole.getId());
-        sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
-        sysRoleDataScopeMapper.insert(sysRoleDataScope);
-        if (sysRoleVo.getDataScope().getDataMark().equals("2") || sysRoleVo.getDataScope().getDataMark().equals("1")) {
-            List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
-            if (!Objects.isNull(sysRoleVo.getDataScope().getDeptIds())) {
-                if (!sysRoleVo.getDataScope().getDeptIds().isEmpty()) {
-                    sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
-                        SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
-                        sysRoleDataScopeLink.setId(IdGenerate.nextId());
-                        sysRoleDataScopeLink.setRoleId(sysRole.getId());
-                        sysRoleDataScopeLink.setDeptId(item);
-                        sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
-                    });
+        if(Objects.nonNull(sysRoleVo.getDataScope())) {
+            sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
+            sysRoleDataScopeMapper.insert(sysRoleDataScope);
+            if (sysRoleVo.getDataScope().getDataMark().equals("2") || sysRoleVo.getDataScope().getDataMark().equals("1")) {
+                List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
+                if (!Objects.isNull(sysRoleVo.getDataScope().getDeptIds())) {
+                    if (!sysRoleVo.getDataScope().getDeptIds().isEmpty()) {
+                        sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
+                            SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
+                            sysRoleDataScopeLink.setId(IdGenerate.nextId());
+                            sysRoleDataScopeLink.setRoleId(sysRole.getId());
+                            sysRoleDataScopeLink.setDeptId(item);
+                            sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
+                        });
+                    }
                 }
+                sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
             }
-            sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
         }
+
         if(sysRolePermsMapper.insert(sysRolePermsList).stream().count() > 0 && baseMapper.insert(sysRole) > 0){
             return true;
         }

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

@@ -34,6 +34,7 @@
         <if test="ptlAgreementAttributionQueryVo.username != null and ptlAgreementAttributionQueryVo.username != ''">
             and paa.username like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
             or paa.user_abbr like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
+            or eic.name_simple like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
         </if>
         <if test="ptlAgreementAttributionQueryVo.quoteStatus != null and ptlAgreementAttributionQueryVo.quoteStatus != ''">
             and paa.quote_status = #{ptlAgreementAttributionQueryVo.quoteStatus}

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

@@ -18,7 +18,7 @@
             and pau.company_id = #{ptlAgreementUrlVo.companyId}
         </if>
         <if test="ptlAgreementUrlVo.name != null and ptlAgreementUrlVo.name != ''">
-            and pau.name = #{ptlAgreementUrlVo.name}
+            and pau.name like concat('%',#{ptlAgreementUrlVo.name},'%')
         </if>
     </select>
 </mapper>

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

@@ -3,6 +3,7 @@ package com.jzg.quotation.summary.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.vo.CarModelDTO;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.summary.entity.po.ModelsQueryQueryVo;
 import com.jzg.quotation.summary.service.CarModelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -45,6 +46,10 @@ public class  CarModelController {
     @PostMapping(value = "/modelsQuery")
     @Operation(description = "车型查询接口")
     public HttpResult<List<CarModelDTO>> modelsQuery(@RequestBody ModelsQueryQueryVo modelsQueryQueryVo) {
+        String filtered = modelsQueryQueryVo.getModelName().replaceAll("[\\u4e00-\\u9fa5]", "");
+        if("".equals(filtered)){
+            throw new SystemException("品牌型号不能为纯中文");
+        }
         List<CarModelDTO> map = carModelService.modelsQuery(modelsQueryQueryVo.getModelName());
         List<CarModelDTO> carModelDTOS =
                 map.stream().sorted(Comparator.comparing(CarModelDTO::getReplacementValue)).collect(Collectors.toList());

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

@@ -367,13 +367,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         // 业务员信息
         SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy(),baseController.getToken(),baseController.getAppSystemCode());
-        InsOrdersVo.Salesman salesman = new InsOrdersVo.Salesman();
-        salesman.setName(salesmanInfo.getName());
-        salesman.setDeptName(salesmanInfo.getDeptName());
-        salesman.setTypeAttr(salesmanInfo.getTypeAttr());
-        salesman.setDeptId(salesmanInfo.getDeptId());
-        salesman.setMobile(salesmanInfo.getMobile());
-        insOrdersVo.setSalesmanInfo(salesman);
+        if(Objects.nonNull(salesmanInfo)) {
+            InsOrdersVo.Salesman salesman = new InsOrdersVo.Salesman();
+            salesman.setName(salesmanInfo.getName());
+            salesman.setDeptName(salesmanInfo.getDeptName());
+            salesman.setTypeAttr(salesmanInfo.getTypeAttr());
+            salesman.setDeptId(salesmanInfo.getDeptId());
+            salesman.setMobile(salesmanInfo.getMobile());
+            insOrdersVo.setSalesmanInfo(salesman);
+        }
         // 2. 处理车辆用户信息列表
         if (CollectionUtil.isNotEmpty(insOrdersVo.getCarUserInfoList())) {
             for (InsOrdersCarUserInfo carUserInfo : insOrdersVo.getCarUserInfoList()) {

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

@@ -735,7 +735,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
                         .eq(SysUserJzgInfoBankCard::getSystemCode, baseController.getUserSystemCode()));
         if (verifyBankCard != null) {
-            HttpResult.error("该租户下银行卡已存在");
+            return HttpResult.error("该租户下银行卡已存在");
         }
         SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
         BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -57,6 +57,7 @@
         <result column="inlet" property="inlet" jdbcType="DECIMAL"/>
         <result column="export" property="export" jdbcType="DECIMAL"/>
         <result column="add_throw" property="addThrow" jdbcType="DECIMAL"/>
+        <result column="keep_point_ratio" property="keepPointRatio" jdbcType="DECIMAL"/>
     </resultMap>
 
 
@@ -281,6 +282,7 @@
             tt.inlet,
             tt.export,
             tt.add_throw,
+            tt.keep_point_ratio,
             CASE
                 WHEN tt.cost_type = '交强险' THEN pa.jq_entrance_fee_ratio
                 WHEN tt.cost_type = '商业险' THEN pa.sy_entrance_fee_ratio

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -983,6 +983,13 @@
             </where>
             GROUP BY ipiil.income_id
             ) invoice_summary ON invoice_summary.income_id = ipi.id
+        LEFT JOIN (
+                     SELECT
+                     ifo.order_no,
+                     SUM(DISTINCT (ifo.jq_commission_premium + ifo.sy_commission_premium + ifo.jy_commission_premium)) as total_commission
+                     FROM ins_fee_orders ifo
+                     GROUP BY ifo.order_no
+                     ) fee_summary ON ipi.order_no = fee_summary.order_no
         WHERE
         eic.parent_id = 0
             <if test="settlementReportQueryVo.companyId != null and settlementReportQueryVo.companyId != ''">

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -9,7 +9,7 @@
         <result column="bankAddress" jdbcType="VARCHAR" property="bankAddress"/>
         <result column="bankCardNumber" jdbcType="VARCHAR" property="bankCardNumber"/>
         <result column="auditStatus" jdbcType="VARCHAR" property="auditStatus"/>
-        <result column="cardFile" jdbcType="VARCHAR" property="cardFile"/>
+        <result column="cardFileUrl" jdbcType="VARCHAR" property="cardFileUrl"/>
         <result column="systemCode" jdbcType="VARCHAR" property="systemCode"/>
     </resultMap>
 
@@ -22,7 +22,7 @@
             sujibc.bank_address as bankAddress,
             sujibc.bank_card_number as bankCardNumber,
             sujibc.audit_status as auditStatus,
-            sujif.file_url as cardFile
+            sujif.file_url as cardFileUrl
         from
             sys_user_jzg_info_bank_card sujibc
         left join sys_user su on su.id = sujibc.user_id