1.add日志上传模块

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceLogFileDto.java

@@ -18,8 +18,14 @@ public class DeviceLogFileDto {
      * 移动端日志唯一标识符
      */
     String logAcceptId;
+
+    /**
+     *
+     */
+    String logfileUrl;
+
     /**
-     * log日志文件
+     * 设备Id
      */
-    File logFile;
+    Long deviceId;
 }

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/WechatDeviceLogDto.java

@@ -24,9 +24,9 @@ public class WechatDeviceLogDto {
     String logAcceptId;
 
     /**
-     * 视频 图片文件
+     * 视频 图片文件路径
      */
-    List<File> files;
+    List<String> locationUrls;
 
     /**
      * bug名字
@@ -43,4 +43,10 @@ public class WechatDeviceLogDto {
      */
     Integer probability;
 
+
+    /**
+     * 设备ID
+     */
+    Long deviceId;
+
 }

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/WechatDeviceLogVo.java

@@ -24,9 +24,9 @@ public class WechatDeviceLogVo {
     String logAcceptId;
 
     /**
-     * 视频 图片文件
+     * 视频 图片文件路径
      */
-    List<File> files;
+    List<String> locationUrls;
 
     /**
      * bug名字

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java

@@ -40,9 +40,6 @@ public interface DeviceClient {
     void deleteSeries(@RequestBody List<Long> ids);
 
 
-
-
-
     @PostMapping("device/info/list")
     PageDto deviceList(@RequestParam Integer page,
                        @RequestParam("limit") Integer pageSize,

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/LogFileClient.java

@@ -32,10 +32,10 @@ public interface LogFileClient {
     @PostMapping("/log/upload/finishLog")
     void finishLog(@RequestBody Long logId);
 
-    @PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/log/upload/wechatUploadLog")
     void wechatUploadLog(@RequestBody WechatDeviceLogDto dto);
 
-    @PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/log/upload/uploadLogFile")
     void uploadLogFile(@RequestBody DeviceLogFileDto dto);
 
 }

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/LogFlieController.java

@@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -38,19 +41,31 @@ public class LogFlieController {
     @Autowired
     private LogFileClient logFileClient;
 
+    @Autowired
+    private DeviceClient deviceClient;
 
     @PostMapping("/logfile/wechatDeviceLogUpload")
-    public R wechatUploadLog(WechatDeviceLogVo vo){
+    public R wechatUploadLog(WechatDeviceLogVo vo, MultipartFile[] file){
         WechatDeviceLogDto dto = new WechatDeviceLogDto();
         BeanUtils.copyProperties(vo, dto);
+
+        // 把图片存入oos 返回路径
+        // dto.setLogfileUrl()
+        DeviceInfoDto deviceInfoDto = deviceClient.queryDeviceByImei(dto.getImei());
+        dto.setDeviceId(deviceInfoDto.getDeviceId());
         logFileClient.wechatUploadLog(dto);
         return R.ok();
     }
 
     @PostMapping("/logfile/DeviceLogFileUpload")
-    public R uploadLogFile(DeviceLogFileVo vo, MultipartFile file){
+    public R uploadLogFile(DeviceLogFileVo vo, MultipartFile file) throws IOException {
         DeviceLogFileDto dto = new DeviceLogFileDto();
         BeanUtils.copyProperties(vo, dto);
+
+        // 把图片存入oos 返回路径
+        // dto.setLogfileUrl()
+        DeviceInfoDto deviceInfoDto = deviceClient.queryDeviceByImei(dto.getImei());
+        dto.setDeviceId(deviceInfoDto.getDeviceId());
         logFileClient.uploadLogFile(dto);
         return R.ok();
     }

cneeds-server-logupload/src/main/java/com/mx/cneeds/server/logupload/service/DeviceLogService.java

@@ -14,4 +14,10 @@ public interface DeviceLogService extends IService<DeviceLogEntity> {
     void deleteBatch(Long[] deviceLogIds);
 
     void changeStatus(Long logId);
+
+    void wechatUploadLog(DeviceLogEntity deviceLogEntity);
+
+    void deviceUploadLogFile(DeviceLogEntity deviceLogEntity);
+
+    DeviceLogEntity queryOneBylogAcceptId(String logAcceptId);
 }
\ No newline at end of file

cneeds-server-logupload/src/main/java/com/mx/cneeds/server/logupload/service/impl/DeviceLogServiceImpl.java

@@ -9,6 +9,7 @@ import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.DeviceLogDao;
 import com.mx.cneeds.server.entity.DeviceLogEntity;
 import com.mx.cneeds.server.logupload.service.DeviceLogService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,4 +52,34 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogDao, DeviceLogEnt
         deviceLogEntity.setStatus(1);
         getBaseMapper().update(deviceLogEntity, new UpdateWrapper<DeviceLogEntity>().eq("log_id", logId));
     }
+
+    @Override
+    public void wechatUploadLog(DeviceLogEntity deviceLogEntity){
+        DeviceLogEntity logEntity = queryOneBylogAcceptId(deviceLogEntity.getLogAcceptId());
+        if(logEntity != null){
+            getBaseMapper().update(deviceLogEntity,
+                    new UpdateWrapper<DeviceLogEntity>()
+                            .eq("log_accept_id", deviceLogEntity.getLogAcceptId()));
+        }else {
+            getBaseMapper().insert(deviceLogEntity);
+        }
+    }
+
+    @Override
+    public void deviceUploadLogFile(DeviceLogEntity deviceLogEntity){
+        DeviceLogEntity logEntity = queryOneBylogAcceptId(deviceLogEntity.getLogAcceptId());
+        if(logEntity != null){
+            getBaseMapper().update(deviceLogEntity,
+                    new UpdateWrapper<DeviceLogEntity>()
+                            .eq("log_accept_id", deviceLogEntity.getLogAcceptId()));
+        }else {
+            getBaseMapper().insert(deviceLogEntity);
+        }
+    }
+
+    @Override
+    public DeviceLogEntity queryOneBylogAcceptId(String logAcceptId){
+        return getBaseMapper().selectOne(new QueryWrapper<DeviceLogEntity>()
+                .eq("log_accept_id",logAcceptId));
+    }
 }

cneeds-server-logupload/src/main/java/com/mx/cneeds/server/logupload/web/LogUploadController.java

@@ -5,6 +5,7 @@ import com.mx.cneeds.common.dto.DeviceLogFileDto;
 import com.mx.cneeds.common.dto.WechatDeviceLogDto;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
+import com.mx.cneeds.server.entity.DeviceLogEntity;
 import com.mx.cneeds.server.logupload.service.DeviceLogService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,15 +31,28 @@ public class LogUploadController {
     private DeviceLogService deviceLogService;
 
 
-    @RequestMapping("/addLogInfo")
+    @RequestMapping("/wechatUploadLog")
     public void wechatUploadLog(WechatDeviceLogDto dto){
+        DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
 
-    }
 
+        deviceLogEntity.setLogAcceptId(dto.getLogAcceptId());
+        deviceLogEntity.setDeviceId(dto.getDeviceId());
+        deviceLogEntity.setLogName(dto.getBugTitle());
+        deviceLogEntity.setRepetitionProbability(dto.getProbability());
+        deviceLogEntity.setRepetitionSteps(dto.getSteps());
+        deviceLogService.wechatUploadLog(deviceLogEntity);
+
+    }
 
-    @RequestMapping("/addLogFile")
-    public void uploadLogFile(DeviceLogFileDto dto){
 
+    @RequestMapping("/uploadLogFile")
+    public void uploadLogFile(@RequestBody DeviceLogFileDto dto){
+        DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
+        deviceLogEntity.setDeviceId(dto.getDeviceId());
+        deviceLogEntity.setLogfileUrl(dto.getLogfileUrl());
+        deviceLogEntity.setLogAcceptId(dto.getLogAcceptId());
+        deviceLogService.deviceUploadLogFile(deviceLogEntity);
     }
 
     /**