5.24--仓库的增删改查，gateway和tdl的绑定与解绑

src/main/java/com/example/tdl/domain/vo/AddWarehouseGatewayVo.java

+package com.example.tdl.domain.vo;
+
+public class AddWarehouseGatewayVo {
+
+    private String warehouseNo;
+
+    private  String SN;
+
+    public String getWarehouseNo() {
+        return warehouseNo;
+    }
+
+    public void setWarehouseNo(String warehouseNo) {
+        this.warehouseNo = warehouseNo;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+}

src/main/java/com/example/tdl/domain/vo/AddWarehouseVo.java

@@ -6,21 +6,15 @@ public class AddWarehouseVo {
 
     private String country;
 
-    private String province;
-
     private String city;
 
-    private String district;
-
-    private String address;
-
-    private String regionCN;//区域中文
+    private String addressDetail;
 
-    private String regionEN;//区域英文
+    private String lng;
 
-    private String longitude;//经度
+    private String lat;
 
-    private String latitude;//纬度
+    private String regionName;//
 
     private String property;//属性
 
@@ -42,8 +36,6 @@ public class AddWarehouseVo {
 
     private Integer timeZone;//时区
 
-    private String weatherInfo;//区域气象信息
-
     private String warehouseInfo;//基础描述
 
     private String remark;
@@ -64,14 +56,6 @@ public class AddWarehouseVo {
         this.country = country;
     }
 
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
     public String getCity() {
         return city;
     }
@@ -80,52 +64,36 @@ public class AddWarehouseVo {
         this.city = city;
     }
 
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
+    public String getAddressDetail() {
+        return addressDetail;
     }
 
-    public String getAddress() {
-        return address;
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public String getLng() {
+        return lng;
     }
 
-    public String getRegionCN() {
-        return regionCN;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public void setRegionCN(String regionCN) {
-        this.regionCN = regionCN;
+    public String getLat() {
+        return lat;
     }
 
-    public String getRegionEN() {
-        return regionEN;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public void setRegionEN(String regionEN) {
-        this.regionEN = regionEN;
+    public String getRegionName() {
+        return regionName;
     }
 
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
     }
 
     public String getProperty() {
@@ -208,14 +176,6 @@ public class AddWarehouseVo {
         this.timeZone = timeZone;
     }
 
-    public String getWeatherInfo() {
-        return weatherInfo;
-    }
-
-    public void setWeatherInfo(String weatherInfo) {
-        this.weatherInfo = weatherInfo;
-    }
-
     public String getWarehouseInfo() {
         return warehouseInfo;
     }

src/main/java/com/example/tdl/domain/vo/AlarmTypeVo.java

+package com.example.tdl.domain.vo;
+
+public class AlarmTypeVo {
+
+    private String alarmType;
+
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+}

src/main/java/com/example/tdl/domain/vo/ResultWarehouseVo.java

@@ -2,27 +2,23 @@ package com.example.tdl.domain.vo;
 
 public class ResultWarehouseVo {
 
-    private String warehouseName;
-
     private String warehouseNo;//仓库编号
 
-    private String country;
+    private String warehouseName;
 
-    private String province;
+    private String country;
 
     private String city;
 
-    private String district;
-
-    private String address;
+    private String regions;
 
-    private String regionCN;//区域中文
+    private String addressDetail;
 
-    private String regionEN;//区域英文
+    private String regionName;
 
-    private String longitude;//经度
+    private String lng;//经度
 
-    private String latitude;//纬度
+    private String lat;//纬度
 
     private String property;//属性
 
@@ -30,8 +26,6 @@ public class ResultWarehouseVo {
 
     private String alarmType;
 
-    private String alarmScene;
-
     private String hardwareLevel;//硬件等级
 
     private Double areaIndoor;//室内平面面积
@@ -46,19 +40,11 @@ public class ResultWarehouseVo {
 
     private Integer timeZone;//时区
 
-    private String weatherInfo;//区域气象信息
-
     private String warehouseInfo;//基础描述
 
-    private String remark;
+    private String companyName;
 
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
+    private String remark;
 
     public String getWarehouseNo() {
         return warehouseNo;
@@ -68,20 +54,20 @@ public class ResultWarehouseVo {
         this.warehouseNo = warehouseNo;
     }
 
-    public String getCountry() {
-        return country;
+    public String getWarehouseName() {
+        return warehouseName;
     }
 
-    public void setCountry(String country) {
-        this.country = country;
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
     }
 
-    public String getProvince() {
-        return province;
+    public String getCountry() {
+        return country;
     }
 
-    public void setProvince(String province) {
-        this.province = province;
+    public void setCountry(String country) {
+        this.country = country;
     }
 
     public String getCity() {
@@ -92,52 +78,44 @@ public class ResultWarehouseVo {
         this.city = city;
     }
 
-    public String getDistrict() {
-        return district;
+    public String getRegions() {
+        return regions;
     }
 
-    public void setDistrict(String district) {
-        this.district = district;
+    public void setRegions(String regions) {
+        this.regions = regions;
     }
 
-    public String getAddress() {
-        return address;
+    public String getAddressDetail() {
+        return addressDetail;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
     }
 
-    public String getRegionCN() {
-        return regionCN;
+    public String getRegionName() {
+        return regionName;
     }
 
-    public void setRegionCN(String regionCN) {
-        this.regionCN = regionCN;
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
     }
 
-    public String getRegionEN() {
-        return regionEN;
+    public String getLng() {
+        return lng;
     }
 
-    public void setRegionEN(String regionEN) {
-        this.regionEN = regionEN;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public String getLongitude() {
-        return longitude;
+    public String getLat() {
+        return lat;
     }
 
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
     public String getProperty() {
@@ -164,14 +142,6 @@ public class ResultWarehouseVo {
         this.alarmType = alarmType;
     }
 
-    public String getAlarmScene() {
-        return alarmScene;
-    }
-
-    public void setAlarmScene(String alarmScene) {
-        this.alarmScene = alarmScene;
-    }
-
     public String getHardwareLevel() {
         return hardwareLevel;
     }
@@ -228,14 +198,6 @@ public class ResultWarehouseVo {
         this.timeZone = timeZone;
     }
 
-    public String getWeatherInfo() {
-        return weatherInfo;
-    }
-
-    public void setWeatherInfo(String weatherInfo) {
-        this.weatherInfo = weatherInfo;
-    }
-
     public String getWarehouseInfo() {
         return warehouseInfo;
     }
@@ -244,6 +206,14 @@ public class ResultWarehouseVo {
         this.warehouseInfo = warehouseInfo;
     }
 
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getRemark() {
         return remark;
     }

src/main/java/com/example/tdl/domain/vo/SearchLocationVo.java

+package com.example.tdl.domain.vo;
+
+public class SearchLocationVo {
+
+    private String  transportationNo;
+
+    private  String type;
+
+    public String getTransportationNo() {
+        return transportationNo;
+    }
+
+    public void setTransportationNo(String transportationNo) {
+        this.transportationNo = transportationNo;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

src/main/java/com/example/tdl/domain/vo/UpdateWarehouseVo.java

@@ -7,21 +7,15 @@ public class UpdateWarehouseVo {
 
     private String country;
 
-    private String province;
-
     private String city;
 
-    private String district;
-
-    private String address;
-
-    private String regionCN;//区域中文
+    private String addressDetail;
 
-    private String regionEN;//区域英文
+    private String  lng;
 
-    private String longitude;//经度
+    private String lat;
 
-    private String latitude;//纬度
+    private String regionName;
 
     private String property;//属性
 
@@ -43,8 +37,6 @@ public class UpdateWarehouseVo {
 
     private Integer timeZone;//时区
 
-    private String weatherInfo;//区域气象信息
-
     private String warehouseInfo;//基础描述
 
     private Long updateTime;
@@ -75,14 +67,6 @@ public class UpdateWarehouseVo {
         this.country = country;
     }
 
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
     public String getCity() {
         return city;
     }
@@ -91,52 +75,36 @@ public class UpdateWarehouseVo {
         this.city = city;
     }
 
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
+    public String getAddressDetail() {
+        return addressDetail;
     }
 
-    public String getAddress() {
-        return address;
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public String getLng() {
+        return lng;
     }
 
-    public String getRegionCN() {
-        return regionCN;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public void setRegionCN(String regionCN) {
-        this.regionCN = regionCN;
+    public String getLat() {
+        return lat;
     }
 
-    public String getRegionEN() {
-        return regionEN;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public void setRegionEN(String regionEN) {
-        this.regionEN = regionEN;
+    public String getRegionName() {
+        return regionName;
     }
 
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
     }
 
     public String getProperty() {
@@ -219,14 +187,6 @@ public class UpdateWarehouseVo {
         this.timeZone = timeZone;
     }
 
-    public String getWeatherInfo() {
-        return weatherInfo;
-    }
-
-    public void setWeatherInfo(String weatherInfo) {
-        this.weatherInfo = weatherInfo;
-    }
-
     public String getWarehouseInfo() {
         return warehouseInfo;
     }

src/main/java/com/example/tdl/domain/vo/WareHouseByTermVo.java

+package com.example.tdl.domain.vo;
+
+public class WareHouseByTermVo {
+
+    private String warehouseName;
+
+    private String country;
+
+    private String city;
+
+    private String  alarm;
+
+    private String  companyName;
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAlarm() {
+        return alarm;
+    }
+
+    public void setAlarm(String alarm) {
+        this.alarm = alarm;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

src/main/java/com/example/tdl/domain/vo/WarehouseTermVo.java

@@ -5,8 +5,6 @@ public class WarehouseTermVo {
 
     private String country;
 
-    private String province;
-
     private String city;
 
     private String property;
@@ -15,6 +13,8 @@ public class WarehouseTermVo {
 
     private String hardwareLevel;
 
+    private String companyName;
+
     public String getWarehouseName() {
         return warehouseName;
     }
@@ -31,14 +31,6 @@ public class WarehouseTermVo {
         this.country = country;
     }
 
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
     public String getCity() {
         return city;
     }
@@ -70,4 +62,12 @@ public class WarehouseTermVo {
     public void setHardwareLevel(String hardwareLevel) {
         this.hardwareLevel = hardwareLevel;
     }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
 }

src/main/java/com/example/tdl/domain/vo/WarehouseUserVo.java

+package com.example.tdl.domain.vo;
+
+import java.util.List;
+
+public class WarehouseUserVo {
+
+    private String warehouseNo;
+
+    private List<String> userNameList;
+
+    public String getWarehouseNo() {
+        return warehouseNo;
+    }
+
+    public void setWarehouseNo(String warehouseNo) {
+        this.warehouseNo = warehouseNo;
+    }
+
+    public List<String> getUserNameList() {
+        return userNameList;
+    }
+
+    public void setUserNameList(List<String> userNameList) {
+        this.userNameList = userNameList;
+    }
+}

src/main/java/com/example/tdl/entity/Company.java

+package com.example.tdl.entity;
+
+import java.io.Serializable;
+
+public class Company implements Serializable {
+
+    private Serializable serializable = 1L;
+
+    private  Integer id;
+
+    private String companyNo;
+
+    private String companyName;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String tel;
+
+    private String manager;
+
+    private  Integer  state;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getManager() {
+        return manager;
+    }
+
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

src/main/java/com/example/tdl/entity/Warehouse.java

@@ -16,23 +16,15 @@ public class Warehouse implements Serializable {
 
     private String warehouseNo;//仓库编号
 
-    private String country;
+    private City city;
 
-    private String province;
+    private String addressDetail;
 
-    private String city;
+    private String lng;
 
-    private String district;
+    private  String  lat;
 
-    private String address;
-
-    private String regionCN;//区域中文
-
-    private String regionEN;//区域英文
-
-    private String longitude;//经度
-
-    private String latitude;//纬度
+    private String regionName;
 
     private String property;//属性
 
@@ -54,47 +46,16 @@ public class Warehouse implements Serializable {
 
     private Integer timeZone;//时区
 
-    private String weatherInfo;//区域气象信息
-
     private String warehouseInfo;//基础描述
 
+    private Company  company;
+
     private Long createTime;
 
     private Long updateTime;
 
     private String remark;
 
-    public Warehouse() {
-    }
-
-    public Warehouse( String warehouseName, String warehouseNo, String country, String province, String city, String district, String address, String regionCN, String regionEN, String longitude, String latitude, String property, String type, String alarmType, String hardwareLevel, Double areaIndoor, Double areaRack, Double areaOutdoor, Double areaPlanIndoor, String office, Integer timeZone, String weatherInfo, String warehouseInfo, Long createTime, Long updateTime, String remark) {
-        this.warehouseName = warehouseName;
-        this.warehouseNo = warehouseNo;
-        this.country = country;
-        this.province = province;
-        this.city = city;
-        this.district = district;
-        this.address = address;
-        this.regionCN = regionCN;
-        this.regionEN = regionEN;
-        this.longitude = longitude;
-        this.latitude = latitude;
-        this.property = property;
-        this.type = type;
-        this.alarmType = alarmType;
-        this.hardwareLevel = hardwareLevel;
-        this.areaIndoor = areaIndoor;
-        this.areaRack = areaRack;
-        this.areaOutdoor = areaOutdoor;
-        this.areaPlanIndoor = areaPlanIndoor;
-        this.office = office;
-        this.timeZone = timeZone;
-        this.weatherInfo = weatherInfo;
-        this.warehouseInfo = warehouseInfo;
-        this.createTime = createTime;
-        this.updateTime = updateTime;
-        this.remark = remark;
-    }
 
     public Integer getId() {
         return id;
@@ -120,76 +81,44 @@ public class Warehouse implements Serializable {
         this.warehouseNo = warehouseNo;
     }
 
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
+    public City getCity() {
         return city;
     }
 
-    public void setCity(String city) {
+    public void setCity(City city) {
         this.city = city;
     }
 
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
-    }
-
-    public String getAddress() {
-        return address;
+    public String getAddressDetail() {
+        return addressDetail;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
     }
 
-    public String getRegionCN() {
-        return regionCN;
+    public String getLng() {
+        return lng;
     }
 
-    public void setRegionCN(String regionCN) {
-        this.regionCN = regionCN;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public String getRegionEN() {
-        return regionEN;
+    public String getLat() {
+        return lat;
     }
 
-    public void setRegionEN(String regionEN) {
-        this.regionEN = regionEN;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public String getLongitude() {
-        return longitude;
+    public String getRegionName() {
+        return regionName;
     }
 
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
     }
 
     public String getProperty() {
@@ -272,14 +201,6 @@ public class Warehouse implements Serializable {
         this.timeZone = timeZone;
     }
 
-    public String getWeatherInfo() {
-        return weatherInfo;
-    }
-
-    public void setWeatherInfo(String weatherInfo) {
-        this.weatherInfo = weatherInfo;
-    }
-
     public String getWarehouseInfo() {
         return warehouseInfo;
     }
@@ -288,6 +209,14 @@ public class Warehouse implements Serializable {
         this.warehouseInfo = warehouseInfo;
     }
 
+    public Company getCompany() {
+        return company;
+    }
+
+    public void setCompany(Company company) {
+        this.company = company;
+    }
+
     public Long getCreateTime() {
         return createTime;
     }

src/main/java/com/example/tdl/mapper/AlarmMapper.java

 package com.example.tdl.mapper;
 
 
-import com.example.tdl.domain.vo.AddAlarmVo;
-import com.example.tdl.domain.vo.DelAlarmVo;
-import com.example.tdl.domain.vo.ResultAlarmVo;
-import com.example.tdl.domain.vo.UpdateAlarmVo;
+import com.example.tdl.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +21,7 @@ public interface AlarmMapper {
 
     ResultAlarmVo getByTypeAndScene(@Param("alarmType") String alarmType,@Param("alarmScene") String alarmScene,@Param("companyName") String companyName);
 
-    List<String> getForWarehouse(String companyName);
+    List<AlarmTypeVo> getForWarehouse(String companyName);
 
-    List<String> getForTransportation(String companyName);
+    List<AlarmTypeVo> getForTransportation(String companyName);
 }

src/main/java/com/example/tdl/mapper/TDLLogMapper.java

 package com.example.tdl.mapper;
 
+import com.example.tdl.domain.vo.DelAlarmVo;
 import com.example.tdl.domain.vo.ResultGatewayVo;
 import com.example.tdl.domain.vo.TDLLogVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,4 +18,6 @@ public interface TDLLogMapper {
 
     String getSN(String transportationNo);
 
+    List<String> getByAlarm(DelAlarmVo delAlarmVo);
+
 }

src/main/java/com/example/tdl/mapper/WarehouseMapper.java

 package com.example.tdl.mapper;
 
 
-import com.example.tdl.domain.vo.DelAlarmVo;
-import com.example.tdl.domain.vo.ResultWarehouseVo;
-import com.example.tdl.domain.vo.UpdateWarehouseVo;
-import com.example.tdl.domain.vo.WarehouseTermVo;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.entity.Warehouse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
+import java.util.Map;
 
 
 @Mapper
 public interface WarehouseMapper {
-    List<ResultWarehouseVo> getAll();
+    List<ResultWarehouseVo> getAll(String  companyName);
 
     List<ResultWarehouseVo> getAllByTerm(WarehouseTermVo warehouseTermVo);
 
-    int addWarehouse(Warehouse warehouse);
+    List<String> getByWarehouse(WareHouseByTermVo wareHouseByTermVo);
 
-    int updateWarehouse(UpdateWarehouseVo updateWarehouseVo);
+    Integer  getWarehouseNo(String warehouseNo);
 
-    int delWarehouse(String warehouseNo);
+    Integer getByWarehouseNoAndSN(@Param("warehouseNo") String warehouseNo,@Param("SN") String SN);
 
-    ResultWarehouseVo getByWarehouseName(String warehouseName);
+    int addWarehouse(Map<Object,Object> map);
+
+    int updateWarehouse(Map<Object,Object> map);
+
+    int delWarehouse(Map<Object,Object> map);
+
+    int addGateway(Map<Object,Object> map);
+
+    int untieGateway(Map<Object,Object> map);
+
+    int addUser(Map<Object,Object> map);
+
+    ResultWarehouseVo getByWarehouseName(@Param("warehouseName") String warehouseName, @Param("companyName") String companyName);
 
     List<ResultWarehouseVo> getByAlarm(DelAlarmVo delAlarmVo);
 
+    List<GatewaySNVo> getGateway(String warehouseNo);
+
 
 }

src/main/java/com/example/tdl/service/AlarmService.java

 package com.example.tdl.service;
 
 
-import com.example.tdl.domain.vo.AddAlarmVo;
-import com.example.tdl.domain.vo.DelAlarmVo;
-import com.example.tdl.domain.vo.ResultAlarmVo;
-import com.example.tdl.domain.vo.UpdateAlarmVo;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.mapper.AlarmMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,11 +38,11 @@ public class AlarmService {
         return alarmMapper.getByTypeAndScene(alarmType,alarmScene,companyName);
     }
 
-    public List<String> getForWarehouse(String companyName){
+    public List<AlarmTypeVo> getForWarehouse(String companyName){
         return alarmMapper.getForWarehouse(companyName);
     }
 
-    public List<String> getForTransportation(String companyName){
+    public List<AlarmTypeVo> getForTransportation(String companyName){
         return alarmMapper.getForTransportation(companyName);
     }
 

src/main/java/com/example/tdl/service/TDLLogService.java

 package com.example.tdl.service;
 
 
+import com.example.tdl.domain.vo.DelAlarmVo;
 import com.example.tdl.domain.vo.ResultGatewayVo;
 import com.example.tdl.domain.vo.TDLLogVo;
 import com.example.tdl.mapper.TDLLogMapper;
@@ -31,4 +32,8 @@ public class TDLLogService {
         return  tdlLogMapper.getSN(transportationNo);
     }
 
+
+    public List<String> getByAlarm(DelAlarmVo delAlarmVo){
+        return  tdlLogMapper.getByAlarm(delAlarmVo);
+    }
 }

src/main/java/com/example/tdl/service/WarehouseService.java

 package com.example.tdl.service;
 
 
-import com.example.tdl.domain.vo.DelAlarmVo;
-import com.example.tdl.domain.vo.ResultWarehouseVo;
-import com.example.tdl.domain.vo.UpdateWarehouseVo;
-import com.example.tdl.domain.vo.WarehouseTermVo;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.entity.Warehouse;
 import com.example.tdl.mapper.WarehouseMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class WarehouseService {
     @Autowired
     private WarehouseMapper warehouseMapper;
 
-    public List<ResultWarehouseVo> getAll(){
-        return warehouseMapper.getAll();
+    public List<ResultWarehouseVo> getAll(String  companyName){
+        return warehouseMapper.getAll(companyName);
     }
 
     public List<ResultWarehouseVo> getAllByTerm(WarehouseTermVo warehouseTermVo){
         return warehouseMapper.getAllByTerm(warehouseTermVo);
     }
 
-    public int addWarehouse(Warehouse warehouse){
-        return warehouseMapper.addWarehouse(warehouse);
+    public List<String> getByWarehouse(WareHouseByTermVo wareHouseByTermVo){
+        return warehouseMapper.getByWarehouse(wareHouseByTermVo);
     }
 
-    public int updateWarehouse(UpdateWarehouseVo updateWarehouseVo){
-        return warehouseMapper.updateWarehouse(updateWarehouseVo);
+    public  Integer  getWarehouseNo(String warehouseNo){
+        return  warehouseMapper.getWarehouseNo(warehouseNo);
     }
 
-    public int delWarehouse(String warehouseNo){
-        return warehouseMapper.delWarehouse(warehouseNo);
+    public  Integer getByWarehouseNoAndSN(String warehouseNo,String SN){
+        return  warehouseMapper.getByWarehouseNoAndSN(warehouseNo,SN);
     }
 
-    public ResultWarehouseVo getByWarehouseName(String warehouseName){
-        return warehouseMapper.getByWarehouseName(warehouseName);
+    public int addWarehouse(Map<Object,Object> map){
+        return warehouseMapper.addWarehouse(map);
+    }
+
+    public int updateWarehouse(Map<Object,Object> map){
+        return warehouseMapper.updateWarehouse(map);
+    }
+
+    public int delWarehouse(Map<Object,Object> map){
+        return warehouseMapper.delWarehouse(map);
+    }
+
+    public int addGateway(Map<Object,Object> map){
+        return warehouseMapper.addGateway(map);
+    }
+
+
+    public int untieGateway(Map<Object,Object> map){
+        return warehouseMapper.untieGateway(map);
+    }
+
+    public int addUser(Map<Object,Object> map){
+        return warehouseMapper.addUser(map);
+    }
+
+    public ResultWarehouseVo getByWarehouseName(String warehouseName,String companyName){
+        return warehouseMapper.getByWarehouseName(warehouseName,companyName);
     }
 
     public List<ResultWarehouseVo> getByAlarm(DelAlarmVo delAlarmVo){
         return warehouseMapper.getByAlarm(delAlarmVo);
     }
 
-
+    public List<GatewaySNVo> getGateway(String warehouseNo){
+        return warehouseMapper.getGateway(warehouseNo);
+    }
 }

src/main/java/com/example/tdl/web/AlarmController.java

@@ -6,6 +6,7 @@ import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
 import com.example.tdl.service.AlarmService;
 
+import com.example.tdl.service.TDLLogService;
 import com.example.tdl.service.WarehouseService;
 import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
@@ -42,6 +43,9 @@ public class AlarmController {
     @Autowired
     private TokenRedisService tokenRedisService;
 
+    @Autowired
+    private TDLLogService  tdlLogService;
+
     @Autowired
     private I18nController  i18n;
 
@@ -139,6 +143,11 @@ public class AlarmController {
             fb.setMessage(i18n.getMessage(request,"temMin"));
             return gson.toJson(fb);
         }
+        if(addAlarmVo.getTemMin() >addAlarmVo.getTemMax()){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongTemp"));
+            return gson.toJson(fb);
+        }
         if (addAlarmVo.getHumidityMax()==null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"humidityMax"));
@@ -149,6 +158,11 @@ public class AlarmController {
             fb.setMessage(i18n.getMessage(request,"humidityMin"));
             return gson.toJson(fb);
         }
+        if(addAlarmVo.getHumidityMin() >addAlarmVo.getHumidityMax()){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongHumidity"));
+            return gson.toJson(fb);
+        }
         if (addAlarmVo.getTilt()==null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"tilt"));
@@ -201,13 +215,6 @@ public class AlarmController {
         String port = request.getHeader("AccountLanguage");
         if (StringUtils.isEmpty(updateAlarmVo.getOldAlarmType())){
             fb.setCode(0);
-            if(!StringUtils.isEmpty(port) &&port.equals("en")){
-                    fb.setMessage("The type of early warning that needs to be modified can not be empty");
-            }else  if(!StringUtils.isEmpty(port) && port .equals("jp")){
-                fb.setMessage("アラームタイプを入力してください。");
-            }else{
-                fb.setMessage("需要修改的预警类型不能为空");
-            }
             fb.setMessage(i18n.getMessage(request,"modifiedAlarmType"));
             return gson.toJson(fb);
         }
@@ -246,6 +253,11 @@ public class AlarmController {
             fb.setMessage(i18n.getMessage(request,"temMin"));
             return gson.toJson(fb);
         }
+        if(updateAlarmVo.getTemMin() >updateAlarmVo.getTemMax()){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongTemp"));
+            return gson.toJson(fb);
+        }
         if (updateAlarmVo.getHumidityMax()==null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"humidityMax"));
@@ -256,6 +268,11 @@ public class AlarmController {
             fb.setMessage(i18n.getMessage(request,"humidityMin"));
             return gson.toJson(fb);
         }
+        if(updateAlarmVo.getHumidityMin()>updateAlarmVo.getHumidityMax()){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongHumidity"));
+            return gson.toJson(fb);
+        }
         if (updateAlarmVo.getTilt()==null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"tilt"));
@@ -275,7 +292,6 @@ public class AlarmController {
         int a=alarmService.updateAlarm(updateAlarmVo);
         if (a>0){
             fb.setCode(1);
-            fb.setMessage("修改预警信息成功");
             fb.setMessage(i18n.getMessage(request,"modifiedSuccess"));
         }else{
             fb.setCode(0);
@@ -310,10 +326,18 @@ public class AlarmController {
             return gson.toJson(fb);
         }
         delAlarmVo.setCompanyName(user.getCompanyName());
-        if (warehouseService.getByAlarm(delAlarmVo).size()>0){
-            fb.setCode(0);
-            fb.setMessage(i18n.getMessage(request,"dusedAlarm"));
-            return gson.toJson(fb);
+        if("运输".equals(delAlarmVo.getAlarmScene())){
+            if(tdlLogService.getByAlarm(delAlarmVo).size()>0){
+                fb.setCode(0);
+                fb.setMessage(i18n.getMessage(request,"dusedAlarm"));
+                return gson.toJson(fb);
+            }
+        }else{
+            if (warehouseService.getByAlarm(delAlarmVo).size()>0){
+                fb.setCode(0);
+                fb.setMessage(i18n.getMessage(request,"dusedAlarm"));
+                return gson.toJson(fb);
+            }
         }
         int a=alarmService.delAlarm(delAlarmVo);
         if (a>0){
@@ -338,6 +362,7 @@ public class AlarmController {
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         return alarmService.getForWarehouse(user.getCompanyName());
+
     }
 
 

src/main/java/com/example/tdl/web/CircuitController.java

@@ -636,16 +636,16 @@ public class CircuitController {
             return gson.toJson(fb);
         }
         Long time = System.currentTimeMillis();
-        String countryVar=addCircuitVo.getStartAddressVo().getCountry()+" ";
-        String cityVar=addCircuitVo.getStartAddressVo().getCity()+ " ";
-        String addressDetailVar=addCircuitVo.getStartAddressVo().getAddressDetail() +" ";
-        String lngVar=addCircuitVo.getStartAddressVo().getLng()+" ";
-        String latVar = addCircuitVo.getStartAddressVo().getLat()+" ";
-        String postCodeVar = addCircuitVo.getStartAddressVo().getPostCode()+" ";
-        String expTimeVar = addCircuitVo.getStartAddressVo().getExpTime()+" ";
-        String compTimeVar = "0 ";
-        String arrivalTimeVar=time +" ";
-        String startTimeVar=0 +" ";
+        String countryVar=addCircuitVo.getStartAddressVo().getCountry()+"&";
+        String cityVar=addCircuitVo.getStartAddressVo().getCity()+ "&";
+        String addressDetailVar=addCircuitVo.getStartAddressVo().getAddressDetail() +"&";
+        String lngVar=addCircuitVo.getStartAddressVo().getLng()+"&";
+        String latVar = addCircuitVo.getStartAddressVo().getLat()+"&";
+        String postCodeVar = addCircuitVo.getStartAddressVo().getPostCode()+"&";
+        String expTimeVar = addCircuitVo.getStartAddressVo().getExpTime()+"&";
+        String compTimeVar = "0&";
+        String arrivalTimeVar=time +"&";
+        String startTimeVar=0 +"&";
         if(addCircuitVo.getAddressVoList() != null){
             if(addCircuitVo.getAddressVoList().size()>3){
                 fb.setCode(0);
@@ -715,16 +715,16 @@ public class CircuitController {
                         return gson.toJson(fb);
                     }
                 }
-                countryVar=countryVar +addCircuitVo.getAddressVoList().get(i).getCountry() +" ";
-                cityVar=cityVar +addCircuitVo.getAddressVoList().get(i).getCity() +" ";
-                addressDetailVar =addressDetailVar +addCircuitVo.getAddressVoList().get(i).getAddressDetail() +" ";
-                lngVar = lngVar + addCircuitVo.getAddressVoList().get(i).getLng() +" ";
-                latVar = latVar + addCircuitVo.getAddressVoList().get(i).getLat() +" ";
-                postCodeVar=postCodeVar + addCircuitVo.getAddressVoList().get(i).getPostCode() +" ";
-                expTimeVar = expTimeVar +addCircuitVo.getAddressVoList().get(i).getExpTime() +" ";
-                compTimeVar  = compTimeVar  +addCircuitVo.getAddressVoList().get(i).getCompTime() +" ";
-                startTimeVar =startTimeVar + "0 ";
-                arrivalTimeVar = arrivalTimeVar +"0 ";
+                countryVar=countryVar +addCircuitVo.getAddressVoList().get(i).getCountry() +"&";
+                cityVar=cityVar +addCircuitVo.getAddressVoList().get(i).getCity() +"&";
+                addressDetailVar =addressDetailVar +addCircuitVo.getAddressVoList().get(i).getAddressDetail() +"&";
+                lngVar = lngVar + addCircuitVo.getAddressVoList().get(i).getLng() +"&";
+                latVar = latVar + addCircuitVo.getAddressVoList().get(i).getLat() +"&";
+                postCodeVar=postCodeVar + addCircuitVo.getAddressVoList().get(i).getPostCode() +"&";
+                expTimeVar = expTimeVar +addCircuitVo.getAddressVoList().get(i).getExpTime() +"&";
+                compTimeVar  = compTimeVar  +addCircuitVo.getAddressVoList().get(i).getCompTime() +"&";
+                startTimeVar =startTimeVar + "0&";
+                arrivalTimeVar = arrivalTimeVar +"0&";
             }
         }
         if(StringUtils.isEmpty(addCircuitVo.getEndAddressVo().getCountry())){
@@ -782,16 +782,16 @@ public class CircuitController {
             fb.setMessage(i18n.getMessage(request,"gateway"));
             return gson.toJson(fb);
         }
-        countryVar=countryVar +addCircuitVo.getEndAddressVo().getCountry() +" ";
-        cityVar=cityVar +addCircuitVo.getEndAddressVo().getCity() +" ";
-        addressDetailVar =addressDetailVar +addCircuitVo.getEndAddressVo().getAddressDetail() +" ";
-        lngVar = lngVar + addCircuitVo.getEndAddressVo().getLng() +" ";
-        latVar = latVar + addCircuitVo.getEndAddressVo().getLat() +" ";
-        postCodeVar=postCodeVar + addCircuitVo.getEndAddressVo().getPostCode() +" ";
-        expTimeVar = expTimeVar +"0 ";
-        compTimeVar  = compTimeVar  +addCircuitVo.getEndAddressVo().getCompTime() +" ";
-        startTimeVar =startTimeVar + "0 ";
-        arrivalTimeVar = arrivalTimeVar +"0 ";
+        countryVar=countryVar +addCircuitVo.getEndAddressVo().getCountry() +"&";
+        cityVar=cityVar +addCircuitVo.getEndAddressVo().getCity() +"&";
+        addressDetailVar =addressDetailVar +addCircuitVo.getEndAddressVo().getAddressDetail() +"&";
+        lngVar = lngVar + addCircuitVo.getEndAddressVo().getLng() +"&";
+        latVar = latVar + addCircuitVo.getEndAddressVo().getLat() +"&";
+        postCodeVar=postCodeVar + addCircuitVo.getEndAddressVo().getPostCode() +"&";
+        expTimeVar = expTimeVar +"0&";
+        compTimeVar  = compTimeVar  +addCircuitVo.getEndAddressVo().getCompTime() +"&";
+        startTimeVar =startTimeVar + "0&";
+        arrivalTimeVar = arrivalTimeVar +"0&";
         String type =gatewayService.getBySN(addCircuitVo.getSN());
         //判断当前gateWay是否存在
         if(StringUtils.isEmpty(type)){
@@ -834,14 +834,13 @@ public class CircuitController {
                 fb.setMessage(i18n.getMessage(request,args,"tdlUsed"));
                 return gson.toJson(fb);
             }
-
             if(StringUtils.isEmpty(addCircuitVo.getTdlAlarmList().get(j).getAlarmType())){
                 fb.setCode(0);
                 fb.setMessage(i18n.getMessage(request,"alarmType"));
                 return gson.toJson(fb);
             }
-            alarmTypeVar =alarmTypeVar + addCircuitVo.getTdlAlarmList().get(j).getAlarmType() +" ";
-            TDLSNVar =TDLSNVar + addCircuitVo.getTdlAlarmList().get(j).getTDLSN() +" ";
+            alarmTypeVar =alarmTypeVar + addCircuitVo.getTdlAlarmList().get(j).getAlarmType() +"&";
+            TDLSNVar =TDLSNVar + addCircuitVo.getTdlAlarmList().get(j).getTDLSN() +"&";
             devList.add("TDL-"+addCircuitVo.getTdlAlarmList().get(j).getTDLSN());
             saveAlarmRule("TDL/"+type+"/" +addCircuitVo.getSN()+"/Data",addCircuitVo.getTdlAlarmList().get(j).getTDLSN(),addCircuitVo.getTdlAlarmList().get(j).getAlarmType(),request);
         }
@@ -1333,13 +1332,13 @@ public class CircuitController {
             fb.setMessage(i18n.getMessage(request,"noCircuit"));
             return gson.toJson(fb);
         }
-        if (resultCircuitVo.getCircuitState()!=0){
+        if (resultCircuitVo.getCircuitState()==1){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"inTransit"));
             return gson.toJson(fb);
         }
         TDLLogVo tdlLogVo =  tdlLogService.getByTransportationNo(transportationNo);
-        if(tdlLogVo != null){
+        if(tdlLogVo != null &&  resultCircuitVo.getCircuitState() == 0){
             List<String> dev = tdlLogService.getTdlSN(transportationNo);
             if(dev == null){
                 fb.setCode(0);

src/main/java/com/example/tdl/web/DataController.java

@@ -89,14 +89,17 @@ public class DataController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
             @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
     })
-    public Object getLocation(@RequestBody String transportationNo,HttpServletRequest request){
+    public Object getLocation(@RequestBody SearchLocationVo searchLocationVo,HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
+        if(StringUtils.isEmpty(searchLocationVo.getTransportationNo())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"transportationNo"));
+            return gson.toJson(fb);
+        }
         //根据运输编号获取线路信息
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo,user.getCompanyName());
+        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(searchLocationVo.getTransportationNo(),user.getCompanyName());
         List<LocationDataVo> locationDataVoList =new ArrayList<>();
         if(resultCircuitVo == null){
             return gson.toJson(locationDataVoList);
@@ -105,12 +108,12 @@ public class DataController {
             return gson.toJson(locationDataVoList);
         }
         Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        if(resultCircuitVo.getEndTime() !=null  && infoRedisService.hasHashKey("TransportConfig",transportationNo)){
-            Object ret = infoRedisService.getHash("TransportConfig",transportationNo);
+        if(resultCircuitVo.getEndTime() !=null  && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){
+            Object ret = infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo());
             return ret;
         }
         //获取gateway的信息
-        TDLLogVo tdlLogVo =  tdlLogService.getByTransportationNo(transportationNo);
+        TDLLogVo tdlLogVo =  tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo());
         if(tdlLogVo==null){
             return gson.toJson(locationDataVoList);
         }
@@ -118,9 +121,21 @@ public class DataController {
         String sql ="";
         if(resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0){
             Long time = resultCircuitVo.getEndTime()*1000000l;
-            sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  and time<= "+time+"  ORDER BY time ";
+            if("baidu".equals(searchLocationVo.getType())){
+                sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  and time<= "+time+"  ORDER BY time ";
+
+            }else{
+                sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  and time<= "+time+"  ORDER BY time ";
+
+            }
         }else{
-            sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  ORDER BY time ";
+            if("baidu".equals(searchLocationVo.getType())){
+                sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + "  ORDER BY time ";
+
+            }else {
+                sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + "  ORDER BY time ";
+
+            }
         }
         //获取tdl信息
         QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
@@ -149,7 +164,11 @@ public class DataController {
             String sql3 ="";
             for(String time : timeList){
                 Long t = Long.valueOf(time) *1000000l;
-                sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +" and time<="+ t +" ORDER BY time desc limit 1;" +sql3;
+                if("baidu".equals(searchLocationVo.getType())){
+                    sql3 = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +" and time<="+ t +" ORDER BY time desc limit 1;" +sql3;
+                }else{
+                    sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +" and time<="+ t +" ORDER BY time desc limit 1;" +sql3;
+                }
             }
             QueryResult  queryResult3  = influxDBTemplate.query(new Query(sql3,database));
             List<String> time= new ArrayList<>();
@@ -168,7 +187,7 @@ public class DataController {
             //如果是已经完结保存到redis中
             if(resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0){
                 Map<Object,Object> map=new HashMap<>();
-                map.put(transportationNo,locationDataVoList.toString());
+                map.put(searchLocationVo.getTransportationNo(),locationDataVoList.toString());
                 infoRedisService.setHash("TransportConfig",map,System.currentTimeMillis());
             }
             return gson.toJson(locationDataVoList);
@@ -176,7 +195,7 @@ public class DataController {
             //如果是已经完结保存到redis中
             if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
                 Map<Object, Object> map = new HashMap<>();
-                map.put(transportationNo, locationDataVos.toString());
+                map.put(searchLocationVo.getTransportationNo(), locationDataVos.toString());
                 infoRedisService.setHash("TransportConfig", map,System.currentTimeMillis());
             }
             return gson.toJson(locationDataVos);

src/main/java/com/example/tdl/web/EquipmentBindingController.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
-import com.example.tdl.service.AlarmService;
-import com.example.tdl.service.ConfigService;
-import com.example.tdl.service.GatewayService;
-import com.example.tdl.service.TDLDeviceService;
+import com.example.tdl.service.*;
 import com.example.tdl.service.redis.AlarmRedisService;
 import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
@@ -57,6 +54,9 @@ public class EquipmentBindingController {
     @Autowired
     private TokenRedisService tokenRedisService;
 
+    @Autowired
+    private WarehouseService warehouseService;
+
     @Autowired
     private I18nController  i18n;
 
@@ -234,14 +234,63 @@ public class EquipmentBindingController {
         msg.put("msg",map.get("msg"));
         if (msg.get("msg").equals("解除网关成功")){
             fb.setCode(1);
-
-                fb.setMessage("解除网关成功");
+            fb.setMessage("解除tdl成功");
             String key ="TDL/"+resultTDLDeviceVo.getGatewayType()+"/" +resultTDLDeviceVo.getGatewaySN() +"/Data";
             alarmRedisService.delKey(key);
         }else{
             fb.setCode(0);
+            fb.setMessage("解除tdl失败");
+        }
+        return  gson.toJson(fb);
+    }
+
 
-                fb.setMessage("解除网关失败");
+    @ApiOperation(value = "解绑网关",notes = "解绑网关")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping("/untieGateway")
+    public  Object untieGateway(@RequestBody AddWarehouseGatewayVo addWarehouseGatewayVo,HttpServletRequest request){
+        if(StringUtils.isEmpty(addWarehouseGatewayVo.getWarehouseNo())){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不能为空");
+            return  gson.toJson(fb);
+        }
+        if(warehouseService.getWarehouseNo(addWarehouseGatewayVo.getWarehouseNo()) ==0){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不存在");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseGatewayVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关编号不能为空");
+            return gson.toJson(fb);
+        }
+        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        //判断该网关是否属于当前仓库
+        Integer i =  warehouseService.getByWarehouseNoAndSN(addWarehouseGatewayVo.getWarehouseNo(),addWarehouseGatewayVo.getSN());
+        if(i == 0){
+            fb.setCode(0);
+            fb.setMessage("该网关不属于该仓库");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",addWarehouseGatewayVo.getWarehouseNo());
+        map.put("gSN",addWarehouseGatewayVo.getSN());
+        map.put("gType","WTD93LG");
+        warehouseService.untieGateway(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("删除网关成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
         }
         return  gson.toJson(fb);
     }

src/main/java/com/example/tdl/web/WarehouseController.java

@@ -6,8 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
 import com.example.tdl.entity.Warehouse;
-import com.example.tdl.service.RoleService;
-import com.example.tdl.service.WarehouseService;
+import com.example.tdl.service.*;
 import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,12 +17,13 @@ import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/warehouse")
@@ -41,23 +41,32 @@ public class WarehouseController {
     @Autowired
     private TokenRedisService tokenRedisService;
 
+    @Autowired
+    private AlarmService alarmService;
+
+    @Autowired
+    private I18nController i18n;
+
+    @Autowired
+    private GatewayService gatewayService;
+
+    @Autowired
+    private UserService userService;
+
     //查询所有仓库信息
     @ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" +
             "   warehouseName:仓库名," +
             "   warehouseNo:仓库编号," +
             "   country:国家," +
-            "   province:省," +
             "   city:市," +
-            "   district:区," +
-            "   address:具体地址," +
-            "   regionCN:区域中文," +
-            "   regionEN:区域英文," +
-            "   longitude:经度," +
-            "   latitude:纬度," +
+            "   regions:国家地区," +
+            "   addressDetail:具体地址," +
+            "   regionName:区域," +
+            "   lng:经度," +
+            "   lat:纬度," +
             "   property:属性," +
             "   type:类型," +
             "   alarmType:预警类型," +
-            "   alarmScene:预警场景," +
             "   hardwareLevel:硬件等级," +
             "   areaIndoor:室内平面面积," +
             "   areaRack:货架面积," +
@@ -65,7 +74,7 @@ public class WarehouseController {
             "   areaPlanIndoor:实际室内总面积," +
             "   office:办事处," +
             "   timeZone:时区," +
-            "   weatherInfo:区域气象信息," +
+            "   companyName:所属公司," +
             "   warehouseInfo:基础描述," +
             "   remark:备注")
     @ApiImplicitParams({
@@ -75,20 +84,14 @@ public class WarehouseController {
     public Object getAll(HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
-        if(datum == null){
-            fb.setCode(0);
-            fb.setMessage("您没有登录，请先登录");
-            return gson.toJson(fb);
-        }else{
-            return warehouseService.getAll();
-        }
+        UserRedisVo userRedisVo = gson.fromJson(datum,UserRedisVo.class);
+        return warehouseService.getAll(userRedisVo.getCompanyName());
     }
 
     //根据条件查询仓库信息
     @ApiOperation(value = "根据条件查询仓库信息",notes = "根据条件查询仓库信息,传值说明：" +
             "   warehouseName:仓库名," +
             "   country:国家," +
-            "   province:省," +
             "   city:市," +
             "   property:属性," +
             "   type:,仓库类型" +
@@ -97,14 +100,12 @@ public class WarehouseController {
             "   warehouseName:仓库名," +
             "   warehouseNo:仓库编号," +
             "   country:国家," +
-            "   province:省," +
             "   city:市," +
-            "   district:区," +
-            "   address:具体地址," +
-            "   regionCN:区域中文," +
-            "   regionEN:区域英文," +
-            "   longitude:经度," +
-            "   latitude:纬度," +
+            "   regions:国家地区," +
+            "   addressDetail:具体地址," +
+            "   regionName:区域," +
+            "   lng:经度," +
+            "   lat:纬度," +
             "   property:属性," +
             "   type:类型," +
             "   alarmType:预警类型," +
@@ -116,37 +117,88 @@ public class WarehouseController {
             "   areaPlanIndoor:实际室内总面积," +
             "   office:办事处," +
             "   timeZone:时区," +
-            "   weatherInfo:区域气象信息," +
+            "   companyName:公司," +
             "   warehouseInfo:基础描述," +
             "   remark:备注")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    @RequestMapping(value="/getAllByTerm",method = RequestMethod.POST)
-    public Object getAllByTerm(@RequestBody WarehouseTermVo warehouseTermVo,HttpServletRequest request){
+    @PostMapping(value="/getWarehouseByTerm")
+    public Object getWarehouseByTerm(@RequestBody WarehouseTermVo warehouseTermVo,HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
-        if(datum == null){
+        UserRedisVo userRedisVo = gson.fromJson(datum,UserRedisVo.class);
+        warehouseTermVo.setCompanyName(userRedisVo.getCompanyName());
+        return warehouseService.getAllByTerm(warehouseTermVo);
+    }
+
+
+    //获取仓库以及设备数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping(value="/getByTerm")
+    public Object getByTerm(@RequestBody WareHouseByTermVo warehouseTermVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo userRedisVo = gson.fromJson(datum,UserRedisVo.class);
+        warehouseTermVo.setCompanyName(userRedisVo.getCompanyName());
+        //获取
+        warehouseService.getByWarehouse(warehouseTermVo);
+        return  gson.toJson(fb);
+    }
+
+    //根据仓库编号获取仓库信息
+    @ApiOperation(value = "根据条件查询仓库信息",notes = "根据条件查询仓库信息,传值说明：")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping("/getDetails")
+    public Object getDetails(@RequestBody String warehouseNo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo userRedisVo = gson.fromJson(datum,UserRedisVo.class);
+
+        return  gson.toJson(fb);
+    }
+
+    //获取某个仓库的网关
+    @ApiOperation(value="添加网关",notes = "添加网关，传值:" +
+            "warehouseNo:仓库编号" +
+            "SN:网关编号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping("/getGateway")
+    public Object getGateway(@RequestBody String warehouseNo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(warehouseNo)){
             fb.setCode(0);
-            fb.setMessage("您没有登录，请先登录");
+            fb.setMessage("仓库编号不能为空");
+            return gson.toJson(fb);
+        }
+        JSONObject jsonObject= JSON.parseObject(warehouseNo);
+        warehouseNo=(String)jsonObject.get("warehouseNo");
+        if(warehouseService.getWarehouseNo(warehouseNo) ==0){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不存在");
             return gson.toJson(fb);
-        }else{
-            return warehouseService.getAllByTerm(warehouseTermVo);
         }
+        //获取网关编号
+        return warehouseService.getGateway(warehouseNo);
     }
 
+
+
     //添加仓库信息
     @ApiOperation(value = "添加仓库信息",notes = "添加仓库信息,传值说明：" +
             "   warehouseName:仓库名," +
             "   country:国家," +
-            "   province:省," +
             "   city:市," +
-            "   district:区," +
-            "   address:具体地址," +
-            "   regionCN:区域中文," +
-            "   regionEN:区域英文," +
-            "   longitude:经度," +
-            "   latitude:纬度," +
+            "   addressDetail:具体地址," +
+            "   regionName:区域名," +
             "   property:属性," +
             "   type:类型," +
             "   alarmType:预警类型," +
@@ -157,7 +209,6 @@ public class WarehouseController {
             "   areaPlanIndoor:实际室内总面积," +
             "   office:办事处," +
             "   timeZone:时区," +
-            "   weatherInfo:区域气象信息," +
             "   warehouseInfo:基础描述," +
             "   remark:备注")
     @ApiImplicitParams({
@@ -167,166 +218,165 @@ public class WarehouseController {
     public Object addWarehouse(@RequestBody AddWarehouseVo addWarehouseVo,HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
-        if(datum == null){
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(addWarehouseVo.getWarehouseName())){
             fb.setCode(0);
-            fb.setMessage("您没有登录，请先登录");
+            fb.setMessage("仓库名不能为空");
             return gson.toJson(fb);
-        }else{
-            if (StringUtils.isEmpty(addWarehouseVo.getWarehouseName())){
-                fb.setCode(0);
-                fb.setMessage("仓库名不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getCountry())){
-                fb.setCode(0);
-                fb.setMessage("国家不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getProvince())){
-                fb.setCode(0);
-                fb.setMessage("省不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getCity())){
-                fb.setCode(0);
-                fb.setMessage("市不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getDistrict())){
-                fb.setCode(0);
-                fb.setMessage("区不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getAddress())){
-                fb.setCode(0);
-                fb.setMessage("具体地址不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getRegionCN())){
-                fb.setCode(0);
-                fb.setMessage("区域中文不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getRegionEN())){
-                fb.setCode(0);
-                fb.setMessage("区域英文不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getLatitude())){
-                fb.setCode(0);
-                fb.setMessage("纬度不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getLongitude())){
-                fb.setCode(0);
-                fb.setMessage("经度不能为空");
-                return gson.toJson(fb);
-            }
-            if(!addWarehouseVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-                fb.setCode(0);
-                fb.setMessage("纬度的范围为-90~90");
-                return gson.toJson(fb);
-            }
-            if(!addWarehouseVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-                fb.setCode(0);
-                fb.setMessage("经度的范围为-180~180");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getProperty())){
-                fb.setCode(0);
-                fb.setMessage("属性不能为空");
-                return gson.toJson(fb);
-            }else if (!addWarehouseVo.getProperty().equals("供应中心")&&!addWarehouseVo.getProperty().equals("项目仓")&&
-                    !addWarehouseVo.getProperty().equals("中心仓")&&!addWarehouseVo.getProperty().equals("X-dock")){
-                fb.setCode(0);
-                fb.setMessage("请输入正确的属性");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getType())){
-                fb.setCode(0);
-                fb.setMessage("类型不能为空");
-                return gson.toJson(fb);
-            }else if (!addWarehouseVo.getType().equals("平面仓")&&!addWarehouseVo.getType().equals("立体仓")){
-                fb.setCode(0);
-                fb.setMessage("请输入正确的仓库类型");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getAlarmType())){
-                fb.setCode(0);
-                fb.setMessage("预警类型不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getHardwareLevel())){
-                fb.setCode(0);
-                fb.setMessage("硬件等级不能为空");
-                return gson.toJson(fb);
-            }else if (!addWarehouseVo.getHardwareLevel().equals("好")&&!addWarehouseVo.getHardwareLevel().equals("一般")&&
-                    !addWarehouseVo.getHardwareLevel().equals("较差")&&!addWarehouseVo.getHardwareLevel().equals("极差")){
-                fb.setCode(0);
-                fb.setMessage("请选择正确的硬件等级");
-                return gson.toJson(fb);
-            }
-            if (addWarehouseVo.getAreaIndoor()==null){
-                fb.setCode(0);
-                fb.setMessage("室内平面面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (addWarehouseVo.getAreaRack()==null){
-                fb.setCode(0);
-                fb.setMessage("货架面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (addWarehouseVo.getAreaOutdoor()==null){
-                fb.setCode(0);
-                fb.setMessage("室外面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (addWarehouseVo.getAreaPlanIndoor() == null){
-                fb.setCode(0);
-                fb.setMessage("实际室内总面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getOffice())){
-                fb.setCode(0);
-                fb.setMessage("办事处不能为空");
-                return gson.toJson(fb);
-            }
-            if (addWarehouseVo.getTimeZone()==null){
-                fb.setCode(0);
-                fb.setMessage("时区不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getWeatherInfo())){
-                fb.setCode(0);
-                fb.setMessage("区域气象信息不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(addWarehouseVo.getWarehouseInfo())){
-                fb.setCode(0);
-                fb.setMessage("基础描述不能为空");
-                return gson.toJson(fb);
-            }
-            if (warehouseService.getByWarehouseName(addWarehouseVo.getWarehouseName())!=null){
-                fb.setCode(0);
-                fb.setMessage("仓库名不能重复");
-                return gson.toJson(fb);
-            }
-            int a = warehouseService.addWarehouse(new Warehouse(addWarehouseVo.getWarehouseName(),String.valueOf(System.currentTimeMillis()),
-                    addWarehouseVo.getCountry(),addWarehouseVo.getProvince(),addWarehouseVo.getCity(),addWarehouseVo.getDistrict(),
-                    addWarehouseVo.getAddress(),addWarehouseVo.getRegionCN(),addWarehouseVo.getRegionEN(),addWarehouseVo.getLongitude(),
-                    addWarehouseVo.getLatitude(),addWarehouseVo.getProperty(),addWarehouseVo.getType(),addWarehouseVo.getAlarmType(),
-                    addWarehouseVo.getHardwareLevel(),addWarehouseVo.getAreaIndoor(),addWarehouseVo.getAreaRack(),addWarehouseVo.getAreaOutdoor(),
-                    addWarehouseVo.getAreaPlanIndoor(),addWarehouseVo.getOffice(),addWarehouseVo.getTimeZone(),addWarehouseVo.getWeatherInfo(),
-                    addWarehouseVo.getWarehouseInfo(),System.currentTimeMillis(),System.currentTimeMillis(),addWarehouseVo.getRemark()));
-            if (a>0){
-                fb.setCode(1);
-                fb.setMessage("添加仓库信息成功");
-            }else {
-                fb.setCode(0);
-                fb.setMessage("添加仓库信息失败");
-            }
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"country"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"city"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"addressDetail"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getRegionName())) {
+            fb.setCode(0);
+            fb.setMessage("区域不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getLat())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"lat"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getLng())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"lng"));
+            return gson.toJson(fb);
+        }
+        if(!addWarehouseVo.getLat().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongLat"));
+            return gson.toJson(fb);
+        }
+        if(!addWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"wrongLng"));
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getProperty())){
+            fb.setCode(0);
+            fb.setMessage("仓库属性不能为空");
+            return gson.toJson(fb);
+        }
+        if (!"供应中心".equals(addWarehouseVo.getProperty())&&!"项目仓".equals(addWarehouseVo.getProperty())&&
+                !"中心仓".equals(addWarehouseVo.getProperty())&&!"X-dock".equals(addWarehouseVo.getProperty())){
+            fb.setCode(0);
+            fb.setMessage("请输入正确的属性");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("仓库类型不能为空");
             return gson.toJson(fb);
         }
+        if (!addWarehouseVo.getType().equals("平面仓")&&!addWarehouseVo.getType().equals("立体仓")){
+            fb.setCode(0);
+            fb.setMessage("请输入正确的仓库类型");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getAlarmType())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"alarmType"));
+            return gson.toJson(fb);
+        }
+        if(alarmService.getAllByAlarmType(user.getCompanyName(),addWarehouseVo.getAlarmType()) == null){
+            fb.setCode(0);
+            fb.setMessage("预警类型不存在");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getHardwareLevel())){
+            fb.setCode(0);
+            fb.setMessage("硬件等级不能为空");
+            return gson.toJson(fb);
+        }
+        if (!addWarehouseVo.getHardwareLevel().equals("好")&&!addWarehouseVo.getHardwareLevel().equals("一般")&&
+                !addWarehouseVo.getHardwareLevel().equals("较差")&&!addWarehouseVo.getHardwareLevel().equals("极差")){
+            fb.setCode(0);
+            fb.setMessage("请选择正确的硬件等级");
+            return gson.toJson(fb);
+        }
+        if (addWarehouseVo.getAreaIndoor()==null){
+            fb.setCode(0);
+            fb.setMessage("室内平面面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (addWarehouseVo.getAreaRack()==null){
+            fb.setCode(0);
+            fb.setMessage("货架面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (addWarehouseVo.getAreaOutdoor()==null){
+            fb.setCode(0);
+            fb.setMessage("室外面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (addWarehouseVo.getAreaPlanIndoor() == null){
+            fb.setCode(0);
+            fb.setMessage("实际室内总面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseVo.getOffice())){
+            fb.setCode(0);
+            fb.setMessage("办事处不能为空");
+            return gson.toJson(fb);
+        }
+        if (addWarehouseVo.getTimeZone()==null){
+            fb.setCode(0);
+            fb.setMessage("时区不能为空");
+            return gson.toJson(fb);
+        }
+        if (warehouseService.getByWarehouseName(addWarehouseVo.getWarehouseName(),user.getCompanyName())!=null){
+            fb.setCode(0);
+            fb.setMessage("仓库名不能重复");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",getWarehouseNo());
+        map.put("warehouseName",addWarehouseVo.getWarehouseName());
+        map.put("country",addWarehouseVo.getCountry());
+        map.put("city",addWarehouseVo.getCity());
+        map.put("addressDetail",addWarehouseVo.getAddressDetail());
+        map.put("lng",addWarehouseVo.getLng());
+        map.put("lat",addWarehouseVo.getLat());
+        map.put("regionName",addWarehouseVo.getRegionName());
+        map.put("property",addWarehouseVo.getProperty());
+        map.put("type",addWarehouseVo.getType());
+        map.put("alarmType",addWarehouseVo.getAlarmType());
+        map.put("hardwareLevel",addWarehouseVo.getHardwareLevel());
+        map.put("areaIndoor",addWarehouseVo.getAreaIndoor());
+        map.put("areaRack",addWarehouseVo.getAreaRack());
+        map.put("areaOutdoor",addWarehouseVo.getAreaOutdoor());
+        map.put("areaPlanIndoor",addWarehouseVo.getAreaPlanIndoor());
+        map.put("office",addWarehouseVo.getOffice());
+        map.put("timeZone",addWarehouseVo.getTimeZone());
+        map.put("warehouseInfo",addWarehouseVo.getWarehouseInfo() == null ? "" :addWarehouseVo.getWarehouseInfo());
+        map.put("companyName",user.getCompanyName());
+        map.put("createTime",System.currentTimeMillis());
+        map.put("updateTime",System.currentTimeMillis());
+        map.put("remark",addWarehouseVo.getRemark()== null ? "" :addWarehouseVo.getRemark());
+        warehouseService.addWarehouse(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("添加仓库成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+
     }
 
     //根据仓库编号修改仓库信息
@@ -362,200 +412,329 @@ public class WarehouseController {
     public Object updateWarehouse(@RequestBody UpdateWarehouseVo updateWarehouseVo,HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
-        if(datum == null){
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseNo())){
             fb.setCode(0);
-            fb.setMessage("您没有登录，请先登录");
+            fb.setMessage("需要修改的仓库编号不能为空");
             return gson.toJson(fb);
-        }else{
-            if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseNo())){
-                fb.setCode(0);
-                fb.setMessage("需要修改的仓库编号不能为空");
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseName())){
-                fb.setCode(0);
-                fb.setMessage("仓库名不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getCountry())){
-                fb.setCode(0);
-                fb.setMessage("国家不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getProvince())){
-                fb.setCode(0);
-                fb.setMessage("省不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getCity())){
-                fb.setCode(0);
-                fb.setMessage("市不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getDistrict())){
-                fb.setCode(0);
-                fb.setMessage("区不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getAddress())){
-                fb.setCode(0);
-                fb.setMessage("具体地址不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getRegionCN())){
-                fb.setCode(0);
-                fb.setMessage("区域中文不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getRegionEN())){
-                fb.setCode(0);
-                fb.setMessage("区域英文不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getLatitude())){
-                fb.setCode(0);
-                fb.setMessage("纬度不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getLongitude())){
-                fb.setCode(0);
-                fb.setMessage("经度不能为空");
-                return gson.toJson(fb);
-            }
-            if(!updateWarehouseVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-                fb.setCode(0);
-                fb.setMessage("纬度的范围为-90~90");
-                return gson.toJson(fb);
-            }
-            if(!updateWarehouseVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-                fb.setCode(0);
-                fb.setMessage("经度的范围为-180~180");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getProperty())){
-                fb.setCode(0);
-                fb.setMessage("属性不能为空");
-                return gson.toJson(fb);
-            }else if (!updateWarehouseVo.getProperty().equals("供应中心")&&!updateWarehouseVo.getProperty().equals("项目仓")&&
-                    !updateWarehouseVo.getProperty().equals("中心仓")&&!updateWarehouseVo.getProperty().equals("X-dock")){
-                fb.setCode(0);
-                fb.setMessage("请输入正确的属性");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getType())){
-                fb.setCode(0);
-                fb.setMessage("类型不能为空");
-                return gson.toJson(fb);
-            }else if (!updateWarehouseVo.getType().equals("平面仓")&&!updateWarehouseVo.getType().equals("立体仓")){
-                fb.setCode(0);
-                fb.setMessage("请输入正确的仓库类型");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getAlarmType())){
-                fb.setCode(0);
-                fb.setMessage("预警类型不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){
-                fb.setCode(0);
-                fb.setMessage("硬件等级不能为空");
-                return gson.toJson(fb);
-            }else if (!updateWarehouseVo.getHardwareLevel().equals("好")&&!updateWarehouseVo.getHardwareLevel().equals("一般")&&
-                    !updateWarehouseVo.getHardwareLevel().equals("较差")&&!updateWarehouseVo.getHardwareLevel().equals("极差")){
-                fb.setCode(0);
-                fb.setMessage("请选择正确的硬件等级");
-                return gson.toJson(fb);
-            }
-            if (updateWarehouseVo.getAreaIndoor() == null){
-                fb.setCode(0);
-                fb.setMessage("室内平面面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (updateWarehouseVo.getAreaRack()== null){
-                fb.setCode(0);
-                fb.setMessage("货架面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (updateWarehouseVo.getAreaOutdoor()== null){
-                fb.setCode(0);
-                fb.setMessage("室外面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (updateWarehouseVo.getAreaPlanIndoor()== null){
-                fb.setCode(0);
-                fb.setMessage("实际室内总面积不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getOffice())){
-                fb.setCode(0);
-                fb.setMessage("办事处不能为空");
-                return gson.toJson(fb);
-            }
-            if (updateWarehouseVo.getTimeZone()== null){
-                fb.setCode(0);
-                fb.setMessage("时区不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getWeatherInfo())){
-                fb.setCode(0);
-                fb.setMessage("区域气象信息不能为空");
-                return gson.toJson(fb);
-            }
-            if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseInfo())){
-                fb.setCode(0);
-                fb.setMessage("基础描述不能为空");
-                return gson.toJson(fb);
-            }
-            ResultWarehouseVo resultWarehouseVo=warehouseService.getByWarehouseName(updateWarehouseVo.getWarehouseName());
-            if (resultWarehouseVo!=null&&!resultWarehouseVo.getWarehouseNo().equals(updateWarehouseVo.getWarehouseNo())){
-                fb.setCode(0);
-                fb.setMessage("修改的仓库名已存在");
-                return gson.toJson(fb);
-            }
-            updateWarehouseVo.setUpdateTime(System.currentTimeMillis());
-            int a = warehouseService.updateWarehouse(updateWarehouseVo);
-            if (a>0){
-                fb.setCode(1);
-                fb.setMessage("修改仓库信息成功");
-            }else {
-                fb.setCode(0);
-                fb.setMessage("修改仓库信息失败");
-            }
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseName())){
+            fb.setCode(0);
+            fb.setMessage("仓库名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage("国家不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage("市不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage("具体地址不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getRegionName())){
+            fb.setCode(0);
+            fb.setMessage("区域不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getLat())){
+            fb.setCode(0);
+            fb.setMessage("纬度不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getLng())){
+            fb.setCode(0);
+            fb.setMessage("经度不能为空");
+            return gson.toJson(fb);
+        }
+        if(!updateWarehouseVo.getLat().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+            fb.setCode(0);
+            fb.setMessage("纬度的范围为-90~90");
+            return gson.toJson(fb);
+        }
+        if(!updateWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+            fb.setCode(0);
+            fb.setMessage("经度的范围为-180~180");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getProperty())){
+            fb.setCode(0);
+            fb.setMessage("仓库属性不能为空");
+            return gson.toJson(fb);
+        }
+        if (!updateWarehouseVo.getProperty().equals("供应中心")&&!updateWarehouseVo.getProperty().equals("项目仓")&&
+                !updateWarehouseVo.getProperty().equals("中心仓")&&!updateWarehouseVo.getProperty().equals("X-dock")){
+            fb.setCode(0);
+            fb.setMessage("请输入正确的仓库属性");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("仓库类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (!"平面仓".equals(updateWarehouseVo.getType())&&!"立体仓".equals(updateWarehouseVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("请输入正确的仓库仓库类型");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getAlarmType())){
+            fb.setCode(0);
+            fb.setMessage("预警类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){
+            fb.setCode(0);
+            fb.setMessage("硬件等级不能为空");
+            return gson.toJson(fb);
+        }
+        if (!updateWarehouseVo.getHardwareLevel().equals("好")&&!updateWarehouseVo.getHardwareLevel().equals("一般")&&
+                !updateWarehouseVo.getHardwareLevel().equals("较差")&&!updateWarehouseVo.getHardwareLevel().equals("极差")){
+            fb.setCode(0);
+            fb.setMessage("请选择正确的硬件等级");
+            return gson.toJson(fb);
+        }
+        if (updateWarehouseVo.getAreaIndoor() == null){
+            fb.setCode(0);
+            fb.setMessage("室内平面面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateWarehouseVo.getAreaRack()== null){
+            fb.setCode(0);
+            fb.setMessage("货架面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateWarehouseVo.getAreaOutdoor()== null){
+            fb.setCode(0);
+            fb.setMessage("室外面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateWarehouseVo.getAreaPlanIndoor()== null){
+            fb.setCode(0);
+            fb.setMessage("实际室内总面积不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getOffice())){
+            fb.setCode(0);
+            fb.setMessage("办事处不能为空");
             return gson.toJson(fb);
         }
+        if (updateWarehouseVo.getTimeZone()== null){
+            fb.setCode(0);
+            fb.setMessage("时区不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseInfo())){
+            fb.setCode(0);
+            fb.setMessage("基础描述不能为空");
+            return gson.toJson(fb);
+        }
+        ResultWarehouseVo resultWarehouseVo=warehouseService.getByWarehouseName(updateWarehouseVo.getWarehouseName(),user.getCompanyName());
+        if (resultWarehouseVo!=null&&!resultWarehouseVo.getWarehouseNo().equals(updateWarehouseVo.getWarehouseNo())){
+            fb.setCode(0);
+            fb.setMessage("修改的仓库名已存在");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",updateWarehouseVo.getWarehouseNo());
+        map.put("warehouseName",updateWarehouseVo.getWarehouseName());
+        map.put("country",updateWarehouseVo.getCountry());
+        map.put("city",updateWarehouseVo.getCity());
+        map.put("addressDetail",updateWarehouseVo.getAddressDetail());
+        map.put("lng",updateWarehouseVo.getLng());
+        map.put("lat",updateWarehouseVo.getLat());
+        map.put("regionName",updateWarehouseVo.getRegionName());
+        map.put("property",updateWarehouseVo.getProperty());
+        map.put("type",updateWarehouseVo.getType());
+        map.put("alarmType",updateWarehouseVo.getAlarmType());
+        map.put("hardwareLevel",updateWarehouseVo.getHardwareLevel());
+        map.put("areaIndoor",updateWarehouseVo.getAreaIndoor());
+        map.put("areaRack",updateWarehouseVo.getAreaRack());
+        map.put("areaOutdoor",updateWarehouseVo.getAreaOutdoor());
+        map.put("areaPlanIndoor",updateWarehouseVo.getAreaPlanIndoor());
+        map.put("office",updateWarehouseVo.getOffice());
+        map.put("timeZone",updateWarehouseVo.getTimeZone());
+        map.put("warehouseInfo",updateWarehouseVo.getWarehouseInfo());
+        map.put("companyName",user.getCompanyName());
+        map.put("updateTime",System.currentTimeMillis());
+        map.put("remark",updateWarehouseVo.getRemark());
+        warehouseService.delWarehouse(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("修改仓库成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
     }
 
-    //删除仓库信息
-    @ApiOperation(value = "删除仓库信息",notes = "删除仓库信息,只用传需要删除的仓库编号")
+
+//    删除仓库信息
+    @ApiOperation(value = "删除仓库信息",notes = "删除仓库信息,只用传仓库编号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/delWarehouse",method = RequestMethod.POST)
     public Object delWarehouse(@RequestBody String warehouseNo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(warehouseNo)){
+            fb.setCode(0);
+            fb.setMessage("需要删除的仓库编号不能为空");
+            return gson.toJson(fb);
+        }
         JSONObject jsonObject= JSON.parseObject(warehouseNo);
         warehouseNo=(String)jsonObject.get("warehouseNo");
+        if(warehouseService.getWarehouseNo(warehouseNo) ==0){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不存在");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",warehouseNo);
+        map.put("companyName",user.getCompanyName());
+        warehouseService.updateWarehouse(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("仓库删除成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+
+
+    @ApiOperation(value="添加网关",notes = "添加网关，传值:" +
+            "warehouseNo:仓库编号" +
+            "SN:网关编号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping("/addGateway")
+    public Object addGateway(@RequestBody AddWarehouseGatewayVo addWarehouseGatewayVo,HttpServletRequest request){
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
-        if(datum == null){
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(addWarehouseGatewayVo.getWarehouseNo())){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不能为空");
+            return gson.toJson(fb);
+        }
+        if(warehouseService.getWarehouseNo(addWarehouseGatewayVo.getWarehouseNo()) ==0){
             fb.setCode(0);
-            fb.setMessage("您没有登录，请先登录");
+            fb.setMessage("仓库编号不存在");
             return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addWarehouseGatewayVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关编号不能为空");
+            return gson.toJson(fb);
+        }
+        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        //判断当前网关是否已经被使用
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",addWarehouseGatewayVo.getWarehouseNo());
+        map.put("gSN",addWarehouseGatewayVo.getSN());
+        map.put("gType","WTD93LG");
+        warehouseService.addGateway(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("添加网关成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
         }else{
-            if (StringUtils.isEmpty(warehouseNo)){
-                fb.setCode(0);
-                fb.setMessage("需要删除的仓库编号不能为空");
-                return gson.toJson(fb);
-            }
-            int a = warehouseService.delWarehouse(warehouseNo);
-            if (a>0){
-                fb.setCode(1);
-                fb.setMessage("删除仓库信息成功");
-            }else {
-                fb.setCode(0);
-                fb.setMessage("删除仓库信息失败");
-            }
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+
+
+    //绑定报警联系人
+    @ApiOperation(value="绑定报警联系人",notes = "绑定报警联系人，传值:" +
+            "warehouseNo:仓库编号" +
+            "userNameList:用户名的集合")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @PostMapping("/addUser")
+    public Object addUser(@RequestBody WarehouseUserVo warehouseUserVo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(warehouseUserVo.getWarehouseNo())){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不能为空");
+            return gson.toJson(fb);
+        }
+        if(warehouseService.getWarehouseNo(warehouseUserVo.getWarehouseNo()) ==0){
+            fb.setCode(0);
+            fb.setMessage("仓库编号不存在");
+            return gson.toJson(fb);
+        }
+        if (warehouseUserVo.getUserNameList().size() == 0){
+            fb.setCode(0);
+            fb.setMessage("用户不能为空");
             return gson.toJson(fb);
         }
+        String userNameVar = "";
+        for(int i = 0,length=warehouseUserVo.getUserNameList().size();i<length;i++){
+                if(userService.getByUserName(warehouseUserVo.getUserNameList().get(i)) == null){
+                    fb.setCode(0);
+                    fb.setMessage("用户名不存在");
+                    return gson.toJson(fb);
+                }
+                userNameVar = userNameVar +warehouseUserVo.getUserNameList().get(i) +" ";
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("warehouseNo",warehouseUserVo.getWarehouseNo());
+        map.put("number",warehouseUserVo.getUserNameList().size());
+        map.put("userNameVar",userNameVar);
+        warehouseService.addUser(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if(msg.get("msg").equals("添加紧急联系人成功")){
+            fb.setCode(1);
+            fb.setMessage(msg.get("msg").toString());
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return  gson.toJson(fb);
     }
 
 
+
+
+
+    //生成仓库编号
+    public String getWarehouseNo(){
+        String warehouseNo = "WH" +System.currentTimeMillis() ;
+        warehouseNo = warehouseNo +((int)(Math.random()*(9999-1000+1))+1000);
+        if (warehouseService.getWarehouseNo(warehouseNo)>0){
+            while (warehouseService.getWarehouseNo(warehouseNo)>0){
+                warehouseNo=warehouseNo+((int)(Math.random()*(9999-1000+1))+1000);
+            }
+        }
+        return warehouseNo;
+    }
 }

src/main/resources/i18n/messages_en.properties

@@ -64,7 +64,7 @@ completedCircuit=The line can be evaluated when the transportation has been comp
 evaluateSuccess=Evaluation is successful
 evaluateFailure=Evaluation failed
 circuitState=The transport number cannot be empty
-inTransit=The line is in transit or has been shipped
+inTransit=The line is in transit and can not be deleted
 bindTDL=The line is not bound to tdl
 bindGateway=The line is not bound to  the gateway
 circuitDeleteSuccess=You have deleted the line successfully
@@ -159,4 +159,6 @@ null=NullPointerException
 illegal=IllegalArgumentException
 sql=SQLException
 badSql=BadSqlGrammarException
-error=The server code has been exceptions, please contact the administrator
+error=The server code has been exceptions, please contact the administrator
\ No newline at end of file
+wrongTemp=The upper limit of temperature should not be less than the limit of temperature
+wrongHumidity=The lower humidity limit is not greater than the upper limit of humidity
\ No newline at end of file

src/main/resources/i18n/messages_ja.properties

@@ -159,3 +159,5 @@ illegal=\u30D1\u30E9\u30E1\u30FC\u30BF\u30BF\u30A4\u30D7\u306E\u4E0D\u4E00\u81F4
 sql=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A2\u30AF\u30BB\u30B9\u7570\u5E38
 badSql=\u30C7\u30FC\u30BF\u306E\u7570\u5E38
 error=\u30B5\u30FC\u30D0\u30FC\u30B3\u30FC\u30C9\u304C\u7570\u5E38\u306B\u767A\u751F\u3057\u305F\u5834\u5408\u3001\u7BA1\u7406\u8005\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044
+wrongTemp=\u6E29\u5EA6\u4E0B\u9650\u3088\u308A\u306A\u3044\u6E29\u5EA6\u306E\u4E0A\u9650
+wrongHumidity=\u6E7F\u5EA6\u306E\u4E0A\u9650\u306F\u6E7F\u5EA6\u306E\u4E0B\u9650\u3088\u308A\u5C0F\u3055\u304F\u306F\u3042\u308A\u307E\u305B\u3093

src/main/resources/i18n/messages_zh_CN.properties

@@ -4,8 +4,10 @@ alarmScene = \u9884\u8B66\u573A\u666F\u4E0D\u80FD\u4E3A\u7A7A
 wrongAlarmScene = \u8BF7\u9009\u62E9\u6B63\u786E\u7684\u9884\u8B66\u573A\u666F
 temMax = \u6E29\u5EA6\u4E0A\u9650\u4E0D\u80FD\u4E3A\u7A7A
 temMin = \u6E29\u5EA6\u4E0B\u9650\u4E0D\u80FD\u4E3A\u7A7A
+wrongTemp=\u6E29\u5EA6\u4E0A\u9650\u4E0D\u80FD\u5C0F\u4E8E\u6E29\u5EA6\u4E0B\u9650
 humidityMax = \u6E7F\u5EA6\u4E0A\u9650\u4E0D\u80FD\u4E3A\u7A7A
 humidityMin = \u6E7F\u5EA6\u4E0B\u9650\u4E0D\u80FD\u4E3A\u7A7A
+wrongHumidity=\u6E7F\u5EA6\u4E0A\u9650\u4E0D\u80FD\u5C0F\u4E8E\u6E7F\u5EA6\u4E0B\u9650
 tilt = \u503E\u659C\u5EA6\u4E0D\u80FD\u4E3A\u7A7A
 shock = \u9707\u5EA6\u4E0D\u80FD\u4E3A\u7A7A
 alarmExist = \u6DFB\u52A0\u7684\u9884\u8B66\u7C7B\u578B\u5728\u8BE5\u573A\u666F\u4E2D\u5DF2\u5B58\u5728
@@ -81,7 +83,7 @@ completedCircuit = \u7EBF\u8DEF\u5B8C\u6210\u8FD0\u8F93\u624D\u80FD\u8BC4\u4EF7
 evaluateSuccess = \u8BC4\u4EF7\u6210\u529F
 evaluateFailure =\u8BC4\u4EF7\u5931\u8D25
 circuitState = \u9700\u8981\u67E5\u8BE2\u7684\u7EBF\u8DEF\u72B6\u6001\u4E0D\u80FD\u4E3A\u7A7A
-inTransit = \u8BE5\u7EBF\u8DEF\u5728\u8FD0\u8F93\u4E2D\u6216\u5DF2\u7ECF\u5B8C\u6210\u8FD0\u8F93
+inTransit = \u8BE5\u7EBF\u8DEF\u6B63\u5728\u8FD0\u8F93\u4E2D\uFF0C\u4E0D\u80FD\u5220\u9664
 bindTDL = \u8BE5\u7EBF\u8DEF\u672A\u7ED1\u5B9Atdl
 bindGateway = \u8BE5\u7EBF\u8DEF\u672A\u7ED1\u5B9A\u7F51\u5173
 circuitDeleteSuccess = \u7EBF\u8DEF\u5220\u9664\u6210\u529F

src/main/resources/mapper/AlarmLogMapper.xml

@@ -84,7 +84,8 @@
         select  c.transportationNo,al.startCity,al.endCity,c.cargoNo,al.description,al.alarmTime
         from alarm_log al,circuit c,company co
         where  al.transportationNo =c.transportationNo
-        and c.company_id = co.id
+        and   c.company_id = co.id
+        and  co.companyName =#{companyName,jdbcType=VARCHAR}
         <if test="transportationNo!=null">
         AND c.transportationNo = #{transportationNo,jdbcType=VARCHAR}
         </if>

src/main/resources/mapper/AlarmMapper.xml

@@ -67,12 +67,12 @@
     </select>
 
     <!--查询仓库的预警类型-->
-    <select id="getForWarehouse" resultType="String">
+    <select id="getForWarehouse" parameterType="String" resultType="com.example.tdl.domain.vo.AlarmTypeVo">
         SELECT alarmType from alarm WHERE alarmScene="仓库" AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
     </select>
 
     <!--查询仓库的预警类型-->
-    <select id="getForTransportation" resultType="String">
+    <select id="getForTransportation" parameterType="String" resultType="com.example.tdl.domain.vo.AlarmTypeVo">
         SELECT alarmType from alarm WHERE alarmScene="运输" AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
     </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/TDLLogMapper.xml

@@ -25,4 +25,14 @@
         where transportationNo = #{transportationNo,jdbcType=VARCHAR}
     </select>
 
+    <select id="getByAlarm" parameterType="com.example.tdl.domain.vo.DelAlarmVo" resultType="String">
+        select  DISTINCT  transportationNo
+        from  tdl_gateway_log tgl ,alarm a ,company c
+        where a.id=tgl.alarm_id
+        and a.company_id =c.id
+        AND a.alarmType=#{alarmType,jdbcType=VARCHAR}
+        AND a.alarmScene=#{alarmScene,jdbcType=VARCHAR}
+        and c.companyName=#{companyName,jdbcType=VARCHAR}
+    </select>
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/WarehouseMapper.xml

@@ -3,27 +3,34 @@
 <mapper namespace="com.example.tdl.mapper.WarehouseMapper">
     <!--查询所有仓库信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
-        SELECT warehouseName,warehouseNo,country,province,city,district,address,regionCN,regionEN,longitude,latitude,property,type,
-        alarmType,alarmScene,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,weatherInfo,warehouseInfo,w.remark
-        from warehouse w,alarm a WHERE w.alarm_id=a.id
+          select warehouseNo,warehouseName,c.country,c.city,CONCAT_WS("-",c.country,c.city) regions ,w.addressDetail,r.regionName,lng,lat,a.alarmType,property,
+                  type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+            from warehouse w,alarm a,region r,city ct ,company c
+            where c.id = w.company_id
+            and a.id = w.alarm_id
+            and r.id = w.region_id
+            and ct.id = w.city_id
+            and c.companyName=#{companyName,jdbcType=VARCHAR}
     </select>
 
-    <!--根据条件查询仓库信息-->
+        <!-- 根据条件查询仓库信息-->
     <select id="getAllByTerm" resultType="com.example.tdl.domain.vo.ResultWarehouseVo" parameterType="com.example.tdl.domain.vo.WarehouseTermVo">
-        SELECT warehouseName,warehouseNo,country,province,city,district,address,regionCN,regionEN,longitude,latitude,property,type,
-        alarmType,alarmScene,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,weatherInfo,warehouseInfo,w.remark
-        from warehouse w,alarm a WHERE w.alarm_id=a.id
+        select warehouseNo,warehouseName,c.country,c.city,CONCAT_WS("-",c.country,c.city) regions ,w.addressDetail,r.regionName,lng,lat,a.alarmType,property,
+               type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+            from warehouse w,alarm a,region r,city ct ,company c
+            where c.id = w.company_id
+            and a.id = w.alarm_id
+            and r.id = w.region_id
+            and ct.id = w.city_id
+            and c.companyName=#{companyName,jdbcType=VARCHAR}
         <if test="warehouseName!=null">
             AND warehouseName like CONCAT(CONCAT('%',#{warehouseName,jdbcType=VARCHAR}), '%')
         </if>
         <if test="country!=null">
-            AND country like CONCAT(CONCAT('%',#{country,jdbcType=VARCHAR}), '%')
-        </if>
-        <if test="province!=null">
-            AND province like CONCAT(CONCAT('%',#{province,jdbcType=VARCHAR}), '%')
+            AND ct.country like CONCAT(CONCAT('%',#{country,jdbcType=VARCHAR}), '%')
         </if>
         <if test="city!=null">
-            AND city like CONCAT(CONCAT('%',#{city,jdbcType=VARCHAR}), '%')
+            AND ct.city like CONCAT(CONCAT('%',#{city,jdbcType=VARCHAR}), '%')
         </if>
         <if test="property!=null">
             AND property=#{property,jdbcType=VARCHAR}
@@ -36,90 +43,167 @@
         </if>
     </select>
 
-    <!--添加仓库信息-->
-    <insert id="addWarehouse" parameterType="com.example.tdl.entity.Warehouse">
-        INSERT INTO warehouse VALUES (
-        NULL ,
-        #{warehouseName,jdbcType=VARCHAR},
-        #{warehouseNo,jdbcType=VARCHAR},
-        #{country,jdbcType=VARCHAR},
-        #{province,jdbcType=VARCHAR},
-        #{city,jdbcType=VARCHAR},
-        #{district,jdbcType=VARCHAR},
-        #{address,jdbcType=VARCHAR},
-        #{regionCN,jdbcType=VARCHAR},
-        #{regionEN,jdbcType=VARCHAR},
-        #{longitude,jdbcType=VARCHAR},
-        #{latitude,jdbcType=VARCHAR},
-        #{property,jdbcType=VARCHAR},
-        #{type,jdbcType=VARCHAR},
-        (SELECT id from alarm WHERE alarmType=#{alarmType,jdbcType=VARCHAR} AND alarmScene="仓库"),
-        #{hardwareLevel,jdbcType=VARCHAR},
-        #{areaIndoor,jdbcType=DOUBLE},
-        #{areaRack,jdbcType=DOUBLE},
-        #{areaOutdoor,jdbcType=DOUBLE},
-        #{areaPlanIndoor,jdbcType=DOUBLE},
-        #{office,jdbcType=VARCHAR},
-        #{timeZone,jdbcType=INTEGER},
-        #{weatherInfo,jdbcType=VARCHAR},
-        #{warehouseInfo,jdbcType=VARCHAR},
-        #{createTime,jdbcType=BIGINT},
-        #{updateTime,jdbcType=BIGINT},
-        #{remark,jdbcType=VARCHAR}
-        )
+    <select id="getWarehouseNo" resultType="java.lang.Integer" parameterType="String">
+        select  count(warehouseNo)  from  warehouse where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    </select>
+
+
+    <select id="getByWarehouseName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
+        select warehouseNo,warehouseName,c.country,c.city,CONCAT_WS("-",c.country,c.city) regions ,w.addressDetail,r.regionName,lng,lat,a.alarmType,property,
+                  type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+            from warehouse w,alarm a,region r,city ct ,company c
+            where c.id = w.company_id
+            and a.id = w.alarm_id
+            and r.id = w.region_id
+            and ct.id = w.city_id
+            and c.companyName=#{companyName,jdbcType=VARCHAR}
+            AND warehouseName=#{warehouseName,jdbcType=VARCHAR}
+    </select>
+
+    <insert id="addWarehouse" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_addWarehouse(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{warehouseName,mode=IN,jdbcType=VARCHAR},
+                #{country,mode=IN,jdbcType=VARCHAR},
+                #{city,mode=IN,jdbcType=VARCHAR},
+                #{addressDetail,mode=IN,jdbcType=VARCHAR},
+                #{lng,mode=IN,jdbcType=VARCHAR},
+                #{lat,mode=IN,jdbcType=VARCHAR},
+                #{regionName,mode=IN,jdbcType=VARCHAR},
+                #{property,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=BIGINT},
+                #{alarmType,mode=IN,jdbcType=BIGINT},
+                #{hardwareLevel,mode=IN,jdbcType=BIGINT},
+                #{areaIndoor,mode=IN,jdbcType=VARCHAR},
+                #{areaRack,mode=IN,jdbcType=VARCHAR},
+                #{areaOutdoor,mode=IN,jdbcType=VARCHAR},
+                #{areaPlanIndoor,mode=IN,jdbcType=VARCHAR},
+                #{office,mode=IN,jdbcType=VARCHAR},
+                #{timeZone,mode=IN,jdbcType=VARCHAR},
+                #{warehouseInfo,mode=IN,jdbcType=VARCHAR},
+                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{createTime,mode=IN,jdbcType=BIGINT},
+                #{updateTime,mode=IN,jdbcType=BIGINT},
+                #{remark,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
     </insert>
 
-    <!--根据仓库编号修改仓库信息-->
-    <update id="updateWarehouse" parameterType="com.example.tdl.domain.vo.UpdateWarehouseVo">
-        update warehouse SET
-        warehouseName=#{warehouseName,jdbcType=VARCHAR},
-        country=#{country,jdbcType=VARCHAR},
-        province=#{province,jdbcType=VARCHAR},
-        city=#{city,jdbcType=VARCHAR},
-        district=#{district,jdbcType=VARCHAR},
-        address=#{address,jdbcType=VARCHAR},
-        regionCN=#{regionCN,jdbcType=VARCHAR},
-        regionEN=#{regionEN,jdbcType=VARCHAR},
-        longitude=#{longitude,jdbcType=VARCHAR},
-        latitude=#{latitude,jdbcType=VARCHAR},
-        property=#{property,jdbcType=VARCHAR},
-        type=#{type,jdbcType=VARCHAR},
-        alarm_id=(SELECT id from alarm WHERE alarmType=#{alarmType,jdbcType=VARCHAR} AND alarmScene="仓库"),
-        hardwareLevel=#{hardwareLevel,jdbcType=VARCHAR},
-        areaIndoor=#{areaIndoor,jdbcType=DOUBLE},
-        areaRack=#{areaRack,jdbcType=DOUBLE},
-        areaOutdoor=#{areaOutdoor,jdbcType=DOUBLE},
-        areaPlanIndoor=#{areaPlanIndoor,jdbcType=DOUBLE},
-        office=#{office,jdbcType=VARCHAR},
-        timeZone=#{timeZone,jdbcType=INTEGER},
-        weatherInfo=#{weatherInfo,jdbcType=VARCHAR},
-        warehouseInfo=#{warehouseInfo,jdbcType=VARCHAR},
-        updateTime=#{updateTime,jdbcType=BIGINT},
-        remark=#{remark,jdbcType=VARCHAR}
-        WHERE warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    <update id="updateWarehouse" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_updateWarehouse(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{warehouseName,mode=IN,jdbcType=VARCHAR},
+                #{country,mode=IN,jdbcType=VARCHAR},
+                #{city,mode=IN,jdbcType=VARCHAR},
+                #{addressDetail,mode=IN,jdbcType=VARCHAR},
+                #{lng,mode=IN,jdbcType=VARCHAR},
+                #{lat,mode=IN,jdbcType=VARCHAR},
+                #{regionName,mode=IN,jdbcType=VARCHAR},
+                #{property,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=BIGINT},
+                #{alarmType,mode=IN,jdbcType=BIGINT},
+                #{hardwareLevel,mode=IN,jdbcType=BIGINT},
+                #{areaIndoor,mode=IN,jdbcType=VARCHAR},
+                #{areaRack,mode=IN,jdbcType=VARCHAR},
+                #{areaOutdoor,mode=IN,jdbcType=VARCHAR},
+                #{areaPlanIndoor,mode=IN,jdbcType=VARCHAR},
+                #{office,mode=IN,jdbcType=VARCHAR},
+                #{timeZone,mode=IN,jdbcType=VARCHAR},
+                #{warehouseInfo,mode=IN,jdbcType=VARCHAR},
+                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{updateTime,mode=IN,jdbcType=BIGINT},
+                #{remark,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
     </update>
 
-    <!--删除仓库信息-->
-    <delete id="delWarehouse" parameterType="String">
-        DELETE from warehouse WHERE warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    <delete id="delWarehouse" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_deleteWarehouse(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
     </delete>
 
-    <!--根据仓库名查询信息-->
-    <select id="getByWarehouseName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
-        SELECT warehouseName,warehouseNo,country,province,city,district,address,regionCN,regionEN,longitude,latitude,property,type,
-        alarmType,alarmScene,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,weatherInfo,warehouseInfo,w.remark
-        from warehouse w,alarm a WHERE w.alarm_id=a.id
-        AND warehouseName=#{warehouseName,jdbcType=VARCHAR}
+    <insert id="addGateway" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_warehouseAddGateway(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{gSN,mode=IN,jdbcType=VARCHAR},
+                #{gType,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+
+    <update id="untieGateway" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_resWarehouseGateway(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{gSN,mode=IN,jdbcType=VARCHAR},
+                #{gType,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </update>
+
+    <insert id="addUser" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_addWarehouseAddUser(
+                #{warehouseNo,mode=IN,jdbcType=VARCHAR},
+                #{number,mode=IN,jdbcType=INTEGER},
+                #{userNameVar,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+    <select id = "getGateway" parameterType="String" resultType="com.example.tdl.domain.vo.GatewaySNVo">
+        select g.SN from gateway_warehouse gw,warehouse w,gateway g
+        where  gw.gateway_id=g.id
+        and gw.warehouse_id = w.id
+        and w.warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getByWarehouseNoAndSN" resultType="java.lang.Integer" parameterType="String">
+        select count(id) from gateway_warehouse gw,warehouse w,gateway g
+        where  gw.gateway_id=g.id
+        and gw.warehouse_id = w.id
+        and w.warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+        and g.SN=#{SN,jdbcType=VARCHAR}
     </select>
 
     <!--根据报警信息查询仓库信息-->
-    <select id="getByAlarm" parameterType="String" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
-        SELECT warehouseName,warehouseNo,country,province,city,district,address,regionCN,regionEN,longitude,latitude,property,type,
-        alarmType,alarmScene,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,weatherInfo,warehouseInfo,w.remark
-        from warehouse w,alarm a WHERE w.alarm_id=a.id
+    <select id="getByAlarm" parameterType="com.example.tdl.domain.vo.DelAlarmVo" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
+        SELECT warehouseNo,warehouseName,ct.country,ct.city,CONCAT_WS("-",ct.country,ct.city) regions ,w.addressDetail,r.regionName,lng,lat,a.alarmType,property,
+                  type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,w.remark
+        from warehouse w,alarm a ,region r,company c,city ct
+        WHERE w.alarm_id=a.id
+         and w.city_id =ct.id
+        and w.region_id = r.id
+        and w.company_id= c.id
+        and a.company_id =c.id
         AND a.alarmType=#{alarmType,jdbcType=VARCHAR}
         AND a.alarmScene=#{alarmScene,jdbcType=VARCHAR}
+        and c.companyName=#{companyName,jdbcType=VARCHAR}
     </select>
-
-
 </mapper>
\ No newline at end of file