Fix the gatewayName "null" error for getWarehouseData interface.

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

 package com.example.tdl.web;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
@@ -12,7 +11,6 @@ import com.example.tdl.service.redis.InfoRedisService;
 import com.example.tdl.service.redis.TokenRedisService;
 import com.example.tdl.util.AlarmRule;
 import com.google.gson.Gson;
-import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -26,10 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import retrofit2.http.POST;
 
-import javax.print.DocFlavor;
-import javax.print.attribute.standard.RequestingUserName;
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;

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

@@ -1006,7 +1006,7 @@ public class WarehouseController {
         }
         List<WarehouseGatewayDateVo> warehouseGatewayDateVoList=new ArrayList<>();
         List<GatewayOnLineVo> gatewayOnLineVos=gatewayService.getByWarehouseNo(warehouseVo.getWarehouseNo());
-        Long endTime = System.currentTimeMillis() +2*24*3600*1000l;
+        Long endTime = System.currentTimeMillis() + 2 * 24 * 3600 * 1000L;
         for (int a=0;a<gatewayOnLineVos.size();a++){
             if(gatewayOnLineVos.get(a) == null){
                 continue;
@@ -1038,7 +1038,7 @@ public class WarehouseController {
             }else{
                 warehouseGatewayDateVo.setState(6);
             }
-            //List<String> tdls=tdlDeviceService.getByGatewaySN(gatewayOnLineVos.get(a).getgSN(),gatewayOnLineVos.get(a).getType());
+
             List<TDLDeviceVo> tdlDeviceVoList = tdlDeviceService.getTdlByGatewaySN(
                     gatewayOnLineVos.get(a).getgSN(),gatewayOnLineVos.get(a).getType());
             List<WarehouseDataVo> warehouseDataVos=new ArrayList<>();

src/main/resources/mapper/GatewayMapper.xml

@@ -119,8 +119,8 @@
 
     <!--根据仓库编号查询网关信息-->
     <select id="getByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.GatewayOnLineVo">
-          SELECT DISTINCT gatewaySN gSN, gatewayType  type,createTime startTime
-          from tdl_gateway_log
+          SELECT DISTINCT tgl.gatewaySN gSN, tgl.gatewayType type, g.name, tgl.createTime startTime
+          from tdl_gateway_log tgl inner join gateway g on tgl.gatewaySN = g.SN and tgl.gatewayType = g.type
           where  warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
           and  ISNULL(endTime)
           GROUP BY gSN