ossclient修改

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/DeviceController.java

@@ -7,7 +7,6 @@ import com.hfln.portal.common.request.device.DeviceBandingParams;
 import com.hfln.portal.common.request.device.DeviceListParams;
 import com.hfln.portal.common.request.device.DeviceLocationParams;
 import com.hfln.portal.common.response.device.WcTimesQueryRes;
-import com.hfln.portal.common.request.device.*;
 import com.hfln.portal.domain.gateway.DeviceGateway;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,10 +17,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-@RestController("/wap/device")
+@RestController
 @CatchAndLog
 @Api(tags = "设备相关")
 @Slf4j
+@RequestMapping("/wap/device")
 public class DeviceController {
     @Autowired
     private DeviceGateway deviceGateway;

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/EventController.java

@@ -18,19 +18,20 @@ import javax.validation.Valid;
 @CatchAndLog
 @Api(tags = "设备事件相关")
 @Slf4j
+@RequestMapping("/wap/event")
 public class EventController {
 
     @Autowired
     private DeviceGateway deviceGateway;
 
 
-    @PostMapping("/wap/event/deviceEventList")
+    @PostMapping("/deviceEventList")
     @ApiOperation(value = "设备事件")
     public ApiResult<PageRecord<EventListDTO>> deviceEventList(@RequestBody @Valid EventListParams request) {
         return ApiResult.success(deviceGateway.queryEventByPage(request));
     }
 
-    @GetMapping("/wap/event/handleEvent/{eventId}")
+    @GetMapping("/handleEvent/{eventId}")
     @ApiOperation(value = "处理设备事件")
     public ApiResult<Boolean> handleEvent(@PathVariable("eventId") Long eventId){
         return ApiResult.success(deviceGateway.handleEvent(eventId));

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/RadarController.java

@@ -10,13 +10,15 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController("/wap/radar")
+@RestController
 @CatchAndLog
 @Api(tags = "雷达相关")
 @Slf4j
+@RequestMapping("/wap/radar")
 public class RadarController {
 
 

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/RoomController.java

@@ -15,10 +15,11 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.IOException;
 
-@RestController("/wap/room")
+@RestController
 @CatchAndLog
 @Api(tags = "房间相关")
 @Slf4j
+@RequestMapping("/wap/room")
 public class RoomController {
 
     @Autowired

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/ShareController.java

@@ -16,10 +16,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-@RestController("/wap/share")
+@RestController
 @CatchAndLog
 @Api(tags = "设备分享")
 @Slf4j
+@RequestMapping("/wap/share")
 public class ShareController {
 
     @Autowired

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/UserController.java

@@ -18,10 +18,11 @@ import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 
-@RestController("/wap/user")
+@RestController
 @CatchAndLog
 @Api(tags = "用户相关")
 @Slf4j
+@RequestMapping("/wap/user")
 public class UserController {
 
 

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/WechatController.java

@@ -9,16 +9,18 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-@RestController("/wap/wechat")
+@RestController
 @CatchAndLog
 @Api(tags = "微信相关")
 @Slf4j
+@RequestMapping("/wap/wechat")
 public class WechatController {
 
     @Autowired

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -620,7 +620,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
             throw new BizException(ErrorEnum.FILE_ONLY_PNG_JPG02.getErrorCode(), ErrorEnum.FILE_ONLY_PNG_JPG02.getErrorMessage());
         }
 
-        String objectName = OssUtils.getObjectName(OssBusiType.FLOORPLAN.getCode(), file.getName());
+        String objectName = OssUtils.getObjectName(OssBusiType.FLOORPLAN.getCode(), file.getOriginalFilename());
         ossClient.upload(file.getInputStream(), OssUtils.BUCKET_NAME, objectName);
 
         TblOssFile ossFile = ossFileService.queryOneFile(OssBusiType.FLOORPLAN.getCode(), groupUuid);
@@ -629,7 +629,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
             newFile.setBusiType(OssBusiType.FLOORPLAN.getCode());
             newFile.setBusiKey(groupUuid);
             newFile.setFileName(file.getName());
-            newFile.setOssUrl(OssUtils.BUCKET_NAME+objectName);
+            newFile.setOssUrl(OssUtils.BUCKET_NAME + "/" +objectName);
             ossFileService.save(newFile);
         } else {
             if (ossFile.getIsDeleted() == BasePO.DeleteFlag.NOT_DELETED) {
@@ -639,7 +639,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
             ossFile.setBusiType(OssBusiType.FLOORPLAN.getCode());
             ossFile.setBusiKey(groupUuid);
             ossFile.setFileName(file.getName());
-            ossFile.setOssUrl(OssUtils.BUCKET_NAME+objectName);
+            ossFile.setOssUrl(OssUtils.BUCKET_NAME + "/" +objectName);
             ossFileService.updateById(ossFile);
         }
     }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/oss/OssClient.java

@@ -79,7 +79,7 @@ public class OssClient {
     }
 
     public String getDownloadUrl(String ossUrl) {
-        return getDownloadUrl(ossUrl.substring(0, ossUrl.indexOf("/")), ossUrl.substring(ossUrl.indexOf("/")));
+        return getDownloadUrl(ossUrl.substring(0, ossUrl.indexOf("/")), ossUrl.substring(ossUrl.indexOf("/")+1));
     }
 
     public String getDownloadUrl(String bucketName, String objectName) {

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/oss/OssUtils.java

@@ -8,12 +8,13 @@ import java.util.UUID;
 
 public class OssUtils {
 
-    public static final String BUCKET_NAME = "hfln";
+    public static final String BUCKET_NAME = "hflnxx";
 
     public static String getObjectName(String ossBusiType, String fileName) {
 
         StringBuilder sb = new StringBuilder();
-        sb.append("/")
+        sb
+//                .append("/")
                 .append(ossBusiType)
                 .append("/")
                 .append(DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now()))