Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes

clll

2023-09-11 b134ac3690e6d31d40ee6def5c65fb778050a556

 springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java

@@ -35,22 +35,21 @@

  @GetMapping("/stTime")
  public Result selecttime(String shijian1, String shijian2) {
    System.out.println("++++++");
    System.out.println(shijian1);

    if (shijian1 != "" || shijian2 != "") {
      String sj1 = shijian1.replace("#20", " ");
      String sj2 = shijian2.replace("#20", " ");
      List<alarmmg> storageCagelist = alarmMapper.selecttime(sj1, sj2);
      Map<String, Object> map = new HashMap<>();
      map.put("list", storageCagelist);
      return Result.success(map);
    } else {
      List<alarmmg> storageCagelist = alarmMapper.selectAll();
      Map<String, Object> map = new HashMap<>();
      map.put("list", storageCagelist);
      return Result.success(map);
    }
    // if (shijian1 != "" || shijian2 != "") {
    // 将get方法传过来的参数中"#20"替换为" "
    String sj1 = shijian1.replace("#20", " ");
    String sj2 = shijian2.replace("#20", " ");
    List<alarmmg> storageCagelist = alarmMapper.selecttime(sj1, sj2);
    Map<String, Object> map = new HashMap<>();
    map.put("list", storageCagelist);
    return Result.success(map);
    // } else {
    // List<alarmmg> storageCagelist = alarmMapper.selectAll();
    // Map<String, Object> map = new HashMap<>();
    // map.put("list", storageCagelist);
    // return Result.success(map);
    // }

  }