3.14:网关，通道，主题的增删改查

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

+package com.example.tdl.domain.vo;
+
+public class AddGatewayVo {
+    private String SN;
+
+    private String name;
+
+    private String type;
+
+    private String modelName;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+}

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

+package com.example.tdl.domain.vo;
+
+public class AddProbesVo {
+    private String SN;
+
+    private String gType;
+
+    private Integer port;
+
+    private String unit;
+
+    private String description;
+
+    private String alias;
+
+    private String type;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getAlarmUp() {
+        return alarmUp;
+    }
+
+    public void setAlarmUp(Integer alarmUp) {
+        this.alarmUp = alarmUp;
+    }
+
+    public Integer getAlarmDown() {
+        return alarmDown;
+    }
+
+    public void setAlarmDown(Integer alarmDown) {
+        this.alarmDown = alarmDown;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class AddTopicConfigVo {
+    private String topicName;
+
+    private Integer port;
+
+    private String SN;
+
+    private String type;
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    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;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class AddTopicVo {
+    private String SN;
+
+    private String gType;
+
+    private String topicName;
+
+    private Integer type;
+
+    private Integer intervalTime;
+
+    private Integer frequency;
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Integer intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class DelAProbesVo {
+    private String SN;
+
+    private String type;
+
+    private Integer port;
+
+    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 Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class DelGatewayVo {
+    private String SN;
+
+    private String type;
+
+    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;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class DelTopicVo {
+    private String SN;
+
+    private String type;
+
+    private String topicName;
+
+    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 getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class DeployProbesVo {
+    private String SN;
+
+    private String type;
+
+    private String modelName;
+
+    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 getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class GatewaySNAndTypeVo {
+    private String SN;
+
+    private String type;
+
+    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;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class ResultProbesVo {
+    private Integer port;
+
+    private String unit;
+
+    private String description;
+
+    private String alias;
+
+    private String pType;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    private String SN;
+
+    private String gType;
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getpType() {
+        return pType;
+    }
+
+    public void setpType(String pType) {
+        this.pType = pType;
+    }
+
+    public Integer getAlarmUp() {
+        return alarmUp;
+    }
+
+    public void setAlarmUp(Integer alarmUp) {
+        this.alarmUp = alarmUp;
+    }
+
+    public Integer getAlarmDown() {
+        return alarmDown;
+    }
+
+    public void setAlarmDown(Integer alarmDown) {
+        this.alarmDown = alarmDown;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class ResultTopicConfigVo {
+    private Integer port;
+
+    private String unti;
+
+    private String description;
+
+    private String alias;
+
+    private String type;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    private String topicName;
+
+    private Integer tType;
+
+    private Integer intervalTime;
+
+    private String frequency;
+
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public String getUnti() {
+        return unti;
+    }
+
+    public void setUnti(String unti) {
+        this.unti = unti;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getAlarmUp() {
+        return alarmUp;
+    }
+
+    public void setAlarmUp(Integer alarmUp) {
+        this.alarmUp = alarmUp;
+    }
+
+    public Integer getAlarmDown() {
+        return alarmDown;
+    }
+
+    public void setAlarmDown(Integer alarmDown) {
+        this.alarmDown = alarmDown;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public Integer gettType() {
+        return tType;
+    }
+
+    public void settType(Integer tType) {
+        this.tType = tType;
+    }
+
+    public Integer getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Integer intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public String getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(String frequency) {
+        this.frequency = frequency;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class ResultTopicVo {
+    private String topicName;
+
+    private Integer type;
+
+    private Integer intervalTime;
+
+    private Integer frequency;
+
+    private String SN;
+
+    private String gType;
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Integer intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateGatewayVo {
+    private String SN;
+
+    private String name;
+
+    private String type;
+
+    private Long updateTime;
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Long updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateProbesVo {
+    private String unit;
+
+    private String description;
+
+    private String alias;
+
+    private String type;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    private Long updateTime;
+
+    private String SN;
+
+    private String gType;
+
+    private Integer port;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getAlarmUp() {
+        return alarmUp;
+    }
+
+    public void setAlarmUp(Integer alarmUp) {
+        this.alarmUp = alarmUp;
+    }
+
+    public Integer getAlarmDown() {
+        return alarmDown;
+    }
+
+    public void setAlarmDown(Integer alarmDown) {
+        this.alarmDown = alarmDown;
+    }
+
+    public Long getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Long updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateTopicVo {
+    private String topicName;
+
+    private Integer type;
+
+    private Integer intervalTime;
+
+    private Integer frequency;
+
+    private String oldTopicName;
+
+    private String SN;
+
+    private String gType;
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Integer intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+
+    public String getOldTopicName() {
+        return oldTopicName;
+    }
+
+    public void setOldTopicName(String oldTopicName) {
+        this.oldTopicName = oldTopicName;
+    }
+
+    public String getSN() {
+        return SN;
+    }
+
+    public void setSN(String SN) {
+        this.SN = SN;
+    }
+
+    public String getgType() {
+        return gType;
+    }
+
+    public void setgType(String gType) {
+        this.gType = gType;
+    }
+}

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

 package com.example.tdl.mapper;
 
-
+import com.example.tdl.domain.vo.ResultGatewayVo;
+import com.example.tdl.domain.vo.UpdateGatewayVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface GatewayMapper {
+    List<ResultGatewayVo> getAll();
+
+    int addGateway(Map<Object,Object> map);
+
+    int updateGateway(UpdateGatewayVo updateGatewayVo);
+
+    int delGateway(Map<Object,Object> map);
+
+    ResultGatewayVo getBySNAndType(@Param("SN") String SN,@Param("type") String type);
+
+    int getIdBySNAndType(@Param("SN") String SN,@Param("type") String type);
 
+    int deployGateway(Map<Object,Object> map);
 }

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

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.ResultProbesVo;
+import com.example.tdl.domain.vo.UpdateProbesVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ProbesMapper {
+    List<ResultProbesVo> getProbesByGateway(@Param("SN") String SN, @Param("type") String type);
+
+    ResultProbesVo getByPortAndGateway(@Param("SN") String SN, @Param("type") String type, @Param("port") int port);
+
+    ResultProbesVo getByAliasAndGateway(@Param("SN") String SN, @Param("type") String type, @Param("alias") String alias);
+
+    ResultProbesVo getByDescriptionAndGateway(@Param("SN") String SN, @Param("type") String type, @Param("description") String description);
+
+    List<Integer> getAllPort(@Param("SN") String SN, @Param("type") String type);
+
+    List<String> getAllAlias(@Param("SN") String SN, @Param("type") String type);
+
+    List<String> getUnitByAlias(@Param("SN") String SN, @Param("type") String type);
+
+    List<String> getNameByAliasList(@Param("SN") String SN, @Param("type") String type, @Param("aliasList") List<String> aliasList);
+
+    Integer getCountByGateway(@Param("SN") String SN, @Param("type") String type);
+
+    int addProbes(Map<String, Object> map);
+
+    int updateProbes(UpdateProbesVo updateProbesVo);
+
+    int delAProbes(Map<String, Object> map);
+
+    int delAllProbes(Map<String, Object> map);
+
+}

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

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.AddTopicConfigVo;
+import com.example.tdl.domain.vo.ResultTopicConfigVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TopicConfigMapper {
+    List<ResultTopicConfigVo> getByTopicName(String topicName);
+
+    int addTopicConfig(AddTopicConfigVo addTopicConfigVo);
+
+    int delTopicConfig(AddTopicConfigVo addTopicConfigVo);
+
+    //    int addTopicConfig(Map<String,Object> map);
+
+//    List<DevChannelVo> getChannelByTopicName(@Param("topicName") String topicName, @Param("SN") String SN, @Param("type") String type);
+
+
+//    int updateTopicConfig(TopicConfig topicConfig);
+
+//    TopicConfig getByDevChannelId(Integer devChannelId);
+}

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

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.GatewaySNAndTypeVo;
+import com.example.tdl.domain.vo.ResultTopicVo;
+import com.example.tdl.domain.vo.UpdateTopicVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface TopicMapper{
+
+    List<ResultTopicVo> getByGateway(GatewaySNAndTypeVo gatewaySNAndTypeVo);
+
+    ResultTopicVo getByTopicName(@Param("SN") String SN, @Param("type") String type,@Param("topicName") String topicName);
+
+    int addTopic(Map<String, Object> map);
+
+    int updateTopic(UpdateTopicVo updateTopicVo);
+
+    int delTopic(Map<String, Object> map);
+
+
+//    List<TopicResultVo> getTopicByCompanyName(String companyName);
+
+//    List<TopicVo> getTypeByDevcie(String SN, String type);
+
+//    List<Topic> getAll(Device device);
+
+}

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

 package com.example.tdl.service;
 
 
+import com.example.tdl.domain.vo.AddGatewayVo;
+import com.example.tdl.domain.vo.DelGatewayVo;
+import com.example.tdl.domain.vo.ResultGatewayVo;
+import com.example.tdl.domain.vo.UpdateGatewayVo;
 import com.example.tdl.mapper.GatewayMapper;
 import com.example.tdl.mapper.RoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class GatewayService {
     @Autowired
     private GatewayMapper gatewayMapper;
 
+    public List<ResultGatewayVo> getAll(){
+        return gatewayMapper.getAll();
+    }
 
+    public int addGateway(Map<Object,Object> map){
+        return gatewayMapper.addGateway(map);
+    }
+
+    public int updateGateway(UpdateGatewayVo updateGatewayVo){
+        return gatewayMapper.updateGateway(updateGatewayVo);
+    }
+
+    public int delGateway(Map<Object,Object> map){
+        return gatewayMapper.delGateway(map);
+    }
+
+    public ResultGatewayVo getBySNAndType(String SN,String type){
+        return gatewayMapper.getBySNAndType(SN,type);
+    }
+
+    public int getIdBySNAndType(String SN,String type){
+        return gatewayMapper.getIdBySNAndType(SN,type);
+    }
+
+    public int deployGateway(Map<Object,Object> map){
+        return gatewayMapper.deployGateway(map);
+    }
 }

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

+package com.example.tdl.service;
+
+import com.example.tdl.domain.vo.ResultProbesVo;
+import com.example.tdl.domain.vo.UpdateProbesVo;
+import com.example.tdl.mapper.ProbesMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ProbesService {
+
+    @Autowired
+    private ProbesMapper probesMapper;
+
+    public List<ResultProbesVo> getProbesByGateway(String SN, String type){
+        return probesMapper.getProbesByGateway(SN,type);
+    }
+
+    public ResultProbesVo getByPortAndGateway(String SN,String type,int port){
+        return probesMapper.getByPortAndGateway(SN,type,port);
+    }
+
+    public ResultProbesVo getByAliasAndGateway(String SN,String type,String alias){
+        return probesMapper.getByAliasAndGateway(SN,type,alias);
+    }
+
+    public ResultProbesVo getByDescriptionAndGateway(String SN,String type,String description){
+        return probesMapper.getByDescriptionAndGateway(SN,type,description);
+    }
+
+    public List<Integer> getAllPort(String SN, String type){
+        return probesMapper.getAllPort(SN, type);
+    }
+
+    public List<String> getAllAlias(String SN, String type){
+        return probesMapper.getAllAlias(SN, type);
+    }
+
+    public List<String> getUnitByAlias(String SN, String type){
+        return probesMapper.getUnitByAlias(SN, type);
+    }
+
+    public List<String> getNameByAliasList(String SN, String type,List<String> aliasList){
+        return probesMapper.getNameByAliasList(SN, type,aliasList);
+    }
+
+    public Integer getCountByGateway(String SN, String type){
+        return probesMapper.getCountByGateway(SN,type);
+    }
+
+    public int addProbes(Map<String,Object> map){
+        return probesMapper.addProbes(map);
+    }
+
+    public int updateProbes(UpdateProbesVo updateProbesVo){
+        return probesMapper.updateProbes(updateProbesVo);
+    }
+
+    public int delAProbes(Map<String,Object> map){
+        return probesMapper.delAProbes(map);
+    }
+
+    public int delAllProbes(Map<String,Object> map){
+        return probesMapper.delAllProbes(map);
+    }
+
+}

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

+package com.example.tdl.service;
+
+import com.example.tdl.domain.vo.AddTopicConfigVo;
+import com.example.tdl.domain.vo.ResultTopicConfigVo;
+import com.example.tdl.mapper.TopicConfigMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TopicConfigService {
+
+    @Autowired
+    private TopicConfigMapper topicConfigMapper;
+
+    public List<ResultTopicConfigVo> getByTopicName(String topicName){
+        return topicConfigMapper.getByTopicName(topicName);
+    }
+
+    public int addTopicConfig(AddTopicConfigVo addTopicConfigVo){
+        return topicConfigMapper.addTopicConfig(addTopicConfigVo);
+    }
+
+    public int delTopicConfig(AddTopicConfigVo addTopicConfigVo){
+        return topicConfigMapper.delTopicConfig(addTopicConfigVo);
+    }
+
+//    public int updateTopicConfig(TopicConfig topicConfig){
+//        return topicConfigMapper.updateTopicConfig(topicConfig);
+//    }
+
+//    public List<ResultTopicConfigVo> getChannelByTopicName(String topicName, String SN, String type){
+//        return topicConfigMapper.getChannelByTopicName(topicName,SN,type);
+//    }
+
+//    public TopicConfig getByDevChannelId(Integer devChannelId){
+//        return topicConfigMapper.getByDevChannelId(devChannelId);
+//    }
+}

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

+package com.example.tdl.service;
+
+import com.example.tdl.domain.vo.GatewaySNAndTypeVo;
+import com.example.tdl.domain.vo.ResultTopicVo;
+import com.example.tdl.domain.vo.UpdateTopicVo;
+import com.example.tdl.mapper.TopicMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class TopicService {
+
+    @Autowired
+    private TopicMapper topicMapper;
+
+    //获取一设备所有的主题
+    public List<ResultTopicVo> getByGateway(GatewaySNAndTypeVo gatewaySNAndTypeVo){
+        return topicMapper.getByGateway(gatewaySNAndTypeVo);
+    }
+
+    public ResultTopicVo getByTopicName(String SN,String type,String topicName){
+        return topicMapper.getByTopicName(SN,type,topicName);
+    }
+
+    //新增主题
+    public int addTopic(Map<String,Object> map){
+        return topicMapper.addTopic(map);
+    }
+
+    public int updateTopic(UpdateTopicVo updateTopicVo){
+        return topicMapper.updateTopic(updateTopicVo);
+    }
+
+    public int delTopic(Map<String,Object> map){
+        return topicMapper.delTopic(map);
+    }
+
+//    public List<TopicResultVo> getTopicByCompanyName(String companyName){
+//        return topicMapper.getTopicByCompanyName(companyName);
+//    }
+
+//    public List<Topic> getAll(Device device){
+//        return topicMapper.getAll(device);
+//    }
+
+    ////根据设备查询主题
+//    public List<TopicVo> getTypeByDevcie(String SN, String type){
+//        return topicMapper.getTypeByDevcie(SN,type);
+//    }
+
+
+}

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

@@ -2,21 +2,27 @@ package com.example.tdl.web;
 
 
 import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.service.GatewayService;
+import com.example.tdl.service.ModelService;
 import com.example.tdl.service.RoleService;
 import com.example.tdl.service.TokenRedisService;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 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 javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/gateway")
@@ -29,22 +35,227 @@ public class GatewayController {
     Gson gson=new Gson();
 
     @Autowired
-    private GatewayService gatewayService=new GatewayService();
+    private GatewayService gatewayService;
 
     @Autowired
-    private TokenRedisService tokenRedisService;
+    private ModelService modelService;
 
 
-    //查询本公司的用户
-    @ApiOperation(value = "查询所有网关信息",notes = "查询所有网关信息：")
+    //查询所有网关信息
+    @ApiOperation(value = "查询所有网关信息",notes = "查询所有网关信息：" +
+            "   SN:网关序列号，" +
+            "   name:网关名字，" +
+            "   type:网关类型，" +
+            "   state:网关状态，" +
+            "   bConfig:是否配置通道，" +
+            "   useScene:使用场景")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    @RequestMapping(value="/getAllRoleName",method = RequestMethod.GET)
-    public Object getAllRoleName(){
-        return null;
+    @RequestMapping(value="/getAll",method = RequestMethod.GET)
+    public Object getAll(){
+        return gatewayService.getAll();
     }
 
+    //添加网关信息
+    @ApiOperation(value = "添加网关信息",notes = "添加网关信息，createTime,updateTime不用传，要传的参数：" +
+            "   SN:网关序列号，" +
+            "   name:网关名字，" +
+            "   type:网关类型" )
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/addGateway",method = RequestMethod.POST)
+    public Object addGateway(@RequestBody AddGatewayVo addGatewayVo){
+        if (StringUtils.isEmpty(addGatewayVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("添加的SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addGatewayVo.getName())){
+            fb.setCode(0);
+            fb.setMessage("添加的名字不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addGatewayVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("添加的类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addGatewayVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("添加的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (modelService.getByModelName(addGatewayVo.getModelName())==null){
+            fb.setCode(0);
+            fb.setMessage("该模板不存在");
+            return gson.toJson(fb);
+        }
+        if (gatewayService.getBySNAndType(addGatewayVo.getSN(),addGatewayVo.getType())!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的网关已存在");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("SN",addGatewayVo.getSN());
+        map.put("name",addGatewayVo.getName());
+        map.put("type",addGatewayVo.getType());
+        map.put("createTime",System.currentTimeMillis());
+        map.put("updateTime",System.currentTimeMillis());
+        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("添加网关成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+    //修改网关信息
+    @ApiOperation(value = "修改网关信息",notes = "修改网关信息，updateTime不用传，要传的参数：" +
+            "   name:网关名字，" +
+            "   SN:需要修改的网关序列号，" +
+            "   type:需要修改的网关类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/updateGateway",method = RequestMethod.POST)
+    public Object updateGateway(@RequestBody UpdateGatewayVo updateGatewayVo){
+        if (StringUtils.isEmpty(updateGatewayVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("修改的SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateGatewayVo.getName())){
+            fb.setCode(0);
+            fb.setMessage("修改的名字不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateGatewayVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("修改的类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (gatewayService.getBySNAndType(updateGatewayVo.getSN(),updateGatewayVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("修改的设备不存在");
+            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);
+//        }
+        updateGatewayVo.setUpdateTime(System.currentTimeMillis());
+        int a=gatewayService.updateGateway(updateGatewayVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("修改网关成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("修改网关失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除网关信息
+    @ApiOperation(value = "删除网关信息",notes = "删除网关信息，要传的参数：" +
+            "   SN:网关序列号，" +
+            "   type:网关类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/delGateway",method = RequestMethod.POST)
+    public Object delGateway(@RequestBody DelGatewayVo delGatewayVo){
+        if (StringUtils.isEmpty(delGatewayVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("删除的SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delGatewayVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("删除的类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (gatewayService.getBySNAndType(delGatewayVo.getSN(),delGatewayVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("删除的网关不存在");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("SN",delGatewayVo.getSN());
+        map.put("type",delGatewayVo.getType());
+        gatewayService.delGateway(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if (msg.get("msg").equals("删除网关成功")){
+            fb.setCode(1);
+            fb.setMessage("删除网关成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
 
+    @ApiOperation(value = "使用通道模板配置通道",notes = "使用通道模板配置通道" +
+            "       SN：设备编号" +
+            "       type：设备类型" +
+            "       modelName：模板名")
+    @RequestMapping(value = "/deployProbes" ,method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String deployProbes(@RequestBody DeployProbesVo deployProbesVo){
+        if(StringUtils.isEmpty(deployProbesVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(deployProbesVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(deployProbesVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(gatewayService.getBySNAndType(deployProbesVo.getSN(),deployProbesVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        //根据SN,type获取设备状态
+        boolean state = gatewayService.getBySNAndType(deployProbesVo.getSN(),deployProbesVo.getType()).getState();
+        if(state){
+            fb.setCode(0);
+            fb.setMessage("设备在挂载，请先卸载设备");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("SN",deployProbesVo.getSN());
+        map.put("type",deployProbesVo.getType());
+        map.put("modelName",deployProbesVo.getModelName());
+        gatewayService.deployGateway(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/ProbesController.java

+package com.example.tdl.web;
+
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.*;
+import com.example.tdl.service.GatewayService;
+import com.example.tdl.service.ProbesService;
+import com.example.tdl.service.TokenRedisService;
+import com.google.gson.Gson;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.dao.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(path="/probes")
+public class ProbesController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private CommFeedback fb = new CommFeedback();
+
+    private Gson gson = new Gson();
+
+    @Autowired
+    private ProbesService probesService;
+
+    @Autowired
+    private GatewayService gatewayService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+    //根据网关SN,type获取通道
+    @ApiOperation(value = "根据网关SN,type获取通道",notes = "根据网关SN,type获取通道")
+    @RequestMapping(value="/getAll",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getProbesByGateway(@RequestBody GatewaySNAndTypeVo gatewaySNAndTypeVo){
+        if (StringUtils.isEmpty(gatewaySNAndTypeVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(gatewaySNAndTypeVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (gatewayService.getBySNAndType(gatewaySNAndTypeVo.getSN(),gatewaySNAndTypeVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("没有该网关");
+            return gson.toJson(fb);
+        }
+        return probesService.getProbesByGateway(gatewaySNAndTypeVo.getSN(),gatewaySNAndTypeVo.getType());
+    }
+
+
+    @ApiOperation(value = "添加单个通道",notes = "添加通道:" +
+        "       SN:网关序列号," +
+        "       gType:网关类型," +
+        "       port:通道编号," +
+        "       unit:单位," +
+        "       description:通道描述," +
+        "       alias:通道别名," +
+        "       type:通道类型," +
+        "       alarmUp:设备编号," +
+        "       alarmDown:设备类型")
+    @RequestMapping(value = "/addProbes", method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String addProbes(@RequestBody AddProbesVo addProbesVo){
+        if(StringUtils.isEmpty(addProbesVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(addProbesVo.getgType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(addProbesVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(addProbesVo.getUnit())){
+            fb.setCode(0);
+            fb.setMessage("通道单位不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addProbesVo.getDescription())) {
+            fb.setCode(0);
+            fb.setMessage("通道描述不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(addProbesVo.getAlias())){
+            fb.setCode(0);
+            fb.setMessage("通道别名不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(addProbesVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("通道类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(addProbesVo.getAlarmUp()==null){
+            fb.setCode(0);
+            fb.setMessage("报警上限不能为空");
+            return gson.toJson(fb);
+        }
+        if(addProbesVo.getAlarmDown()==null){
+            fb.setCode(0);
+            fb.setMessage("报警下限不能为空");
+            return gson.toJson(fb);
+        }
+        //判断当前设备的通道个数是否大于100
+        if (probesService.getCountByGateway(addProbesVo.getSN(),addProbesVo.getgType())<100){
+            if (probesService.getByPortAndGateway(addProbesVo.getSN(),addProbesVo.getgType(),addProbesVo.getPort())!=null) {
+                fb.setCode(0);
+                fb.setMessage("通道编号不能相同");
+                return gson.toJson(fb);
+            }
+            if (probesService.getByAliasAndGateway(addProbesVo.getSN(),addProbesVo.getgType(),addProbesVo.getAlias())!=null) {
+                fb.setCode(0);
+                fb.setMessage("通道别名不能相同");
+                return gson.toJson(fb);
+            }
+            if (probesService.getByDescriptionAndGateway(addProbesVo.getSN(),addProbesVo.getgType(),addProbesVo.getDescription())!=null) {
+                fb.setCode(0);
+                fb.setMessage("通道描述不能相同");
+                return gson.toJson(fb);
+            }
+            if(gatewayService.getBySNAndType(addProbesVo.getSN(),addProbesVo.getgType())==null){
+                fb.setCode(0);
+                fb.setMessage("添加的网关不存在");
+                return gson.toJson(fb);
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("SN", addProbesVo.getSN());
+            map.put("gType", addProbesVo.getgType());
+            map.put("port", addProbesVo.getPort());
+            map.put("unit", addProbesVo.getUnit());
+            map.put("description", addProbesVo.getDescription());
+            map.put("alias", addProbesVo.getAlias());
+            map.put("type", addProbesVo.getType());
+            map.put("alarmUp", addProbesVo.getAlarmUp());
+            map.put("alarmDown", addProbesVo.getAlarmDown());
+            try {
+                probesService.addProbes(map);
+                Map<String, 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());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.info(e.toString());
+                fb.setCode(0);
+                fb.setMessage("添加失败");
+            }
+        } else{
+            fb.setCode(0);
+            fb.setMessage("每个网关最多100个通道");
+        }
+        return gson.toJson(fb);
+    }
+
+    @ApiOperation(value = "删除单个通道",notes = "删除单个通道的时候根据网关和通道号删除" +
+        "       SN:设备编号," +
+        "       type:设备类型," +
+        "       port:通道编号")
+    @RequestMapping(value = "/delAProbes", method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delAProbes(@RequestBody DelAProbesVo delAProbesVo){
+        if(StringUtils.isEmpty(delAProbesVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(delAProbesVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if(delAProbesVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        if(gatewayService.getBySNAndType(delAProbesVo.getSN(),delAProbesVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("SN",delAProbesVo.getSN());
+        map.put("type",delAProbesVo.getType());
+        map.put("port",delAProbesVo.getPort());
+        try {
+            probesService.delAProbes(map);
+            Map<String,Object> msg=new HashMap<>();
+            msg.put("msg",map.get("msg"));
+            if (msg.get("msg").equals("删除通道成功")){
+                fb.setCode(1);
+                fb.setMessage("删除通道成功");
+            }else{
+                fb.setCode(0);
+                fb.setMessage(msg.get("msg").toString());
+            }
+        }catch (DataAccessException e){
+            e.printStackTrace();
+            fb.setCode(0);
+            fb.setMessage("删除失败");
+        }
+        return gson.toJson(fb);
+    }
+
+
+    @ApiOperation(value = "删除所有通道",notes = "根据设备信息删除该设备下所有通道" +
+        "       SN:设备编号," +
+        "       type:设备类型")
+    @RequestMapping(value = "/delAllProbes", method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delAllProbes(@RequestBody GatewaySNAndTypeVo gatewaySNAndTypeVo){
+        if(StringUtils.isEmpty(gatewaySNAndTypeVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(gatewaySNAndTypeVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if(gatewayService.getBySNAndType(gatewaySNAndTypeVo.getSN(),gatewaySNAndTypeVo.getType())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("SN",gatewaySNAndTypeVo.getSN());
+        map.put("type",gatewaySNAndTypeVo.getType());
+        try {
+            probesService.delAllProbes(map);
+            Map<String,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());
+            }
+        }catch (DataAccessException e){
+            e.printStackTrace();
+            fb.setCode(0);
+            fb.setMessage("删除失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    @ApiOperation(value = "修改通道",notes = "根据网关信息和通道号修改通道" +
+        "       port:需要修改的通道编号," +
+        "       unit：修改后的单位," +
+        "       alias:修改后的别名," +
+        "       description：修改后的通道描述," +
+        "       type:修改后的通道类型," +
+        "       alarmUp：修改后的报警上线," +
+        "       alarmDown：修改后的报警下线," +
+        "       SN：需要修改的网关序列号," +
+        "       gType：需要修改的网关类型")
+    @RequestMapping(value = "/updateProbes" ,method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String updateProbes(@RequestBody UpdateProbesVo updateProbesVo){
+        if(StringUtils.isEmpty(updateProbesVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("网关序列号不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateProbesVo.getgType())){
+            fb.setCode(0);
+            fb.setMessage("网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if(updateProbesVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateProbesVo.getDescription())) {
+            fb.setCode(0);
+            fb.setMessage("通道描述不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateProbesVo.getAlias())){
+            fb.setCode(0);
+            fb.setMessage("通道别名不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateProbesVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("通道类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateProbesVo.getAlarmUp()==null){
+            fb.setCode(0);
+            fb.setMessage("报警上限不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateProbesVo.getAlarmDown()==null){
+            fb.setCode(0);
+            fb.setMessage("报警下限不能为空");
+            return gson.toJson(fb);
+        }
+        if(gatewayService.getBySNAndType(updateProbesVo.getSN(),updateProbesVo.getgType())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        //根据SN,type获取设备状态
+        boolean state = gatewayService.getBySNAndType(updateProbesVo.getSN(),updateProbesVo.getgType()).getState();
+        if(state){
+            fb.setCode(0);
+            fb.setMessage("设备在挂载，请先卸载设备");
+            return gson.toJson(fb);
+        }
+        ResultProbesVo resultProbesVo1= probesService.getByAliasAndGateway(updateProbesVo.getSN(),updateProbesVo.getgType(),updateProbesVo.getAlias());
+        ResultProbesVo resultProbesVo2= probesService.getByDescriptionAndGateway(updateProbesVo.getSN(),updateProbesVo.getgType(),updateProbesVo.getDescription());
+        if(resultProbesVo1!=null && !resultProbesVo1.getPort().equals(updateProbesVo.getPort())){
+            fb.setCode(0);
+            fb.setMessage("该别名已经存在");
+            return gson.toJson(fb);
+        }
+        if(resultProbesVo2!=null && !resultProbesVo2.getPort().equals(updateProbesVo.getPort())){
+            fb.setCode(0);
+            fb.setMessage("该描述已经存在");
+            return gson.toJson(fb);
+        }
+        try {
+            int d=probesService.updateProbes(updateProbesVo);
+            if (d>0){
+                fb.setCode(1);
+                fb.setMessage("修改成功");
+            }else{
+                fb.setCode(0);
+                fb.setMessage("修改失败");
+            }
+        }catch (DataAccessException e){
+            e.printStackTrace();
+            fb.setCode(0);
+            fb.setMessage("修改失败");
+        }
+        return gson.toJson(fb);
+    }
+
+
+}

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

+package com.example.tdl.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.AddTopicConfigVo;
+import com.example.tdl.domain.vo.ResultTopicConfigVo;
+import com.example.tdl.service.TokenRedisService;
+import com.example.tdl.service.TopicConfigService;
+import com.google.gson.Gson;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("/topicConfig")
+public class TopicConfigController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    Gson gson = new Gson();
+
+    CommFeedback fb = new CommFeedback();
+
+    @Autowired
+    private TopicConfigService topicConfigService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+    @ApiOperation(value = "根据主题名查看该主题下所有的通道",notes = "需要传主题名,返回值：" +
+            "   port:通道编号," +
+            "   unit:通道单位," +
+            "   description:通道描述," +
+            "   alias:通道别名," +
+            "   type:通道类型," +
+            "   alarmUp:报警上限," +
+            "   alarmDown:报警下限," +
+            "   topicName:主题名," +
+            "   tType:主题类型," +
+            "   intervalTime:间隔时间," +
+            "   frequency:发送次数")
+    @RequestMapping(value = "/getAll",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getAll(@RequestBody String topicName){
+        //创建JSONObject对象
+        JSONObject json =JSONObject.parseObject(topicName);
+        topicName=(String)json.get("topicName");
+        if (StringUtils.isEmpty(topicName)){
+            fb.setCode(0);
+            fb.setMessage("查询的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        List<ResultTopicConfigVo> list = topicConfigService.getByTopicName(topicName);
+        return list;
+    }
+
+    @ApiOperation(value = "添加主题配置",notes = "根据主题名和通道编号添加主题配置，sn,type不用传，传递参数：" +
+            "   topicName:主题名," +
+            "   port:通道编号,")
+    @RequestMapping(value="/addTopicConfig",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String addTopicConfig(@RequestBody AddTopicConfigVo addTopicConfigVo){
+        if (StringUtils.isEmpty(addTopicConfigVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("添加的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (addTopicConfigVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("添加的通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        String SN =addTopicConfigVo.getTopicName().split("/")[2];
+        String type =addTopicConfigVo.getTopicName().split("/")[1];
+        addTopicConfigVo.setSN(SN);
+        addTopicConfigVo.setType(type);
+        int a =topicConfigService.addTopicConfig(addTopicConfigVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("添加主题配置成功");
+        }else {
+            fb.setCode(0);
+            fb.setMessage("添加主题配置失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    @ApiOperation(value = "删除主题配置",notes = "根据主题名和通道编号删除主题配置，SN,type不用传,传递参数：" +
+            "   topicName:主题名," +
+            "   port:通道编号")
+    @RequestMapping(value = "/delTopicConfig",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delTopicConfig(@RequestBody AddTopicConfigVo addTopicConfigVo){
+        if (StringUtils.isEmpty(addTopicConfigVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("删除的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (addTopicConfigVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("删除的通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        String SN =addTopicConfigVo.getTopicName().split("/")[2];
+        String type =addTopicConfigVo.getTopicName().split("/")[1];
+        addTopicConfigVo.setSN(SN);
+        addTopicConfigVo.setType(type);
+        int i =topicConfigService.delTopicConfig(addTopicConfigVo);
+        if(i>0){
+            fb.setCode(1);
+            fb.setMessage("删除成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("删除失败");
+        }
+        return gson.toJson(fb);
+    }
+
+//    @RequestMapping(value = "/updateTopicConfig",method = RequestMethod.POST)
+//    public String updateTopicConfig(@RequestBody TopicConfigVo topicConfigVo,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);
+//        }
+//        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        TopicConfig topicConfig = new TopicConfig();
+//        int i = topicConfigService.updateTopicConfig(topicConfig);
+//        if(i == 0){
+//            fb.setCode(0);
+//            fb.setMessage("修改失败");
+//        }else{
+//            fb.setCode(1);
+//            fb.setMessage("修改成功");
+//        }
+//        return gson.toJson(fb);
+//    }
+
+}

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

+package com.example.tdl.web;
+
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.AddTopicVo;
+import com.example.tdl.domain.vo.DelTopicVo;
+import com.example.tdl.domain.vo.GatewaySNAndTypeVo;
+import com.example.tdl.domain.vo.UpdateTopicVo;
+import com.example.tdl.service.GatewayService;
+import com.example.tdl.service.TokenRedisService;
+import com.example.tdl.service.TopicService;
+import com.google.gson.Gson;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(path = "/topic")
+public class TopicController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private CommFeedback fb = new CommFeedback();
+
+    private Gson gson = new Gson();
+
+    @Autowired
+    private TopicService topicService;
+
+    @Autowired
+    private GatewayService gatewayService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+    //获取设备的所有主题
+    @ApiOperation(value = "根据设备查询主题",notes = "根据设备查询主题：" +
+        "   sn:设备的SN，" +
+        "   type:设备类型")
+    @RequestMapping(value = "/getAllByDevice",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getAllByDevice(@RequestBody GatewaySNAndTypeVo gatewaySNAndTypeVo){
+        if(StringUtils.isEmpty(gatewaySNAndTypeVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("查询的网关SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(gatewaySNAndTypeVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("查询的网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        return topicService.getByGateway(gatewaySNAndTypeVo);
+    }
+
+    @ApiOperation(value = "添加主题",notes = "添加所需要传递的参数：" +
+        "   SN:需要添加的网关SN，" +
+        "   gType:需要添加的网关类型，" +
+        "   topicName:添加的主题名，" +
+        "   type:添加的主题类型，" +
+        "   intervalTime:添加的主题间隔时间，" +
+        "   frequency:添加的主题发送次数")
+    @RequestMapping(value="/addTopic",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public  String addTopic(@RequestBody AddTopicVo addTopicVo){
+        if (StringUtils.isEmpty(addTopicVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("需要添加主题的网关SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addTopicVo.getgType())){
+            fb.setCode(0);
+            fb.setMessage("需要添加主题的网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addTopicVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("添加的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (addTopicVo.getType()==null){
+            fb.setCode(0);
+            fb.setMessage("添加的主题类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (addTopicVo.getIntervalTime()==null){
+            fb.setCode(0);
+            fb.setMessage("需要添加的主题间隔时间不能为空");
+            return gson.toJson(fb);
+        }
+        if (addTopicVo.getFrequency()==null){
+            fb.setCode(0);
+            fb.setMessage("需要添加的主题发送次数不能为空");
+            return gson.toJson(fb);
+        }
+        if (gatewayService.getBySNAndType(addTopicVo.getSN(),addTopicVo.getgType())==null){
+            fb.setCode(0);
+            fb.setMessage("该网关不存在");
+            return gson.toJson(fb);
+        }
+        if(topicService.getByTopicName(addTopicVo.getSN(),addTopicVo.getgType(),addTopicVo.getTopicName()) != null ){
+            fb.setCode(0);
+            fb.setMessage("该主题名已存在");
+        }else{
+            if (addTopicVo.getIntervalTime()>=100){
+                Map<String,Object> map=new HashMap<>();
+                map.put("SN",addTopicVo.getSN());
+                map.put("gType",addTopicVo.getgType());
+                map.put("topicName",addTopicVo.getTopicName());
+                map.put("type",addTopicVo.getType());
+                map.put("intervalTime",addTopicVo.getIntervalTime());
+                map.put("frequency",addTopicVo.getFrequency());
+                topicService.addTopic(map);
+                Map<String,Object> msg=new HashMap<>();
+                msg.put("msg",map.get("msg"));
+                if (msg.get("msg").equals("添加成功")){
+                    fb.setCode(1);
+                    fb.setMessage("添加成功");
+                }else{
+                    fb.setCode(0);
+                    fb.setMessage(msg.get("msg").toString());
+                }
+            }else{
+                fb.setCode(0);
+                fb.setMessage("间隔时间不能低于100毫秒");
+            }
+        }
+        return gson.toJson(fb);
+    }
+
+    @ApiOperation(value = "修改主题",notes = "修改所需要传递的参数：" +
+        "   topicName:修改后的主题名，" +
+        "   type:修改的主题类型，" +
+        "   intervalTime:修改的主题间隔时间，" +
+        "   frequency:修改的主题发送次数，" +
+        "   oldTopicName:需要修改的主题名，" +
+        "   SN:需要修改的网关SN，" +
+        "   gType:需要修改的网关类型")
+    @RequestMapping(value = "/updateTopic",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public  String updateTopic(@RequestBody UpdateTopicVo updateTopicVo){
+
+        if (StringUtils.isEmpty(updateTopicVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("修改后的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateTopicVo.getType()==null){
+            fb.setCode(0);
+            fb.setMessage("修改的主题类型不能为空");
+        }
+        if (updateTopicVo.getIntervalTime()==null){
+            fb.setCode(0);
+            fb.setMessage("修改的主题间隔时间不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateTopicVo.getFrequency()==null){
+            fb.setCode(0);
+            fb.setMessage("修改的主题发送次数不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateTopicVo.getOldTopicName())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateTopicVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的网关SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateTopicVo.getgType())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (topicService.getByTopicName(updateTopicVo.getSN(),updateTopicVo.getgType(),updateTopicVo.getTopicName())!=null&&!updateTopicVo.getTopicName().equals(updateTopicVo.getOldTopicName())){
+            fb.setCode(0);
+            fb.setMessage("修改的主题已存在");
+            return gson.toJson(fb);
+        }
+        if (updateTopicVo.getIntervalTime()>=100){
+            int i = topicService.updateTopic(updateTopicVo);
+            if(i >= 0 ){
+                fb.setCode(1);
+                fb.setMessage("修改主题成功");
+            }else{
+                fb.setCode(0);
+                fb.setMessage("修改失败");
+            }
+        }else{
+            fb.setCode(0);
+            fb.setMessage("间隔时间不能低于100毫秒");
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除
+    @ApiOperation(value = "删除主题",notes = "删除所需要传递的参数：" +
+        "   topicName:主题名，" +
+        "   SN:删除的网关SN，" +
+        "   type:需要删除的网关类型")
+    @RequestMapping(value = "/delTopic",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delTopic(@RequestBody DelTopicVo delTopicVo){
+        if (StringUtils.isEmpty(delTopicVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("删除的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delTopicVo.getSN())){
+            fb.setCode(0);
+            fb.setMessage("删除的网关SN不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delTopicVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("需要删除的网关类型不能为空");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("SN",delTopicVo.getSN());
+        map.put("type",delTopicVo.getType());
+        map.put("topicName",delTopicVo.getTopicName());
+        topicService.delTopic(map);
+        Map<String,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/resources/mapper/GatewayMapper.xml

@@ -2,11 +2,72 @@
 <!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,(SELECT useScene from tdldevice where gateway_id=g.id limit 1) useScene
-        from gateway g
+        SELECT SN,name,type,state,bConfig,useScene
+        from gateway
     </select>
 
-<!--    <insert id="addGateway" parameterType="">
+    <insert id="addGateway" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_addGateway(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{name,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{createTime,mode=IN,jdbcType=BIGINT},
+                #{updateTime,mode=IN,jdbcType=BIGINT},
+                #{modelName,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+    <update id="updateGateway" parameterType="com.example.tdl.domain.vo.UpdateGatewayVo">
+        UPDATE gateway SET
+        name=#{name,jdbcType=VARCHAR},
+        updateTime=#{updateTime,jdbcType=BIGINT}
+        WHERE SN=#{SN,jdbcType=VARCHAR}
+        AND type=#{type,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="delGateway" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_delGateway(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </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}
+        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}
+    </select>
+
+    <update id="deployGateway" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_deployGateway(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{modelName,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </update>
+
+
+    <!--    <insert id="addGateway" parameterType="com.example.tdl.domain.vo.AddGatewayVo">
         INSERT into gateway VALUES (
             NULL ,
             #{SN,jdbcType=VARCHAR},
@@ -14,10 +75,9 @@
             #{type,jdbcType=VARCHAR},
             0,
             0,
-
-
+            0,
+            #{createTime,jdbcType=BIGINT},
+            #{updateTime,jdbcType=BIGINT}
         )
     </insert>-->
-
-
 </mapper>
\ No newline at end of file

src/main/resources/mapper/ProbesMapper.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.ProbesMapper">
+    <select id="getProbesByGateway" resultType="com.example.tdl.domain.vo.ResultProbesVo" parameterType="String">
+        select p.port,p.unit,p.description,p.alias,p.type pType,p.alarmUp,p.alarmDown,g.SN,g.type gType
+        from probes p INNER JOIN gateway g ON p.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+        AND g.type=#{type,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getByPortAndGateway"  resultType="com.example.tdl.domain.vo.ResultProbesVo">
+        select p.port,p.unit,p.description,p.alias,p.type pType,p.alarmUp,p.alarmDown,g.SN,g.type gType
+        from probes p INNER JOIN gateway g ON p.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+        AND g.type=#{type,jdbcType=VARCHAR}
+        AND p.port=#{port,jdbcType=INTEGER}
+    </select>
+
+    <select id="getByAliasAndGateway" parameterType="String" resultType="com.example.tdl.domain.vo.ResultProbesVo">
+        select p.port,p.unit,p.description,p.alias,p.type pType,p.alarmUp,p.alarmDown,g.SN,g.type gType
+        from probes p INNER JOIN gateway g ON p.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+        AND g.type=#{type,jdbcType=VARCHAR}
+        AND alias=#{alias,jdbcType=INTEGER}
+    </select>
+
+    <select id="getByDescriptionAndGateway" parameterType="String" resultType="com.example.tdl.domain.vo.ResultProbesVo">
+        select p.port,p.unit,p.description,p.alias,p.type pType,p.alarmUp,p.alarmDown,g.SN,g.type gType
+        from probes p INNER JOIN gateway g ON p.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+        AND g.type=#{type,jdbcType=VARCHAR}
+        AND description=#{description,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getAllPort" parameterType="String" resultType="java.lang.Integer">
+        select port from probes where gateway_id =(
+            SELECT id FROM gateway WHERE SN = #{SN,jdbcType=VARCHAR} AND type = #{type,jdbcType=VARCHAR})
+    </select>
+
+    <select id="getAllAlias" parameterType="String" resultType="String">
+        select alias from probes where gateway_id =(
+            select id from gateway where SN=#{SN,jdbcType=VARCHAR} and type= #{type,jdbcType=VARCHAR})
+    </select>
+
+    <select id="getAllUnit" parameterType="String" resultType="String">
+        select unit from probes where gateway_id =(
+            select id from gateway where SN=#{SN,jdbcType=VARCHAR} and type= #{type,jdbcType=VARCHAR})
+        and alias =#{alias,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getNameByAliasList" resultType="String" parameterType="String" >
+        select description from probes where gateway_id =(
+            select id from gateway where SN=#{SN,jdbcType=VARCHAR} and type= #{type,jdbcType=VARCHAR})
+        and alias in
+        <foreach collection="aliasList" item="alias" open="(" close=")" separator=",">
+            #{alias,jdbcType=VARCHAR}
+        </foreach>
+        ORDER BY FIELD(alias,
+        <foreach collection="aliasList" item="alias" separator=",">
+            #{alias,jdbcType=VARCHAR}
+        </foreach>)
+    </select>
+
+    <select id="getCountByGateway" parameterType="String" resultType="java.lang.Integer">
+        select COUNT(*) from probes where gateway_id =(
+            SELECT id FROM gateway WHERE SN = #{SN,jdbcType=VARCHAR} AND type = #{type,jdbcType=VARCHAR})
+    </select>
+
+    <insert id="addProbes" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_addProbes(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{gType,mode=IN,jdbcType=VARCHAR},
+                #{port,mode=IN,jdbcType=INTEGER},
+                #{unit,mode=IN,jdbcType=VARCHAR},
+                #{description,mode=IN,jdbcType=VARCHAR},
+                #{alias,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{alarmUp,mode=IN,jdbcType=INTEGER},
+                #{alarmDown,mode=IN,jdbcType=INTEGER},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+    <update id="updateProbes" parameterType="com.example.tdl.domain.vo.UpdateProbesVo">
+        UPDATE probes SET
+        unit=#{unit,jdbcType=VARCHAR},
+        description=#{description,jdbcType=VARCHAR},
+        alias=#{alias,jdbcType=VARCHAR},
+        type=#{type,jdbcType=VARCHAR},
+        alarmUp=#{alarmUp,jdbcType=INTEGER},
+        alarmDown=#{alarmDown,jdbcType=INTEGER}
+        WHERE gateway_id = (SELECT id FROM gateway WHERE SN= #{SN,jdbcType=VARCHAR} AND type= #{gType,jdbcType=VARCHAR})
+        AND port=#{port,jdbcType=INTEGER}
+    </update>
+
+    <delete id="delAProbes" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_delAProbes(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{port,mode=IN,jdbcType=INTEGER},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </delete>
+
+    <delete id="delAllProbes" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_delAllProbes(
+                #{SN,mode=IN,jdbcType=VARCHAR},
+                #{type,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </delete>
+
+
+
+
+    <!--<select id="getMessageByAlias" resultType="com.example.demo.domain.vo.ResultDevChannelVo" parameterType="String" >-->
+    <!--select dc.port,dc.unit,dc.description,dc.type from devchannel dc,device d-->
+    <!--where d.id = dc.device_id-->
+    <!--and  d.SN=#{SN,jdbcType=VARCHAR}-->
+    <!--and d.type= #{type,jdbcType=VARCHAR}-->
+    <!--and dc.alias =#{alias,jdbcType=VARCHAR}-->
+    <!--</select>-->
+
+    <!--    <select id="getAlias" parameterType="String" resultType="String">
+            select alias from devchannel where device_id =(
+                select id from device where SN=#{SN,jdbcType=VARCHAR} and type= #{type,jdbcType=VARCHAR})
+        </select>-->
+
+
+    <!--    <select id="getAllChannelByDevice" parameterType="String" resultType="com.example.demo.domain.vo.DevChannelVo">
+            select  port,unit,alias,description,type
+            from devchannel
+            where device_id = (select id from device where SN=#{SN,jdbcType=VARCHAR} AND type=#{type,jdbcType=VARCHAR})
+        </select>-->
+
+
+    <!--<select id="getByAlias" parameterType="com.example.demo.entity.DevChannel" resultType="com.example.demo.entity.DevChannel">-->
+    <!--SELECT * FROM devchannel WHERE device_id= #{device.id,jdbcType=INTEGER} AND description LIKE CONCAT(CONCAT('%',#{description,jdbcType=VARCHAR}), '%')-->
+    <!--</select>-->
+
+    <!--    <select id="getChannelBySN" parameterType="String" resultType="java.lang.Integer">
+            select count(*) from devchannel
+            where device_id= (select id from device where SN=#{SN,jdbcType=VARCHAR} and type=#{type,jdbcType=VARCHAR})
+        </select>-->
+
+    <!--<select id="getAllByDeviceID" resultType="com.example.demo.entity.DevChannel" parameterType="java.lang.Integer">-->
+    <!--select * from devchannel where device_id=#{device.id,jdbcType=INTEGER}-->
+    <!--</select>-->
+
+    <!--    <select id="getDevChannelIdByDeviceIdAndPort" parameterType="com.example.demo.entity.DevChannel" resultType="com.example.demo.entity.DevChannel">
+            SELECT id from devchannel WHERE `port`=#{port,jdbcType=INTEGER}
+            AND device_id = (SELECT id FROM device WHERE SN= #{SN,jdbcType=VARCHAR} AND type= #{type,jdbcType=VARCHAR} LIMIT 1)
+        </select>-->
+
+    <!--    <select id="getDeviceId" parameterType="com.example.demo.entity.Device" resultType="com.example.demo.entity.Device">
+            SELECT id FROM device
+            WHERE SN = #{SN,jdbcType=VARCHAR}
+            AND type = #{type,jdbcType=VARCHAR}
+        </select>-->
+
+    <!-- <select id="getDevchannelByalias" parameterType="com.example.demo.entity.DevChannel" resultType="com.example.demo.entity.DevChannel">
+      select  unit,type,description from devchannel where description LIKE CONCAT(CONCAT('%',#{description,jdbcType=VARCHAR}), '%') AND device_id=#{device.id,jdbcType=INTEGER}
+    </select>
+-->
+
+    <!--    <select id="getIdByPort" resultType="java.lang.Integer">
+        select id from devchannel
+        where device_id = (SELECT id FROM device WHERE SN= #{SN,jdbcType=VARCHAR} AND type= #{type,jdbcType=VARCHAR})
+        AND port=#{port,jdbcType=INTEGER}
+    </select>
+
+    <select id="getIdByAlias" parameterType="String" resultType="com.example.demo.entity.DevChannel">
+            select * from devchannel
+            where device_id = (SELECT id FROM device WHERE SN= #{SN,jdbcType=VARCHAR} AND type= #{type,jdbcType=VARCHAR})
+            AND alias=#{alias,jdbcType=VARCHAR}
+    </select>-->
+
+<!--    <select id="getIdByDesc" parameterType="String" resultType="com.example.demo.entity.DevChannel">
+            select * from devchannel
+            where device_id = (SELECT id FROM device WHERE SN= #{SN,jdbcType=VARCHAR} AND type= #{type,jdbcType=VARCHAR})
+            AND description=#{description,jdbcType=VARCHAR}
+    </select>-->
+
+</mapper>

src/main/resources/mapper/TopicConfigMapper.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.TopicConfigMapper">
+    <select id="getByTopicName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultTopicConfigVo">
+        SELECT p.port,p.unit,p.description,p.alias,p.type,p.alarmUp,p.alarmDown,t.topicName,t.type tType,t.intervalTime,t.frequency
+        FROM topic_config tc,topic t,probes p
+        WHERE tc.probes_id=p.id
+        AND tc.topic_id=t.id
+        AND t.topicName =#{topicName,jdbcType=VARCHAR}
+    </select>
+
+    <insert id="addTopicConfig" parameterType="com.example.tdl.domain.vo.AddTopicConfigVo">
+        INSERT INTO topic_config VALUES (
+        null,
+        (SELECT id from topic WHERE topicName=#{topicName,jdbcType=VARCHAR}),
+        (SELECT id from probes WHERE `port`=#{port,jdbcType=INTEGER} AND gateway_id=(
+            SELECT id from gateway WHERE SN=#{SN,jdbcType=VARCHAR} AND type=#{type,jdbcType=VARCHAR}))
+        )
+    </insert>
+
+    <delete id="delTopicConfig" parameterType="com.example.tdl.domain.vo.AddTopicConfigVo">
+        DELETE from topic_config
+        WHERE topic_id=(SELECT id from topic WHERE topicName=#{topicName,jdbcType=VARCHAR})
+        AND probes_id=(SELECT id from probes WHERE `port`=#{port,jdbcType=INTEGER} AND gateway_id=(
+            SELECT id from gateway WHERE SN=#{SN,jdbcType=VARCHAR} AND type=#{type,jdbcType=VARCHAR}))
+    </delete>
+
+    <!--    <select id="getChannelByTopicName" parameterType="String" resultType="com.example.demo.domain.vo.DevChannelVo">
+        SELECT dc.port,dc.unit,dc.description,dc.alias
+        FROM topic_config tc,topic t,devchannel dc
+		WHERE tc.devchannel_id=dc.id
+		AND tc.topic_id=t.id
+		AND dc.device_id = (select id from device where SN=#{SN,jdbcType=VARCHAR} AND type=#{type,jdbcType=VARCHAR})
+		AND t.topicName =#{topicName,jdbcType=VARCHAR}
+    </select>-->
+
+    <!--    <insert id="addTopicConfig"  statementType="CALLABLE" parameterType="java.util.Map">
+            <![CDATA[
+            {
+               call pro_addTopicConfig(
+                    #{topicName,mode=IN,jdbcType=VARCHAR},
+                    #{portVar,mode=IN,jdbcType=VARCHAR},
+                    #{SN,mode=IN,jdbcType=VARCHAR},
+                    #{type,jdbcType=VARCHAR},
+                    #{companyName,jdbcType=VARCHAR},
+                    #{num,jdbcType=INTEGER},
+                    #{msg,mode=OUT,jdbcType=VARCHAR}
+               )
+            }
+          ]]>
+        </insert>-->
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/TopicMapper.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.TopicMapper">
+    <select id="getByGateway" parameterType="com.example.tdl.domain.vo.GatewaySNAndTypeVo" resultType="com.example.tdl.domain.vo.ResultTopicVo">
+        select t.topicName,t.type,t.intervalTime,t.frequency,g.SN,g.type gType
+        from topic t INNER JOIN gateway g ON t.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+		AND g.type=#{type,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getByTopicName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultTopicVo">
+        select t.topicName,t.type,t.intervalTime,t.frequency,g.SN,g.type gType
+        from topic t INNER JOIN gateway g ON t.gateway_id=g.id
+        where g.SN=#{SN,jdbcType=VARCHAR}
+		AND g.type=#{type,jdbcType=VARCHAR}
+        AND topicName =#{topicName,jdbcType=VARCHAR}
+    </select>
+
+    <insert id="addTopic" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_addTopic(
+              #{SN,mode=IN,jdbcType=VARCHAR},
+              #{gType,mode=IN,jdbcType=VARCHAR},
+              #{topicName,mode=IN,jdbcType=VARCHAR},
+              #{type,mode=IN,jdbcType=INTEGER},
+              #{intervalTime,mode=IN,jdbcType=INTEGER},
+              #{frequency,mode=IN,jdbcType=INTEGER},
+              #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+    <update id="updateTopic" parameterType="com.example.tdl.domain.vo.UpdateTopicVo">
+        update topic set
+        topicName=#{topicName,jdbcType=VARCHAR},
+        type=#{type,jdbcType=INTEGER},
+        intervalTime=#{intervalTime,jdbcType=INTEGER},
+        frequency=#{frequency,jdbcType=INTEGER}
+        where gateway_id=(SELECT id from gateway where SN=#{SN,jdbcType=VARCHAR} AND type=#{gType,jdbcType=VARCHAR})
+        AND topicName=#{oldTopicName,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="delTopic" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_delTopic(
+              #{SN,mode=IN,jdbcType=VARCHAR},
+              #{type,mode=IN,jdbcType=VARCHAR},
+              #{topicName,mode=IN,jdbcType=VARCHAR},
+              #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </delete>
+
+<!--
+    <select id ="getTopicByCompanyName" parameterType="java.lang.String" resultType="com.example.demo.domain.vo.TopicResultVo">
+       select topicName,type,intervalTime from topic
+        where device_id in(select id from device where company_id =(select id from company where companyName=#{companyName,jdbcType=VARCHAR}))
+    </select>-->
+
+    <!--    <select id="getAll" parameterType="com.example.demo.entity.Device" resultType="com.example.demo.domain.vo.TopicVo">
+        select topicName,type,intervalTime from topic
+        where device_id =(select id from device where SN=#{SN,jdbcType=VARCHAR} and type=#{type,jdbcType=VARCHAR})
+    </select>-->
+
+
+    <!--    <select id="getTypeByDevcie" parameterType="String" resultType="com.example.demo.domain.vo.TopicVo">
+            select  topicName,type,intervalTime,SN,dtype from topic
+            where device_id =(select id from device where SN=#{SN,jdbcType=VARCHAR} and type=#{type,jdbcType=VARCHAR})
+        </select>-->
+</mapper>
\ No newline at end of file

src/main/resources/mybatis-config.xml

@@ -41,6 +41,9 @@
         <mapper resource="mapper/ProbesModelInfoMapper.xml"/>
         <mapper resource="mapper/ModelMapper.xml"/>
         <mapper resource="mapper/ModelInfoMapper.xml"/>
+        <mapper resource="mapper/ProbesMapper.xml"/>
+        <mapper resource="mapper/TopicMapper.xml"/>
+        <mapper resource="mapper/TopicConfigMapper.xml"/>
 
     </mappers>
 </configuration>