Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: ab651c091ed290c83cebd96a944073317144fd8f
+  newTag: 8eb64c025055bfd59beaeda23979e963b24d9b95

src/main/java/com/mmc/oms/client/PmsClient.java

@@ -12,6 +12,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.apache.commons.lang.StringUtils;
+import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
@@ -112,4 +114,16 @@ public class PmsClient {
         }
         return JSONObject.parseObject(result,ServiceDTO.class);
     }
+
+    public List<ServiceDTO> feignQueryWorkServiceListById(List<Integer> ids){
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(ids), headers);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(pmsAppUri + "backstage/work/feignQueryWorkServiceListById", HttpMethod.POST, entity, String.class);
+        if (StringUtils.isBlank(responseEntity.getBody())) {
+            return null;
+        }
+        List<ServiceDTO> serviceDTOS = JSONArray.parseArray(responseEntity.getBody(), ServiceDTO.class);
+        return serviceDTOS;
+    }
 }