fix: insert bug resolve

guzijian
1 parent 81c8d8d7
Showing 4 changed files with 123 additions and 2 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -44,7 +44,7 @@ public class DriverController extends BaseController {
      */
     @GetMapping("/{date}/{jobCode}")
     @ApiOperation("获取驾驶员排班信息")
-    public AjaxResult getDriverSchedulingInfo(@PathVariable("date") String date, @PathVariable("jobCode") String jobCode) {
+    public AjaxResult getDriverSchedulingInfo(@ApiParam(name = "date",value = "yyyyMMdd")@PathVariable("date") String date, @PathVariable("jobCode") String jobCode) {
         return driverService.getDriverSchedulingInfo(date,jobCode);
     }
  
 package com.ruoyi.in.controller;
  
+import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
  
+import com.ruoyi.common.exception.file.FileUploadException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -82,13 +84,25 @@ public class SignInController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('in:in:add')")
     @Log(title = "签到", businessType = BusinessType.INSERT)
     @PostMapping
-    @ApiOperation("新增签到")
+    @ApiOperation("新增签到（通过后台管理页面）")
     public AjaxResult add(@RequestBody SignIn signIn)
     {
         return toAjax(signInService.insertSignIn(signIn));
     }
  
     /**
+     * 新增签到
+     * @param signIn
+     * @return
+     * @throws FileUploadException
+     */
+    @PostMapping("/newAdd")
+    @ApiOperation("新增签到（设备传入）")
+    public AjaxResult addSignIn(@RequestBody SignIn signIn) throws FileUploadException, IOException {
+        return toAjax(signInService.addSignIn(signIn));
+    }
+
+    /**
      * 修改签到
      */
 //    @PreAuthorize("@ss.hasPermi('in:in:edit')")
 package com.ruoyi.in.service;
  
+import java.io.IOException;
 import java.util.List;
+
+import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.in.domain.SignIn;
  
 /**
@@ -59,4 +62,10 @@ public interface ISignInService
      */
     public int deleteSignInById(Long id);
  
+    /**
+     * 设备签到
+     * @param signIn
+     * @return
+     */
+    int addSignIn(SignIn signIn) throws FileUploadException, IOException;
 }
 package com.ruoyi.in.service.impl;
  
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Base64;
 import java.util.List;
+import java.util.Objects;
  
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.file.FileException;
+import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.SignInEnum;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.uuid.Seq;
+import com.ruoyi.common.utils.uuid.UUID;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
+import org.springframework.web.multipart.MultipartFile;
  
 /**
  * 签到Service业务层处理
@@ -92,4 +108,86 @@ public class SignInServiceImpl implements ISignInService {
         return signInMapper.deleteSignInById(id);
     }
  
+    @Override
+    public int addSignIn(SignIn signIn) throws FileUploadException, IOException {
+        // base64转图片
+        // 图片路径
+        String filePath = RuoYiConfig.getUploadPath();
+        // 固定jpg文件
+        String fileName = extractFilename("jpg");
+        // 获取相对路径
+        String absPath = getAbsoluteFile(filePath, fileName).getAbsolutePath();
+        startUpload(absPath,signIn.getImage());
+
+        // 把上传的文件路径保存到服务器
+        String pathFileName = getPathFileName(filePath, fileName);
+        signIn.setImage(pathFileName);
+
+        return signInMapper.insertSignIn(signIn);
+    }
+
+    /**
+     * 获取相对路径名
+     * @param uploadDir
+     * @param fileName
+     * @return
+     * @throws IOException
+     */
+    public  File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists())
+        {
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc;
+    }
+
+    /**
+     * 获取扩展文件名
+     * @param extendFileName
+     * @return
+     */
+    public   String extractFilename(String extendFileName)
+    {
+        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+                FilenameUtils.getBaseName(UUID.randomUUID().toString().replace("-","")), Seq.getId(Seq.uploadSeqType), extendFileName);
+    }
+
+    /**
+     *
+     * @param uploadDir
+     * @param fileName
+     * @return
+     * @throws IOException
+     */
+    public String getPathFileName(String uploadDir, String fileName) throws IOException
+    {
+        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+    }
+
+    public void startUpload(String url,String base64) throws FileUploadException {
+        FileOutputStream outputStream = null;
+        byte[] imageBytes = Base64.getDecoder().decode(base64);
+        try {
+            outputStream = new FileOutputStream(url);
+            outputStream.write(imageBytes);
+        } catch (Exception e) {
+            throw new FileUploadException("文件上传异常");
+        } finally {
+            try {
+                if (!Objects.isNull(outputStream)) {
+                    outputStream.close();
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 }