提交chime社交相关

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java

@@ -7,7 +7,6 @@ import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
@@ -51,11 +50,8 @@ public interface FeignKylinForChimeClient {
 //    @GetMapping(value = "/performance/list")
 //    ResponseDto<List<KylinPerformanceVo>> performanceList(@RequestParam("performancesIds") String... performancesIds);
 
-    @GetMapping("performance/{performancesId}")
-    ResponseDto<KylinPerformanceVo> detail(
-            @PathVariable("performancesId") String performancesId,
-            @RequestParam(defaultValue = "0") double latitudeFrom,
-            @RequestParam(defaultValue = "0") double longitudeFrom,
-            @RequestParam(defaultValue = "0") String agentId
+    @GetMapping("myPerformance/getDetail")
+    ResponseDto<KylinPerformanceVo> getDetail(
+            @RequestParam("performancesId") String performancesId
     );
 }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/biz/ChimeUserBiz.java

@@ -120,7 +120,7 @@ public class ChimeUserBiz {
                 isOnline = true;
             }else{
                 //获取演出状态信息
-                ResponseDto<KylinPerformanceVo> responseDto = feignKylinForChimeClient.detail(performanceId,0,0,"0");
+                ResponseDto<KylinPerformanceVo> responseDto = feignKylinForChimeClient.getDetail(performanceId);
                 if(responseDto.isSuccess()&&StringUtil.isNotNull(responseDto.getData())){
                     KylinPerformanceVo kylinPerformanceVo = responseDto.getData();
                     if(kylinPerformanceVo.getAppStatus() == KylinPerformanceStatusEnum.PERFORMANCESTATUS6.getIndex()

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/test/java/com/liquidnet/service/chime/test/TestShumei.java

@@ -26,7 +26,9 @@ public class TestShumei {
 
     @Test
     public void checkText(){
-        shumeiUtil.checkText("user123","习近平");
+
+//        System.out.println(shumeiUtil.checkText("user123","甜梅号的小茉莉"));
+        System.out.println(shumeiUtil.checkText("user123","158****8858"));
     }
     @Test
     public void checkImage(){

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinMyPerformancesController.java

 package com.liquidnet.service.kylin.controller;
 
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -36,4 +37,26 @@ public class KylinMyPerformancesController {
         List<KylinPerformanceVo> result = kylinPerformancesService.myPerformancesList();
         return ResponseDto.success(result);
     }
+
+
+    @GetMapping("getDetail")
+    @ApiOperation("演出详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "path", dataType = "String", name = "performancesId", value = "演出id", required = true)
+    })
+    public ResponseDto<KylinPerformanceVo> getDetail(
+            @RequestParam("performancesId") String performancesId
+    ) {
+        try {
+            KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, 0, 0, "0");
+            if (result != null) {
+                return ResponseDto.success(result);
+            } else {
+                return ResponseDto.failure(ErrorMapping.get("20700"));
+            }
+        } catch (Exception e) {
+            log.error("演出详情Error", e);
+            return ResponseDto.failure(ErrorMapping.get("20700"));
+        }
+    }
 }