Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -170,7 +170,7 @@ spring:
       datasource:
         master:
           type: com.alibaba.druid.pool.DruidDataSource
-          url: jdbc:mysql://152.136.206.27:3306/phm?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://152.136.206.27:3306/ems?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
           password: itdm-boot@2023
           driver-class-name: com.mysql.cj.jdbc.Driver

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/controller/CmmsRepairController.java

@@ -60,7 +60,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepairService> {
 	@Autowired
 	private ICmmsRepairService cmmsRepairService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -70,21 +70,74 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "维修工单-分页列表查询")
 	@ApiOperation(value="维修工单-分页列表查询", notes="维修工单-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CmmsRepair>> queryPageList(CmmsRepair cmmsRepair,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		//QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		CmmsRepair cmmsRepair1 = new CmmsRepair();
+		cmmsRepair1.setPriority(cmmsRepair.getPriority());
+		cmmsRepair1.setStatus(cmmsRepair.getStatus());
+		cmmsRepair1.setRepairstatus(cmmsRepair.getRepairstatus());
+		cmmsRepair1.setEquipmentid(cmmsRepair.getEquipmentid());
+		cmmsRepair1.setRepairuser(cmmsRepair.getRepairuser());
+		QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair1, req.getParameterMap());
+		queryWrapper.like(cmmsRepair.getRepaircode()!=null && !cmmsRepair.getRepaircode().equals(""),"repaircode",cmmsRepair.getRepaircode());
+		queryWrapper.like(cmmsRepair.getRepairname()!=null && !cmmsRepair.getRepairname().equals(""),"repairname",cmmsRepair.getRepairname());
+//		queryWrapper.like(cmmsRepair.getEquipmentid()!=null && !cmmsRepair.getEquipmentid().equals(""),"equipmentid",cmmsRepair.getEquipmentid());
+//		queryWrapper.like(cmmsRepair.getRepairuser()!=null && !cmmsRepair.getRepairuser().equals(""),"repairuser",cmmsRepair.getRepairuser());
+//		queryWrapper.like(cmmsRepair.getRepairstatus()!=null && !cmmsRepair.getRepairstatus().equals(""),"repairstatus",cmmsRepair.getRepairstatus());
 		Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
-		//IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
-		List<CmmsRepair> list = cmmsRepairService.getPageList(page,cmmsRepair);
-		page.setRecords(list);
-		return Result.OK(page);
+		IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+	 /**
+	  * 查询列表(我的)
+	  */
+	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
+	 @GetMapping("/listMy")
+	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		 Subject subject = SecurityUtils.getSubject();
+		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
+		 String userId = loginUser.getId();
+
+		 CmmsRepair cmmsRepair1 = new CmmsRepair();
+		 cmmsRepair1.setPriority(cmmsRepair.getPriority());
+		 cmmsRepair1.setStatus(cmmsRepair.getStatus());
+		 cmmsRepair1.setRepairstatus(cmmsRepair.getRepairstatus());
+		 cmmsRepair1.setEquipmentid(cmmsRepair.getEquipmentid());
+		 cmmsRepair1.setRepairuser(userId);
+
+		 QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair1, req.getParameterMap());
+		 queryWrapper.like(cmmsRepair.getRepaircode()!=null && !cmmsRepair.getRepaircode().equals(""),"repaircode",cmmsRepair.getRepaircode());
+		 queryWrapper.like(cmmsRepair.getRepairname()!=null && !cmmsRepair.getRepairname().equals(""),"repairname",cmmsRepair.getRepairname());
+
+		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+		 IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+	//@AutoLog(value = "维修工单-分页列表查询")
+//	@ApiOperation(value="维修工单-分页列表查询", notes="维修工单-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsRepair>> queryPageList(CmmsRepair cmmsRepair,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		//QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
+//		Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+//		//IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+//		List<CmmsRepair> list = cmmsRepairService.getPageList(page,cmmsRepair);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -102,7 +155,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -117,7 +170,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.updateById(cmmsRepair);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -132,7 +185,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -147,7 +200,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		this.cmmsRepairService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -190,26 +243,26 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
         return super.importExcel(request, response, CmmsRepair.class);
     }
 
