21

src/main/java/com/fdkankan/manage/controller/SysUserController.java

@@ -70,9 +70,10 @@ public class SysUserController  extends BaseController{
         sysUserService.removeById(param.getId());
         return ResultData.ok();
     }
+
     @PostMapping("/rePassword")
     public ResultData rePassword(@RequestBody SysUserParam param){
-        if(param.getId() == null || StringUtils.isEmpty(param.getPassword())){
+        if(param.getId() == null || StringUtils.isEmpty(param.getNewPassword())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         sysUserService.addOrUpdate(param);

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -86,15 +86,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         // 写文件到本地
         File file1 = new File(filePath);
         file.transferTo(file1);
-        log.info("filePath: {}", filePath);
-        // 上传到阿里云sso
-        mangeUploadToOssUtil.upload(filePath, DIR_NAME + fileName);
-        log.info("upload success");
-        String url = prefixAli + DIR_NAME + fileName;
-        if("aws".equals(ossType)){
-            url = YAMAXUN_S3_PATH + fileName;
-        }
-        log.info("upload url: {}" + url);
+
         // 添加对象信息
         switch (type){
             case 1: type = 1;break;
@@ -106,6 +98,15 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         if(cameraVersions != null && cameraVersions.size() >0){
             throw new BusinessException(ResultCode.VISION_EXIST.code(),ResultCode.VISION_EXIST.message());
         }
+        log.info("filePath: {}", filePath);
+        // 上传到阿里云sso
+        mangeUploadToOssUtil.upload(filePath, DIR_NAME + fileName);
+        log.info("upload success");
+        String url = prefixAli + DIR_NAME + fileName;
+        if("aws".equals(ossType)){
+            url = YAMAXUN_S3_PATH + fileName;
+        }
+        log.info("upload url: {}" + url);
 
         CameraVersion versionEntity = new CameraVersion();
         versionEntity.setName(fileName);

src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -97,7 +97,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         log.info("filePath: {}", filePath);
 
         // 上传到阿里云sso
-        mangeUploadToOssUtil.upload(filePath, DIR_NAME + fileName);
+        mangeUploadToOssUtil.uploadSdk(filePath, DIR_NAME + fileName);
         log.info("upload success");
 
         String url = prefixAli + DIR_NAME + fileName;

src/main/java/com/fdkankan/manage/vo/InvoiceVO.java

@@ -137,7 +137,6 @@ public class InvoiceVO {
      * 开票状态（0-否，1-是）
      */
     @ExcelProperty("状态")
-    @ExcelIgnore
     private String invoicedStr;