wuweihao преди 3 години
родител
ревизия
ecb4a72dbb

+ 5 - 5
gis_cms/src/main/java/com/gis/cms/entity/vo/HotelVo.java

@@ -84,11 +84,11 @@ public class HotelVo  implements Serializable {
 //    @ApiModelProperty(value = "创建者id")
 //    private Long creatorId;
 
-//    @ApiModelProperty(value = "lng")
-//    private String lng;
-//
-//    @ApiModelProperty(value = "lat")
-//    private String lat;
+    @ApiModelProperty(value = "lng:经度")
+    private String lng;
+
+    @ApiModelProperty(value = "lat:纬度")
+    private String lat;
 
     @ApiModelProperty(value = "密接人数")
     private Integer touch;

+ 6 - 0
gis_cms/src/main/java/com/gis/cms/zhengyuan/ZhengYuanHotelDto.java

@@ -46,6 +46,12 @@ public class ZhengYuanHotelDto implements Serializable {
     @ApiModelProperty(value = "次密接人数")
     private Integer secondaryCloseContactNumber;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
 
 
 

+ 3 - 1
gis_cms/src/main/java/com/gis/cms/zhengyuan/ZhengYuanService.java

@@ -37,10 +37,12 @@ public class ZhengYuanService {
 
     }
 
-
+    /**更新酒店信息*/
     public void updateHotel(HotelEntity param){
         ZhengYuanUtil.saveHotel(getToken(), param);
         log.info("正圆酒店信息更新完成");
+
+        // 查看酒店列表
 //        PageDto dto = new PageDto();
 //        dto.setPageNum(1);
 //        dto.setPageSize(10);

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/zhengyuan/ZhengYuanUtil.java

@@ -83,6 +83,8 @@ public class ZhengYuanUtil {
         req.setUseNumber(param.getUsed());
         req.setFreeNumber(param.getUsable());
         req.setReserveNumber(param.getBook());
+        req.setLongitude(param.getLng());
+        req.setLatitude(param.getLat());
 
         JSONObject reqBody = (JSONObject)JSON.toJSON(req);
         String res = HttpUtils.doPost(api, header, reqBody);

+ 2 - 0
gis_common/src/main/java/com/gis/common/filter/ApiInterceptor.java

@@ -72,6 +72,8 @@ public class ApiInterceptor implements HandlerInterceptor {
 //        String projectId = EncryptUtils.getId(appId);
         String ip = EncryptUtils.getIp(appId);
 
+        // 这里使用一个appId对应多个ip的规则
+
         // 校验appId登记id是否跟请求ip类型一致
 //        SysIpEntity entity = ipService.findByIdentifier(appId);
 //        if (!entity.getIp().equals(ip)){