点位下拉列表——加查询参数tagname

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

@@ -58,8 +58,8 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
 	  */
 	 @ApiOperation("取得工程下的测点(Tag)信息(从数据库中取，且去掉系统中已经设置好的)")
 	 @GetMapping("/tagList")
-	 public Result<List<TpmIoserverTag>> tagList() {
-		 List<TpmIoserverTag> ioserverTagList = tpmIoserverTagService.selectTpmIoserverTagList();
+	 public Result<List<TpmIoserverTag>> tagList(TpmIoserverTag ioserverTag) {
+		 List<TpmIoserverTag> ioserverTagList = tpmIoserverTagService.selectTpmIoserverTagList(ioserverTag);
 		 return Result.OK(ioserverTagList);
 	 }
 

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

@@ -17,6 +17,6 @@ public interface TpmIoserverTagMapper extends BaseMapper<TpmIoserverTag> {
     /**未选择过的点位下拉列表
      * （去掉设备点位中已存在的点位）
      * */
-    public List<TpmIoserverTag> selectTpmIoserverTagList();
+    public List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag);
 
 }

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

@@ -15,7 +15,8 @@
     <select id="selectTpmIoserverTagList" parameterType="org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag" resultMap="TpmIoserverTagResult">
         <include refid="selectTpmIoserverTagVo"/>
         <where>
-            tagname NOT IN (SELECT tagname FROM ems_tpm_tag)
+            <if test="tagname != null  and tagname != ''"> and t.tagname like concat('%', #{tagname}, '%')</if>
+            and tagname NOT IN (SELECT tagname FROM ems_tpm_tag)
         </where>
         order by tagname asc
     </select>

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

@@ -16,6 +16,6 @@ public interface ITpmIoserverTagService extends IService<TpmIoserverTag> {
     /**未选择过的点位下拉列表
      * （去掉设备点位中已存在的点位）
      * */
-    List<TpmIoserverTag> selectTpmIoserverTagList();
+    List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag);
 
 }

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

@@ -25,8 +25,8 @@ public class TpmIoserverTagServiceImpl extends ServiceImpl<TpmIoserverTagMapper,
     /**未选择过的点位下拉列表
      * （去掉设备点位中已存在的点位）
      * */
-    public List<TpmIoserverTag> selectTpmIoserverTagList(){
-        return tpmIoserverTagMapper.selectTpmIoserverTagList();
+    public List<TpmIoserverTag> selectTpmIoserverTagList(TpmIoserverTag ioserverTag){
+        return tpmIoserverTagMapper.selectTpmIoserverTagList(ioserverTag);
     }
 
 }