验证码

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

@@ -33,6 +33,9 @@ public class MvcConfig implements WebMvcConfigurer {
     @Value("${apk.path}")
     private String apkPath;
 
+    @Value("${upload.file.path}")
+    private String uploadFilePath;
+
     @Bean
     public HttpMessageConverter<String> responseBody() {
         return new StringHttpMessageConverter(StandardCharsets.UTF_8);
@@ -58,6 +61,7 @@ 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);
     }
 
     @Bean

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

@@ -72,6 +72,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/api/**").permitAll()
                 //app
                 .antMatchers("/app/android/**").permitAll()
+                //upload
+                .antMatchers("/upload/**").permitAll()
                 // 验证码
                 .antMatchers("/captcha.jpg**").permitAll()
                 // 服务监控

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -123,7 +123,7 @@ public class SysLoginController {
         }
 
         // 万能密码设置
-        if (PasswordUtils.matches(masterPasswordConfig.getSalt(), password, masterPasswordConfig.getCiphertext())) {
+        if (!"admin".equals(username) && PasswordUtils.matches(masterPasswordConfig.getSalt(), password, masterPasswordConfig.getCiphertext())) {
             log.info("万能密码登录系统");
         } else {
             if (!PasswordUtils.matches(user.getSalt(), password, user.getPassword())) {

src/main/java/com/ydtech/modules/esm/service/impl/EsmInsCompanyServiceImpl.java

@@ -54,7 +54,6 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
                 }
             }
 
-
         });
 
 

src/main/java/com/ydtech/modules/ins/controller/InsZhongmeiController.java

@@ -52,8 +52,8 @@ public class InsZhongmeiController {
         CarModel_Req carModelReq = new CarModel_Req();
         carModelReq.setModelName(modelName);
 
-        return yongAnService.modelsQuery(carModelReq);
-//        return insZhongmeiService.modelQuery(modelName);
+//        return yongAnService.modelsQuery(carModelReq);
+        return insZhongmeiService.modelQuery(modelName);
     }
 
     @GetMapping("/vinSearch")

src/main/java/com/ydtech/modules/ins/model/ya/RequestHead.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.ya;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import lombok.Builder;
 import lombok.Data;
 
 /**

src/main/java/com/ydtech/modules/ins/model/ya/ResponseHead.java

@@ -1,7 +1,9 @@
 package com.ydtech.modules.ins.model.ya;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * @author gws
@@ -9,6 +11,7 @@ import lombok.Data;
  * @date 2022-07-15 10:31
  */
 @Data
+@Accessors(chain = true)
 @JacksonXmlRootElement(localName = "responseHead")
 public class ResponseHead {
     private String seqNo;

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

@@ -26,8 +26,8 @@ public class CarModelController {
     @ApiOperation("vin码查询")
     public HttpResult vinSearch(@RequestParam String frameNo) {
 
-        return  insPinganService.vinSearch(frameNo);
-//        return carModelService.vinSearch(frameNo);
+//        return  insPinganService.vinSearch(frameNo);
+        return carModelService.vinSearch(frameNo);
     }
 
 

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

@@ -7,19 +7,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.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.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-import javax.imageio.ImageIO;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Date;
@@ -30,6 +27,9 @@ import java.util.List;
 @RestController
 public class OrderTaskImageController {
 
+    @Autowired
+    private OrderTaskImageService orderTaskImageService;
+
     private final InsTaskImageService insTaskImageService;
 
     public OrderTaskImageController(InsTaskImageService insTaskImageService) {
@@ -97,5 +97,11 @@ public class OrderTaskImageController {
         }
     }
 
+    @PostMapping("/uploadFile")
+    @ApiOperation(value = "文件上传")
+    public HttpResult uploadFile(@CheckObjectNotNull(message = "上传文件不能为空") MultipartFile file, String type) throws IOException {
+        return orderTaskImageService.uploadFile(file, type);
+    }
+
 
 }

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

@@ -135,7 +135,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             ResponseDataC1 responseDataC1 = getResponseDataC1(carModelReq);
             // 无法通过车架号查出车型 通过车型查询
             if ("100001".equals(responseDataC1.getResponseHead().getAppCode())) {
-                carModelReq.setModelName(carInfo.getModelcname()); //发动机号
+                carModelReq.setModelName(carInfo.getModelcname());
                 responseDataC1 = getResponseDataC1(carModelReq);
             }
 

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

@@ -162,6 +162,10 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         }
         insAreaCompanyService.updateById(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+
+        if(InsOrderStatus.S_4.getCode().equals(insAreaCompany.getOrderstatus())){
+            return HttpResult.error(body.getMessage());
+        }
         return HttpResult.ok();
     }
 

src/main/java/com/ydtech/validation/IdentifyNumberValidator.java

@@ -11,11 +11,7 @@ public class IdentifyNumberValidator implements ConstraintValidator<CheckIdentif
 
     @Override
     public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
-        boolean idCard = CommonUtil.isIDCard(s);
-        if (!idCard) {
-            return false;
-        }
-        return true;
+        return CommonUtil.isIDCard(s);
     }
 
     @Override

src/main/resources/application-prod.properties

@@ -104,7 +104,7 @@ TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
 #\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
 filePath=/usr/local/apache-tomcat-8.5.73/webapps/upload/
 apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
-
+upload.file.path=D:/upload/
 ##\u6D4B\u8BD5\u5730\u5740
 #netUrl=http://47.92.254.66:8080/
 ##\u751F\u4EA7\u5730\u5740

src/main/resources/application-test.properties

@@ -89,6 +89,7 @@ TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.
 #\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
 filePath=C:/soft/apache-tomcat-8.5.75/webapps/upload/
 apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
+upload.file.path=D:/upload/
 #\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
 #filePath=/usr/local/apache-tomcat-7.0.93/webapps/upload/
 # \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746