From bf1d40d49282a96f4c23d20795d21d76aa28e2e0 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 3 Sep 2024 11:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/datacenter/DataCenterRest.java | 21 +++++++++++++ .../report/biz/datacenter/WarehouseInfo.java | 31 +++++++++++++++++++ .../biz/datacenter/WarehouseInfoMapQuery.java | 15 +++++++++ 3 files changed, 67 insertions(+) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoMapQuery.java diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index a1dcdbfb..724847d0 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -13,8 +13,12 @@ import com.yxt.supervise.report.feign.monitor.YDeviceFeign; import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -167,4 +171,21 @@ public class DataCenterRest { ResultBean rb = ResultBean.fireFail(); return reportInventoryDayGatherService.getProjectBySid(projectSid); } + + @ApiOperation("获取仓库地址及经纬度") + @PostMapping("/getWarehouseAddress") + public Object getWarehouseAddress(@RequestBody WarehouseInfoMapQuery query){ + String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list"; + Map sendBodyMM = new HashMap<>(); + if(StringUtils.isNotBlank(query.getName())){ + sendBodyMM.put("name",query.getName()); + } + sendBodyMM.put("orgPath",query.getProjectSid()); + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity forEntity = restTemplate.postForEntity(a, sendBodyMM, String.class); + com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject(); + jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()); +// String b=jsonObject.get("date"); + return jsonObject; + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java new file mode 100644 index 00000000..287f4a66 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WarehouseInfo extends BaseEntity { + + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String lngAndLat;//经纬度 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoMapQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoMapQuery.java new file mode 100644 index 00000000..28498c1c --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoMapQuery.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.report.biz.datacenter; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/8/29 11:52 + */ +@Data +public class WarehouseInfoMapQuery { + private String name;//仓库名称 + @ApiModelProperty("组织sid") + private String projectSid; +}