修改mongodb相关功能

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_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);
+
 }