该参数，在线用户支持模糊查询

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -54,16 +54,16 @@ public class SysUserOnlineController extends BaseController {
         }
         if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
             userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
-                StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
-                    StringUtils.equals(userName, userOnline.getUserName())
+                StringUtils.contains(userOnline.getIpaddr(), ipaddr) &&
+                    StringUtils.contains(userOnline.getUserName(), userName)
             );
         } else if (StringUtils.isNotEmpty(ipaddr)) {
             userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
-                StringUtils.equals(ipaddr, userOnline.getIpaddr())
+                StringUtils.contains(userOnline.getIpaddr(), ipaddr)
             );
         } else if (StringUtils.isNotEmpty(userName)) {
             userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
-                StringUtils.equals(userName, userOnline.getUserName())
+                StringUtils.contains(userOnline.getUserName(), userName)
             );
         }
         Collections.reverse(userOnlineDTOList);

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Plan.java

@@ -106,8 +106,8 @@ public class Plan {
         this.template = bo.getTemplate();
 
         this.planCreateTime = DateUtil.date();
-        this.planStartTime = bo.getPlanStartTime();
-        this.planEndTime = bo.getPlanEndTime();
+        this.planStartTime = DateUtil.parse(bo.getPlanStartTime());
+        this.planEndTime = DateUtil.parse(bo.getPlanEndTime());
 
         this.state = StateUtil.NOT_AUDITED;
         this.onState = OnStateUtil.UP;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/PlanAddBo.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -45,11 +46,11 @@ public class PlanAddBo {
     @NotBlank(groups = {AddGroup.class}, message = "负责人联系方式不能为空")
     private String principalTelephone;
 
-    @NotNull(groups = {AddGroup.class}, message = "计划开始时间不能为空")
-    private Date planStartTime;
-    @NotNull(groups = {AddGroup.class}, message = "计划结束时间不能为空")
-    private Date planEndTime;
-    @NotNull(groups = {AddGroup.class}, message = "设备不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "计划开始时间不能为空")
+    private String planStartTime;
+    @NotBlank(groups = {AddGroup.class}, message = "计划结束时间不能为空")
+    private String planEndTime;
+    @NotEmpty(groups = {AddGroup.class}, message = "设备不能为空")
     private List<PlanItemAddBo> items;
     @NotBlank(groups = {AddGroup.class}, message = "签名不能为空")
     private String sign;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/PlanBo.java

@@ -24,9 +24,9 @@ public class PlanBo {
     private List<String> planIds;
 //    private String auditComment;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    private String startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    private String endTime;
     private String commercialId;
     private List<String> addrCodes;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -464,6 +464,7 @@ public class PlanServiceImpl implements PlanService {
                     .or()
                     .like("principal_telephone", bo.getText());
             });
+        planQueryWrapper.ge("plan_start_time", new Date()).le("plan_end_time", new Date());
         if (bo.getStartTime() != null)
             planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null)