-	 /**
-	  * 查询列表(我的)
-	  */
-	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
-	 @GetMapping("/listMy")
-	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
-												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-												   HttpServletRequest req) {
-		 Subject subject = SecurityUtils.getSubject();
-		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
-		 String username = loginUser.getUsername();
-		 String userId = loginUser.getId();
-		 //cmmsRepair.setRepairuser(username);
-		 cmmsRepair.setRepairuser(userId);
-		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
-		 List<CmmsRepair> list = cmmsRepairService.selectList(page,cmmsRepair);
-		 page.setRecords(list);
-		 return Result.OK(page);
-	 }
+//	 /**
+//	  * 查询列表(我的)
+//	  */
+//	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
+//	 @GetMapping("/listMy")
+//	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
+//												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//												   HttpServletRequest req) {
+//		 Subject subject = SecurityUtils.getSubject();
+//		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
+//		 String username = loginUser.getUsername();
+//		 String userId = loginUser.getId();
+//		 //cmmsRepair.setRepairuser(username);
+//		 cmmsRepair.setRepairuser(userId);
+//		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+//		 List<CmmsRepair> list = cmmsRepairService.selectList(page,cmmsRepair);
+//		 page.setRecords(list);
+//		 return Result.OK(page);
+//	 }
 
 
 	 /**

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/controller/CmmsUpkeepItemController.java

@@ -78,21 +78,37 @@ public class CmmsUpkeepItemController extends JeecgController<CmmsUpkeepItem, IC
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "保养项-分页列表查询")
 	@ApiOperation(value="保养项-分页列表查询", notes="保养项-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeepItemDto>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-//		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem, req.getParameterMap());
-		Page<CmmsUpkeepItemDto> page = new Page<CmmsUpkeepItemDto>(pageNo, pageSize);
-//		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
-		List<CmmsUpkeepItemDto> pageList = cmmsUpkeepItemService.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
-		page.setRecords(pageList);
-		return Result.OK(page);
+	public Result<IPage<CmmsUpkeepItem>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		CmmsUpkeepItem cmmsUpkeepItem1 = new CmmsUpkeepItem();
+		cmmsUpkeepItem1.setEquipdefid(cmmsUpkeepItem.getEquipdefid());
+		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem1, req.getParameterMap());
+		queryWrapper.like(cmmsUpkeepItem.getItemcode()!=null && !cmmsUpkeepItem.getItemcode().equals(""),"itemcode",cmmsUpkeepItem.getItemcode());
+		queryWrapper.like(cmmsUpkeepItem.getItemname()!=null && !cmmsUpkeepItem.getItemname().equals(""),"itemname",cmmsUpkeepItem.getItemname());
+		Page<CmmsUpkeepItem> page = new Page<CmmsUpkeepItem>(pageNo, pageSize);
+		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
 
+//	//@AutoLog(value = "保养项-分页列表查询")
+//	@ApiOperation(value="保养项-分页列表查询", notes="保养项-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsUpkeepItemDto>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+////		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem, req.getParameterMap());
+//		Page<CmmsUpkeepItemDto> page = new Page<CmmsUpkeepItemDto>(pageNo, pageSize);
+////		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
+//		List<CmmsUpkeepItemDto> pageList = cmmsUpkeepItemService.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
+//		page.setRecords(pageList);
+//		return Result.OK(page);
+//	}
+
 
 	/**
 	 *   添加

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItem.java

@@ -63,6 +63,7 @@ public class CmmsUpkeepItem implements Serializable {
 	/**设备类型ID（设备定义，可单选可多选，多选设备类型用逗号连接）*/
 	@Excel(name = "设备类型ID（设备定义，可单选可多选，多选设备类型用逗号连接）", width = 15)
     @ApiModelProperty(value = "设备类型ID（设备定义，可单选可多选，多选设备类型用逗号连接）")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     private java.lang.String equipdefid;
 	/**保养描述*/
 	@Excel(name = "保养描述", width = 15)

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java

@@ -65,21 +65,40 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "保养计划-分页列表查询")
 	@ApiOperation(value="保养计划-分页列表查询", notes="保养计划-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeepPlanDto>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
+	public Result<IPage<CmmsUpkeepPlan>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
 														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														  HttpServletRequest req) {
-//		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan, req.getParameterMap());
-		Page<CmmsUpkeepPlanDto> page = new Page<CmmsUpkeepPlanDto>(pageNo, pageSize);
-//		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
-		List<CmmsUpkeepPlanDto> pageList = cmmsUpkeepPlanService.getAllCmmsUpkeepPlan(page, cmmsUpkeepPlan);
-		page.setRecords(pageList);
+		CmmsUpkeepPlan cmmsUpkeepPlan1 = new CmmsUpkeepPlan();
+		cmmsUpkeepPlan1.setStatus(cmmsUpkeepPlan.getStatus());
+		cmmsUpkeepPlan1.setEquipmentid(cmmsUpkeepPlan.getEquipmentid());
+		cmmsUpkeepPlan1.setChargeruser(cmmsUpkeepPlan.getChargeruser());
+		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan1, req.getParameterMap());
+		queryWrapper.like(cmmsUpkeepPlan.getPlanname()!=null && ! cmmsUpkeepPlan.getPlanname().equals(""),"planname",cmmsUpkeepPlan.getPlanname());
+		queryWrapper.like(cmmsUpkeepPlan.getPlancode()!=null && ! cmmsUpkeepPlan.getPlancode().equals(""),"plancode",cmmsUpkeepPlan.getPlancode());
+		Page<CmmsUpkeepPlan> page = new Page<CmmsUpkeepPlan>(pageNo, pageSize);
+		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
 		return Result.OK(page);
 	}
 
