app报价编辑报错问题解决

authentication/src/main/java/com/jzg/entity/RedisToken.java

@@ -4,12 +4,14 @@ import com.jzg.commons.entity.vo.SysRoleDataScopeVo;
 import com.jzg.config.JzgGrantedAuthority;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 import java.util.List;
 
 @Data
 public class RedisToken {
+    @Schema(description = "用户id")
+    private String userId;
+
     @Schema(description = "用户名")
     private String username;
 

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

@@ -51,6 +51,7 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
                 .map(authority -> (JzgGrantedAuthority) authority)
                 .collect(Collectors.toList());
 
+        redisToken.setUserId(id);
         redisToken.setAuths(jzgGrantedAuthorities);
         redisToken.setUsername(username);
         redisToken.setWorkNumber(workNumber);

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

@@ -3,7 +3,6 @@ package com.jzg.commons.core.base;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.exception.TokenExpireException;
 import jakarta.servlet.http.HttpServletRequest;
 import org.redisson.api.RedissonClient;
@@ -64,6 +63,18 @@ public class BaseController {
         return userInfo.getString("username");
     }
 
+    public String getUserId(){
+        String token = getToken();
+        if(token == null){
+            //如果是内部请求的话 返回空值
+            return "";
+        }
+        valiedToken(token);
+        String userJsonStr = redissonClient.getBucket(token).get().toString();
+        JSONObject userInfo = JSONObject.parseObject(userJsonStr);
+        return userInfo.getString("userId");
+    }
+
     /**
      * 获取用户登录的系统
      * @return

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

@@ -3,20 +3,17 @@ package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.constants.quote.enums.quote.RiskCode;
 import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersQrcode;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.InsCompanyClause;
-import com.jzg.commons.entity.po.InsFeeOrders;
 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.image.InsuranceImageVo;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.commons.entity.scheme.vo.PtlAgreementInsCompanyVo;
-import com.jzg.commons.constants.quote.enums.quote.RiskCode;
-import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import com.jzg.commons.entity.vo.ImagesVo;
 import com.jzg.commons.entity.vo.InsFeeOrdersVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
@@ -280,12 +277,13 @@ public class QuoteEchoVo extends QuoteVo {
         this.setCiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0507")).collect(Collectors.toList()));
         this.setBiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0510")).collect(Collectors.toList()));
         Salesman salesman = new Salesman();
-        salesman.setName(insOrdersVo.getSalesmanInfo().getName());
-        salesman.setDeptName(insOrdersVo.getSalesmanInfo().getDeptName());
-        salesman.setTypeAttr(insOrdersVo.getSalesmanInfo().getTypeAttr());
-        salesman.setDeptId(insOrdersVo.getSalesmanInfo().getDeptId());
-        salesman.setMobile(insOrdersVo.getSalesmanInfo().getMobile());
-
+        if (!Objects.isNull(insOrdersVo.getSalesmanInfo())){
+            salesman.setName(insOrdersVo.getSalesmanInfo().getName());
+            salesman.setDeptName(insOrdersVo.getSalesmanInfo().getDeptName());
+            salesman.setTypeAttr(insOrdersVo.getSalesmanInfo().getTypeAttr());
+            salesman.setDeptId(insOrdersVo.getSalesmanInfo().getDeptId());
+            salesman.setMobile(insOrdersVo.getSalesmanInfo().getMobile());
+        }
         this.setSalesmanInfo(salesman);
         this.setErrorMessage(insOrdersVo.getErrorMessage());
 

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

@@ -26,9 +26,7 @@ import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.*;
-import com.jzg.service.PtlAgreementService;
-import com.jzg.service.SysSystemService;
-import com.jzg.service.SysAreaBService;
+import com.jzg.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -566,6 +564,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return sysSystemBusPermsVo;
     }
 
+    @Autowired
+    SysUserJzgInfoService sysUserJzgInfoService;
+
     @Override
     public List<EsmInsCompany> getUserCompany(String systemCode) {
         SysSystemBusPermsVo busPerms = getBusPerms(systemCode);
@@ -577,8 +578,12 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
         // 根据用户权限获取 可使用的协议
         List<String> companyIdList = companyList.stream().map(x -> x.getId()).collect(Collectors.toList());
-
-        List<PtlAgreement> userAgreement = ptlAgreementService.getUserAgreementByCompanyIds(baseController.getUserDeptId(), companyIdList);
+        String userDeptId = baseController.getUserDeptId();
+        if (StringUtils.isEmpty(userDeptId)){
+            SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(baseController.getUserId(), systemCode);
+            userDeptId = userByUserId.getDeptId();
+        }
+        List<PtlAgreement> userAgreement = ptlAgreementService.getUserAgreementByCompanyIds(userDeptId, companyIdList);
 
         Map<String, List<PtlAgreement>> groupedMap = userAgreement.stream()
                 .collect(Collectors.groupingBy(PtlAgreement::getCompanyId));

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/service/Impl/HuaTaiApiRequestImpl.java

@@ -74,7 +74,7 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
         //配置信息
         HuaTaiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(HuaTaiConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
         HuaTaiBaseRequestHead baseRequestHead = new HuaTaiBaseRequestHead(parameters);
-        String url = getApiUrl(orderBase.getInsuranceCompanyId());
+        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
 
         //查询车型
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();

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

@@ -986,13 +986,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         for (InsTaskImages images : imagesList) {
             ImagesVo imagesVo = new ImagesVo();
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(images.getImageId());
+            if (!Objects.isNull(sysUploadFiles)){
+                imagesVo.setImageId(sysUploadFiles.getId());
+                imagesVo.setFileName(sysUploadFiles.getFileName());
+                imagesVo.setFileType(sysUploadFiles.getFileType());
+                imagesVo.setBucketName(sysUploadFiles.getBucketName());
+                imagesVo.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName,sysUploadFiles.getFileName()));
+            }
             imagesVo.setId(images.getId());
-            imagesVo.setImageId(sysUploadFiles.getId());
-            imagesVo.setFileName(sysUploadFiles.getFileName());
             imagesVo.setImageType(images.getImageType());
-            imagesVo.setFileType(sysUploadFiles.getFileType());
-            imagesVo.setBucketName(sysUploadFiles.getBucketName());
-            imagesVo.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName,sysUploadFiles.getFileName()));
             imageVoList.add(imagesVo);
         }
         resultVo.setImageVoList(imageVoList);

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name="jzg-platform",url = "${feign.client.jzg-platform.url}")
+@FeignClient(name="jzg-platform",url = "http://localhost:8001/")
 public interface EsmInsCompanyClient {
 
 
@@ -40,7 +40,8 @@ public interface EsmInsCompanyClient {
      */
     @GetMapping("/system/getUserCompany")
     public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode,
-                                                          @RequestHeader("Authorization") String token);
+                                                          @RequestHeader("Authorization") String token,
+                                                          @RequestHeader("system_code") String sysCode);
 
     /**
      * 获取保司账号信息

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

@@ -1,9 +1,6 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +13,7 @@ import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchRulesAt
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchQuery;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
 import com.jzg.commons.entity.agreement.dispatch.vo.ValidateDispatchRuleVo;
+import com.jzg.commons.entity.costs.vo.ValidateSchemeRuleVo;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.scheme.po.*;
@@ -24,7 +22,6 @@ import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.exception.NoneException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
-import com.jzg.commons.entity.costs.vo.ValidateSchemeRuleVo;
 import com.jzg.organization.client.CostsRuleClient;
 import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.client.OrgClient;
@@ -313,7 +310,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     @Override
     public List<EsmInsCompanyResVo> getCompanyList(String systemCode) {
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken());
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken(),systemCode);
         List<EsmInsCompany> companyList = companyListResult.getData();
         return BeanUtil.copyToList(companyList, EsmInsCompanyResVo.class);
     }
@@ -337,7 +334,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             systemCode = baseController.getUserSystemCode();
         }
         //根据权限获取所有保司
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken());
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken(),systemCode);
         AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案

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

@@ -93,6 +93,7 @@ tenant:
     - ins_fee_audit
     - sys_user_jzg_info_bank_card_record
     - sys_app_manage
+    - sys_version
     - ptl_agreement_dispatch_rules_attr_link
     - ptl_agreement_dispatch_action