3.12:主题模板、通道模板和配置模板的增删改查接口

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

+package com.example.tdl.domain.vo;
+
+public class AddModelInfoVo {
+    private String modelName;
+
+    private String probesModelName;
+
+    private Integer port;
+
+    private String topicModelName;
+
+    private String topicName;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public String getTopicModelName() {
+        return topicModelName;
+    }
+
+    public void setTopicModelName(String topicModelName) {
+        this.topicModelName = topicModelName;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class AddModelVo {
+    private String modelName;
+
+    private String probesModelName;
+
+    private String topicModelName;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public String getTopicModelName() {
+        return topicModelName;
+    }
+
+    public void setTopicModelName(String topicModelName) {
+        this.topicModelName = topicModelName;
+    }
+}

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

 package com.example.tdl.domain.vo;
 
 public class AddProbesModelInfoVo {
-    private String probesModelName;
+    private Integer probesModelId;
 
     private Integer port;
 
@@ -17,12 +17,12 @@ public class AddProbesModelInfoVo {
 
     private Integer alarmDown;
 
-    public String getProbesModelName() {
-        return probesModelName;
+    public Integer getProbesModelId() {
+        return probesModelId;
     }
 
-    public void setProbesModelName(String probesModelName) {
-        this.probesModelName = probesModelName;
+    public void setProbesModelId(Integer probesModelId) {
+        this.probesModelId = probesModelId;
     }
 
     public Integer getPort() {
@@ -80,4 +80,18 @@ public class AddProbesModelInfoVo {
     public void setAlarmDown(Integer alarmDown) {
         this.alarmDown = alarmDown;
     }
+
+    public AddProbesModelInfoVo() {
+    }
+
+    public AddProbesModelInfoVo(Integer probesModelId, Integer port, String unit, String description, String alias, String type, Integer alarmUp, Integer alarmDown) {
+        this.probesModelId = probesModelId;
+        this.port = port;
+        this.unit = unit;
+        this.description = description;
+        this.alias = alias;
+        this.type = type;
+        this.alarmUp = alarmUp;
+        this.alarmDown = alarmDown;
+    }
 }

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

+package com.example.tdl.domain.vo;
+
+public class DelModelInfoVo {
+    private String modelName;
+
+    private String probesModelName;
+
+    private Integer port;
+
+    private String topicModelName;
+
+    private String topicName;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public String getTopicModelName() {
+        return topicModelName;
+    }
+
+    public void setTopicModelName(String topicModelName) {
+        this.topicModelName = topicModelName;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class DelProbesModelInfoVo {
+    private String probesModelName;
+
+    private Integer port;
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class ModelInfoTermVo {
+    private String modelName;
+
+    private String topicModelName;
+
+    private String topicName;
+
+    private String probesModelName;
+
+    private Integer port;
+
+    public ModelInfoTermVo() {
+
+    }
+
+    public ModelInfoTermVo(String modelName, String topicModelName, String topicName, String probesModelName, Integer port) {
+        this.modelName = modelName;
+        this.topicModelName = topicModelName;
+        this.topicName = topicName;
+        this.probesModelName = probesModelName;
+        this.port = port;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getTopicModelName() {
+        return topicModelName;
+    }
+
+    public void setTopicModelName(String topicModelName) {
+        this.topicModelName = topicModelName;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class ResultModelInfoVo {
+    private String modelName;
+
+    private String probesModelName;
+
+    private Integer port;
+
+    private String unit;
+
+    private String description;
+
+    private String alias;
+
+    private String pType;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    private String topicModelName;
+
+    private String topicName;
+
+    private Integer tType;
+
+    private Integer intervalTime;
+
+    private String frequency;
+
+    public String getProbesModelName() {
+        return probesModelName;
+    }
+
+    public void setProbesModelName(String probesModelName) {
+        this.probesModelName = probesModelName;
+    }
+
+    public String getpType() {
+        return pType;
+    }
+
+    public String getTopicModelName() {
+        return topicModelName;
+    }
+
+    public void setTopicModelName(String topicModelName) {
+        this.topicModelName = topicModelName;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    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 void setpType(String pType) {
+        this.pType = pType;
+    }
+
+    public Integer gettType() {
+        return tType;
+    }
+
+    public void settType(Integer tType) {
+        this.tType = tType;
+    }
+
+    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 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/ResultModelVo.java

+package com.example.tdl.domain.vo;
+
+public class ResultModelVo {
+    private String modelName;
+
+    private String createTime;
+
+    private String updateTime;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateModelVo {
+    private String modelName;
+
+    private String oldModelName;
+
+    private Long updateTime;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getOldModelName() {
+        return oldModelName;
+    }
+
+    public void setOldModelName(String oldModelName) {
+        this.oldModelName = oldModelName;
+    }
+
+    public Long getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Long updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateProbesModelInfoVo {
+    private Integer probesModelId;
+
+    private Integer port;
+
+    private String unit;
+
+    private String description;
+
+    private String alias;
+
+    private String type;
+
+    private Integer alarmUp;
+
+    private Integer alarmDown;
+
+    public UpdateProbesModelInfoVo() {
+    }
+
+    public UpdateProbesModelInfoVo(Integer probesModelId, Integer port, String unit, String description, String alias, String type, Integer alarmUp, Integer alarmDown) {
+        this.probesModelId = probesModelId;
+        this.port = port;
+        this.unit = unit;
+        this.description = description;
+        this.alias = alias;
+        this.type = type;
+        this.alarmUp = alarmUp;
+        this.alarmDown = alarmDown;
+    }
+
+    public Integer getProbesModelId() {
+        return probesModelId;
+    }
+
+    public void setProbesModelId(Integer probesModelId) {
+        this.probesModelId = probesModelId;
+    }
+
+    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/mapper/ModelInfoMapper.java

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.AddModelInfoVo;
+import com.example.tdl.domain.vo.DelModelInfoVo;
+import com.example.tdl.domain.vo.ModelInfoTermVo;
+import com.example.tdl.domain.vo.ResultModelInfoVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ModelInfoMapper {
+
+    List<ResultModelInfoVo> getAll(String modelName);
+
+    int addModelInfo(AddModelInfoVo addModelInfoVo);
+
+    int delModelInfo(DelModelInfoVo delModelInfoVo);
+
+    ResultModelInfoVo getByPortAndTopicName(ModelInfoTermVo modelInfoTermVo);
+
+}

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

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.ResultModelVo;
+import com.example.tdl.domain.vo.UpdateModelVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface ModelMapper {
+
+    List<ResultModelVo> getAll();
+
+    int addModel(Map<String, Object> map);
+
+    int updateModel(UpdateModelVo updateModelVo);
+
+    int delModel(Map<String, Object> map);
+
+    ResultModelVo getByModelName(String modelName);
+
+}

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

 package com.example.tdl.mapper;
 
+import com.example.tdl.domain.vo.AddProbesModelInfoVo;
+import com.example.tdl.domain.vo.ResultProbesModelInfoVo;
+import com.example.tdl.domain.vo.UpdateProbesModelInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,21 +12,24 @@ import java.util.Map;
 @Mapper
 public interface ProbesModelInfoMapper {
 
-//    List<DevChannelModuleVo> getAll(@Param("companyName") String companyName, @Param("name") String moduleName);
-//
-//    int getCountById(Integer id);
-//
-//    int addADevChannelModule(Map<String, Object> map);
-//
+    List<ResultProbesModelInfoVo> getAll(String probesModelName);
+
+    int getCountByProbesModelName(Integer probesModelId);
+
+    int addProbesModelInfo(AddProbesModelInfoVo addProbesModelInfoVo);
+
+    int delProbesModelInfo(Map<String, Object> map);
+
+    int updateProbesModelInfo(UpdateProbesModelInfoVo updateProbesModelInfoVo);
+
+    ResultProbesModelInfoVo getByAlias(@Param("probesModelId") Integer probesModelId, @Param("alias") String alias);
+
+    ResultProbesModelInfoVo getByPort(@Param("probesModelId") Integer probesModelId, @Param("port") Integer port);
+
+
+
+
 //    int delAllDevChannelModule(Map<String, String> map);
-//
-//    int delDevChannelModule(Map<String, Object> map);
-//
-//    int updateDevChannelModule(UpdateDevChannelModule updateDevChannelModule);
-//
-//    DevChannelModuleVo getByAlias(@Param("companyName") String companyName, @Param("name") String moduleName, @Param("alias") String alias);
-//
-//    DevChannelModuleVo getByPort(@Param("companyName") String companyName, @Param("name") String moduleName, @Param("port") int port);
 
 //    int updateMoreDevChannelModule(Map<String,Object> map);
 }

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

@@ -22,5 +22,7 @@ public interface ProbesModelMapper {
 
     int getProbesModelCount();
 
+    int getIdByProbesModel(String probesModelName);
+
 
 }

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

+package com.example.tdl.service;
+
+import com.example.tdl.domain.vo.AddModelInfoVo;
+import com.example.tdl.domain.vo.DelModelInfoVo;
+import com.example.tdl.domain.vo.ModelInfoTermVo;
+import com.example.tdl.domain.vo.ResultModelInfoVo;
+import com.example.tdl.mapper.ModelInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ModelInfoService {
+
+    @Autowired
+    private ModelInfoMapper modelInfoMapper;
+
+
+    public List<ResultModelInfoVo> getAll(String modelName){
+        return modelInfoMapper.getAll(modelName);
+    }
+
+
+    public int addModelInfo(AddModelInfoVo addModelInfoVo){
+        return modelInfoMapper.addModelInfo(addModelInfoVo);
+    }
+
+    public int delModelInfo(DelModelInfoVo delModelInfoVo){
+        return modelInfoMapper.delModelInfo(delModelInfoVo);
+    }
+
+    public ResultModelInfoVo getByPortAndTopicName(ModelInfoTermVo modelInfoTermVo){
+        return modelInfoMapper.getByPortAndTopicName(modelInfoTermVo);
+    }
+
+}

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

+package com.example.tdl.service;
+
+import com.example.tdl.domain.vo.ResultModelVo;
+import com.example.tdl.domain.vo.UpdateModelVo;
+import com.example.tdl.mapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ModelService {
+
+    @Autowired
+    private ModelMapper modelMapper;
+
+    public List<ResultModelVo> getAll(){
+        return modelMapper.getAll();
+    }
+
+    public int addModel(Map<String,Object> map){
+        return modelMapper.addModel(map);
+    }
+
+    public int updateModel(UpdateModelVo updateModelVo){
+        return modelMapper.updateModel(updateModelVo);
+    }
+
+    public int delModel(Map<String,Object> map){
+        return modelMapper.delModel(map);
+    }
+
+    public ResultModelVo getByModelName(String modelName){
+        return modelMapper.getByModelName(modelName);
+    }
+
+    //    public PageInfo<ModelVo> getAllByPage(String companyName, Integer page, Integer rows) {
+//        PageHelper.startPage(page, rows);
+//        List<ModelVo> list = modelMapper.getAll(companyName);
+//        return new PageInfo<ModelVo>(list);
+//    }
+}

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

 package com.example.tdl.service;
 
+import com.example.tdl.domain.vo.AddProbesModelInfoVo;
+import com.example.tdl.domain.vo.ResultProbesModelInfoVo;
+import com.example.tdl.domain.vo.UpdateProbesModelInfoVo;
+import com.example.tdl.mapper.ProbesModelInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,51 +13,57 @@ import java.util.Map;
 @Service
 public class ProbesModelInfoService {
 
-//    @Autowired
-//    private DevChannelModuleMapper devChannelModuleMapper;
-//
-//
-//    //根据模板名获取所有的通道
-//
-//    public List<DevChannelModuleVo> queryByPage(String companyName, String moduleName){
-//        return devChannelModuleMapper.getAll(companyName,moduleName);
-//    }
-////    public PageInfo<DevChannelModule> queryByPage(String companyName,String moduleName,Integer page,Integer rows){
-////        PageHelper.startPage(page,rows);
-////        List<DevChannelModule> list = devChannelModuleMapper.getAll(companyName,moduleName);
-////        return  new PageInfo<DevChannelModule>(list);
-////
-////    }
-//
-//
-//    public int addADevChannelModule(Map<String,Object> map){
-//        return  devChannelModuleMapper.addADevChannelModule(map);
-//    }
-//
-//    public int getCountById(Integer id){
-//        return  devChannelModuleMapper.getCountById(id);
-//    }
-//
-//    public int delDevChannelModule(Map<String,Object> map){
-//        return devChannelModuleMapper.delDevChannelModule(map);
-//    }
-//
+    @Autowired
+    private ProbesModelInfoMapper probesModelInfoMapper;
+
+
+    //根据模板名获取所有的通道
+
+    public List<ResultProbesModelInfoVo> getAll(String probesModelName){
+        return probesModelInfoMapper.getAll(probesModelName);
+    }
+
+    public int addProbesModelInfo(AddProbesModelInfoVo addProbesModelInfoVo){
+        return  probesModelInfoMapper.addProbesModelInfo(addProbesModelInfoVo);
+    }
+
+    public int getCountByProbesModelName(Integer probesModelId){
+        return  probesModelInfoMapper.getCountByProbesModelName(probesModelId);
+    }
+
+    public int delProbesModelInfo(Map<String,Object> map){
+        return probesModelInfoMapper.delProbesModelInfo(map);
+    }
+
+    public int updateProbesModelInfo(UpdateProbesModelInfoVo updateProbesModelInfoVo){
+        return probesModelInfoMapper.updateProbesModelInfo(updateProbesModelInfoVo);
+    }
+
+    public ResultProbesModelInfoVo getByAlias(Integer probesModelId,String alias){
+        return probesModelInfoMapper.getByAlias(probesModelId,alias);
+    }
+
+    public ResultProbesModelInfoVo getByPort(Integer probesModelId,int port){
+        return probesModelInfoMapper.getByPort(probesModelId,port);
+    }
+
+
+
+
+
+
 //    public int delAllDevChannelModule(Map<String,String> map){
-//            return devChannelModuleMapper.delAllDevChannelModule(map);
-//    }
-//
-//    public int updateDevChannelModule(UpdateDevChannelModule updateDevChannelModule){
-//        return devChannelModuleMapper.updateDevChannelModule(updateDevChannelModule);
-//    }
-//
-//    public DevChannelModuleVo getByAlias(String companyName,String name,String alias){
-//        return devChannelModuleMapper.getByAlias(companyName,name,alias);
+//            return probesModelInfoMapper.delAllDevChannelModule(map);
 //    }
+
+    //    public PageInfo<DevChannelModule> queryByPage(String companyName,String moduleName,Integer page,Integer rows){
+//        PageHelper.startPage(page,rows);
+//        List<DevChannelModule> list = devChannelModuleMapper.getAll(companyName,moduleName);
+//        return  new PageInfo<DevChannelModule>(list);
 //
-//    public DevChannelModuleVo getByPort(String companyName,String moduleName,int port){
-//        return devChannelModuleMapper.getByPort(companyName,moduleName,port);
 //    }
 
+
 /*    public int updateMoreDevChannelModule(Map<String,Object> map){
         return devChannelModuleMapper.updateMoreDevChannelModule(map);
     }*/

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

@@ -44,4 +44,8 @@ public class ProbesModelService {
     public int getProbesModelCount(){
         return  probesModelMapper.getProbesModelCount();
     }
+
+    public int getIdByProbesModel(String probesModelName){
+        return probesModelMapper.getIdByProbesModel(probesModelName);
+    }
 }

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

+package com.example.tdl.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.AddModelVo;
+import com.example.tdl.domain.vo.UpdateModelVo;
+import com.example.tdl.entity.TopicModel;
+import com.example.tdl.service.ModelService;
+import com.example.tdl.service.ProbesModelService;
+import com.example.tdl.service.TopicModelService;
+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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(path = "/model")
+public class ModelController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private CommFeedback fb = new CommFeedback();
+
+    private Gson gson = new Gson();
+
+    @Autowired
+    private ModelService modelService;
+
+    @Autowired
+    private TopicModelService topicModelService;
+
+    @Autowired
+    private ProbesModelService probesModelService;
+
+
+    //获取设备的所有主题
+    @ApiOperation(value = "查询所有配置模板",notes = "查询所有配置模板的返回值对应的意义:" +
+        "      modelName: 模板名," +
+        "      createTime: 模板创建时间," +
+        "      updateTime: 模板最新修改时间")
+    @RequestMapping(value = "/getAll",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getAll(){
+        return modelService.getAll();
+    }
+
+    @ApiOperation(value = "添加模板",notes = "添加模板的同时添加通道配置信息，传递的参数:" +
+        "      modelName: 添加的模板名," +
+        "      probesModelName: 通道模板名," +
+        "      topicModelName: 主题模板名")
+    @RequestMapping(value="/addModel",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String addModel(@RequestBody AddModelVo addModelVo){
+        if (StringUtils.isEmpty(addModelVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("添加的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addModelVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("通道模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addModelVo.getTopicModelName())){
+            fb.setCode(0);
+            fb.setMessage("主题模板不能为空");
+            return gson.toJson(fb);
+        }
+        if (topicModelService.getByTopicModelName(addModelVo.getTopicModelName())==null){
+            fb.setCode(0);
+            fb.setMessage("该主题模板不存在");
+            return gson.toJson(fb);
+        }
+        if (probesModelService.getByProbesModelName(addModelVo.getProbesModelName())==null){
+            fb.setCode(0);
+            fb.setMessage("该通道模板不存在");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("modelName",addModelVo.getModelName());
+        map.put("probesModelName",addModelVo.getProbesModelName());
+        map.put("topicModelName",addModelVo.getTopicModelName());
+        map.put("createTime",System.currentTimeMillis());
+        map.put("updateTime",System.currentTimeMillis());
+        modelService.addModel(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());
+        }
+        return gson.toJson(fb);
+    }
+
+    @ApiOperation(value = "修改主题模板",notes = "修改模板只能修改模板名，updateTime不用传，传递的参数:" +
+        "      modelName: 修改后的模板名," +
+        "      oldModelName: 修改以前的模板名")
+    @RequestMapping(value = "/updateModel",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public  String updateModel(@RequestBody UpdateModelVo updateModelVo){
+        if (StringUtils.isEmpty(updateModelVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("修改的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateModelVo.getOldModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (modelService.getByModelName(updateModelVo.getModelName())!=null&&!updateModelVo.getModelName().equals(updateModelVo.getOldModelName())){
+            fb.setCode(0);
+            fb.setMessage("修改的模板名不能相同");
+            return gson.toJson(fb);
+        }
+        updateModelVo.setUpdateTime(System.currentTimeMillis());
+        int a=modelService.updateModel(updateModelVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("修改模板成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("修改模板失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除
+    @ApiOperation(value = "删除模板",notes = "删除模板需要传的参数:" +
+        "      name: 删除的模板名," +
+        "      companyName: 模板所属公司")
+    @RequestMapping(value = "/delModel",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delModel(@RequestBody String modelName){
+        JSONObject jsonObject= JSON.parseObject(modelName);
+        modelName=(String)jsonObject.get("modelName");
+        if (StringUtils.isEmpty(modelName)){
+            fb.setCode(0);
+            fb.setMessage("删除的主题模板名不能为空");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("modelName",modelName);
+        modelService.delModel(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());
+        }
+        return gson.toJson(fb);
+    }
+}

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

+package com.example.tdl.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.AddModelInfoVo;
+import com.example.tdl.domain.vo.DelModelInfoVo;
+import com.example.tdl.domain.vo.ModelInfoTermVo;
+import com.example.tdl.service.ModelInfoService;
+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;
+
+
+@RestController
+@RequestMapping("/topicConfigModel")
+public class ModelInfoController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    Gson gson = new Gson();
+
+    CommFeedback fb = new CommFeedback();
+
+    @Autowired
+    private ModelInfoService modelInfoService;
+
+
+    @ApiOperation(value = "查询所有配置模板",notes = "modelName是查询的模板名，查询所有配置模板的返回值对应的意义:" +
+        "      modelName: 模板名," +
+        "      probesModelName:通道模板名," +
+        "      port: 通道模板的通道号," +
+        "      unit: 通道模板的通道单位," +
+        "      description: 通道模板的描述," +
+        "      alias: 通道模板的别名," +
+        "      pType: 通道模板的通道类型," +
+        "      alarmUp: 通道模板的报警上限," +
+        "      alarmDown: 通道模板的通道下限," +
+        "      topicModelName:主题模板名" +
+        "      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 modelName){
+        JSONObject jsonObject= JSON.parseObject(modelName);
+        modelName=(String)jsonObject.get("modelName");
+        if(StringUtils.isEmpty(modelName)){
+            fb.setCode(0);
+            fb.setMessage("模板名不能为空");
+            return gson.toJson(fb);
+        }
+        return modelInfoService.getAll(modelName);
+    }
+
+    @ApiOperation(value = "添加配置模板",notes = "添加配置模板传递的参数:" +
+        "      modelName: 需要添加的模板名," +
+        "      port: 通道模板的通道号," +
+        "      probesModelName: 通道模板名," +
+        "      topicName: 主题模板的主题名," +
+        "      topicModelName: 主题模板名")
+    @RequestMapping(value="/addTopicConfigModel",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String addTopicConfigModel(@RequestBody AddModelInfoVo addModelInfoVo){
+        if (StringUtils.isEmpty(addModelInfoVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addModelInfoVo.getTopicModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的主题模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addModelInfoVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("需要添加的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addModelInfoVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的通道模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (addModelInfoVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("需要添加的通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        if (modelInfoService.getByPortAndTopicName(new ModelInfoTermVo(addModelInfoVo.getModelName(),addModelInfoVo.getTopicModelName(),
+                addModelInfoVo.getTopicName(),addModelInfoVo.getProbesModelName(),addModelInfoVo.getPort()))!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的配置已存在");
+            return gson.toJson(fb);
+        }
+        int a=modelInfoService.addModelInfo(addModelInfoVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("添加模板配置成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("添加模板配置失败");
+        }
+        return gson.toJson(fb);
+    }
+
+
+    @ApiOperation(value = "删除配置模板",notes = "删除配置模板传递的参数:" +
+        "      modelName: 需要删除的模板名," +
+        "      port: 通道模板的通道号," +
+        "      probesModelName: 通道模板名," +
+        "      topicName: 主题模板的主题名," +
+        "      topicModelName: 主题模板名" )
+    @RequestMapping(value = "/delTopicConfigModel",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delTopicConfigModel(@RequestBody DelModelInfoVo delModelInfoVo){
+        if (StringUtils.isEmpty(delModelInfoVo.getModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delModelInfoVo.getTopicModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的主题模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delModelInfoVo.getTopicName())){
+            fb.setCode(0);
+            fb.setMessage("需要删除的主题名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(delModelInfoVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要操作的通道模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (delModelInfoVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("需要删除的通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        int a=modelInfoService.delModelInfo(delModelInfoVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("删除模板配置成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("删除模板配置失败");
+        }
+        return gson.toJson(fb);
+    }
+}
\ No newline at end of file

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

@@ -20,9 +20,7 @@ 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;
 
 
@@ -165,7 +163,7 @@ public class ProbesModelController {
             return gson.toJson(fb);
         }
         Map<String,Object> params=new HashMap<String, Object>();
-        params.put("name",probesModelName);
+        params.put("probesModelName",probesModelName);
         try {
             probesModelService.delProbesModel(params);
             Map<String,Object> ms=new HashMap<>();

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

 package com.example.tdl.web;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.*;
+import com.example.tdl.service.ProbesModelInfoService;
+import com.example.tdl.service.ProbesModelService;
 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.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping(path="/devChannelModule")
+@RequestMapping(path="/probesModelInfo")
 public class ProbesModelInfoController {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -24,380 +28,241 @@ public class ProbesModelInfoController {
 
     private CommFeedback fb = new CommFeedback();
 
-//    @Autowired
-//    private DevChannelModuleService devChannelModuleService;
-//
-//    @Autowired
-//    private ChannelModuleServcie channelModuleServcie;
-//
-//    @Autowired
-//    private RoleService roleService;
-//
-//    @Autowired
-//    private RoleHasActionService roleHasActionService;
-//
-//    @Autowired
-//    private TokenRedisService tokenRedisService;
-//
-//    //根据模板名获取所有的通道信息
-//    @ApiOperation(value = "根据模板名获取所有的通道模板信息",notes = "根据模板名查询所有模板通道返回参数改变" +
-//        "    channelModuleName: 模板名," +
-//        "    port: 通道模板编号," +
-//        "    unit: 通道模板单位" +
-//        "    description: 通道模板描述," +
-//        "    alias: 通道模板别名," +
-//        "    type: 通道模板类型," +
-//        "    alarmUp: 通道模板报警上限," +
-//        "    alarmDown: 通道模板报警下限")
-//    @RequestMapping(value = "/getAllDevChannelModule",method = RequestMethod.GET)
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-//    })
-//    public Object getAllDevChannelModule(@RequestParam(value ="page",defaultValue = "1")Integer page,
-//                                         @RequestParam(value = "rows",defaultValue = "10")Integer rows,
-//                                         @RequestParam(value = "moduleName",required = true) String  moduleName,
-//                                         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);
-//        ResultRoleVo role = roleService.getRoleId(user.getUserName());
-//        if (role==null){
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//            return gson.toJson(fb);
-//        }
-//        List<String> actions = roleHasActionService.getActionByRoleName(role.getRoleName(), user.getCompanyName());
-//        if (actions.contains("模板通道查询")) {
-//            try {
-//                return devChannelModuleService.queryByPage(user.getCompanyName(),moduleName);
-//            }catch (Exception e){
-//                e.printStackTrace();
-//                logger.info(e.toString());
-//                return  null;
-//            }
-//        } else {
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//        }
-//        return gson.toJson(fb);
-//    }
-//
-//    //新增通道
-//    @ApiOperation(value = "添加单个通道模板",notes = "添加单个通道模板传递参数改变，需要多传alarmUp，alarmDown" +
-//        "    channelModuleName: 新增模板通道的模板名," +
-//        "    port: 通道模板编号," +
-//        "    unit: 通道模板单位," +
-//        "    description: 通道模板描述," +
-//        "    alias: 通道模板别名," +
-//        "    type: 通道模板类型," +
-//        "    alarmUp: 通道模板报警上限," +
-//        "    alarmDown: 通道模板报警下限")
-//    @RequestMapping(value="/addADevChannelModule",method = RequestMethod.POST)
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-//    })
-//    public String  addADevChannelModule(@RequestBody DevChannelModuleVo devChannelModuleVo, 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);
-//        ResultRoleVo role = roleService.getRoleId(user.getUserName());
-//        if (role==null){
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//            return gson.toJson(fb);
-//        }
-//        List<String> actions = roleHasActionService.getActionByRoleName(role.getRoleName(), user.getCompanyName());
-//        if (actions.contains("模板通道添加")) {
-//            if ((channelModuleServcie.getByName(devChannelModuleVo.getChannelModuleName(),user.getCompanyName())!=null)){
-//                if (devChannelModuleVo.getChannelModuleName().equals("")||devChannelModuleVo.getChannelModuleName()==null){
-//                    fb.setCode(0);
-//                    fb.setMessage("添加的模板名不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getPort()+""==null||(devChannelModuleVo.getPort()+"").equals("0")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板编号不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getUnit()==null||devChannelModuleVo.getUnit().equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板单位不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getDescription()==null||devChannelModuleVo.getDescription().equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板描述不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getAlias()==null||devChannelModuleVo.getAlias().equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板别名不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getType()==null||devChannelModuleVo.getType().equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板类型不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getAlarmUp()+""==null||(devChannelModuleVo.getAlarmUp()+"").equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板报警上限不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (devChannelModuleVo.getAlarmDown()+""==null||(devChannelModuleVo.getAlarmDown()+"").equals("")){
-//                    fb.setCode(0);
-//                    fb.setMessage("通道模板报警下限不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if(channelModuleServcie.getByName(devChannelModuleVo.getChannelModuleName(),user.getCompanyName()).getCountNum()>=100) {
-//                    fb.setCode(0);
-//                    fb.setMessage("每个模板只能添加100个通道模板");
-//                    return gson.toJson(fb);
-//                }
-//                Map<String,Object> map=new HashMap<>();
-//                map.put("channelModuleName",devChannelModuleVo.getChannelModuleName());
-//                map.put("companyName",user.getCompanyName());
-//                map.put("port",devChannelModuleVo.getPort());
-//                map.put("unit",devChannelModuleVo.getUnit());
-//                map.put("description",devChannelModuleVo.getDescription());
-//                map.put("alias",devChannelModuleVo.getAlias());
-//                map.put("type",devChannelModuleVo.getType());
-//                map.put("alarmUp",devChannelModuleVo.getAlarmUp());
-//                map.put("alarmDown",devChannelModuleVo.getAlarmDown());
-//                devChannelModuleService.addADevChannelModule(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());
-//                }
-//            }else{
-//                fb.setCode(0);
-//                fb.setMessage("该模板不属于贵公司");
-//            }
-//        } else {
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//        }
-//        return gson.toJson(fb);
-//    }
-//
-//    //删除单个通道模板
-//    @ApiOperation(value = "删除单个通道模板",notes = "删除单个通道模板传递参数改变" +
-//        "    port: 需要删除的通道模板编号" +
-//        "    channelModuleName: 需要删除的模板名" +
-//        "    companyName: 需要删除的模板通道所属公司")
-//    @RequestMapping(value="/delDevChannelModule",method = RequestMethod.POST)
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-//    })
-//    public String delDevChannelModule(@RequestBody DelDevChannelModuleVo delDevChannelModuleVo, 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);
-//
-//        ResultRoleVo role = roleService.getRoleId(user.getUserName());
-//        if (role==null){
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//            return gson.toJson(fb);
-//        }
-//        List<String> actions = roleHasActionService.getActionByRoleName(role.getRoleName(), user.getCompanyName());
-//        if (actions.contains("模板通道删除")) {
-//            if (delDevChannelModuleVo.getCompanyName().equals(user.getCompanyName())){
-//                if (delDevChannelModuleVo.getCompanyName().equals("")||delDevChannelModuleVo.getCompanyName()==null){
-//                    fb.setCode(0);
-//                    fb.setMessage("需要删除的模板所属公司不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (delDevChannelModuleVo.getChannelModuleName().equals("")||delDevChannelModuleVo.getChannelModuleName()==null){
-//                    fb.setCode(0);
-//                    fb.setMessage("需要删除的模板名不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                if (delDevChannelModuleVo.getPort()+""==null||(delDevChannelModuleVo.getPort()+"").equals("0")){
-//                    fb.setCode(0);
-//                    fb.setMessage("需要删除的通道模板编号不能为空");
-//                    return gson.toJson(fb);
-//                }
-//                Map<String,Object> params=new HashMap<String, Object>();
-//                params.put("name",delDevChannelModuleVo.getChannelModuleName());
-//                params.put("port",delDevChannelModuleVo.getPort());
-//                params.put("companyName",user.getCompanyName());
-//                try {
-//                    devChannelModuleService.delDevChannelModule(params);
-//                    Map<String,Object> ms=new HashMap<>();
-//                    ms.put("msg",params.get("msg"));
-//                    if(ms.get("msg").equals("删除通道模板成功")){
-//                        fb.setCode(1);
-//                        fb.setMessage(ms.get("msg").toString());
-//                    }else{
-//                        fb.setCode(0);
-//                        fb.setMessage(ms.get("msg").toString());
-//                    }
-//                }catch (Exception e){
-//                    e.printStackTrace();
-//                    logger.toString();
-//                    fb.setCode(0);
-//                    fb.setMessage("删除失败");
-//                }
-//            } else {
-//                fb.setCode(0);
-//                fb.setMessage("对不起，您没有此权限");
-//            }
-//        }else{
-//            fb.setCode(0);
-//            fb.setMessage("对不起，该模板通道不属于贵公司");
-//        }
-//        return gson.toJson(fb);
-//    }
-//
-//
-//    //修改单个通道模板
-//    @ApiOperation(value = "修改单个通道模板",notes = "修改单个通道模板传递参数有改变" +
-//        "    channelModuleName: 需要修改的模板名," +
-//        "    companyName: 需要修改的模板通道所属公司,"+
-//        "    port: 需要修改的通道模板编号," +
-//        "    unit: 通道模板单位," +
-//        "    description: 通道模板描述," +
-//        "    alias: 通道模板别名," +
-//        "    type: 通道模板类型," +
-//        "    alarmUp: 通道模板报警上限," +
-//        "    alarmDown: 通道模板报警下限")
-//    @RequestMapping(value = "/updateDevChannelModule",method = RequestMethod.POST)
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-//    })
-//    public String updateDevChannelModule(@RequestBody UpdateDevChannelModule updateDevChannelModule, 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);
-//        ResultRoleVo role = roleService.getRoleId(user.getUserName());
-//        if (role==null){
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//            return gson.toJson(fb);
-//        }
-//        List<String> actions = roleHasActionService.getActionByRoleName(role.getRoleName(), user.getCompanyName());
-//        if (actions.contains("模板通道修改")) {
-//            if (updateDevChannelModule.getChannelModuleName().equals("")||updateDevChannelModule.getChannelModuleName()==null){
-//                fb.setCode(0);
-//                fb.setMessage("需要修改的模板名不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getPort()+""==null||(updateDevChannelModule.getPort()+"").equals("0")){
-//                fb.setCode(0);
-//                fb.setMessage("需要修改的通道模板编号不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getCompanyName()==null||updateDevChannelModule.getCompanyName().equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("需要修改的通道模板所属公司不能为空");
-//            }
-//            if (updateDevChannelModule.getUnit()==null||updateDevChannelModule.getUnit().equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板单位不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getDescription()==null||updateDevChannelModule.getDescription().equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板描述不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getAlias()==null||updateDevChannelModule.getAlias().equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板别名不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getType()==null||updateDevChannelModule.getType().equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板类型不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getAlarmUp()+""==null||(updateDevChannelModule.getAlarmUp()+"").equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板报警上限不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getAlarmDown()+""==null||(updateDevChannelModule.getAlarmDown()+"").equals("")){
-//                fb.setCode(0);
-//                fb.setMessage("通道模板报警下限不能为空");
-//                return gson.toJson(fb);
-//            }
-//            if (updateDevChannelModule.getCompanyName().equals(user.getCompanyName())){
-//                DevChannelModuleVo devChannelModuleVo=devChannelModuleService.getByAlias(updateDevChannelModule.getCompanyName(),updateDevChannelModule.getChannelModuleName(),updateDevChannelModule.getAlias());
-//                if (devChannelModuleVo!=null&&devChannelModuleVo.getPort()!=updateDevChannelModule.getPort()){
-//                    fb.setCode(0);
-//                    fb.setMessage("修改的别名不能重复");
-//                    return gson.toJson(fb);
-//                }
-//                int a = devChannelModuleService.updateDevChannelModule(updateDevChannelModule);
-//                if (a>0) {
-//                    fb.setCode(1);
-//                    fb.setMessage("修改通道模板成功");
-//                } else {
-//                    fb.setCode(0);
-//                    fb.setMessage("修改通道模板失败");
-//                }
-//            }else{
-//                fb.setCode(0);
-//                fb.setMessage("只能修改自己公司的通道模板");
-//            }
-//        } else {
-//            fb.setCode(0);
-//            fb.setMessage("对不起，您没有此权限");
-//        }
-//        return gson.toJson(fb);
-//    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /*   //修改多个通道模板
+    @Autowired
+    private ProbesModelInfoService probesModelInfoService;
+
+    @Autowired
+    private ProbesModelService probesModelService;
+
+    //根据模板名获取所有的通道信息
+    @ApiOperation(value = "根据通道模板名获取所有的通道模板信息",notes = "根据通道模板名获取所有的通道模板信息：" +
+        "    probesModelName: 通道模板名," +
+        "    port: 通道模板编号," +
+        "    unit: 通道模板单位" +
+        "    description: 通道模板描述," +
+        "    alias: 通道模板别名," +
+        "    type: 通道模板类型," +
+        "    alarmUp: 通道模板报警上限," +
+        "    alarmDown: 通道模板报警下限")
+    @RequestMapping(value = "/getAll",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getAll(@RequestBody String probesModelName){
+        JSONObject jsonObject= JSON.parseObject(probesModelName);
+        probesModelName=(String) jsonObject.get("probesModelName");
+        return probesModelInfoService.getAll(probesModelName);
+    }
+
+    //新增通道
+    @ApiOperation(value = "添加单个通道模板",notes = "添加单个通道模板传递参数：" +
+        "    probesModelName: 新增模板通道的模板名," +
+        "    port: 通道模板编号," +
+        "    unit: 通道模板单位," +
+        "    description: 通道模板描述," +
+        "    alias: 通道模板别名," +
+        "    type: 通道模板类型," +
+        "    alarmUp: 通道模板报警上限," +
+        "    alarmDown: 通道模板报警下限")
+    @RequestMapping(value="/addProbesModelInfo",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String  addProbesModelInfo(@RequestBody ResultProbesModelInfoVo resultProbesModelInfoVo){
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("添加的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道编号不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getUnit())){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道单位不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getDescription())){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道描述不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getAlias())){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道别名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getAlarmUp()==null){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道报警上限不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getAlarmDown()==null){
+            fb.setCode(0);
+            fb.setMessage("通道模板通道报警下限不能为空");
+            return gson.toJson(fb);
+        }
+        if (probesModelService.getByProbesModelName(resultProbesModelInfoVo.getProbesModelName())==null){
+            fb.setCode(0);
+            fb.setMessage("添加的模板名不存在");
+            return gson.toJson(fb);
+        }
+        Integer probesModelId=probesModelService.getIdByProbesModel(resultProbesModelInfoVo.getProbesModelName());
+        if(probesModelInfoService.getCountByProbesModelName(probesModelId)>=100) {
+            fb.setCode(0);
+            fb.setMessage("每个模板只能添加100个通道模板");
+            return gson.toJson(fb);
+        }
+        if (probesModelInfoService.getByPort(probesModelId,resultProbesModelInfoVo.getPort())!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的模板通道编号不能重复");
+            return gson.toJson(fb);
+        }
+        if (probesModelInfoService.getByAlias(probesModelId,resultProbesModelInfoVo.getAlias())!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的模板通道别名不能重复");
+            return gson.toJson(fb);
+        }
+        int a = probesModelInfoService.addProbesModelInfo(new AddProbesModelInfoVo(probesModelId,resultProbesModelInfoVo.getPort(),
+                resultProbesModelInfoVo.getUnit(),resultProbesModelInfoVo.getDescription(),resultProbesModelInfoVo.getAlias(),
+                resultProbesModelInfoVo.getType(),resultProbesModelInfoVo.getAlarmUp(),resultProbesModelInfoVo.getAlarmDown()));
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("添加单个通道模板成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("添加单个通道模板失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除单个通道模板
+    @ApiOperation(value = "删除单个通道模板",notes = "删除单个通道模板传递参数改变" +
+        "    port: 需要删除的通道模板编号" +
+        "    probesModelName: 需要删除的通道模板名")
+    @RequestMapping(value="/delProbesModelInfo",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String delProbesModelInfo(@RequestBody DelProbesModelInfoVo delProbesModelInfoVo){
+        if (StringUtils.isEmpty(delProbesModelInfoVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要删除的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (delProbesModelInfoVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("需要删除的通道模板编号不能为空");
+            return gson.toJson(fb);
+        }
+        Map<String,Object> params=new HashMap<String, Object>();
+        params.put("probesModelName",delProbesModelInfoVo.getProbesModelName());
+        params.put("port",delProbesModelInfoVo.getPort());
+        try {
+            probesModelInfoService.delProbesModelInfo(params);
+            Map<String,Object> ms=new HashMap<>();
+            ms.put("msg",params.get("msg"));
+            if(ms.get("msg").equals("删除通道模板成功")){
+                fb.setCode(1);
+                fb.setMessage(ms.get("msg").toString());
+            }else{
+                fb.setCode(0);
+                fb.setMessage(ms.get("msg").toString());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.toString();
+            fb.setCode(0);
+            fb.setMessage("删除失败");
+        }
+        return gson.toJson(fb);
+    }
+
+
+    //修改单个通道模板
+    @ApiOperation(value = "修改单个通道模板",notes = "修改单个通道模板,port不能该：" +
+        "    probesModelName: 需要修改的模板名," +
+        "    port: 需要修改的通道模板编号," +
+        "    unit: 通道模板单位," +
+        "    description: 通道模板描述," +
+        "    alias: 通道模板别名," +
+        "    type: 通道模板类型," +
+        "    alarmUp: 通道模板报警上限," +
+        "    alarmDown: 通道模板报警下限")
+    @RequestMapping(value = "/updateProbesModelInfo",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public String updateProbesModelInfo(@RequestBody ResultProbesModelInfoVo resultProbesModelInfoVo){
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getProbesModelName())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的模板名不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getPort()==null){
+            fb.setCode(0);
+            fb.setMessage("需要修改的通道模板编号不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getUnit())){
+            fb.setCode(0);
+            fb.setMessage("通道模板单位不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getDescription())){
+            fb.setCode(0);
+            fb.setMessage("通道模板描述不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getAlias())){
+            fb.setCode(0);
+            fb.setMessage("通道模板别名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(resultProbesModelInfoVo.getType())){
+            fb.setCode(0);
+            fb.setMessage("通道模板类型不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getAlarmUp()==null){
+            fb.setCode(0);
+            fb.setMessage("通道模板报警上限不能为空");
+            return gson.toJson(fb);
+        }
+        if (resultProbesModelInfoVo.getAlarmDown()==null){
+            fb.setCode(0);
+            fb.setMessage("通道模板报警下限不能为空");
+            return gson.toJson(fb);
+        }
+        Integer probesModelId=probesModelService.getIdByProbesModel(resultProbesModelInfoVo.getProbesModelName());
+        ResultProbesModelInfoVo resultAlias=probesModelInfoService.getByAlias(probesModelId,resultProbesModelInfoVo.getAlias());
+        if (resultAlias!=null&&resultAlias.getPort()!=resultProbesModelInfoVo.getPort()){
+            fb.setCode(0);
+            fb.setMessage("修改的别名不能重复");
+            return gson.toJson(fb);
+        }
+
+        int a = probesModelInfoService.updateProbesModelInfo(new UpdateProbesModelInfoVo(probesModelId,resultProbesModelInfoVo.getPort(),
+                resultProbesModelInfoVo.getUnit(),resultProbesModelInfoVo.getDescription(),resultProbesModelInfoVo.getAlias(),
+                resultProbesModelInfoVo.getType(),resultProbesModelInfoVo.getAlarmUp(),resultProbesModelInfoVo.getAlarmDown()));
+        if (a>0) {
+            fb.setCode(1);
+            fb.setMessage("修改通道模板成功");
+        } else {
+            fb.setCode(0);
+            fb.setMessage("修改通道模板失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //修改多个通道模板
 //    @ApiOperation(value = "修改多个通道模板",notes = "修改多个通道模板需传递多个对象")
 //    @RequestMapping(value = "/updateMoreDevChannelModule",method = RequestMethod.POST)
 //    public String updateMoreDevChannelModule(@RequestBody List<UpdateDevChannelModule> updateDevChannelModule) {
@@ -509,5 +374,5 @@ public class ProbesModelInfoController {
 //        }
 //        return gson.toJson(fb);
 //    }
-*/
+
 }

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

@@ -160,7 +160,7 @@ public class TopicModelInfoController {
         }
         if (updateTopicModelInfoVo.getIntervalTime()<100){
             fb.setCode(0);
-            fb.setMessage("添加的间隔时间不能小于100");
+            fb.setMessage("修改的间隔时间不能小于100");
             return gson.toJson(fb);
         }
         if (topicModelInfoService.getByTopicModelNameAndTopicName(updateTopicModelInfoVo.getTopicModelName(),updateTopicModelInfoVo.getTopicName())!=null&&!updateTopicModelInfoVo.getOldTopicName().equals(updateTopicModelInfoVo.getTopicName())){

src/main/resources/mapper/ModelInfoMapper.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.ModelInfoMapper">
+    <select id="getAll" parameterType="string" resultType="com.example.tdl.domain.vo.ResultModelInfoVo">
+        SELECT (#{modelName,jdbcType=VARCHAR}) modelName,(select probesModelName from probes_model WHERE id=p.probesModel_id) probesModelName,`port`,unit,description,alias,p.type pType,alarmUp,alarmDown,
+        (select topicModelName from topic_model WHERE id=t.topicModel_id) topicModelName,topicName,t.type tType,intervalTime,frequency
+        from model_info m,probes_model_info p,topic_model_info t
+        WHERE m.topicModelInfo_id=t.id
+        AND m.probesModelInfo_id=p.id
+        AND m.model_id=(SELECT id from model WHERE modelName=#{modelName,jdbcType=VARCHAR})
+    </select>
+
+    <insert id="addModelInfo" parameterType="com.example.tdl.domain.vo.AddModelInfoVo">
+        INSERT INTO model_info VALUES(
+            NULL,
+            (SELECT id from model WHERE modelName=#{modelName,jdbcType=VARCHAR}),
+            (SELECT id from topic_model_info WHERE topicName=#{topicName,jdbcType=VARCHAR} AND topicModel_id=(
+                SELECT id from topic_model WHERE topicModelName=#{topicModelName,jdbcType=VARCHAR})),
+            (SELECT id from probes_model_info WHERE port=#{port,jdbcType=INTEGER} AND probesModel_id=(
+                SELECT id from probes_model where probesModelName=#{probesModelName,jdbcType=VARCHAR}))
+        );
+    </insert>
+
+    <delete id="delModelInfo" parameterType="com.example.tdl.domain.vo.DelModelInfoVo">
+        DELETE from model_info
+        WHERE model_id=(SELECT id from model WHERE modelName=#{modelName,jdbcType=VARCHAR})
+        AND topicModelInfo_id=(SELECT id from topic_model_info WHERE topicName=#{topicName,jdbcType=VARCHAR}
+            AND topicModel_id=(SELECT id from topic_model WHERE topicModelName=#{topicModelName,jdbcType=VARCHAR}))
+        AND probesModelInfo_id=(SELECT id from probes_model_info WHERE port=#{port,jdbcType=INTEGER} AND probesModel_id=(
+            SELECT id from probes_model where probesModelName=#{probesModelName,jdbcType=VARCHAR}))
+    </delete>
+
+    <select id="getByPortAndTopicName" parameterType="com.example.tdl.domain.vo.ModelInfoTermVo" resultType="com.example.tdl.domain.vo.ResultModelInfoVo">
+        SELECT (#{modelName,jdbcType=VARCHAR}) modelName,(select probesModelName from probes_model WHERE id=p.probesModel_id) probesModelName,`port`,unit,description,alias,p.type pType,alarmUp,alarmDown,
+        (select topicModelName from topic_model WHERE id=t.topicModel_id) topicModelName,topicName,t.type tType,intervalTime,frequency
+        from model_info m,probes_model_info p,topic_model_info t
+        WHERE m.topicModelInfo_id=t.id
+        AND m.probesModelInfo_id=p.id
+        AND m.model_id=(SELECT id from model WHERE modelName=#{modelName,jdbcType=VARCHAR})
+        AND p.probesModel_id=(SELECT id from probes_model where probesModelName=#{probesModelName,jdbcType=VARCHAR})
+		AND `port`=#{port,jdbcType=INTEGER}
+		AND t.topicModel_id=(SELECT id from topic_model WHERE topicModelName=#{topicModelName,jdbcType=VARCHAR})
+		AND topicName=#{topicName,jdbcType=VARCHAR}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/ModelMapper.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.ModelMapper">
+    <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">
+        SELECT modelName,from_unixtime((createTime/1000),'%Y-%m-%d %T') createTime,from_unixtime((updateTime/1000),'%Y-%m-%d %T') updateTime
+        from model
+   </select>
+
+    <insert id="addModel" statementType="CALLABLE" parameterType="java.util.Map">
+        <![CDATA[
+        {
+           call pro_addModel(
+                #{modelName,mode=IN,jdbcType=VARCHAR},
+                #{probesModelName,mode=IN,jdbcType=VARCHAR},
+                #{topicModelName,mode=IN,jdbcType=VARCHAR},
+                #{createTime,mode=IN,jdbcType=BIGINT},
+                #{updateTime,mode=IN,jdbcType=BIGINT},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </insert>
+
+    <update id="updateModel" parameterType="com.example.tdl.domain.vo.UpdateModelVo">
+        UPDATE model SET
+        modelName=#{modelName,jdbcType=VARCHAR},
+        updateTime=#{updateTime,jdbcType=BIGINT}
+        WHERE modelName=#{oldModelName,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="delModel" statementType="CALLABLE" parameterType="java.util.Map">
+        <![CDATA[
+        {
+           call pro_delModel(
+                #{modelName,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </delete>
+
+    <select id="getByModelName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">
+        SELECT modelName,from_unixtime((createTime/1000),'%Y-%m-%d %T') createTime,from_unixtime((updateTime/1000),'%Y-%m-%d %T') updateTime
+        from model
+        WHERE modelName=#{modelName,jdbcType=VARCHAR}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/ProbesModelInfoMapper.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.ProbesModelInfoMapper">
-    <!--<select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultProbesModelInfoVo">
-          select p.probesModelName, pi.port,pi.unit,pi.description,pi.alias,pi.type,pi.alarmUp,pi.alarmDown
-          from probes_model_info pi,probes_model p
-          where pi.probesModel_id=p.id
-          AND p.probesModelName = #{probesModelName,jdbcType=VARCHAR}
+    <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultProbesModelInfoVo">
+        select probesModelName, port,unit,description,alias,type,alarmUp,alarmDown
+        from probes_model_info pi INNER JOIN probes_model p ON pi.probesModel_id=p.id
+        where probesModelName=#{probesModelName,jdbcType=VARCHAR}
     </select>
 
-    <select id="getCountByProbesModelName" parameterType="String" resultType="java.lang.Integer">
-        select count(*) from probes_model_info where channelmodule_id =#{channelModuleId,jdbcType =INTEGER}
+    <select id="getCountByProbesModelName" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+        select count(*) from probes_model_info
+        where probesModel_id=#{probesModelId,jdbcType=INTEGER}
     </select>
 
-    &lt;!&ndash;添加单个模板通道&ndash;&gt;
+    <!--添加单个模板通道-->
     <insert id="addProbesModelInfo" parameterType="com.example.tdl.domain.vo.AddProbesModelInfoVo">
         INSERT INTO probes_model_info VALUES (
           NULL ,
-          (SELECT id from probes_model WHERE probesModelName=#{probesModelName,jdbcType=VARCHAR}),
+          #{probesModelId,jdbcType=INTEGER},
           #{port,jdbcType=INTEGER},
           #{unit,jdbcType=VARCHAR},
           #{description,jdbcType=VARCHAR},
@@ -27,94 +27,58 @@
         )
     </insert>
 
-    &lt;!&ndash;删除单个模板通道&ndash;&gt;
+    <!--删除单个模板通道-->
     <delete id="delProbesModelInfo" statementType="CALLABLE" parameterType="java.util.Map">
         <![CDATA[
         {
-           call pro_delDevChannelModule(
-                #{name,mode=IN,jdbcType=VARCHAR},
+           call pro_delProbesModelInfo(
+                #{probesModelName,mode=IN,jdbcType=VARCHAR},
                 #{port,mode=IN,jdbcType=INTEGER},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
            )
         }
       ]]>
     </delete>
 
-    &lt;!&ndash;删除所有模板通道&ndash;&gt;
-    <delete id="delAllDevChannelModule" statementType="CALLABLE" parameterType="java.util.Map">
-        <![CDATA[
-        {
-           call pro_delAllDevChannelModule(
-                #{name,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
-                #{msg,mode=OUT,jdbcType=VARCHAR}
-           )
-        }
-      ]]>
-    </delete>
-
-    <select id="getByAlias" parameterType="String" resultType="com.example.demo.domain.vo.DevChannelModuleVo">
-        select c.name channelModuleName, d.port,d.unit,d.description,d.alias,d.type,d.alarmUp,d.alarmDown
-        from devchannelmodule d,channelmodule c
-        where d.channelmodule_id=c.id
-        and c.name = #{name,mode=IN,jdbcType=VARCHAR}
-        and c.company_id = (select id from company where companyName=#{companyName,mode=IN,jdbcType=VARCHAR})
-        AND d.alias=#{alias,jdbcType=VARCHAR}
+    <select id="getByAlias" resultType="com.example.tdl.domain.vo.ResultProbesModelInfoVo">
+        select port,unit,description,alias,type,alarmUp,alarmDown
+        from probes_model_info
+        where probesModel_id=#{probesModelId,jdbcType=INTEGER}
+        AND alias=#{alias,jdbcType=VARCHAR}
     </select>
 
-    <select id="getByPort" resultType="com.example.demo.domain.vo.DevChannelModuleVo">
-        select c.name channelModuleName, d.port,d.unit,d.description,d.alias,d.type,d.alarmUp,d.alarmDown
-        from devchannelmodule d,channelmodule c
-        where d.channelmodule_id=c.id
-        and c.name = #{name,mode=IN,jdbcType=VARCHAR}
-        and c.company_id = (select id from company where companyName=#{companyName,mode=IN,jdbcType=VARCHAR})
-        AND d.port=#{port,jdbcType=VARCHAR}
+    <select id="getByPort" resultType="com.example.tdl.domain.vo.ResultProbesModelInfoVo">
+        select port,unit,description,alias,type,alarmUp,alarmDown
+        from probes_model_info
+        where probesModel_id=#{probesModelId,jdbcType=INTEGER}
+        AND port=#{port,jdbcType=INTEGER}
     </select>
 
-    <update id="updateDevChannelModule" parameterType="com.example.demo.domain.vo.UpdateDevChannelModule">
-        UPDATE devchannelmodule SET
+    <update id="updateProbesModelInfo" parameterType="com.example.tdl.domain.vo.UpdateProbesModelInfoVo">
+        UPDATE probes_model_info 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 channelmodule_id=(SELECT id from channelmodule WHERE name=#{channelModuleName,jdbcType=VARCHAR} AND company_id=(SELECT id FROM company where companyName=#{companyName,jdbcType=VARCHAR}))
+        WHERE probesModel_id=#{probesModelId,jdbcType=INTEGER}
         AND port=#{port,jdbcType=INTEGER}
-    </update>-->
-
-
+    </update>
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-    <!--<![CDATA[
+    <!--删除所有模板通道-->
+    <!--    <delete id="delAllDevChannelModule" statementType="CALLABLE" parameterType="java.util.Map">
+            <![CDATA[
             {
-           call pro_insertADevChannelModule(
-                #{channelModuleName,mode=IN,jdbcType=VARCHAR},
+               call pro_delAllDevChannelModule(
+                    #{name,mode=IN,jdbcType=VARCHAR},
                     #{companyName,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}
                )
             }
-      ]]>-->
+          ]]>
+        </delete>-->
 
     <!--    <update id="updateMoreDevChannelModule" parameterType="java.util.Map" statementType="CALLABLE">
             <![CDATA[

src/main/resources/mapper/ProbesModelMapper.xml

@@ -43,12 +43,15 @@
     <update id="updateProbesModel" parameterType="com.example.tdl.domain.vo.UpdateProbesModelVo">
         UPDATE probes_model SET
         probesModelName=#{probesModelName,jdbcType=VARCHAR},
-        updateTime=#{probesModelName,jdbcType=VARCHAR}
+        updateTime=#{updateTime,jdbcType=BIGINT}
         WHERE probesModelName = #{oldProbesModelName,jdbcType=VARCHAR}
     </update>
 
-
     <select id="getProbesModelCount"  resultType="java.lang.Integer">
         select COUNT(*) from probes_model
     </select>
+
+    <select id="getIdByProbesModel" parameterType="String" resultType="java.lang.Integer">
+        SELECT id from probes_model where probesModelName=#{probesModelName,jdbcType=VARCHAR}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis-config.xml

@@ -39,5 +39,8 @@
         <mapper resource="mapper/TopicModelInfoMapper.xml"/>
         <mapper resource="mapper/ProbesModelMapper.xml"/>
         <mapper resource="mapper/ProbesModelInfoMapper.xml"/>
+        <mapper resource="mapper/ModelMapper.xml"/>
+        <mapper resource="mapper/ModelInfoMapper.xml"/>
+
     </mappers>
 </configuration>