5.29--仓库详细数据

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

+package com.example.tdl.domain.vo;
+
+public class AlarmContactsVo {
+
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

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

@@ -6,14 +6,16 @@ public class DeviceVo {
 
     private  String  tdl;
 
-    private String tdlSN;
-
     private String SN;
 
     private String type;
 
     private String device;
 
+    private Long  startTime;
+
+    private Long endTime;
+
     public String getWarehouseNo() {
         return warehouseNo;
     }
@@ -31,14 +33,6 @@ public class DeviceVo {
         this.tdl = tdl;
     }
 
-    public String getTdlSN() {
-        return tdlSN;
-    }
-
-    public void setTdlSN(String tdlSN) {
-        this.tdlSN = tdlSN;
-    }
-
     public String getSN() {
         return SN;
     }
@@ -62,4 +56,20 @@ public class DeviceVo {
     public void setDevice(String device) {
         this.device = device;
     }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
 }

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

+package com.example.tdl.domain.vo;
+
+import java.util.List;
+
+public class GraphicDataVo {
+
+    private String  descption;
+
+    private String max;
+
+    private String min;
+
+    private List<HistoryData> historyDataList;
+
+    public String getDescption() {
+        return descption;
+    }
+
+    public void setDescption(String descption) {
+        this.descption = descption;
+    }
+
+    public String getMax() {
+        return max;
+    }
+
+    public void setMax(String max) {
+        this.max = max;
+    }
+
+    public String getMin() {
+        return min;
+    }
+
+    public void setMin(String min) {
+        this.min = min;
+    }
+
+    public List<HistoryData> getHistoryDataList() {
+        return historyDataList;
+    }
+
+    public void setHistoryDataList(List<HistoryData> historyDataList) {
+        this.historyDataList = historyDataList;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class SearchTdlVo {
+
+    private String warehouseNo;
+
+    private String gatewaySN;
+
+    private String tdlSN;
+
+    public String getWarehouseNo() {
+        return warehouseNo;
+    }
+
+    public void setWarehouseNo(String warehouseNo) {
+        this.warehouseNo = warehouseNo;
+    }
+
+    public String getGatewaySN() {
+        return gatewaySN;
+    }
+
+    public void setGatewaySN(String gatewaySN) {
+        this.gatewaySN = gatewaySN;
+    }
+
+    public String getTdlSN() {
+        return tdlSN;
+    }
+
+    public void setTdlSN(String tdlSN) {
+        this.tdlSN = tdlSN;
+    }
+}

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

@@ -4,14 +4,28 @@ public class SimpleWarehouseVo {
 
     private String warehouseNo;
 
-    private String img;
-
     private String warehouseName;
 
     private String regions;
 
+    private String country;
+
+    private String city;
+
     private Integer  count;
 
+    private String property;//属性
+
+    private String type;//类型
+
+    private String hardwareLevel;//硬件等级
+
+    private Double areaPlanIndoor;//实际室内总面积
+
+    private String temp;
+
+    private String humidity;
+
     public String getWarehouseNo() {
         return warehouseNo;
     }
@@ -20,13 +34,6 @@ public class SimpleWarehouseVo {
         this.warehouseNo = warehouseNo;
     }
 
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
 
     public String getWarehouseName() {
         return warehouseName;
@@ -44,6 +51,22 @@ public class SimpleWarehouseVo {
         this.regions = regions;
     }
 
+    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 Integer getCount() {
         return count;
     }
@@ -51,4 +74,52 @@ public class SimpleWarehouseVo {
     public void setCount(Integer count) {
         this.count = count;
     }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getHardwareLevel() {
+        return hardwareLevel;
+    }
+
+    public void setHardwareLevel(String hardwareLevel) {
+        this.hardwareLevel = hardwareLevel;
+    }
+
+    public Double getAreaPlanIndoor() {
+        return areaPlanIndoor;
+    }
+
+    public void setAreaPlanIndoor(Double areaPlanIndoor) {
+        this.areaPlanIndoor = areaPlanIndoor;
+    }
+
+    public String getTemp() {
+        return temp;
+    }
+
+    public void setTemp(String temp) {
+        this.temp = temp;
+    }
+
+    public String getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(String humidity) {
+        this.humidity = humidity;
+    }
 }

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

+package com.example.tdl.domain.vo;
+
+import java.util.List;
+
+public class TdlDataVo {
+
+    private String gSN;
+
+    private String tdl;
+
+    private String warehouseName;
+
+    private String temp;
+
+    private String humidity;
+
+    private List<HistoryDataVo> historyDataList;
+
+    private List<GraphicDataVo> graphicDataList;
+
+    public static class HistoryDataVo{
+
+        private Long time;
+
+        private String temp;
+
+        private String humidity;
+
+        public Long getTime() {
+            return time;
+        }
+
+        public void setTime(Long time) {
+            this.time = time;
+        }
+
+        public String getTemp() {
+            return temp;
+        }
+
+        public void setTemp(String temp) {
+            this.temp = temp;
+        }
+
+        public String getHumidity() {
+            return humidity;
+        }
+
+        public void setHumidity(String humidity) {
+            this.humidity = humidity;
+        }
+    }
+
+
+    public String getgSN() {
+        return gSN;
+    }
+
+    public void setgSN(String gSN) {
+        this.gSN = gSN;
+    }
+
+    public String getTdl() {
+        return tdl;
+    }
+
+    public void setTdl(String tdl) {
+        this.tdl = tdl;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getTemp() {
+        return temp;
+    }
+
+    public void setTemp(String temp) {
+        this.temp = temp;
+    }
+
+    public String getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(String humidity) {
+        this.humidity = humidity;
+    }
+
+    public List<HistoryDataVo> getHistoryDataList() {
+        return historyDataList;
+    }
+
+    public void setHistoryDataList(List<HistoryDataVo> historyDataList) {
+        this.historyDataList = historyDataList;
+    }
+
+    public List<GraphicDataVo> getGraphicDataList() {
+        return graphicDataList;
+    }
+
+    public void setGraphicDataList(List<GraphicDataVo> graphicDataList) {
+        this.graphicDataList = graphicDataList;
+    }
+}

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

@@ -8,7 +8,7 @@ public class WareHouseByTermVo {
 
     private String city;
 
-    private String  alarm;
+    private String  gSN;
 
     private String  companyName;
 
@@ -36,12 +36,12 @@ public class WareHouseByTermVo {
         this.city = city;
     }
 
-    public String getAlarm() {
-        return alarm;
+    public String getgSN() {
+        return gSN;
     }
 
-    public void setAlarm(String alarm) {
-        this.alarm = alarm;
+    public void setgSN(String gSN) {
+        this.gSN = gSN;
     }
 
     public String getCompanyName() {

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

@@ -17,6 +17,14 @@ public class WarehouseDetailVo {
 
     private Integer tdlCounts;
 
+    private String property;//属性
+
+    private String type;//类型
+
+    private String hardwareLevel;//硬件等级
+
+    private Double areaPlanIndoor;//实际室内总面积
+
     private List<GatewayOnLineVo> gatewayOnLineVos;
 
     public List<GatewayOnLineVo> getGatewayOnLineVos() {
@@ -82,4 +90,36 @@ public class WarehouseDetailVo {
     public void setTdlCounts(Integer tdlCounts) {
         this.tdlCounts = tdlCounts;
     }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getHardwareLevel() {
+        return hardwareLevel;
+    }
+
+    public void setHardwareLevel(String hardwareLevel) {
+        this.hardwareLevel = hardwareLevel;
+    }
+
+    public Double getAreaPlanIndoor() {
+        return areaPlanIndoor;
+    }
+
+    public void setAreaPlanIndoor(Double areaPlanIndoor) {
+        this.areaPlanIndoor = areaPlanIndoor;
+    }
 }

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

@@ -6,7 +6,19 @@ public class WarehouseUserVo {
 
     private String warehouseNo;
 
-    private List<String> userNameList;
+    private List<UserVo> userNameList;
+
+    public static  class  UserVo{
+        private  String userName;
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+    }
 
     public String getWarehouseNo() {
         return warehouseNo;
@@ -16,11 +28,11 @@ public class WarehouseUserVo {
         this.warehouseNo = warehouseNo;
     }
 
-    public List<String> getUserNameList() {
+    public List<UserVo> getUserNameList() {
         return userNameList;
     }
 
-    public void setUserNameList(List<String> userNameList) {
+    public void setUserNameList(List<UserVo> userNameList) {
         this.userNameList = userNameList;
     }
 }

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

@@ -37,6 +37,8 @@ public interface WarehouseMapper {
 
     int addUser(Map<Object,Object> map);
 
+    List<AlarmContactsVo> getAlarmContacts(String  warehouseNo);
+
     ResultWarehouseVo getByWarehouseName(@Param("warehouseName") String warehouseName, @Param("companyName") String companyName);
 
     List<ResultWarehouseVo> getByAlarm(DelAlarmVo delAlarmVo);

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

@@ -64,6 +64,10 @@ public class WarehouseService {
         return warehouseMapper.addUser(map);
     }
 
+    public List<AlarmContactsVo> getAlarmContacts(String  warehouseNo){
+        return warehouseMapper.getAlarmContacts(warehouseNo);
+    }
+
     public ResultWarehouseVo getByWarehouseName(String warehouseName,String companyName){
         return warehouseMapper.getByWarehouseName(warehouseName,companyName);
     }

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

@@ -122,7 +122,7 @@ public class EquipmentBindingController {
         }
         //判断当前tdl是否有网关在使用
         ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(bindingVo.getTDLSN());
-        if(!StringUtils.isEmpty(resultTDLDeviceVo.getGatewaySN())){
+        if(resultTDLDeviceVo != null &&!StringUtils.isEmpty(resultTDLDeviceVo.getGatewaySN())){
             fb.setCode(0);
             fb.setMessage("该TDL已经被使用");
             return gson.toJson(fb);
@@ -137,6 +137,18 @@ public class EquipmentBindingController {
         //获取gateway下的所有tdl的编号
         List<String> devList = tdlDeviceService.getByGatewaySN(bindingVo.getSN(),bindingVo.getType());
         devList.add("TDL-"+bindingVo.getTDLSN());
+        String alarmScene = "";
+        Integer gpsPeriod = null;
+        Integer gprsPeriod = null;
+        if(bindingVo.getMode() == 2){
+            alarmScene="仓库";
+            gpsPeriod = 43200;
+            gprsPeriod= 60;
+        }else{
+            alarmScene="运输";
+            gpsPeriod=5;
+            gprsPeriod=15;
+        }
         ConfigCMDVo configCMDVo = new ConfigCMDVo("config",5,15,devList,bindingVo.getMode(),System.currentTimeMillis()/1000l);
         Map<Object,Object> map=new HashMap<>();
         map.put("companyName",user.getCompanyName());
@@ -157,10 +169,9 @@ public class EquipmentBindingController {
         Map<Object,Object> msg=new HashMap<>();
         msg.put("msg",map.get("msg"));
         if (msg.get("msg").equals("配置网关成功")){
-            fb.setCode(1);
-            fb.setMessage("配置网关成功");
             //根据报警类型货报警信息
-            ResultAlarmVo alarmVo =  alarmService.getByTypeAndScene(bindingVo.getAlarmType(),"运输",user.getCompanyName());
+
+            ResultAlarmVo alarmVo =  alarmService.getByTypeAndScene(bindingVo.getAlarmType(),alarmScene,user.getCompanyName());
             for(String alias :list){
                 List<AlarmRuleVo> alarmRuleVos = new ArrayList<>();
                 AlarmRuleVo alarmRuleVo = new AlarmRuleVo();
@@ -186,6 +197,8 @@ public class EquipmentBindingController {
                 alarmRuleVos.add(alarmRuleVo);
                 //向redis中写入报警信息
                 alarmRedisService.hmSet("TDL/"+bindingVo.getType()+"/" +bindingVo.getSN()+"/Data","TDL-" +bindingVo.getTDLSN()+"_" +alias,gson.toJson(alarmRuleVos));
+                fb.setCode(1);
+                fb.setMessage("配置网关成功");
             }
         }else{
             fb.setCode(0);
@@ -196,8 +209,7 @@ public class EquipmentBindingController {
 
 
 
-
-    @ApiOperation(value = "重置tdl",notes = "重置tdl")
+    @ApiOperation(value = "解绑tdl",notes = "解绑tdl")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://192.168.1.53:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.16:3306/cy?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=37774020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
 threadpool.corepoolsize = 30
 threadpool.maxpoolsize = 50
 
-server.port=8092
+server.port=8090
 management.security.enabled=false
 
 

src/main/resources/mapper/WarehouseMapper.xml

@@ -211,7 +211,7 @@
     </select>
 
     <select id="getByWarehouse" parameterType="com.example.tdl.domain.vo.WareHouseByTermVo" resultType="com.example.tdl.domain.vo.SimpleWarehouseVo">
-        select warehouseNo, w.img,warehouseName,CONCAT_WS("-",c.country,c.city) regions, (select  count(id) from  tdldevice t where t.warehouse_id = w.id ) count
+        select warehouseNo, warehouseName,CONCAT_WS("-",c.country,c.city) regions,c.country,c.city, (select  count(id) from  tdldevice t where t.warehouse_id = w.id ) count,property,type,hardwareLevel,areaPlanIndoor
         from warehouse  w ,company  c ,city ct
         where  c.id=w.company_id
         and ct.id = w.city_id
@@ -225,24 +225,17 @@
         <if test="city!=null">
             AND ct.city like CONCAT(CONCAT('%',#{city,jdbcType=VARCHAR}), '%')
         </if>
-        <if test="property!=null">
-            AND property=#{property,jdbcType=VARCHAR}
-        </if>
-        <if test="type!=null">
-            AND type=#{type,jdbcType=VARCHAR}
-        </if>
-        <if test="hardwareLevel!=null">
-            AND hardwareLevel=#{hardwareLevel,jdbcType=VARCHAR}
-        </if>
+
     </select>
     
     <select id="getDevice" parameterType="String" resultType="com.example.tdl.domain.vo.DeviceVo">
-        select w.warehouseNo,CONCAT("TDL-",t.TDLSN) tdl,t.TDLSN,g.SN,g.type,CONCAT(g.type,"_",g.SN) device
-        from  gateway_warehouse gw,gateway g,tdldevice t,warehouse w,
+       select w.warehouseNo,GROUP_CONCAT(CONCAT("TDL-",t.TDLSN)) tdl,t.TDLSN,g.SN,g.type,CONCAT(g.type,"_",g.SN) device,startTime,endTime
+        from  gateway_warehouse gw,gateway g,tdldevice t,warehouse w,use_warehouse_log u
         where gw.warehouse_id = w.id
         and gw.gateway_id  = g.id
         and t.warehouse_id = w.id
         and t.gateway_id  = g.id
+		and u.warehouseNo = w.warehouseNo
         and w.warehouseNo= #{warehouseNo,jdbcType=VARCHAR}
     </select>
 
@@ -251,9 +244,17 @@
         where warehouseNo= #{warehouseNo,jdbcType=VARCHAR}
     </update>
 
+    <select id="getAlarmContacts" parameterType="String" resultType="com.example.tdl.domain.vo.AlarmContactsVo">
+        select  DISTINCT userName
+        from  warehouse w,warehouse_and_user wu,`user` u
+        where w.id = wu.warehouse_id
+        and u.id = wu.user_id
+        and w.warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    </select>
+
     <select id="getWarehouseDetailByNo" parameterType="String" resultType="com.example.tdl.domain.vo.WarehouseDetailVo">
         SELECT warehouseNo,warehouseName,c.country,c.city,addressDetail,(SELECT COUNT(id) from gateway_warehouse WHERE warehouse_id=w.id) gatewayCounts,
-            (SELECT COUNT(id) FROM tdldevice WHERE warehouse_id=w.id) tdlCounts
+            (SELECT COUNT(id) FROM tdldevice WHERE warehouse_id=w.id) tdlCounts,,property,type,hardwareLevel,areaPlanIndoor
         from warehouse w INNER JOIN city c ON w.city_id=c.id
         where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
     </select>