+
+//	//@AutoLog(value = "保养计划-分页列表查询")
+//	@ApiOperation(value="保养计划-分页列表查询", notes="保养计划-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsUpkeepPlanDto>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
+//														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//														  HttpServletRequest req) {
+////		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan, req.getParameterMap());
+//		Page<CmmsUpkeepPlanDto> page = new Page<CmmsUpkeepPlanDto>(pageNo, pageSize);
+////		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
+//		List<CmmsUpkeepPlanDto> pageList = cmmsUpkeepPlanService.getAllCmmsUpkeepPlan(page, cmmsUpkeepPlan);
+//		page.setRecords(pageList);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *

module_tpm/src/main/java/org/jeecg/modules/collectdata/controller/CollectdataController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.collectdata.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.collectdata.dao.CollectdataRepository;
 import org.jeecg.modules.collectdata.entity.Collectdata;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.jeecg.common.api.vo.Result;
 
+import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +55,7 @@ public class CollectdataController {
         return Result.OK("存入成功");
     }
 
-    @ApiOperation(value="测试mongodb-查询", notes="测试mongodb-查询")
+    @ApiOperation(value="测试mongodb-依据设备编号查询", notes="测试mongodb-依据设备编号查询")
     @GetMapping("/querybycode")
     public Result<?> query(@RequestParam(name="equipmentcode") String equipmentcode) {
 //        List<Collectdata> list = repository.findByEquipmentcode(equipmentcode);
@@ -60,4 +63,65 @@ public class CollectdataController {
 
         return Result.OK(list);
     }
+
+    @ApiOperation(value="测试mongodb-依据设备编号、日期查询", notes="测试mongodb-依据设备编号、日期查询")
+    @GetMapping("/querybycodeanddate")
+    public Result<?> querybycodeanddate(@RequestParam(name="equipmentcode") String equipmentcode,
+                                        @RequestParam(name="begindate") String begindate,
+                                        @RequestParam(name="enddate") String enddate) {
+        Date bdate = new Date();
+        Date edate = new Date();
+        try {
+            // 开始日期
+            if (!"".equals(begindate)) {
+                bdate = DateUtils.parseDate(begindate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            }
+            else {
+                bdate = DateUtils.parseDate(DateUtils.formatDate(bdate, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            }
+            // 结束日期
+            if (!"".equals(enddate)) {
+                edate = DateUtils.parseDate(enddate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            }
+            else {
+                edate = DateUtils.parseDate(DateUtils.formatDate(edate, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        List<Collectdata> list = repository.findByEquipmentcodeAndLogtimeBetween(equipmentcode, bdate, edate);
+
+        return Result.OK(list);
+    }
+
+    @ApiOperation(value="测试mongodb-依据日期查询", notes="测试mongodb-依据日期查询")
+    @GetMapping("/querybydate")
+    public Result<?> querybydate(@RequestParam(name="begindate") String begindate,
+                                 @RequestParam(name="enddate") String enddate) {
+        Date bdate = new Date();
+        Date edate = new Date();
+        try {
+            // 开始日期
+            if (!"".equals(begindate)) {
+                bdate = DateUtils.parseDate(begindate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            }
+            else {
+                bdate = DateUtils.parseDate(DateUtils.formatDate(bdate, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            }
+            // 结束日期
+            if (!"".equals(enddate)) {
+                edate = DateUtils.parseDate(enddate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            }
+            else {
+                edate = DateUtils.parseDate(DateUtils.formatDate(edate, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        List<Collectdata> list = repository.findByLogtimeBetween(bdate, edate);
+
+        return Result.OK(list);
+    }
 }

module_tpm/src/main/java/org/jeecg/modules/collectdata/dao/CollectdataRepository.java

@@ -3,11 +3,15 @@ package org.jeecg.modules.collectdata.dao;
 import org.jeecg.modules.collectdata.entity.Collectdata;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
+import java.util.Date;
 import java.util.List;
 
 public interface CollectdataRepository extends MongoRepository<Collectdata, String> {
 
-//    Collectdata findByEquipmentcode(String equpmentcod);
     List<Collectdata> findByEquipmentcode(String equipmentcode);
 
+    List<Collectdata> findByEquipmentcodeAndLogtimeBetween(String equipmentcode, Date begindate, Date enddate);
+
+    List<Collectdata> findByLogtimeBetween(Date begindate, Date enddate);
+
 }