main
黄海 10 months ago
parent 5d1dafbead
commit b2e1c1c0c3

@ -49,6 +49,18 @@
<artifactId>aspose-pdf</artifactId>
<version>22.7.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.25.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager -->
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.9.2</version>
</dependency>
<!-- Java字节码的类库,破解需要-->
<dependency>

@ -2,11 +2,47 @@ package Tools.DataEase;
import org.openqa.selenium.By;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import java.io.IOException;
import java.time.Duration;
public class TestRead {
public static void main(String[] args) throws IOException {
String url = "http://www.wmarkj.com:27080/#/de-link/NtXhclS0";
String url = "http://10.10.14.203/#/de-link/NtXhclS0";
// 设置ChromeDriver的路径
//System.setProperty("webdriver.chrome.driver", "/path/to/chromedriver");
// 初始化Chrome浏览器
WebDriver driver = new FirefoxDriver();
// 打开目标URL
driver.get(url);
// 显式等待等待页面中特定元素加载完成例如等待一个特定的div加载完成
//WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(600)); // 10秒超时时间
//WebElement element = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("element-id")));
// 等待页面加载完成
new WebDriverWait(driver, Duration.ofSeconds(600)).until(webDriver ->
((JavascriptExecutor) webDriver).executeScript("return document.readyState").equals("complete")
);
// 获取渲染后的HTML内容
String renderedHtml = driver.getPageSource();
// 输出渲染后的HTML内容
renderedHtml= renderedHtml.replace("./assets","http://10.10.14.203/assets");
renderedHtml= renderedHtml.replace("./js/","http://10.10.14.203/js/");
renderedHtml= renderedHtml.replace("./dataease.svg","http://10.10.14.203/dataease.svg");
System.out.println(renderedHtml);
//href="./assets
// 关闭浏览器
driver.quit();
}
}

