From 148a7f11b0ead8539cae824f02dda19a703f4d0b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 07 十二月 2024 16:54:02 +0800
Subject: [PATCH] zjh20241207
---
ltkj-admin/src/test/java/zjhTest.java | 92 ++++++++++++++++++++++++++--------------------
ltkj-admin/pom.xml | 6 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 20 +++++-----
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 1
4 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index a0186c9..7b29229 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -193,6 +193,12 @@
<artifactId>weixin-java-miniapp</artifactId>
<version>4.2.0</version>
</dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>3.141.59</version>
+ </dependency>
</dependencies>
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index d209771..f553595 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -127,16 +127,16 @@
config.setUpdateBy(getUsername());
int i = configService.updateConfig(config);
if (i > 0) {
- if (config.getConfigId() == 113) {
- SysMenu byId = menuService.getById(2305);
- if ("Y".equals(configValue)) {
- byId.setVisible("0");
- }
- if ("N".equals(configValue)) {
- byId.setVisible("1");
- }
- menuService.updateById(byId);
- }
+// if (config.getConfigId() == 113) {
+// SysMenu byId = menuService.getById(2305);
+// if ("Y".equals(configValue)) {
+// byId.setVisible("0");
+// }
+// if ("N".equals(configValue)) {
+// byId.setVisible("1");
+// }
+// menuService.updateById(byId);
+// }
}
return toAjax(i);
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 81e55b4..e87ce7d 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,55 +1,41 @@
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.LtkjApplication;
-import com.ltkj.common.core.redis.RedisCache;
-import com.ltkj.common.utils.SecurityUtils;
-import com.ltkj.common.utils.StringUtils;
-import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.DictHosp;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjPackage;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.*;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ScanOptions;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.openqa.selenium.*;
+import org.springframework.core.io.ClassPathResource;
+import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
+
+import static javafx.scene.input.ScrollEvent.VerticalTextScrollUnits.PAGES;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -84,8 +70,8 @@
// public RedisTemplate<Object,Object> redisTemplate;
//// @Resource
// private StringRedisTemplate stringRedisTemplate;
-@Resource
-private IDictHospService dictHospService;
+//@Resource
+//private IDictHospService dictHospService;
@Value("${token.secret_key}")
private String secret;
@Test
@@ -133,19 +119,45 @@
public static void main(String[] args) {
+ try {
+ new zjhTest().chrome("1.png");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
- String s ="612129197611110029";
-
- String ss ="13335337160";
-
- boolean idCard = MatchUtils.isIdCard(s);
- System.out.println(idCard);
-
-
- System.out.println(MatchUtils.isMobileNO(ss));
}
+
+ /**
+ * 鎵ц鐢熸垚
+ * @param filePath 鍥剧墖鐢熸垚璺緞
+ * @return 鏄惁鎴愬姛
+ */
+ private void chrome(String filePath) throws IOException {
+ System.setProperty("webdriver.chrome.driver", "D:\\tools\\chromedriver.exe");
+ ChromeOptions options = new ChromeOptions();
+ options.setBinary("D:\\tools\\124063440\\chrome.exe");
+ options.addArguments("--headless"); // 鍚敤鏃犲ご妯″紡
+ options.addArguments("--disable-gpu"); // 绂佺敤GPU鍔犻��
+ options.addArguments("--no-sandbox"); // 绂佺敤娌欑洅妯″紡锛堝彲閫夛紝閫傜敤浜庢煇浜汱inux鐜锛�
+ System.setProperty("webdriver.chrome.verboseLogging", "true");
+ WebDriver driver = null;
+ try {
+ driver = new ChromeDriver(options);
+ driver.manage().window().setSize(new Dimension(600, 730));
+ driver.get("www.baidu.com");
+ WebDriverWait wait = new WebDriverWait(driver,10);
+ File screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
+ FileUtil.copyFile(screenshot, new File("D:\\"+filePath));
+ }catch (Exception e){
+ log.error("鐜╁淇℃伅寮傚父 ->{}",String.valueOf(e));
+ }finally {
+ if (driver != null)
+ driver.quit();
+ }
+ }
+
/**
* 灏嗙瀛﹁鏁版硶鏂囨湰杞崲鎴愬瓧绗︽枃鏈�
* @param number
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index 2cf9135..62d6251 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -84,6 +84,7 @@
<if test="idCard != null and idCard != ''">and id_card = #{idCard}</if>
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
<if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
+ <if test="companyId != null and companyId != ''">and company_id = #{companyId} </if>
<if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if>
<if test="isExpire != null ">and is_expire = #{isExpire}</if>
and deleted = '0'
--
Gitblit v1.8.0