5.25网关关联公司

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

@@ -13,6 +13,16 @@ public class ResultGatewayVo {
 
     private Integer useScene;
 
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getSN() {
         return SN;
     }

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

+package com.example.tdl.domain.vo;
+
+public class UpdateGatewayCompanyVo {
+    private String SN;
+
+    private String type;
+
+    private String companyNo;
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+}

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

 package com.example.tdl.mapper;
 
-import com.example.tdl.domain.vo.GatewaySNVo;
-import com.example.tdl.domain.vo.GatewayState;
-import com.example.tdl.domain.vo.ResultGatewayVo;
-import com.example.tdl.domain.vo.UpdateGatewayVo;
+import com.example.tdl.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +9,9 @@ import java.util.Map;
 
 @Mapper
 public interface GatewayMapper {
-    List<ResultGatewayVo> getAll();
+    List<ResultGatewayVo> getAll(@Param("companyNo") String companyNo);
+
+    String getBySN(@Param("SN") String SN,@Param("companyNo") String companyNo);
 
     int addGateway(Map<Object,Object> map);
 
@@ -22,15 +21,15 @@ public interface GatewayMapper {
 
     ResultGatewayVo getBySNAndType(@Param("SN") String SN,@Param("type") String type);
 
-    int getIdBySNAndType(@Param("SN") String SN,@Param("type") String type);
+    int getIdBySNAndType(@Param("SN") String SN,@Param("type") String type,@Param("companyNo") String companyNo);
 
     int deployGateway(Map<Object,Object> map);
 
-    String getBySN(String SN);
-
     Integer updateState(GatewayState gatewayState);
 
     String getTransportationNo(@Param("SN") String SN,@Param("type") String type);
 
-    List<GatewaySNVo> getUnusedGateway(String SN);
+    List<GatewaySNVo> getUnusedGateway(@Param("SN") String SN,@Param("companyNo") String companyNo);
+
+    int updateCompany(UpdateGatewayCompanyVo updateGatewayCompanyVo);
 }

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

@@ -15,8 +15,12 @@ public class GatewayService {
     @Autowired
     private GatewayMapper gatewayMapper;
 
-    public List<ResultGatewayVo> getAll(){
-        return gatewayMapper.getAll();
+    public List<ResultGatewayVo> getAll(String companyNo){
+        return gatewayMapper.getAll(companyNo);
+    }
+
+    public String getBySN(String SN,String companyNo){
+        return gatewayMapper.getBySN(SN,companyNo);
     }
 
     public int addGateway(Map<Object,Object> map){
@@ -35,18 +39,14 @@ public class GatewayService {
         return gatewayMapper.getBySNAndType(SN,type);
     }
 
-    public int getIdBySNAndType(String SN,String type){
-        return gatewayMapper.getIdBySNAndType(SN,type);
+    public int getIdBySNAndType(String SN,String type,String companyNo){
+        return gatewayMapper.getIdBySNAndType(SN,type,companyNo);
     }
 
     public int deployGateway(Map<Object,Object> map){
         return gatewayMapper.deployGateway(map);
     }
 
-    public String getBySN(String SN){
-        return gatewayMapper.getBySN(SN);
-    }
-
     public Boolean updateState(GatewayState gatewayState){
         return gatewayMapper.updateState(gatewayState)==1;
     }
@@ -55,7 +55,11 @@ public class GatewayService {
         return gatewayMapper.getTransportationNo(SN,type);
     }
 
-    public  List<GatewaySNVo> getUnusedGateway(String SN){
-        return  gatewayMapper.getUnusedGateway(SN);
+    public  List<GatewaySNVo> getUnusedGateway(String SN,String companyNo){
+        return  gatewayMapper.getUnusedGateway(SN,companyNo);
+    }
+
+    public int updateCompany(UpdateGatewayCompanyVo updateGatewayCompanyVo){
+        return gatewayMapper.updateCompany(updateGatewayCompanyVo);
     }
 }

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

@@ -792,7 +792,7 @@ public class CircuitController {
         compTimeVar  = compTimeVar  +addCircuitVo.getEndAddressVo().getCompTime() +"&";
         startTimeVar =startTimeVar + "0&";
         arrivalTimeVar = arrivalTimeVar +"0&";
-        String type =gatewayService.getBySN(addCircuitVo.getSN());
+        String type =gatewayService.getBySN(addCircuitVo.getSN(),user.getCompanyNo());
         //判断当前gateWay是否存在
         if(StringUtils.isEmpty(type)){
             fb.setCode(0);

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

@@ -251,6 +251,9 @@ public class EquipmentBindingController {
     })
     @PostMapping("/untieGateway")
     public  Object untieGateway(@RequestBody AddWarehouseGatewayVo addWarehouseGatewayVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         if(StringUtils.isEmpty(addWarehouseGatewayVo.getWarehouseNo())){
             fb.setCode(0);
             fb.setMessage("仓库编号不能为空");
@@ -266,7 +269,7 @@ public class EquipmentBindingController {
             fb.setMessage("网关编号不能为空");
             return gson.toJson(fb);
         }
-        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN())==null){
+        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN(),user.getCompanyNo())==null){
             fb.setCode(0);
             fb.setMessage("该网关不存在");
             return gson.toJson(fb);

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

@@ -7,6 +7,7 @@ import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
 import com.example.tdl.service.*;
 import com.example.tdl.service.redis.InfoRedisService;
+import com.example.tdl.service.redis.TokenRedisService;
 import com.example.tdl.util.HttpRequester;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
@@ -57,6 +58,9 @@ public class GatewayController {
     @Autowired
     private TopicConfigService topicConfigService;
 
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
     @Autowired
     private I18nController  i18n;
 
@@ -73,8 +77,11 @@ public class GatewayController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/getAll",method = RequestMethod.GET)
-    public Object getAll(){
-        return gatewayService.getAll();
+    public Object getAll(HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        return gatewayService.getAll(user.getCompanyNo());
     }
 
     //添加网关信息
@@ -86,40 +93,43 @@ public class GatewayController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/addGateway",method = RequestMethod.POST)
-    public Object addGateway(@RequestBody AddGatewayVo addGatewayVo){
+    public Object addGateway(@RequestBody AddGatewayVo addGatewayVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         if (StringUtils.isEmpty(addGatewayVo.getSN())){
             fb.setCode(0);
-            fb.setMessage("gateway编号不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewaySN"));
             return gson.toJson(fb);
         }
         if(!addGatewayVo.getSN().matches("^[0-9]{8}$")){
             fb.setCode(0);
-            fb.setMessage("gateway编号必须是8位数字");
+            fb.setMessage(i18n.getMessage(request,"gatewaySNRule"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(addGatewayVo.getName())){
             fb.setCode(0);
-            fb.setMessage("gateway名字不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayName"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(addGatewayVo.getType())){
             fb.setCode(0);
-            fb.setMessage("gateway类型不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayType"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(addGatewayVo.getModelName())){
             fb.setCode(0);
-            fb.setMessage("gateway模板名不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayModelName"));
             return gson.toJson(fb);
         }
         if (modelService.getByModelName(addGatewayVo.getModelName())==null){
             fb.setCode(0);
-            fb.setMessage("该模板不存在");
+            fb.setMessage(i18n.getMessage(request,"existModelName"));
             return gson.toJson(fb);
         }
         if (gatewayService.getBySNAndType(addGatewayVo.getSN(),addGatewayVo.getType())!=null){
             fb.setCode(0);
-            fb.setMessage("添加的网关已存在");
+            fb.setMessage(i18n.getMessage(request,"repeatedSN"));
             return gson.toJson(fb);
         }
         Map<Object,Object> map=new HashMap<>();
@@ -128,13 +138,14 @@ public class GatewayController {
         map.put("type",addGatewayVo.getType());
         map.put("createTime",System.currentTimeMillis());
         map.put("updateTime",System.currentTimeMillis());
+        map.put("companyNo",user.getCompanyNo());
         map.put("modelName",addGatewayVo.getModelName());
         gatewayService.addGateway(map);
         Map<Object,Object> msg=new HashMap<>();
         msg.put("msg",map.get("msg"));
         if (msg.get("msg").equals("添加网关成功")){
             fb.setCode(1);
-            fb.setMessage("添加网关成功");
+            fb.setMessage(i18n.getMessage(request,"addGatewaySuccess"));
         }else{
             fb.setCode(0);
             fb.setMessage(msg.get("msg").toString());
@@ -152,42 +163,36 @@ public class GatewayController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/updateGateway",method = RequestMethod.POST)
-    public Object updateGateway(@RequestBody UpdateGatewayVo updateGatewayVo){
+    public Object updateGateway(@RequestBody UpdateGatewayVo updateGatewayVo,HttpServletRequest request){
         if (StringUtils.isEmpty(updateGatewayVo.getSN())){
             fb.setCode(0);
-            fb.setMessage("编号不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewaySN"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(updateGatewayVo.getName())){
             fb.setCode(0);
-            fb.setMessage("名字不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayName"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(updateGatewayVo.getType())){
             fb.setCode(0);
-            fb.setMessage("类型不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayType"));
             return gson.toJson(fb);
         }
         if (gatewayService.getBySNAndType(updateGatewayVo.getSN(),updateGatewayVo.getType())==null){
             fb.setCode(0);
-            fb.setMessage("该网关不存在");
+            fb.setMessage(i18n.getMessage(request,"existGateway"));
             return gson.toJson(fb);
         }
-//        ResultGatewayVo resultGatewayVo=gatewayService.getBySNAndType(updateGatewayVo.getSN(),updateGatewayVo.getType());
-//        if (resultGatewayVo!=null&&updateGatewayVo.getSN().equals(updateGatewayVo.getOldSN())){
-//            fb.setCode(0);
-//            fb.setMessage("修改的设备已存在");
-//            return gson.toJson(fb);
-//        }
         if (StringUtils.isEmpty(updateGatewayVo.getModelName())){
             updateGatewayVo.setUpdateTime(System.currentTimeMillis());
             int a=gatewayService.updateGateway(updateGatewayVo);
             if (a>0){
                 fb.setCode(1);
-                fb.setMessage("修改网关成功");
+                fb.setMessage(i18n.getMessage(request,"updateGatewaySuccess"));
             }else{
                 fb.setCode(0);
-                fb.setMessage("修改网关失败");
+                fb.setMessage(i18n.getMessage(request,"updateGatewayFailure"));
             }
         }else {
             Map<Object,Object> map=new HashMap<>();
@@ -199,7 +204,7 @@ public class GatewayController {
             msg.put("msg",map.get("msg"));
             if (msg.get("msg").equals("通过模板修改设备成功")){
                 fb.setCode(1);
-                fb.setMessage("通过模板修改设备成功");
+                fb.setMessage(i18n.getMessage(request,"updateGatewayByModelSuccess"));
             }else{
                 fb.setCode(0);
                 fb.setMessage(msg.get("msg").toString());
@@ -217,20 +222,20 @@ public class GatewayController {
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/delGateway",method = RequestMethod.POST)
-    public Object delGateway(@RequestBody DelGatewayVo delGatewayVo){
+    public Object delGateway(@RequestBody DelGatewayVo delGatewayVo,HttpServletRequest request){
         if (StringUtils.isEmpty(delGatewayVo.getSN())){
             fb.setCode(0);
-            fb.setMessage("删除的SN不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewaySN"));
             return gson.toJson(fb);
         }
         if (StringUtils.isEmpty(delGatewayVo.getType())){
             fb.setCode(0);
-            fb.setMessage("删除的类型不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayType"));
             return gson.toJson(fb);
         }
         if (gatewayService.getBySNAndType(delGatewayVo.getSN(),delGatewayVo.getType())==null){
             fb.setCode(0);
-            fb.setMessage("删除的网关不存在");
+            fb.setMessage(i18n.getMessage(request,"existGateway"));
             return gson.toJson(fb);
         }
         Map<Object,Object> map=new HashMap<>();
@@ -241,7 +246,7 @@ public class GatewayController {
         msg.put("msg",map.get("msg"));
         if (msg.get("msg").equals("删除网关成功")){
             fb.setCode(1);
-            fb.setMessage("删除网关成功");
+            fb.setMessage(i18n.getMessage(request,"deleteGatewaySuccess"));
         }else{
             fb.setCode(0);
             fb.setMessage(msg.get("msg").toString());
@@ -257,32 +262,32 @@ public class GatewayController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public String deployProbes(@RequestBody DeployProbesVo deployProbesVo){
+    public String deployProbes(@RequestBody DeployProbesVo deployProbesVo,HttpServletRequest request){
         if(StringUtils.isEmpty(deployProbesVo.getModelName())){
             fb.setCode(0);
-            fb.setMessage("模板名不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayModelName"));
             return gson.toJson(fb);
         }
         if(StringUtils.isEmpty(deployProbesVo.getSN())){
             fb.setCode(0);
-            fb.setMessage("网关序列号不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewaySN"));
             return gson.toJson(fb);
         }
         if(StringUtils.isEmpty(deployProbesVo.getType())){
             fb.setCode(0);
-            fb.setMessage("网关类型不能为空");
+            fb.setMessage(i18n.getMessage(request,"gatewayType"));
             return gson.toJson(fb);
         }
         if(gatewayService.getBySNAndType(deployProbesVo.getSN(),deployProbesVo.getType())==null){
             fb.setCode(0);
-            fb.setMessage("该网关不存在");
+            fb.setMessage(i18n.getMessage(request,"existGateway"));
             return gson.toJson(fb);
         }
         //根据SN,type获取设备状态
         boolean state = gatewayService.getBySNAndType(deployProbesVo.getSN(),deployProbesVo.getType()).getState();
         if(state){
             fb.setCode(0);
-            fb.setMessage("设备在挂载");
+            fb.setMessage(i18n.getMessage(request,"isUseing"));
             return gson.toJson(fb);
         }
         Map<Object,Object> map=new HashMap<>();
@@ -403,14 +408,56 @@ public class GatewayController {
     })
     @RequestMapping(value = "/getUnusedGateway",method = RequestMethod.POST)
     public Object getUnusedGateway(@RequestBody String gSN, HttpServletRequest request){
-      if(StringUtils.isEmpty(gSN)){
-          fb.setCode(0);
-          fb.setMessage(i18n.getMessage(request,"gateway"));
-          return  gson.toJson(fb);
-      }
-      JSONObject jsonObject= JSON.parseObject(gSN);
-      gSN=(String)jsonObject.get("gSN");
-      return gatewayService.getUnusedGateway(gSN);
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        if(StringUtils.isEmpty(gSN)){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"gateway"));
+            return  gson.toJson(fb);
+        }
+        JSONObject jsonObject= JSON.parseObject(gSN);
+        gSN=(String)jsonObject.get("gSN");
+        return gatewayService.getUnusedGateway(gSN,user.getCompanyNo());
+    }
+
+    //分配网关
+    @ApiOperation(value = "分配网关",notes = "分配网关，传值说明：" +
+            "   SN:需要分配的网关序列号，" +
+            "   type:需要分配的网关类型，" +
+            "   companyNo:分配的公司编号。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value = "/updateCompany",method = RequestMethod.POST)
+    public Object updateCompany(@RequestBody UpdateGatewayCompanyVo updateGatewayCompanyVo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        if(StringUtils.isEmpty(updateGatewayCompanyVo.getCompanyNo())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"companyNo"));
+            return  gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateGatewayCompanyVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"gatewaySN"));
+            return  gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateGatewayCompanyVo.getType())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"gatewayType"));
+            return  gson.toJson(fb);
+        }
+        int a=gatewayService.updateCompany(updateGatewayCompanyVo);
+        if (a>=0){
+            fb.setCode(1);
+            fb.setMessage(i18n.getMessage(request,"updateGatewayCompanySuccess"));
+        }else{
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"updateGatewayCompanyFailure"));
+        }
+        return gson.toJson(fb);
     }
 
 }

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

@@ -679,7 +679,7 @@ public class WarehouseController {
             fb.setMessage("网关编号不能为空");
             return gson.toJson(fb);
         }
-        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN())==null){
+        if( gatewayService.getBySN(addWarehouseGatewayVo.getSN(),user.getCompanyNo())==null){
             fb.setCode(0);
             fb.setMessage("该网关不存在");
             return gson.toJson(fb);

src/main/resources/i18n/messages_zh_CN.properties

@@ -190,4 +190,21 @@ addCarFailure=\u8F66\u8F86\u6DFB\u52A0\u5931\u8D25
 updateCarSuccess=\u8F66\u8F86\u4FEE\u6539\u6210\u529F
 updateCarFailure=\u8F66\u8F86\u4FEE\u6539\u5931\u8D25
 deleteCarSuccess=\u8F66\u8F86\u5220\u9664\u6210\u529F
-deleteCarFailure=\u8F66\u8F86\u5220\u9664\u5931\u8D25
+deleteCarFailure=\u8F66\u8F86\u5220\u9664\u5931\u8D25
\ No newline at end of file
+#\u7F51\u5173
+gatewaySN=\u7F51\u5173\u5E8F\u5217\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+gatewaySNRule=gateway\u7F16\u53F7\u5FC5\u987B\u662F8\u4F4D\u6570\u5B57
+gatewayName=\u7F51\u5173\u540D\u4E0D\u80FD\u4E3A\u7A7A
+gatewayType=\u7F51\u5173\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+gatewayModelName=\u7F51\u5173\u6A21\u677F\u540D\u4E0D\u80FD\u4E3A\u7A7A
+existModelName=\u8BE5\u6A21\u677F\u4E0D\u5B58\u5728
+repeatedSN=\u6DFB\u52A0\u7684\u7F51\u5173\u5DF2\u5B58\u5728
+existGateway=\u8BE5\u7F51\u5173\u4E0D\u5B58\u5728
+addGatewaySuccess=\u6DFB\u52A0\u7F51\u5173\u6210\u529F
+updateGatewaySuccess=\u4FEE\u6539\u7F51\u5173\u6210\u529F
+updateGatewayFailure=\u4FEE\u6539\u7F51\u5173\u5931\u8D25
+updateGatewayByModelSuccess=\u901A\u8FC7\u6A21\u677F\u4FEE\u6539\u8BBE\u5907\u6210\u529F
+deleteGatewaySuccess=\u5220\u9664\u7F51\u5173\u6210\u529F
+isUseing=\u8BBE\u5907\u5728\u6302\u8F7D
+updateGatewayCompanySuccess=\u7F51\u5173\u5206\u914D\u516C\u53F8\u6210\u529F
+updateGatewayCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25

src/main/resources/mapper/GatewayMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.GatewayMapper">
-    <select id="getAll" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
-        SELECT SN,name,type,state,bConfig,useScene
-        from gateway
+    <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
+        SELECT SN,name,type,g.state,bConfig,useScene,companyName
+        from gateway g INNER JOIN company c on g.company_id=c.id
+        <if test="companyNo!='TM201803298320'">
+            WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
+        </if>
     </select>
 
     <select id="getBySN" resultType="String" parameterType="String">
-        SELECT type  from gateway where SN=#{SN,jdbcType=VARCHAR}
+        SELECT type from gateway g INNER JOIN company c on g.company_id=c.id
+        where SN=#{SN,jdbcType=VARCHAR}
+        <if test="companyNo!='TM201803298320'">
+            WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
+        </if>
     </select>
 
     <insert id="addGateway" parameterType="java.util.Map" statementType="CALLABLE">
@@ -19,6 +26,7 @@
                 #{type,mode=IN,jdbcType=VARCHAR},
                 #{createTime,mode=IN,jdbcType=BIGINT},
                 #{updateTime,mode=IN,jdbcType=BIGINT},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{modelName,mode=IN,jdbcType=VARCHAR},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
            )
@@ -47,14 +55,18 @@
     </delete>
 
     <select id="getBySNAndType" parameterType="String" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
-        SELECT SN,name,type,state,bConfig,useScene
-        from gateway WHERE SN=#{SN,jdbcType=VARCHAR}
+        SELECT SN,name,type,g.state,bConfig,useScene,companyName
+        from gateway g INNER JOIN company c on g.company_id=c.id
+        WHERE SN=#{SN,jdbcType=VARCHAR}
         AND type=#{type,jdbcType=VARCHAR}
     </select>
 
     <select id="getIdBySNAndType" parameterType="String" resultType="java.lang.Integer">
         SELECT id from gateway WHERE SN=#{SN,jdbcType=VARCHAR}
         AND type=#{type,jdbcType=VARCHAR}
+        <if test="companyNo!='TM201803298320'">
+            AND companyNo=#{companyNo,jdbcType=VARCHAR}
+        </if>
     </select>
 
     <update id="deployGateway" parameterType="java.util.Map" statementType="CALLABLE">
@@ -77,18 +89,25 @@
     </update>
 
     <select id="getTransportationNo" parameterType="String" resultType="String">
-        select  transportationNo from circuit where id = (select circuit_id from  tdldevice
-        where gateway_id =(SELECT id from gateway where  SN=#{SN,jdbcType=VARCHAR}
-        AND type=#{type,jdbcType=VARCHAR}))
+        select  transportationNo from circuit
+        where id = (select circuit_id from  tdldevice
+              where gateway_id =(SELECT id from gateway where SN=#{SN,jdbcType=VARCHAR}
+              AND type=#{type,jdbcType=VARCHAR}))
     </select>
 
     <select id="getUnusedGateway" parameterType="String" resultType="com.example.tdl.domain.vo.GatewaySNVo">
-        select  SN from gateway
-        where  SN  like CONCAT(CONCAT('%',#{SN,jdbcType=VARCHAR}), '%')
+        select SN from gateway g INNER JOIN company c ON g.company_id=c.id
+        where SN like CONCAT(CONCAT('%',#{SN,jdbcType=VARCHAR}), '%')
         and useScene = 0
-        and state = 1
+        and g.state = 1
+        AND companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
+    <update id="updateCompany" parameterType="com.example.tdl.domain.vo.UpdateGatewayCompanyVo">
+        UPDATE gateway set company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
+        WHERE SN=#{SN,jdbcType=VARCHAR} AND type=#{type,jdbcType=VARCHAR}
+    </update>
+
 
     <!--    <insert id="addGateway" parameterType="com.example.tdl.domain.vo.AddGatewayVo">
         INSERT into gateway VALUES (