传感器下拉列表、项目经理下拉列表、根据委托编号查询委托id、设备下拉列表加注释

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/controller/ItdmChuanganqiController.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,7 +50,19 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, IItdmChuanganqiService> {
 	@Autowired
 	private IItdmChuanganqiService itdmChuanganqiService;
-	
+
+	 /**
+	  * 传感器下拉列表
+	  */
+	 @ApiOperation(value="传感器下拉列表", notes="传感器下拉列表")
+	 @GetMapping("/xialalist")
+	 public List<ItdmChuanganqi> list1()
+	 {
+		 List<ItdmChuanganqi> list = itdmChuanganqiService.queryList();
+		 return list;
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +84,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 		IPage<ItdmChuanganqi> pageList = itdmChuanganqiService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +99,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 		itdmChuanganqiService.save(itdmChuanganqi);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +114,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 		itdmChuanganqiService.updateById(itdmChuanganqi);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +129,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 		itdmChuanganqiService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +144,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 		this.itdmChuanganqiService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/mapper/ItdmChuanganqiMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.chuanganqi.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmChuanganqiMapper extends BaseMapper<ItdmChuanganqi> {
 
+
+    /**
+     * 传感器下拉列表
+     */
+    @Select("select * from itdm_chuanganqi" )
+    List<ItdmChuanganqi> queryList();
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/service/IItdmChuanganqiService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.chuanganqi.service;
 import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 传感器管理
  * @Author: jeecg-boot
@@ -11,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IItdmChuanganqiService extends IService<ItdmChuanganqi> {
 
+    /**
+     * 传感器下拉列表
+     */
+    public List<ItdmChuanganqi> queryList();
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/service/impl/ItdmChuanganqiServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.chuanganqi.service.impl;
 import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
 import org.jeecg.modules.chuanganqi.mapper.ItdmChuanganqiMapper;
 import org.jeecg.modules.chuanganqi.service.IItdmChuanganqiService;
+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
@@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ItdmChuanganqiServiceImpl extends ServiceImpl<ItdmChuanganqiMapper, ItdmChuanganqi> implements IItdmChuanganqiService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmChuanganqiMapper chuanganqiMapper;
+
+    /**
+     * 传感器下拉列表
+     */
+    public List<ItdmChuanganqi> queryList(){
+        return chuanganqiMapper.queryList();
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -52,7 +52,7 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 	private IItdmDeviceService itdmDeviceService;
 
 	 /**
-	  * 设备列表
+	  * 设备下拉列表
 	  */
 	 @ApiOperation(value="设备下拉列表", notes="设备下拉列表")
 	 @GetMapping("/xialalist")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/mapper/ItdmDeviceMapper.java

@@ -15,6 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmDeviceMapper extends BaseMapper<ItdmDevice> {
 
+    /**
+     * 设备下拉列表
+     */
     @Select("select * from itdm_device" )
     List<ItdmDevice> queryList();
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/IItdmDeviceService.java

@@ -13,6 +13,9 @@ import java.util.List;
  */
 public interface IItdmDeviceService extends IService<ItdmDevice> {
 
+    /**
+     * 设备下拉列表
+     */
     public List<ItdmDevice> queryList();
 
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/impl/ItdmDeviceServiceImpl.java

@@ -23,6 +23,9 @@ public class ItdmDeviceServiceImpl extends ServiceImpl<ItdmDeviceMapper, ItdmDev
     @SuppressWarnings("all")
     private ItdmDeviceMapper itdmDeviceMapper;
 
+    /**
+     * 设备下拉列表
+     */
     public List<ItdmDevice> queryList(){
         return itdmDeviceMapper.queryList();
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/controller/ItdmPersonManageController.java

@@ -1,42 +1,28 @@
 package org.jeecg.modules.itdmPersonManage.controller;
 
-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.itdmPersonManage.entity.ItdmPersonManage;
-import org.jeecg.modules.itdmPersonManage.service.IItdmPersonManageService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-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.apache.ibatis.annotations.Param;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
+import org.jeecg.modules.itdmPersonManage.service.IItdmPersonManageService;
 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;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
  * @Description: 人员管理
  * @Author: jeecg-boot
  * @Date:   2023-05-17
@@ -49,7 +35,19 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmPersonManageController extends JeecgController<ItdmPersonManage, IItdmPersonManageService> {
 	@Autowired
 	private IItdmPersonManageService itdmPersonManageService;
-	
+
+	 /**
+	  * 项目经理下拉列表
+	  */
+	 @ApiOperation(value="项目经理下拉列表", notes="项目经理下拉列表")
+	 @GetMapping("/xialalist")
+	 public List<ItdmPersonManage> list1(@RequestParam("position") String position)
+	 {
+		 List<ItdmPersonManage> list = itdmPersonManageService.queryList(position);
+		 return list;
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +69,7 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 		IPage<ItdmPersonManage> pageList = itdmPersonManageService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +84,7 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 		itdmPersonManageService.save(itdmPersonManage);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +99,7 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 		itdmPersonManageService.updateById(itdmPersonManage);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +114,7 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 		itdmPersonManageService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +129,7 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 		this.itdmPersonManageService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/mapper/ItdmPersonManageMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.itdmPersonManage.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
 import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmPersonManageMapper extends BaseMapper<ItdmPersonManage> {
 
+    /**
+     * 项目经理下拉列表
+     */
+    @Select("select * from itdm_person_manage where position = #{position}" )
+    List<ItdmPersonManage> queryList(@Param("position") String position);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/service/IItdmPersonManageService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.itdmPersonManage.service;
 import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 人员管理
  * @Author: jeecg-boot
@@ -11,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IItdmPersonManageService extends IService<ItdmPersonManage> {
 
+    /**
+     * 项目经理下拉列表
+     */
+    public List<ItdmPersonManage> queryList(String position);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/service/impl/ItdmPersonManageServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.itdmPersonManage.service.impl;
 import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
 import org.jeecg.modules.itdmPersonManage.mapper.ItdmPersonManageMapper;
 import org.jeecg.modules.itdmPersonManage.service.IItdmPersonManageService;
+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
@@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ItdmPersonManageServiceImpl extends ServiceImpl<ItdmPersonManageMapper, ItdmPersonManage> implements IItdmPersonManageService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmPersonManageMapper itdmPersonManageMapper;
+
+    /**
+     * 项目经理下拉列表
+     */
+    public List<ItdmPersonManage> queryList(String position){
+        return itdmPersonManageMapper.queryList(position);
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/mapper/ItdmWeituoInfoMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.weituo.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.itdmTestPlan.vo.ItdmJCXMAndSYJHVO;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmWeituoInfoMapper extends BaseMapper<ItdmWeituoInfo> {
 
+    /**根据委托查询委托id*/
+    @Select("select id from itdm_weituo_info where weituo_no = #{weituoNo}")
+    String selectByWeituoNo(@Param("weituoNo") String weituoNo);
+
 }