@ -348,7 +348,7 @@ public class FillSubject {
}
//是否需要进行专家相关的审核操作
boolean ZhuanJiaCheck = gm.getZhuanJaiCheckStatus();
boolean ZhuanJiaCheck = gm.getZhuanJiaCheckStatus();
String subject_ids = "";
//4、修改为已扫描完成
for (Record record : list) {

@ -24,10 +24,10 @@ public class GtzzConst {
step_code=0201
1 gm.getZhuanJaiCheckStatus()=1
1 gm.getZhuanJiaCheckStatus()=1
便step_code=0202step_code=0203
2 gm.getZhuanJaiCheckStatus()=0
2 gm.getZhuanJiaCheckStatus()=0
(JAVA)ZhuanJiaCheck=0
(1)ys_id=1
gm.saveYsSubject(1, subject_ids);
@ -40,22 +40,24 @@ public class GtzzConst {
,
step_code=0202
1 gm.getZhuanJaiCheckStatus()=1
1 gm.getZhuanJiaCheckStatus()=1
step_code=0203
2 gm.getZhuanJaiCheckStatus()=0
2 gm.getZhuanJiaCheckStatus()=0
,step_code=0203
:OK
gm.pass(String org_code='03', int progress_id=?, String message='OK', int radio_id=5)
if(gm.getZhuanJiaCheckStatus()==0){
gm.pass(String org_code='03', int progress_id=?, String message='OK', int radio_id=5)
}
--------------------------------------------------------------------------------
,
step_code=0305
1 gm.getZhuanJaiCheckStatus()=1
1 gm.getZhuanJiaCheckStatus()=1
step_code=0306
2 gm.getZhuanJaiCheckStatus()=0
2 gm.getZhuanJiaCheckStatus()=0
:
(1)
gm.saveSubjectExpert(subject_id, GtzzConst.EXPERT_SHIJI, GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);

@ -57,7 +57,7 @@ public class GtzzController extends Controller {
return;
}
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
String org_code =SessionKit.get(getRequest(), getResponse(),"org_code");
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
Page<Record> list = gm.getToDoStepList(person_id, org_code, data_type, begin_date, end_date, step_code, is_current, keyword, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list));
}
@ -142,7 +142,7 @@ public class GtzzController extends Controller {
//清除统计缓存
gm.delTjCache();
//当前单位代码
String org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
//判断当前步骤是提交状态,还是处于待审核状态
Record r = gm.getProgressInfoById(progress_id);
String step_code = r.getStr("step_code");
@ -186,10 +186,23 @@ public class GtzzController extends Controller {
} else { //1:申请步骤
kv = gm.passNext(org_code, progress_id, radio_id, message);
renderJson(kv);
//根据学校上报的进度id,查询出这是哪个项目,然后再次查询出这个项目的最新progress_id,就是上面passNext后新产生的
r = gm.getProgressInfoById(progress_id);
step_code = r.getStr("step_code");
if (step_code.equals("0202")) {
//找出最新的progress_id
int subject_id = r.getInt("subject_id");
int latestProgressId = gm.getLatestProgressIdBySubjectId(subject_id);
if (!gm.getZhuanJiaCheckStatus()) {
gm.pass("03", latestProgressId, "OK", 5);
}
}
return;
}
//是不是0304(项目单位验收结束),准备触发拷贝市级验收条目
if (step_code.equals("0304")) gm.copyYsItem(r.getInt("subject_id"));//复制吧
//返回
kv.set("success", true);
kv.set("message", "保存成功!");
@ -571,7 +584,8 @@ public class GtzzController extends Controller {
//当前步骤是不是专家审核,专家审核还分两个阶段,每个阶段还细分为组长可以显示,组员不能显示
if (step_code.equals("0203") || step_code.equals("0307")) {
//判断当前登录人员是不是组长
if (gm.checkZjMaster(subject_id, step_code, SessionKit.get(getRequest(), getResponse(), "person_id"))) r2.set("show_button", true);
if (gm.checkZjMaster(subject_id, step_code, SessionKit.get(getRequest(), getResponse(), "person_id")))
r2.set("show_button", true);
else r2.set("show_button", false);
} else r2.set("show_button", true);
} else r2.set("show_button", false);
@ -639,7 +653,7 @@ public class GtzzController extends Controller {
renderJson(kv);
return;
}
String org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
Page<Record> list = gm.getXmxcList(org_code, step_code, year, subject_type_id, keyword, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list));
}
@ -688,7 +702,7 @@ public class GtzzController extends Controller {
//判断文件大小大于20mb则返回错误信息并终止上传删除上传文件
long size = picFile.getFile().length();
if (size > 1024 * 1024 * 20) {
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
map.put("success", false);
map.put("message", "xls文件大小大于20MB,请检查是否正确!");
renderJson(map);
@ -826,7 +840,8 @@ public class GtzzController extends Controller {
}
//org_code=="":全部
//org_code=="1":自己单位
if (!StrKit.isBlank(org_code) && org_code.equals("1")) org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
if (!StrKit.isBlank(org_code) && org_code.equals("1"))
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
Page<Record> p = gm.querySubject(keyword, subject_type_ids, begin_date, end_date, data_type, sbnd, step_code, is_current, org_code, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(p));
}
@ -845,7 +860,8 @@ public class GtzzController extends Controller {
}
//org_code=="":全部
//org_code=="1":自己单位
if (!StrKit.isBlank(org_code) && org_code.equals("1")) org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
if (!StrKit.isBlank(org_code) && org_code.equals("1"))
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
Page<Record> p = gm.queryFile(keyword, document_type_ids, subject_type_ids, begin_date, end_date, data_type, sbnd, org_code, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(p));
}
@ -897,9 +913,9 @@ public class GtzzController extends Controller {
int RoleId = gm.getSysRoleByPersonId(person_id);//四种角色中的哪一种?
String org_code = null;
if (RoleId == RoleConst.ZXX || RoleId == RoleConst.YEY || RoleId == RoleConst.ZY || RoleId == RoleConst.JFDW) {
org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
//项目进展(学校专用)
List<Record> tjxmJz = gm.tjxmJz(SessionKit.get(getRequest(), getResponse(),"org_code"));
List<Record> tjxmJz = gm.tjxmJz(SessionKit.get(getRequest(), getResponse(), "org_code"));
kv.set("tjxmJz", tjxmJz);
} else {
//今年项目概览(市专用)
@ -974,7 +990,7 @@ public class GtzzController extends Controller {
@Before({GET.class})
@IsLoginInterface({})
public void getJzList(int is_finish_flag, int page, int limit) {
Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(),"org_code"), is_finish_flag, page, limit);
Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(), "org_code"), is_finish_flag, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(p));
}

@ -1911,7 +1911,7 @@ public class GtzzModel {
*
* @return
*/
public boolean getZhuanJaiCheckStatus() {
public boolean getZhuanJiaCheckStatus() {
boolean ZhuanJiaCheck = false;
String install_area = GtzzConst.CHANGCHUAN;//长春市
//新增加的项目数据需要根据全局变量ZhuanJiaCheck=1还是ZhuanJiaCheck=0来决定是不是生成这个项目的评审专家和专家组组长
@ -2919,5 +2919,15 @@ public class GtzzModel {
}
/**
* ID
* @param subject_id
* @return
*/
public int getLatestProgressIdBySubjectId(int subject_id){
String sql="select max(progress_id) as progress_id from t_gtzz_progress where subject_id=?";
return Db.findFirst(sql, subject_id).getInt("progress_id");
}
}
Loading…
Cancel
Save