fix bug

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/impl/ItdmGongdanShujuServiceImpl.java

@@ -76,14 +76,18 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
 
                 itdmGongdanDetail.setId(null);
                 BeanUtils.copyProperties(itdmGongdanDetail, itdmGongdanShuju);
-                itdmGongdanShuju.setShiyanTime(DateUtil.offsetMinute(date1, i * Integer.parseInt(itdmGongdanDto.getPinci())).toString().split(" ")[1]);
+                String shiyanTime = DateUtil.offsetMinute(date1, i * Integer.parseInt(itdmGongdanDto.getPinci())).toString().split(" ")[1];
+                shiyanTime = String.join(":", Arrays.asList(shiyanTime.split(":")).subList(0, 2));
+
+
+                itdmGongdanShuju.setShiyanTime(shiyanTime);
 
                 if (b) {
                     String[] endt = itdmGongdanShuju.getShiyanTime().split(",");
                     endt[1] = "10";
                     String nextDateTIme = String.join(":", endt);
                     ItdmWenxiang itdmWenxiang = itdmWenxiangMapper.selectOne(Wrappers.lambdaQuery(ItdmWenxiang.class).eq(ItdmWenxiang::getDeviceId, shijiShebeiId)
-                            .between(ItdmWenxiang::getCreateTime, ShijiWorkDate + " " + itdmGongdanShuju.getShiyanTime(), ShijiWorkDate + " " + nextDateTIme)
+                            .between(ItdmWenxiang::getCreateTime, ShijiWorkDate + " " + itdmGongdanShuju.getShiyanTime() + ":00", ShijiWorkDate + " " + nextDateTIme + ":00")
                             .apply("limit 1"));
                     if (itdmWenxiang != null) {
                         itdmGongdanShuju.setShiyanWendu(itdmWenxiang.getTemperature().toEngineeringString());
@@ -93,7 +97,6 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
                     }
 
 
-
                 }
 
                 boolean save = this.save(itdmGongdanShuju);
@@ -119,4 +122,12 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
         itdmGongdanShujuMapper.updateById(itdmGongdanShuju);
 
     }
+
+
+    public static void main(String[] args) {
+        String shiyanTime = "10:20:30";
+        shiyanTime = String.join(":", Arrays.asList(shiyanTime.split(":")).subList(0, 2));
+        System.out.println(shiyanTime);
+
+    }
 }