Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_tjbbfx
This commit is contained in:
commit
e46b4d89e4
|
|
@ -97,4 +97,84 @@ public interface BlTeacherAnswerMapper extends BaseMapper<BlTeacherAnswer> {
|
|||
List<BlTeacherAnswer> getSelectkclxydbtzc(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师在课程“两性一度”的实施情况
|
||||
List<BlTeacherAnswer> getSelectkclxydgxyjs(BlTeacherInfo blTeacherMain);
|
||||
//践行“成果导向”理念
|
||||
BlTeacherAnswer getSelectcgdxln1(BlTeacherInfo blTeacherMain);
|
||||
//教师评价“成果导向”理念的落实情况
|
||||
List<BlTeacherAnswer> getSelectcgdxTjt1(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师评价“成果导向”理念的落实情况
|
||||
List<BlTeacherAnswer> getSelectcgdxTjt2(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师评价“成果导向”理念的落实情况
|
||||
List<BlTeacherAnswer> getSelectcgdxTjt3(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师评价“成果导向”理念的落实情况
|
||||
List<BlTeacherAnswer> getSelectcgdx4(BlTeacherInfo blTeacherMain);
|
||||
//6.师生互动
|
||||
BlTeacherAnswer getSelectsshdbfb(BlTeacherInfo blTeacherMain);
|
||||
//教师课下与学生在不同方面交流的比例
|
||||
List<BlTeacherAnswer> getSelectsshdbfbTjt1(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师在各项工作上的平均时间投入
|
||||
List<BlTeacherAnswer> getSelectsshdTjt2(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师课下与学生在不同方面交流的比例
|
||||
List<BlTeacherAnswer> getSelectsshdTjt3(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师评价“成果导向”理念的落实情况
|
||||
List<BlTeacherAnswer> getSelectsshd4(BlTeacherInfo blTeacherMain);
|
||||
//教师评价各环节上的学生学习主动性各项占比
|
||||
List<BlTeacherAnswer> getSelectxsxxzdxTjt(BlTeacherInfo blTeacherMain);
|
||||
//教师评价学生学习主动性 雷达图
|
||||
BlTeacherAnswer getSelectxxzdxLdt(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师评价学生学习主动性
|
||||
List<BlTeacherAnswer> getSelectsshd5(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师评价学生学习主动性
|
||||
List<BlTeacherAnswer> getSelectsshd6(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师评价学生学习主动性
|
||||
List<BlTeacherAnswer> getSelectsshd7(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校教师培训各方面的满意度评价各项占比
|
||||
List<BlTeacherAnswer> getSelectjsfz1(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校教师培训各方面的满意度
|
||||
BlTeacherAnswer getSelectjsfz2(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师对本校教师培训各方面的满意度
|
||||
List<BlTeacherAnswer> getSelectjsfz3(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师对本校教师培训各方面的满意度
|
||||
List<BlTeacherAnswer> getSelectjsfz4(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师对本校教师培训各方面的满意度
|
||||
List<BlTeacherAnswer> getSelectjsfz5(BlTeacherInfo blTeacherMain);
|
||||
//教师对工作氛围各方面评价各项占比
|
||||
List<BlTeacherAnswer> getSelectzyfwyzc1(BlTeacherInfo blTeacherMain);
|
||||
//教师对工作氛围各方面的评价
|
||||
BlTeacherAnswer getSelectzyfwyzc2(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师对工作氛围各方面的评价
|
||||
List<BlTeacherAnswer> getSelectzyfwyzc3(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师对工作氛围各方面的评价
|
||||
List<BlTeacherAnswer> getSelectzyfwyzc4(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师对工作氛围各方面的评价
|
||||
List<BlTeacherAnswer> getSelectzyfwyzc5(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校教学评价各方面工作评价各项占比
|
||||
List<BlTeacherAnswer> getSelectjxpjgz1(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校教学评价各方面工作的评价
|
||||
BlTeacherAnswer getSelectjxpjgz2(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师对本校教学评价各方面工作的评价
|
||||
List<BlTeacherAnswer> getSelectjxpjgz3(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师对本校教学评价各方面工作的评价
|
||||
List<BlTeacherAnswer> getSelectjxpjgz4(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师对本校教学评价各方面工作的评价
|
||||
List<BlTeacherAnswer> getSelectjxpjgz5(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校资源条件的满意度评价各项占比
|
||||
List<BlTeacherAnswer> getSelectzytjpj1(BlTeacherInfo blTeacherMain);
|
||||
//教师对本校教学评价各方面工作的评价
|
||||
BlTeacherAnswer getSelectzytjpj2(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师对本校教学评价各方面工作的评价
|
||||
List<BlTeacherAnswer> getSelectzytjpj3(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师对本校教学评价各方面工作的评价
|
||||
List<BlTeacherAnswer> getSelectzytjpj4(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师对本校各项资源条件的满意度
|
||||
List<BlTeacherAnswer> getSelectzytjpj5(BlTeacherInfo blTeacherMain);
|
||||
//学校整体满意度
|
||||
BlTeacherAnswer getSelectztmydpj(BlTeacherInfo blTeacherMain);
|
||||
//教师对学校的整体满意度各项占比
|
||||
BlTeacherAnswer getSelectztmydzb(BlTeacherInfo blTeacherMain);
|
||||
//不同岗位类型教师对学校整体的满意度
|
||||
List<BlTeacherAnswer> getSelectxxztmyd3(BlTeacherInfo blTeacherMain);
|
||||
//不同职称教师对学校整体的满意度
|
||||
List<BlTeacherAnswer> getSelectxxztmyd4(BlTeacherInfo blTeacherMain);
|
||||
//各学院教师对学校整体的满意度
|
||||
List<BlTeacherAnswer> getSelectxxztmyd5(BlTeacherInfo blTeacherMain);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -18,6 +18,7 @@ import java.io.ByteArrayInputStream;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
import java.util.Random;
|
||||
|
||||
public class WebDriverUtil {
|
||||
|
||||
|
|
@ -53,7 +54,6 @@ public class WebDriverUtil {
|
|||
//延迟1秒等待折线图绘制完成
|
||||
Thread.sleep(1000);
|
||||
String imgTxt = js.executeScript("return returnEchartImg()").toString().replace("data:image/png;base64,", "");
|
||||
System.out.println("----------------" + imgTxt);
|
||||
String imageName = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+".png";
|
||||
String downName = base64StringToImage(imgTxt,imageName);
|
||||
return downName;
|
||||
|
|
@ -69,6 +69,120 @@ public class WebDriverUtil {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取图片300高度
|
||||
*/
|
||||
public static String getImgByte300(String option) {
|
||||
WebDriver driver = null;
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(999999) + 100000;
|
||||
try {
|
||||
driver = getWebDriver();
|
||||
//访问网址
|
||||
String osName = System.getProperties().getProperty("os.name");
|
||||
if (osName.equals("Linux")) {
|
||||
driver.get("file:///usr/local/project/test/api/html/zhixiantu.html");
|
||||
} else {
|
||||
// Resource resource = new ClassPathResource("html/zhixiantu.html");
|
||||
//Resource resource = new ClassPathResource("html/bar.html");
|
||||
driver.get("file:///D:/APPLICATION/chromedriver/echarts300.html");
|
||||
}
|
||||
System.out.println(driver.getCurrentUrl());
|
||||
JavascriptExecutor js = (JavascriptExecutor) driver;
|
||||
js.executeScript("showImg(" + option + ")");
|
||||
//延迟1秒等待折线图绘制完成
|
||||
Thread.sleep(1000);
|
||||
String imgTxt = js.executeScript("return returnEchartImg()").toString().replace("data:image/png;base64,", "");
|
||||
String imageName = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+randomNumber+".png";
|
||||
String downName = base64StringToImage(imgTxt,imageName);
|
||||
return downName;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if(driver != null){
|
||||
//driver.close();
|
||||
//driver.quit();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* 获取图片400高度
|
||||
*/
|
||||
public static String getImgByte400(String option) {
|
||||
WebDriver driver = null;
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(999999) + 100000;
|
||||
try {
|
||||
driver = getWebDriver();
|
||||
//访问网址
|
||||
String osName = System.getProperties().getProperty("os.name");
|
||||
if (osName.equals("Linux")) {
|
||||
driver.get("file:///usr/local/project/test/api/html/zhixiantu.html");
|
||||
} else {
|
||||
// Resource resource = new ClassPathResource("html/zhixiantu.html");
|
||||
//Resource resource = new ClassPathResource("html/bar.html");
|
||||
driver.get("file:///D:/APPLICATION/chromedriver/echarts400.html");
|
||||
}
|
||||
System.out.println(driver.getCurrentUrl());
|
||||
JavascriptExecutor js = (JavascriptExecutor) driver;
|
||||
js.executeScript("showImg(" + option + ")");
|
||||
//延迟1秒等待折线图绘制完成
|
||||
Thread.sleep(1000);
|
||||
String imgTxt = js.executeScript("return returnEchartImg()").toString().replace("data:image/png;base64,", "");
|
||||
String imageName = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+randomNumber+".png";
|
||||
String downName = base64StringToImage(imgTxt,imageName);
|
||||
return downName;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if(driver != null){
|
||||
//driver.close();
|
||||
//driver.quit();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取图片400高度
|
||||
*/
|
||||
public static String getImgByte500(String option) {
|
||||
WebDriver driver = null;
|
||||
Random random = new Random();
|
||||
int randomNumber = random.nextInt(999999) + 100000;
|
||||
try {
|
||||
driver = getWebDriver();
|
||||
//访问网址
|
||||
String osName = System.getProperties().getProperty("os.name");
|
||||
if (osName.equals("Linux")) {
|
||||
driver.get("file:///usr/local/project/test/api/html/zhixiantu.html");
|
||||
} else {
|
||||
// Resource resource = new ClassPathResource("html/zhixiantu.html");
|
||||
//Resource resource = new ClassPathResource("html/bar.html");
|
||||
driver.get("file:///D:/APPLICATION/chromedriver/echarts500.html");
|
||||
}
|
||||
System.out.println(driver.getCurrentUrl());
|
||||
JavascriptExecutor js = (JavascriptExecutor) driver;
|
||||
js.executeScript("showImg(" + option + ")");
|
||||
//延迟1秒等待折线图绘制完成
|
||||
Thread.sleep(1000);
|
||||
String imgTxt = js.executeScript("return returnEchartImg()").toString().replace("data:image/png;base64,", "");
|
||||
String imageName = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+randomNumber+".png";
|
||||
String downName = base64StringToImage(imgTxt,imageName);
|
||||
return downName;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if(driver != null){
|
||||
//driver.close();
|
||||
//driver.quit();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 初始化WebDriver
|
||||
*
|
||||
|
|
@ -100,9 +214,6 @@ public class WebDriverUtil {
|
|||
public static String base64StringToImage(String base64String,String imageName) {
|
||||
String downloadName = "";
|
||||
try {
|
||||
System.out.println("==============base64String==================");
|
||||
System.out.println(base64String);
|
||||
System.out.println("==============base64String==================");
|
||||
BufferedImage img = ImgUtil.toImage(base64String);
|
||||
ByteArrayInputStream bais = ImgUtil.toStream(img,"png");
|
||||
BufferedImage bi1 = ImageIO.read(bais);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue