6.28-修改结束线路继续发送数据的bug

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

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

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

@@ -37,4 +37,6 @@ public interface GatewayMapper {
 
     List<GatewayOnLineVo> getByWarehouseNo(@Param("warehouseNo") String warehouseNo);
 
+    List<TypeVo> getGatewayType(@Param("companyNo") String companyNo);
+
 }

src/main/java/com/example/tdl/mqtt/MqttListener.java

@@ -220,20 +220,19 @@ public class MqttListener implements MqttCallback {
         if(configVo == null){
             return 0;//休眠
         }
-        if(StringUtils.isEmpty(configVo.getMessage())) {//未绑定tdl
+        CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
+        if(configVo.getUntie() && StringUtils.isEmpty(configVo.getMessage())  ){
+            return 2;//解绑
+        }
+        if(StringUtils.isEmpty(configVo.getMessage()) && configVo.getUntie() == false){
             return 0;//休眠
         }
-        CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
+        JsonObject returnData = new JsonParser().parse(message).getAsJsonObject();
         ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class);
         if(configCMDVo == null){
             return 0;//休眠
         }
-        if(configVo.getUntie() && StringUtils.isEmpty(configVo.getMessage())  ){
-            return 2;//解绑
-        }
-        JsonObject returnData = new JsonParser().parse(message).getAsJsonObject();
         if(returnData.has("tempL")
-                &&returnData.has("tempL")
                 &&returnData.has("tempH")
                 &&returnData.has("humiL")
                 &&returnData.has("humiH")

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

@@ -72,4 +72,7 @@ public class GatewayService {
     }
 
 
+    public List<TypeVo> getGatewayType(String companyNo){
+        return gatewayMapper.getGatewayType(companyNo);
+    }
 }

src/main/java/com/example/tdl/service/redis/RedisService.java

@@ -66,6 +66,7 @@ public class RedisService {
     }
 
     public Object getHash(String key, Object mapKey) {
+
         Object result = null;
         try {
             HashOperations<Serializable, Object, Object> hash = redisTemplate.opsForHash();

src/main/java/com/example/tdl/service/redis/UserTokenRedisService.java

@@ -9,8 +9,8 @@ public class UserTokenRedisService extends RedisService {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Autowired
-    public UserTokenRedisService(RedisTemplate realRedisTemplate) {
-        super(realRedisTemplate);
+    public UserTokenRedisService(RedisTemplate userTokenTemplate) {
+        super(userTokenTemplate);
     }
 }
 

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

@@ -293,11 +293,11 @@ public class CircuitController {
             "       tdlsn：TDLSN序列号" +
             "       batteryVoltage:电池电压}," +
             "   list：{" +
-                "       city：城市;" +
-                "       time：到达时间/发车时间;" +
-                "       last：运行时长;" +
-                "       alarmCount：报警数;" +
-                "       type：1--出发时间；2--目的时间}," +
+            "       city：城市;" +
+            "       time：到达时间/发车时间;" +
+            "       last：运行时长;" +
+            "       alarmCount：报警数;" +
+            "       type：1--出发时间；2--目的时间}," +
             "   alarmLogList：{" +
             "       transportationNo：运输编号;" +
             "       TDLSN：tag序列号;" +
@@ -933,7 +933,7 @@ public class CircuitController {
         map.put("TDLSNVar",TDLSNVar);
         map.put("alarmTypeVar",alarmTypeVar);
         map.put("TDLCounts",addCircuitVo.getTdlAlarmList()== null ?  0 : addCircuitVo.getTdlAlarmList().size());
-        map.put("message",gson.toJson(configCMDVo));
+        map.put("message",configCMDVo == null ? "" :gson.toJson(configCMDVo));
         map.put("flag",false);
         map.put("untie",false);
         circuitService.addCircuit(map);
@@ -1002,7 +1002,7 @@ public class CircuitController {
             return gson.toJson(fb);
         }
         //判断当前车牌是否已存在
-        if(carService.getByCarNo(user.getCompanyNo(),addCircuitVo.getCargoNo()) == null){
+        if(carService.getByCarNo(user.getCompanyNo(),addCircuitVo.getPlateNo()) == null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"nonexistentTruck"));
             return gson.toJson(fb);
@@ -1236,23 +1236,26 @@ public class CircuitController {
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"notBound"));
             return gson.toJson(fb);
+        }
+        ConfigCMDVo config = gson.fromJson(configVo.getMessage(),ConfigCMDVo.class);
+        Boolean untie = false;
+        if(tdl.equals(tdlLogVo.getTDLSN())){
+            configCMDVo =null;
+            untie = true;
         }else{
-            ConfigCMDVo config = gson.fromJson(configVo.getMessage(),ConfigCMDVo.class);
-            if(tdl.equals(tdlLogVo.getTDLSN())){
-                configCMDVo = new ConfigCMDVo();
-            }else{
-                devList.removeAll(dev);
-                configCMDVo = new ConfigCMDVo("config",config.getGpsPeriod(),config.getGprsPeriod(),devList,config.getMode(),System.currentTimeMillis()/1000l);
-            }
+            devList.removeAll(dev);
+            configCMDVo = new ConfigCMDVo("config",config.getGpsPeriod(),config.getGprsPeriod(),devList,config.getMode(),System.currentTimeMillis()/1000l);
         }
+
         Map<Object,Object> map=new HashMap<>();
         map.put("transportationNo",updateCircuitVo.getTransportationNo());
         map.put("gSN",tdlLogVo.getgSN());
         map.put("gType",tdlLogVo.getgType());
         map.put("startCity",resultCircuitVo.getStartCity());
         map.put("endCity",resultCircuitVo.getEndCity());
-        map.put("message",gson.toJson(configCMDVo));
+        map.put("message",configCMDVo == null ? "" : gson.toJson(configCMDVo));
         map.put("endTime",updateCircuitVo.getEndTime());
+        map.put("untie",untie);
         circuitService.endCircuit(map);
         Map<Object,Object> msg=new HashMap<>();
         msg.put("msg",map.get("msg"));
@@ -1518,7 +1521,7 @@ public class CircuitController {
     @ApiOperation(value = "判断线路是否已经绑定了tdl和gateway",notes = "判断线路是否已经绑定了tdl和gateway" +
             "transportationNo:运输编号" +
             "返回值：" +
-                "binding：false未绑定/true绑定了")
+            "binding：false未绑定/true绑定了")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
             @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
@@ -1551,6 +1554,8 @@ public class CircuitController {
         return gson.toJson(bindVo);
     }
 
+
+
     //生成运输编号
     public String getTransportNo(String transportation,String transportationType){
         String transportationNo="";
@@ -1580,6 +1585,8 @@ public class CircuitController {
         return transportationNo;
     }
 
+
+
     //两个时间戳之间相差多少
     public String getMistiming(Long startTime,Long arrivalTime){
         long nd = 1000 * 24 * 60 * 60;

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

@@ -98,6 +98,21 @@ public class EquipmentBindingController {
             fb.setMessage("使用场景不能为空");
             return gson.toJson(fb);
         }
+        if(bindingVo.getMode() == 1){
+            if(StringUtils.isEmpty(bindingVo.getTransportationNo())){
+                fb.setCode(0);
+                fb.setMessage("运输编号不能为空");
+                return gson.toJson(fb);
+            }
+            bindingVo.setWarehouseNo("");
+        }else if(bindingVo.getMode() == 2){
+            if(StringUtils.isEmpty(bindingVo.getWarehouseNo())){
+                fb.setCode(0);
+                fb.setMessage("仓库编号不能为空");
+                return gson.toJson(fb);
+            }
+            bindingVo.setTransportationNo("");
+        }
         if(StringUtils.isEmpty(bindingVo.getType())){
             bindingVo.setType(gatewayService.getBySN(bindingVo.getgSN(),user.getCompanyNo()));
         }
@@ -120,11 +135,11 @@ public class EquipmentBindingController {
             fb.setMessage("该TDL已经被使用");
             return gson.toJson(fb);
         }
-        if(StringUtils.isEmpty(bindingVo.getTransportationNo()) && !StringUtils.isEmpty(bindingVo.getWarehouseNo())){
-            bindingVo.setTransportationNo("");
-        }else if(StringUtils.isEmpty(bindingVo.getWarehouseNo()) && !StringUtils.isEmpty(bindingVo.getTransportationNo())){
-            bindingVo.setWarehouseNo("");
-        }
+//        if(StringUtils.isEmpty(bindingVo.getTransportationNo()) && !StringUtils.isEmpty(bindingVo.getWarehouseNo())){
+//            bindingVo.setTransportationNo("");
+//        }else if(StringUtils.isEmpty(bindingVo.getWarehouseNo()) && !StringUtils.isEmpty(bindingVo.getTransportationNo())){
+//            bindingVo.setWarehouseNo("");
+//        }
         Integer gpsPeriod = null;
         Integer gprsPeriod = null;
         if(bindingVo.getMode() == 2){
@@ -211,17 +226,19 @@ public class EquipmentBindingController {
         ConfigVo configVo =configService.getConfig(resultTDLDeviceVo.getGatewaySN(),resultTDLDeviceVo.getGatewayType());
         ConfigCMDVo config = gson.fromJson(configVo.getMessage(),ConfigCMDVo.class);
         ConfigCMDVo configCMDVo ;
+        Boolean boo = false;
         if(devList.size()>1){
             devList.remove("TDL-"+TDLSN);
             configCMDVo = new ConfigCMDVo("config",config.getGpsPeriod(),config.getGprsPeriod(),devList,config.getMode(),System.currentTimeMillis()/1000l);
         }else{
-            configCMDVo = new ConfigCMDVo();
+            configCMDVo = null;
+            boo = true;
         }
         Map<Object,Object> map=new HashMap<>();
         map.put("gSN",resultTDLDeviceVo.getGatewaySN());
         map.put("gType",resultTDLDeviceVo.getGatewayType());
-        map.put("message",gson.toJson(configCMDVo));
-        map.put("untie",false);
+        map.put("message",configCMDVo == null ? "": gson.toJson(configCMDVo));
+        map.put("untie",boo);
         map.put("TDLSN",TDLSN);
         map.put("endTime",System.currentTimeMillis());
         configService.updateConfig(map);
@@ -276,10 +293,12 @@ public class EquipmentBindingController {
             fb.setMessage("该网关不属于该仓库");
             return gson.toJson(fb);
         }
+        //获取网关编号
+        String  type = gatewayService.getBySN(addWarehouseGatewayVo.getgSN(),user.getCompanyNo());
         Map<Object,Object> map=new HashMap<>();
         map.put("warehouseNo",addWarehouseGatewayVo.getWarehouseNo());
         map.put("gSN",addWarehouseGatewayVo.getgSN());
-        map.put("gType","WTD93LG");
+        map.put("gType",type);
         map.put("endTime",System.currentTimeMillis());
         warehouseService.untieGateway(map);
         Map<Object,Object> msg=new HashMap<>();

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

@@ -479,4 +479,20 @@ public class GatewayController {
     }
 
 
+    //获取设备类型
+    @ApiOperation(value = "分配网关",notes = "分配网关，传值说明：" +
+            "   SN:需要分配的网关序列号，" +
+            "   type:需要分配的网关类型，" +
+            "   companyNo:分配的公司编号。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value = "/getGatewayType",method = RequestMethod.GET)
+    public Object getGatewayType(HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        return   gatewayService.getGatewayType(user.getCompanyNo());
+    }
+
 }

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

@@ -111,17 +111,19 @@ public class HomePageController {
         //获取近几天的线路信息
         dataVo.setOnRoute(circuitService.getOnRoute(user.getCompanyNo()));//在途数量
        Integer delay =  circuitService.getDelayCount(System.currentTimeMillis(),time,user.getCompanyNo());
-        dataVo.setDelay(delay);//延误数量
+
         dataVo.setAlarmed( alarmLogServcie.getCount(time,user.getCompanyNo()));//报警数量
         dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo())); //获取颠簸数量
 //        dataVo.setAlarmLogVoList(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
         dataVo.setWarehouseVoList(warehouseService.getAll(user.getCompanyNo()));
         List<HistogramData> list = alarmLogServcie.getByCount(time,user.getCompanyNo());//获取报警柱状图
+        list.add(new HistogramData("5",delay));
         //获取所有的仓库数据
         for(int j = 0,length = list.size();j<length;j++){
             if(list.get(j).getClassify().equals("5")){
                 Integer count = list.get(j).getCount() +delay;
                 list.get(j).setCount(count);
+                dataVo.setDelay(list.get(j).getCount());//延误数量
             }
         }
         //获取设备的当前位置
@@ -152,12 +154,7 @@ public class HomePageController {
                     circuitList.add(circuitVo);
                 }else {
                     Long startTime = circuitVos.get(i).getStartTime() * 1000000l;
-                    String sql = "";
-                    if (circuitVos.get(i).getEndTime() == null || circuitVos.get(i).getEndTime() == 0) {
-                        sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where  \"lng\"!=0 and \"lat\"!=0 and  time >= " + startTime + " ORDER BY time  desc limit 1";
-                    } else {
-                        sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"lng\"!=0 and \"lat\"!=0 and  time >= " + startTime + " and time<= " + circuitVos.get(i).getEndTime() * 1000000l + " ORDER BY time  desc limit 1";
-                    }
+                    String sql =  "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"  where   time >= " + startTime + " ORDER BY time  desc limit 1";
                     QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
                     if (queryResult.getResults().get(0).getSeries() != null) {
                         circuitVo.setTime(parseTime(queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString()));

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

@@ -173,21 +173,19 @@ public class TDLDeviceController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/delTDLDevice",method = RequestMethod.POST)
-    public Object delTDLDevice(@RequestBody String TDLSN,HttpServletRequest request){
-        JSONObject jsonObject=JSON.parseObject(TDLSN);
-        TDLSN=(String)jsonObject.get("TDLSN");
-        if (StringUtils.isEmpty(TDLSN)){
+    public Object delTDLDevice(@RequestBody TdlSNVo tdlSNVo,HttpServletRequest request){
+        if (StringUtils.isEmpty(tdlSNVo.getTDLSN())){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"TDLSN"));
             return  gson.toJson(fb);
         }
-        Object[] o={TDLSN};
-        if (tdlDeviceService.getByTDLSN(TDLSN).getUseScene()!=0){
+        Object[] o={tdlSNVo.getTDLSN()};
+        if (tdlDeviceService.getByTDLSN(tdlSNVo.getTDLSN()).getUseScene()!=0){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,o,"tdlUsed"));
             return gson.toJson(fb);
         }
-        int a = tdlDeviceService.delTDLDevice(TDLSN);
+        int a = tdlDeviceService.delTDLDevice(tdlSNVo.getTDLSN());
         if (a>0){
             fb.setCode(1);
             fb.setMessage(i18n.getMessage(request,"deleteTDLSuccess"));

src/main/resources/mapper/CircuitMapper.xml

@@ -185,6 +185,7 @@
                 #{endCity,mode=IN,jdbcType=VARCHAR},
                 #{message,mode=IN,jdbcType=VARCHAR},
                 #{endTime,mode=IN,jdbcType=BIGINT},
+                #{untie,mode=IN,jdbcType=INTEGER},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
            )
         }
@@ -266,6 +267,7 @@
    </select>
 
 
+
    <!--总数量-->
    <select id="getCount" resultType="java.lang.Integer">
        select  count(id) from circuit

src/main/resources/mapper/GatewayMapper.xml

@@ -15,6 +15,7 @@
         <if test="companyNo!='TM201803298320'">
             and  companyNo=#{companyNo,jdbcType=VARCHAR}
         </if>
+        limit 1
     </select>
 
     <insert id="addGateway" parameterType="java.util.Map" statementType="CALLABLE">
@@ -124,6 +125,14 @@
       and  ISNULL(endTime)
     </select>
 
+    <select id="getGatewayType" parameterType="String"  resultType="com.example.tdl.domain.vo.TypeVo">
+        SELECT  DISTINCT  type
+        from gateway g INNER JOIN company c on g.company_id=c.id
+        <if test="companyNo!='TM201803298320'">
+            WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
+        </if>
+    </select>
+
 
     <!--    <insert id="addGateway" parameterType="com.example.tdl.domain.vo.AddGatewayVo">
         INSERT into gateway VALUES (