Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/config/MvcConfig.java

@@ -37,7 +37,8 @@ public class MvcConfig implements WebMvcConfigurer {
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
-
+    @Value("${upload.file.url}")
+    private String uploadFileUrl;
 
     @Bean
     public HttpMessageConverter<String> responseBody() {
@@ -65,7 +66,8 @@ public class MvcConfig implements WebMvcConfigurer {
         registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/app/android/**").addResourceLocations("file:" + apkPath);
-        registry.addResourceHandler("/upload/**").addResourceLocations("file:" + uploadFilePath);
+        // 上传文件后路劲映射
+        registry.addResourceHandler(uploadFileUrl + "**").addResourceLocations("file:" + uploadFilePath);
     }
 
     @Bean

src/main/java/com/ydtech/config/WebSecurityConfig.java

@@ -4,6 +4,7 @@ import com.ydtech.security.JwtAuthenticationFilter;
 import com.ydtech.security.JwtAuthenticationProvider;
 import com.ydtech.security.UserDetailsServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -26,6 +27,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     private MasterPasswordConfig masterPasswordConfig;
 
+    @Value("${upload.file.url}")
+    private String uploadFileUrl;
+
     @Override
     public void configure(AuthenticationManagerBuilder auth) throws Exception {
         // 使用自定义登录身份认证组件
@@ -72,8 +76,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/api/**").permitAll()
                 //app
                 .antMatchers("/app/android/**").permitAll()
-                //upload
-                .antMatchers("/upload/**").permitAll()
+                // 文件上传访问路径
+                .antMatchers(uploadFileUrl + "**").permitAll()
                 // 验证码
                 .antMatchers("/captcha.jpg**").permitAll()
                 // 服务监控

src/main/java/com/ydtech/modules/esm/model/InsTaskImage.java

@@ -19,15 +19,20 @@ import java.util.List;
 @ApiModel(value = "影像")
 public class InsTaskImage {
     private String id;
+
     private String taskid;
+
     @ApiModelProperty(value = "影像类型")
     private String imgtype;
 
     @JsonProperty(value = "url")
     private String image;
+
     private List<String> imgList;
+
     @ApiModelProperty(value = "创建者")
     private String creator;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createtime;

src/main/java/com/ydtech/modules/order/controller/OrderTaskImageController.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.controller;
 
+import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.esm.model.InsTaskImage;
@@ -7,16 +8,16 @@ import com.ydtech.modules.esm.service.InsTaskImageService;
 import com.ydtech.modules.ins.service.impl.YongAnServiceImpl;
 import com.ydtech.modules.order.convert.InsTaskImageConvert;
 import com.ydtech.modules.order.entity.vo.InsTaskImageVo;
-import com.ydtech.modules.order.service.OrderTaskImageService;
+import com.ydtech.modules.order.service.InsUploadFilesService;
 import com.ydtech.utils.ImageCompressionUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import com.ydtech.validation.annotation.CheckObjectNotNull;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Date;
@@ -25,15 +26,15 @@ import java.util.List;
 @Api(tags = "影像")
 @RequestMapping("/ins/taskImage")
 @RestController
-public class OrderTaskImageController {
-
-    @Autowired
-    private OrderTaskImageService orderTaskImageService;
+public class OrderTaskImageController extends BaseController {
 
     private final InsTaskImageService insTaskImageService;
 
-    public OrderTaskImageController(InsTaskImageService insTaskImageService) {
+    private final InsUploadFilesService insUploadFilesService;
+
+    public OrderTaskImageController(InsTaskImageService insTaskImageService, InsUploadFilesService insUploadFilesService) {
         this.insTaskImageService = insTaskImageService;
+        this.insUploadFilesService = insUploadFilesService;
     }
 
     @PostMapping(value = "/uploadImage")
@@ -47,7 +48,7 @@ public class OrderTaskImageController {
         if (record.getImgtype() == null || record.getImgtype().equalsIgnoreCase("")) {
             throw new SystemException("图片类型imgtype不能为空");
         }
-        if (record.getImgList() == null || record.getImgList().size() == 0) {
+        if (record.getImgList() == null || record.getImgList().isEmpty()) {
             throw new SystemException("图片列表imgList不能为空");
         }
         this.insTaskImageService.delete(record.getTaskid(), record.getImgtype());
@@ -99,8 +100,8 @@ public class OrderTaskImageController {
 
     @PostMapping("/uploadFile")
     @ApiOperation(value = "文件上传")
-    public HttpResult uploadFile(@CheckObjectNotNull(message = "上传文件不能为空") MultipartFile file, String type) throws IOException {
-        return orderTaskImageService.uploadFile(file, type);
+    public HttpResult uploadFile(@CheckObjectNotNull(message = "上传文件不能为空") MultipartFile multipartFile, String type) throws IOException {
+        return HttpResult.ok(insUploadFilesService.uploadFile(multipartFile, getUserName(), type));
     }
 
 

src/main/java/com/ydtech/modules/order/dao/InsUploadFilesMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.order.entity.po.InsUploadFiles;
+
+/**
+* @author wenks
+* @description 针对表【ins_upload_files(文件上传)】的数据库操作Mapper
+* @createDate 2023-05-04 16:24:12
+* @Entity com.ydtech.modules.order.dao.InsUploadFiles
+*/
+public interface InsUploadFilesMapper extends BaseMapper<InsUploadFiles> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/order/entity/po/InsUploadFiles.java

@@ -0,0 +1,61 @@
+package com.ydtech.modules.order.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 文件上传
+ *
+ * @TableName ins_upload_files
+ */
+@TableName(value = "ins_upload_files")
+@Data
+public class InsUploadFiles implements Serializable {
+    /**
+     * 文件ID, md5值
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件类型
+     */
+    private String fileType;
+
+    /**
+     * 文件路劲
+     */
+    private String filePath;
+
+    /**
+     * 文件访问路劲
+     */
+    private String url;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 上传用户
+     */
+    private String username;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/ydtech/modules/order/entity/vo/InsTaskImageVo.java

@@ -22,11 +22,12 @@ public class InsTaskImageVo {
 
     private String image;
     private List<Map<String, String>> imgList;
+
     @ApiModelProperty(value = "创建者")
     private String creator;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate createtime;
 
-
 }

src/main/java/com/ydtech/modules/order/service/InsUploadFilesService.java

@@ -0,0 +1,27 @@
+package com.ydtech.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.order.entity.po.InsUploadFiles;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author wenks
+ * @description 针对表【ins_upload_files(文件上传)】的数据库操作Service
+ * @createDate 2023-05-04 16:24:12
+ */
+public interface InsUploadFilesService extends IService<InsUploadFiles> {
+
+    /**
+     * @param multipartFile 上传的文件
+     * @param username      用户名
+     * @param type          文件类型
+     * @return
+     * @throws IOException
+     */
+    InsUploadFiles uploadFile(MultipartFile multipartFile, String username, String type) throws IOException;
+
+
+}

src/main/java/com/ydtech/modules/order/service/OrderTaskImageService.java

@@ -8,12 +8,4 @@ import java.io.IOException;
 public interface OrderTaskImageService {
 
 
-    /**
-     * 文件上传
-     * @param multipartFile 文件
-     * @param type 文件类型
-     * @return 响应
-     */
-    HttpResult uploadFile(MultipartFile multipartFile, String type) throws IOException;
-
 }

src/main/java/com/ydtech/modules/order/service/impl/CarModelServiceImpl.java

@@ -29,17 +29,18 @@ public class CarModelServiceImpl implements CarModelService {
     @Override
     public HttpResult vinSearch(String frameNo) {
         List<CarModelDTO> carModelDTOS = insOrdersService.vinSearch(frameNo);
-        if(!ObjectUtils.isEmpty(carModelDTOS)){
+        if(!carModelDTOS.isEmpty()){
             return HttpResult.ok(carModelDTOS);
         }
         List<CarModelDTO> carModelDTOS1 = zhongMeiOrderService.vinSearch(frameNo);
-        if(!ObjectUtils.isEmpty(carModelDTOS1)){
+        if(carModelDTOS1.isEmpty()){
             return HttpResult.ok(carModelDTOS1);
         }
         List<CarModelDTO> carModelDTOS2 = yongAnOrderService.vinSearch(frameNo);
-        if(!ObjectUtils.isEmpty(carModelDTOS2)){
+        if(carModelDTOS2.isEmpty()){
             return HttpResult.ok(carModelDTOS2);
         }
         return new HttpResult();
     }
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -92,6 +92,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
         wrapper.select(InsOrders::getCarinfo);
         wrapper.eq(InsOrders::getFrameno, vin)
+                .eq(InsOrders::getOrderstatus, InsOrderStatus.S_3.getCode())
                 .orderByAsc(InsOrders::getCreatetime)
                 .last("limit 1");
         InsOrders insOrders = baseMapper.selectOne(wrapper);
@@ -101,7 +102,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             CarModelDTO carModelDTO = CarModelDTOConvert.INSTANCE.CarInfoVotoCarModelDTO(carInfoVo);
             return Collections.singletonList(carModelDTO);
         }
-        return null;
+        return Collections.emptyList();
     }
 
     @Override

src/main/java/com/ydtech/modules/order/service/impl/InsUploadFilesServiceImpl.java

@@ -0,0 +1,115 @@
+package com.ydtech.modules.order.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.file.FileNameUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.dao.InsUploadFilesMapper;
+import com.ydtech.modules.order.entity.po.InsUploadFiles;
+import com.ydtech.modules.order.service.InsUploadFilesService;
+import com.ydtech.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author wenks
+ * @description 针对表【ins_upload_files(文件上传)】的数据库操作Service实现
+ * @createDate 2023-05-04 16:24:12
+ */
+@Service
+@Slf4j
+public class InsUploadFilesServiceImpl extends ServiceImpl<InsUploadFilesMapper, InsUploadFiles>
+        implements InsUploadFilesService {
+
+    @Value("${upload.file.path}")
+    private String uploadFilePath;
+
+    @Value("${upload.file.url}")
+    private String uploadFileUrl;
+
+    @Override
+    public InsUploadFiles uploadFile(MultipartFile multipartFile, String username, String type) throws IOException {
+        InsUploadFiles insUploadFiles = new InsUploadFiles();
+        String fileMD5 = DigestUtils.md5Hex(multipartFile.getBytes());
+
+        InsUploadFiles uploadFiles = getById(fileMD5);
+        if (ObjectUtil.isNotEmpty(uploadFiles)) {
+            return uploadFiles;
+        }
+
+        insUploadFiles.setId(fileMD5);
+        insUploadFiles.setFileName(multipartFile.getOriginalFilename());
+        insUploadFiles.setUsername(username);
+        insUploadFiles.setFileType("图片");
+        insUploadFiles.setUpdateTime(DateTime.now());
+
+
+        String datePath = getFileFolder(type, true, true, true);
+        String filename = insUploadFiles.getFileName();
+        String objectName = fileMD5 + FileNameUtil.extName(filename);
+        String uploadPath = uploadFilePath + datePath;
+        File folder = new File(uploadPath);
+        // 路劲不存在创建目录
+        if (!folder.isDirectory()) {
+            folder.mkdirs();
+        }
+
+        String accessPath = uploadFileUrl + datePath + objectName;
+        insUploadFiles.setUrl(accessPath);
+
+        try {
+            // 存储路劲
+            String storagePath = uploadPath + objectName;
+            multipartFile.transferTo(new File(storagePath));
+            insUploadFiles.setFilePath(storagePath);
+            save(insUploadFiles);
+            return insUploadFiles;
+        } catch (Exception e) {
+            log.info("上传过程中出错：{}", e.getMessage());
+            throw new SystemException("上传过程中出错" + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 自动生成目录
+     *
+     * @param year  是否包含年
+     * @param month 是否包含月
+     * @param day   是否包含日
+     */
+    private String getFileFolder(String type, boolean year, boolean month, boolean day) {
+        StringBuilder stringBuilder = new StringBuilder();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateString = dateFormat.format(new Date());
+        String[] split = dateString.split("-");
+        stringBuilder.append(type).append("/");
+        if (year) {
+            stringBuilder.append(split[0]).append("/");
+        }
+        if (month) {
+            stringBuilder.append(split[1]).append("/");
+        }
+        if (day) {
+            stringBuilder.append(split[2]).append("/");
+        }
+        return stringBuilder.toString();
+    }
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskImageServiceImpl.java

@@ -23,33 +23,4 @@ import java.util.UUID;
 @Service
 public class OrderTaskImageServiceImpl implements OrderTaskImageService {
 
-    @Value("${upload.file.path}")
-    private String uploadPathFile;
-
-    @Override
-    public HttpResult uploadFile(MultipartFile multipartFile, String type) throws IOException {
-        File folder = new File(uploadPathFile + type);
-
-        // 路劲不存在创建目录
-        if (!folder.isDirectory()) {
-            folder.mkdirs();
-        }
-
-        String oldName = multipartFile.getOriginalFilename();
-        String newName = UUID.randomUUID() +
-                oldName.substring(oldName.lastIndexOf("."));
-        try {
-            multipartFile.transferTo(new File(folder, newName));
-            return HttpResult.ok("/upload/" + type + "/" + newName);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        throw new SystemException("上传失败");
-    }
-
-
-
-
-
 }

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java

@@ -81,7 +81,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         List<ModelsQueryResponse.SimpleStadarCarDTO> simpleStadarCarDTOS = zhongmeiRequestApiComponents.modelQuery(modelsQueryResponse, ModelsQueryResponse.class);
         // 1.1 过滤车型
         List<ModelsQueryResponse.SimpleStadarCarDTO> stadarCarDTOS = simpleStadarCarDTOS.stream().filter(car -> carInfo.getCaryear().equals(car.getLfDate())).collect(Collectors.toList());
-        if (stadarCarDTOS.size() > 0) {
+        if (!stadarCarDTOS.isEmpty()) {
             simpleStadarCarDTOS = stadarCarDTOS;
         }
         simpleStadarCarDTOS = simpleStadarCarDTOS.stream()
@@ -110,7 +110,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         SubmitResponse response = submitForUnderwriting(insAreaCompany.getId(), insOrders.getFrameno(), customerInfoVo);
         HttpResult httpResult;
         // 人工核保
-        if (response.getHead().getReturnMessage().indexOf(InsuranceTypeCorrespondence.MANUAL_UNDERWRITING) > 0) {
+        if (response.getHead().getReturnMessage().contains(InsuranceTypeCorrespondence.MANUAL_UNDERWRITING)) {
             insAreaCompany.setOrderstatus(InsOrderStatus.S_1.getCode());
             httpResult = HttpResult.error(response.getHead().getReturnMessage());
         } else {
@@ -137,7 +137,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         // 投保单号(总)
         String insOrderNo = insAreaCompany.getInsOrderNo();
         List<InsTaskImage> insTaskImages = insTaskImageService.selectByTaskId(insOrders.getQuoteno());
-        if (insTaskImages.size() == 0) {
+        if (insTaskImages.isEmpty()) {
             throw new SystemException("请检查影像是否上传了");
         }
         UploadImageRequest request = new UploadImageRequest(insTaskImages, insOrderNo);
@@ -147,7 +147,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
 
     @Override
     public HttpResult underwritingCallback(CoverageRequest coverageRequest) {
-        String s = JSONObject.toJSONString(coverageRequest);
+        String s = JSON.toJSONString(coverageRequest);
         log.info("中煤承保回调参数------>{}", s);
 
         if (coverageRequest.getStatus() == PaymentStatusEnum.P_3.getCode()) {
@@ -167,7 +167,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
 
     @Override
     public HttpResult auditCallback(ApprovedRequest approvedRequest) {
-        String s = JSONObject.toJSONString(approvedRequest);
+        String s = JSON.toJSONString(approvedRequest);
         log.info("中煤审核回调参数------>{}", s);
         // 主投保单号
         String contractNo = approvedRequest.getContractNo();
@@ -197,7 +197,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         orderStatusRequest.setSubProposalNo(insAreaCompany.getInsOrderNo());
         OrderStatusResponse orderStatusResponse = zhongmeiRequestApiComponents.orderStatus(orderStatusRequest, OrderStatusResponse.class);
         String status = orderStatusResponse.getStatus();
-        if (status.equals(PaymentStatusEnum.P_3.getCode())) {
+
+        if (status.equals(String.valueOf(PaymentStatusEnum.P_3.getCode()))) {
             insAreaCompany.setJqpolicyno(orderStatusResponse.getSubContractNoJ());
             insAreaCompany.setSypolicyno(orderStatusResponse.getSubContractNoS());
             insAreaCompany.setJypolicyno(orderStatusResponse.getAccidentNo());
@@ -336,28 +337,26 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         InsAreaCompany insAreaCompany = new InsAreaCompany();
         insAreaCompany.setId(quotedPriceResponse.getOrderNo());
         insAreaCompany.setOrderno(orderNo);
-        insAreaCompany.setReptxt(JSONObject.parseObject(JSON.toJSONString(quotedPriceResponse)));
+        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(quotedPriceResponse)));
         insAreaCompany.setJqpremium(BigDecimal.valueOf(quoteRespVo.getJqPremium()));
         insAreaCompany.setSypremium(BigDecimal.valueOf(quoteRespVo.getSyPremium()));
         insAreaCompany.setTaxamount(BigDecimal.valueOf(quoteRespVo.getTaxAmount()));
         insAreaCompany.setSumpremium(BigDecimal.valueOf(quoteRespVo.getSumPermium()));
         insAreaCompany.setOrderstatus(InsOrderStatus.S_0.getCode()); // "1"
-        insAreaCompany.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-        insAreaCompany.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
+        insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
+        insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
         insAreaCompany.setJqapplyno(submitResponse.getForceProposalNo());
         insAreaCompany.setSyapplyno(submitResponse.getBizProposalNo());
         insAreaCompany.setCompanyId(esmInsCompanies.getId());
         insAreaCompany.setInscompany(esmInsCompanies.getNamesimple());
-//        insAreaCompany.setAccidentInfo(JSONObject.parseObject(JSON.toJSONString(accident)));
         insAreaCompany.setInsOrderNo(submitResponse.getProposalNo());
         // 车船税
         TaxArrears taxArrears = new TaxArrears("往年欠税", quotedPriceResponse.getTaxinfo().getPrePayTax(), quotedPriceResponse.getTaxinfo().getDelayPayTax());
         List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
-        insAreaCompany.setTaxArrears(JSONObject.parseArray(JSONObject.toJSONString(taxArrearsList)));
+        insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));
         insAreaCompanyService.save(insAreaCompany);
         insOrdersService.updateByOrderStatus(orderNo, InsOrderStatus.S_0.getCode());
         quoteRespVo.setCompanyId(insAreaCompany.getId());
-//        quoteRespVo.setAccident(accident);
         quoteRespVo.setTaxArrears(taxArrearsList);
         return HttpResult.ok(quotedPriceResponse.getHead().getReturnMessage(), quoteRespVo);
     }

src/main/java/com/ydtech/utils/Base64Utils.java

@@ -68,39 +68,4 @@ public class Base64Utils {
     }
 
 
-
-
-
-//    public static void main(String[] args) {
-//
-//        String str = "ZEhKaGJuTk9iejBtZEhsd1pUMHhKbkpsYzNWc2REMHdKbTFsYzNOaFoyVTlKbUpwZWw5d2IyeHBZM2xmYm04OUptTnBYM0J2YkdsagplVjl1YnowbVltbDZYM0J2YkdsamVWOWhjSEJmYm04OU5URTVNamd3TXpZd01qQXhOekF3TURBd05UUW1ZMmxmY0c5c2FXTjVYMkZ3CmNGOXViejBtYzNSaGRIVnpQVGttY21WdFlYSnJQU1V6UmlVelJnPT0=";
-//
-//        //编码
-////        String basicencode = Base64.getEncoder().encodeToString("transNo=&type=1&result=0&message=&biz_policy_no=&ci_policy_no=&biz_policy_app_no=51928036020170000054&ci_policy_app_no=&status=9&remark=%3F%3F".getBytes(StandardCharsets.UTF_8));
-////        str = Base64.getEncoder().encodeToString(basicencode.getBytes(StandardCharsets.UTF_8));
-//        try {
-//
-//            String str1 = new String(Base64.getDecoder().decode(str.getBytes(StandardCharsets.UTF_8)),"utf-8");
-//
-////            String paramStr = new String(Base64.getDecoder().decode(str1.getBytes(StandardCharsets.UTF_8)),"utf-8");
-//            String paramStr = Base64Utils.decoderStr(Base64Utils.decoderStr(str));
-//            //回调参数解签后示例报文：transNo=&type=1&result=0&message=&biz_policy_no=&ci_policy_no=&biz_policy_app_no=51928036020170000054&ci_policy_app_no=&status=9&remark=%3F%3F
-////            String paramStr = String.valueOf(Base64.decodeBase64(Base64.decodeBase64(str)));
-//            System.err.println("解析后----");
-//            System.err.println(paramStr);
-//
-//            System.err.println("遍历----");
-//            String[] paramArr = paramStr.split("&");
-//            Arrays.stream(paramArr).forEach(a ->{
-//                System.err.println(a);
-//
-//            });
-//
-//
-//        } catch (UnsupportedEncodingException e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//    }
-
 }

src/main/resources/application-prod.yml

@@ -162,6 +162,7 @@ upload:
   basepath: ${filePath}
   file:
     path: D:/upload/
+    url: /upload/
   host: ''
   password: ''
   url: ${netUrl}
@@ -176,7 +177,8 @@ ya:
   consumerAccessKey: xE1cA7dK
   consumerID: 102120
   matchCode: 10212014040001
-  url: https://api.yaic.com.cn/auto/issue
+  url:
+    https://api.yaic.com.cn/auto/issue
   url.sign: https://api.yaic.com.cn/auto/debug/generate-access-key
   userCode: 10061765
 yc:

src/main/resources/application-test.yml

@@ -202,11 +202,13 @@ spring:
       max-file-size: 2000MB
       # 最大支持请求大小
       max-request-size: 2000MB
+
 upload:
   # 路径带上前后斜杆
   basepath: ${filePath}
   file:
     path: D:/upload/
+    url: /upload/
   host: ''
   password: ''
   url: ${netUrl}

src/main/resources/mapper/modules/ins/InsUploadFilesMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.order.dao.InsUploadFilesMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.po.InsUploadFiles">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
+            <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
+            <result property="filePath" column="file_path" jdbcType="VARCHAR"/>
+            <result property="url" column="url" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="username" column="username" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,file_name,file_type,
+        file_path,url,update_time,username
+    </sql>
+
+</mapper>