将tpm_ioserver_tag改成tpm_params

module_ems/src/main/java/org/jeecg/modules/kafka/consumer/TestConsumer.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kafka.consumer;
 
+import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.jeecg.modules.collectdata.dao.CollectdataRepository;
@@ -14,6 +15,7 @@ import java.util.*;
 import java.text.SimpleDateFormat;
 
 @Component
+@Slf4j
 public class TestConsumer {
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -27,13 +29,14 @@ public class TestConsumer {
 //    @KafkaListener(topicPattern = "thing___.*.___property")
     @KafkaListener(topicPattern = "#{'${spring.kafka.topic-patterns}'}")
     public void simpleConsumer(ConsumerRecord<?, ?> record, Acknowledgment ack) {
-        System.out.printf("topic2.* = %s, 偏移量 = %d, key = %s, 内容 = %s, 创建消息的时间戳 =%d%n \n",
-                record.topic(),
-                record.offset(),
-                record.key(),
-                record.value(),
-                record.timestamp()
-        );
+
+//        log.info("topic2.* = %s, 偏移量 = %d, key = %s, 内容 = %s, 创建消息的时间戳 =%d%n \n",
+//                record.topic(),
+//                record.offset(),
+//                record.key(),
+//                record.value(),
+//                record.timestamp()
+//        );
 
         // 提交（用来标记一条消息已经消费完成,即将从消息队列里移除。）
         ack.acknowledge();

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/controller/TpmIoserverTagController.java

@@ -1,190 +0,0 @@
-package org.jeecg.modules.tpmIoserverTag.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag;
-import org.jeecg.modules.tpmIoserverTag.service.ITpmIoserverTagService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.modules.tpmTag.entity.TpmTag;
-import org.jeecg.modules.tpmTag.service.ITpmTagService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: ioserver点位
- * @Author: jeecg-boot
- * @Date:   2024-01-11
- * @Version: V1.0
- */
-@Api(tags="ioserver点位")
-@RestController
-@RequestMapping("/tpmIoserverTag/tpmIoserverTag")
-@Slf4j
-public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, ITpmIoserverTagService> {
-	@Autowired
-	private ITpmIoserverTagService tpmIoserverTagService;
-
-	 /**
-	  * 取得工程下的测点(Tag)信息(从数据库中取，且去掉系统中已经设置好的)
-	  */
-	 @ApiOperation("取得工程下的测点(Tag)信息(从数据库中取，且去掉系统中已经设置好的)")
-	 @GetMapping("/tagList")
-	 public Result<List<TpmIoserverTag>> tagList(TpmIoserverTag ioserverTag) {
-		 List<TpmIoserverTag> ioserverTagList = tpmIoserverTagService.selectTpmIoserverTagList(ioserverTag);
-		 return Result.OK(ioserverTagList);
-	 }
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param tpmIoserverTag
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "ioserver点位-分页列表查询")
-	@ApiOperation(value="ioserver点位-分页列表查询", notes="ioserver点位-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<TpmIoserverTag>> queryPageList(TpmIoserverTag tpmIoserverTag,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<TpmIoserverTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmIoserverTag, req.getParameterMap());
-		Page<TpmIoserverTag> page = new Page<TpmIoserverTag>(pageNo, pageSize);
-		IPage<TpmIoserverTag> pageList = tpmIoserverTagService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param tpmIoserverTag
-	 * @return
-	 */
-	@AutoLog(value = "ioserver点位-添加")
-	@ApiOperation(value="ioserver点位-添加", notes="ioserver点位-添加")
-	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody TpmIoserverTag tpmIoserverTag) {
-		tpmIoserverTagService.save(tpmIoserverTag);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param tpmIoserverTag
-	 * @return
-	 */
-	@AutoLog(value = "ioserver点位-编辑")
-	@ApiOperation(value="ioserver点位-编辑", notes="ioserver点位-编辑")
-	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody TpmIoserverTag tpmIoserverTag) {
-		tpmIoserverTagService.updateById(tpmIoserverTag);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "ioserver点位-通过id删除")
-	@ApiOperation(value="ioserver点位-通过id删除", notes="ioserver点位-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		tpmIoserverTagService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "ioserver点位-批量删除")
-	@ApiOperation(value="ioserver点位-批量删除", notes="ioserver点位-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.tpmIoserverTagService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "ioserver点位-通过id查询")
-	@ApiOperation(value="ioserver点位-通过id查询", notes="ioserver点位-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<TpmIoserverTag> queryById(@RequestParam(name="id",required=true) String id) {
-		TpmIoserverTag tpmIoserverTag = tpmIoserverTagService.getById(id);
-		if(tpmIoserverTag==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(tpmIoserverTag);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param tpmIoserverTag
-    */
-    //@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, TpmIoserverTag tpmIoserverTag) {
-        return super.exportXls(request, tpmIoserverTag, TpmIoserverTag.class, "ioserver点位");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("tpm_ioserver_tag:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, TpmIoserverTag.class);
-    }
-
-}

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/mapper/TpmIoserverTagMapper.java

@@ -1,22 +0,0 @@
-package org.jeecg.modules.tpmIoserverTag.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ioserver点位
- * @Author: jeecg-boot
- * @Date:   2024-01-11
- * @Version: V1.0
- */
-public interface TpmIoserverTagMapper extends BaseMapper<TpmIoserverTag> {
-
-    /**未选择过的点位下拉列表
-     * （去掉设备点位中已存在的点位）
-     * */
-    public List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag);
-
-}

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/mapper/xml/TpmIoserverTagMapper.xml

@@ -1,24 +0,0 @@
-<?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="org.jeecg.modules.tpmIoserverTag.mapper.TpmIoserverTagMapper">
-
-    <resultMap type="org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag" id="TpmIoserverTagResult">
-        <result property="id"    column="id"    />
-        <result property="tagname"    column="tagname"    />
-        <result property="createTime"    column="create_time"    />
-    </resultMap>
-
-    <sql id="selectTpmIoserverTagVo">
-        select id, tagname, create_time from tpm_ioserver_tag
-    </sql>
-
-    <select id="selectTpmIoserverTagList" parameterType="org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag" resultMap="TpmIoserverTagResult">
-        <include refid="selectTpmIoserverTagVo"/>
-        <where>
-            <if test="tagname != null  and tagname != ''"> and tagname like concat('%', #{tagname}, '%')</if>
-            and tagname NOT IN (SELECT tagname FROM tpm_tag)
-        </where>
-        order by tagname asc
-    </select>
-
-</mapper>

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/service/ITpmIoserverTagService.java

@@ -1,21 +0,0 @@
-package org.jeecg.modules.tpmIoserverTag.service;
-
-import org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * @Description: ioserver点位
- * @Author: jeecg-boot
- * @Date:   2024-01-11
- * @Version: V1.0
- */
-public interface ITpmIoserverTagService extends IService<TpmIoserverTag> {
-
-    /**未选择过的点位下拉列表
-     * （去掉设备点位中已存在的点位）
-     * */
-    List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag);
-
-}

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/service/impl/TpmIoserverTagServiceImpl.java

@@ -1,32 +0,0 @@
-package org.jeecg.modules.tpmIoserverTag.service.impl;
-
-import org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag;
-import org.jeecg.modules.tpmIoserverTag.mapper.TpmIoserverTagMapper;
-import org.jeecg.modules.tpmIoserverTag.service.ITpmIoserverTagService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.List;
-
-/**
- * @Description: ioserver点位
- * @Author: jeecg-boot
- * @Date:   2024-01-11
- * @Version: V1.0
- */
-@Service
-public class TpmIoserverTagServiceImpl extends ServiceImpl<TpmIoserverTagMapper, TpmIoserverTag> implements ITpmIoserverTagService {
-
-    @Autowired
-    private TpmIoserverTagMapper tpmIoserverTagMapper;
-
-    /**未选择过的点位下拉列表
-     * （去掉设备点位中已存在的点位）
-     * */
-    public List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag){
-        return tpmIoserverTagMapper.selectTpmIoserverTagList(ioserverTag);
-    }
-
-}

module_tpm/src/main/java/org/jeecg/modules/tpmparams/controller/TpmParamsController.java

@@ -0,0 +1,173 @@
+package org.jeecg.modules.tpmparams.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tpmparams.entity.TpmParams;
+import org.jeecg.modules.tpmparams.service.ITpmParamsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 设备参数
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+@Api(tags="设备参数")
+@RestController
+@RequestMapping("/tpmParams/tpmParams")
+@Slf4j
+public class TpmParamsController extends JeecgController<TpmParams, ITpmParamsService> {
+	@Autowired
+	private ITpmParamsService tpmParamsService;
+
+	 /**
+	  * 取得工程下的测点(Tag)信息(从数据库中取，且去掉系统中已经设置好的)
+	  */
+	 @ApiOperation("取得工程下的测点(Tag)信息(从数据库中取，且去掉系统中已经设置好的)")
+	 @GetMapping("/tagList")
+	 public Result<List<TpmParams>> tagList(TpmParams params) {
+		 List<TpmParams> paramsList = tpmParamsService.selectTpmParamsList(params);
+		 return Result.OK(paramsList);
+	 }
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tpmParams
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "设备参数-分页列表查询")
+	@ApiOperation(value="设备参数-分页列表查询", notes="设备参数-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TpmParams>> queryPageList(TpmParams tpmParams,
+												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												  HttpServletRequest req) {
+		QueryWrapper<TpmParams> queryWrapper = QueryGenerator.initQueryWrapper(tpmParams, req.getParameterMap());
+		Page<TpmParams> page = new Page<TpmParams>(pageNo, pageSize);
+		IPage<TpmParams> pageList = tpmParamsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param tpmParams
+	 * @return
+	 */
+	@AutoLog(value = "设备参数-添加")
+	@ApiOperation(value="设备参数-添加", notes="设备参数-添加")
+	//@RequiresPermissions("org.jeecg.modules:tpm_params:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TpmParams tpmParams) {
+		tpmParamsService.save(tpmParams);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param tpmParams
+	 * @return
+	 */
+	@AutoLog(value = "设备参数-编辑")
+	@ApiOperation(value="设备参数-编辑", notes="设备参数-编辑")
+	//@RequiresPermissions("org.jeecg.modules:tpm_params:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TpmParams tpmParams) {
+		tpmParamsService.updateById(tpmParams);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "设备参数-通过id删除")
+	@ApiOperation(value="设备参数-通过id删除", notes="设备参数-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:tpm_params:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tpmParamsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "设备参数-批量删除")
+	@ApiOperation(value="设备参数-批量删除", notes="设备参数-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:tpm_params:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tpmParamsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "设备参数-通过id查询")
+	@ApiOperation(value="设备参数-通过id查询", notes="设备参数-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TpmParams> queryById(@RequestParam(name="id",required=true) String id) {
+		TpmParams tpmParams = tpmParamsService.getById(id);
+		if(tpmParams ==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tpmParams);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tpmParams
+    */
+    //@RequiresPermissions("org.jeecg.modules:tpm_params:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TpmParams tpmParams) {
+        return super.exportXls(request, tpmParams, TpmParams.class, "设备参数");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("tpm_params:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TpmParams.class);
+    }
+
+}

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/entity/TpmIoserverTag.java

@@ -1,45 +1,59 @@
-package org.jeecg.modules.tpmIoserverTag.entity;
+package org.jeecg.modules.tpmparams.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: ioserver点位
+ * @Description: 设备参数
  * @Author: jeecg-boot
  * @Date:   2024-01-11
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_ioserver_tag")
+@TableName("tpm_params")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="tpm_ioserver_tag对象", description="ioserver点位")
-public class TpmIoserverTag implements Serializable {
+@ApiModel(value="tpm_params对象", description="设备参数")
+public class TpmParams implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**设备名称*/
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String equipmentname;
+    /**设备编号*/
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String equipmentcode;
 	/**点位名*/
 	@Excel(name = "点位名", width = 15)
     @ApiModelProperty(value = "点位名")
     private java.lang.String tagname;
+    /**参数符号*/
+    @ApiModelProperty(value = "参数符号")
+    private java.lang.String symbol;
+    /**最小值*/
+    @ApiModelProperty(value = "最小值")
+    private java.lang.String minvalue;
+    /**最大值*/
+    @ApiModelProperty(value = "最大值")
+    private java.lang.String maxvalue;
+    /**类型：int，float，long*/
+    @ApiModelProperty(value = "类型")
+    private java.lang.String valuetype;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

module_tpm/src/main/java/org/jeecg/modules/tpmparams/mapper/TpmParamsMapper.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.tpmparams.mapper;
+
+import java.util.List;
+
+import org.jeecg.modules.tpmparams.entity.TpmParams;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 设备参数
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+public interface TpmParamsMapper extends BaseMapper<TpmParams> {
+
+    /**未选择过的点位下拉列表
+     * （去掉设备点位中已存在的点位）
+     * */
+    public List<TpmParams> selectTpmParamsList(TpmParams params);
+
+}

module_tpm/src/main/java/org/jeecg/modules/tpmparams/mapper/xml/TpmParamsMapper.xml

@@ -0,0 +1,32 @@
+<?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="org.jeecg.modules.tpmparams.mapper.TpmParamsMapper">
+
+    <resultMap type="org.jeecg.modules.tpmparams.entity.TpmParams" id="TpmParamsResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentname"    column="equipmentname"    />
+        <result property="equipmentcode"    column="equipmentcode"    />
+        <result property="tagname"    column="tagname"    />
+        <result property="symbol"    column="symbol"    />
+        <result property="minvalue"    column="minvalue"    />
+        <result property="maxvalue"    column="maxvalue"    />
+        <result property="valuetype"    column="valuetype"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="sysOrgCode"    column="sys_org_code"    />
+    </resultMap>
+
+    <sql id="selectTpmParamsVo">
+        select id, equipmentname, equipmentcode, tagname, symbol, minvalue, maxvalue, valuetype, create_time, sys_org_code
+        from tpm_params
+    </sql>
+
+    <select id="selectTpmParamsList" parameterType="org.jeecg.modules.tpmparams.entity.TpmParams" resultMap="TpmParamsResult">
+        <include refid="selectTpmParamsVo"/>
+        <where>
+            <if test="tagname != null  and tagname != ''"> and tagname like concat('%', #{tagname}, '%')</if>
+            and tagname NOT IN (SELECT tagname FROM tpm_tag)
+        </where>
+        order by tagname asc
+    </select>
+
+</mapper>

module_tpm/src/main/java/org/jeecg/modules/tpmparams/service/ITpmParamsService.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.tpmparams.service;
+
+import org.jeecg.modules.tpmparams.entity.TpmParams;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 设备参数
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+public interface ITpmParamsService extends IService<TpmParams> {
+
+    /**未选择过的点位下拉列表
+     * （去掉设备点位中已存在的点位）
+     * */
+    List<TpmParams> selectTpmParamsList(TpmParams params);
+
+}

module_tpm/src/main/java/org/jeecg/modules/tpmparams/service/impl/TpmParamsServiceImpl.java

@@ -0,0 +1,32 @@
+package org.jeecg.modules.tpmparams.service.impl;
+
+import org.jeecg.modules.tpmparams.entity.TpmParams;
+import org.jeecg.modules.tpmparams.mapper.TpmParamsMapper;
+import org.jeecg.modules.tpmparams.service.ITpmParamsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 设备参数
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+@Service
+public class TpmParamsServiceImpl extends ServiceImpl<TpmParamsMapper, TpmParams> implements ITpmParamsService {
+
+    @Autowired
+    private TpmParamsMapper tpmParamsMapper;
+
+    /**未选择过的点位下拉列表
+     * （去掉设备点位中已存在的点位）
+     * */
+    public List<TpmParams> selectTpmParamsList(TpmParams params){
+        return tpmParamsMapper.selectTpmParamsList(params);
+    }
+
+}