暂时提交接口

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -13,7 +13,7 @@ liquidnet:
     refresh-ttl: 525600
     blacklist_grace_period: 5
   mysql:
-    urlHostAndPort: 172.17.205.50:3308
+    urlHostAndPort: 172.17.192.42:3308
     username: root
     password: Zhengzai@rd2U#
   rabbitmq:

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/param/ticketSystem/STInsertFieldParam.java

@@ -7,28 +7,28 @@ import lombok.Data;
 @Data
 @ApiModel(value = "STInsertFieldParam", description = "详情")
 public class STInsertFieldParam {
-    @ApiModelProperty(value = "场所编码")
+    @ApiModelProperty(value = "场所编码 [为空会新增场所]")
     String venueCode;
-    @ApiModelProperty(value = "省ID")
+    @ApiModelProperty(value = "省ID [新增场所时必填]")
     Integer provinceId;
-    @ApiModelProperty(value = "市ID")
+    @ApiModelProperty(value = "市ID [新增场所时必填]")
     Integer cityId;
-    @ApiModelProperty(value = "区ID")
+    @ApiModelProperty(value = "区ID [新增场所时必填]")
     Integer districtId;
-    @ApiModelProperty(value = "场所名称")
+    @ApiModelProperty(value = "场所名称 [新增场所时必填]")
     String venueName;
-    @ApiModelProperty(value = "场所详细地址")
+    @ApiModelProperty(value = "场所详细地址 [新增场所时必填]")
     String venueAddress;
-    @ApiModelProperty(value = "经营单位")
+    @ApiModelProperty(value = "经营单位 [非必传]")
     String managementCompany;
-    @ApiModelProperty(value = "是否有场厅")
+    @ApiModelProperty(value = "是否有场厅 [必传]")
     Integer hasHall;
-    @ApiModelProperty(value = "场厅名称")
+    @ApiModelProperty(value = "场厅名称 [有场厅时必传]")
     String hallName;
-    @ApiModelProperty(value = "是否有座")
+    @ApiModelProperty(value = "是否有座 [必传]")
     Integer hasSeat;
-    @ApiModelProperty(value = "场厅座位数量")
+    @ApiModelProperty(value = "场厅座位数量 [有座时必传]")
     Integer seatNum;
-    @ApiModelProperty(value = "场厅可容纳人数")
+    @ApiModelProperty(value = "场厅可容纳人数 [无座时必传]")
     Integer seatingCapacity;
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/ticketSystem/impl/ITicketSystemServiceImpl.java

@@ -76,21 +76,32 @@ public class ITicketSystemServiceImpl implements ITicketSystemService {
 
     @Override
     public List<STFieldListVo> getFieldList(String accessToken, STFieldListParam fieldListParam) {
+        String url = ticketSystemUrl + "/standard/venue/list";//
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
         HashMap<String, String> params = CollectionUtil.mapStringString();
         params.put("accessToken", accessToken);
-        params.put("provinceId", fieldListParam.getProvinceId() + "");
-        params.put("cityId", fieldListParam.getCityId() + "");
-        params.put("districtId", fieldListParam.getDistrictId() + "");
         params.put("pageNo", fieldListParam.getPageNo().toString());
         params.put("pageSize", fieldListParam.getPageSize().toString());
-        params.put("venueName", fieldListParam.getVenueName());
-        ResponseDataVo<List<STFieldListVo>> response =
-                JsonUtils.fromJson(HttpUtil.getRaw(ticketSystemUrl + "/standard/venue/list?accessToken={accessToken}&provinceId={provinceId}&cityId={cityId}&districtId={districtId}&pageNo={pageNo}&pageSize={pageSize}&venueName={venueName}", JSON.toJSONString(params), headers),
-                        new TypeReference<ResponseDataVo<List<STFieldListVo>>>() {
+        if(fieldListParam.getProvinceId()!=0) {
+            params.put("provinceId", fieldListParam.getProvinceId() + "");
+        }
+        if(fieldListParam.getCityId()!=0) {
+            params.put("cityId", fieldListParam.getCityId() + "");
+        }
+        if(fieldListParam.getDistrictId()!=0) {
+            params.put("districtId", fieldListParam.getDistrictId() + "");
+        }
+        if(fieldListParam.getVenueName()!=null) {
+            params.put("venueName", fieldListParam.getVenueName());
+        }
+        log.debug("URL = "+url);
+        log.debug("params = "+JSON.toJSONString(params));
+        ResponseListVo<List<STFieldListVo>> response =
+                JsonUtils.fromJson(HttpUtil.postRaw(url, JSON.toJSONString(params), headers),
+                        new TypeReference<ResponseListVo<List<STFieldListVo>>>() {
                         });
-        return response.getData();
+        return response.getData().getDataList();
     }
 
     @Override