From 02f1f13a05fc2c7077664534c95121e77506e58f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 17 Jun 2024 17:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BlTeacherMainServiceImpl.java | 151 +++++++++++++----- .../controller/KcDetectionMainController.java | 54 ++++++- .../kc/detection/entity/KcDetectionMain.java | 12 ++ .../impl/KcDetectionDetailedServiceImpl.java | 71 +++++--- .../wjxDjxx/controller/WjxDjxxController.java | 101 ++++++++++++ .../kc/wjxDjxx/entity/StudentCyglSys.java | 1 + .../kc/wjxDjxx/mapper/WjxDjxxMapper.java | 9 +- .../kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml | 66 +++++++- .../kc/wjxDjxx/service/IWjxDjxxService.java | 9 +- .../service/impl/WjxDjxxServiceImpl.java | 10 ++ .../modules/kc/wjxWjxx/entity/KccyglSys.java | 2 +- .../service/impl/WjxWjxxServiceImpl.java | 38 +++-- .../controller/ZyInfoStudentController.java | 7 + .../zyInfoStudent/entity/ZyInfoStudent.java | 6 + .../entity/ZyInfoStudentSys.java | 13 +- .../mapper/xml/ZyInfoStudentMapper.xml | 16 +- .../system/controller/LoginController.java | 42 ++--- .../src/main/resources/application-dev.yml | 3 +- 18 files changed, 488 insertions(+), 123 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/blTeacherMain/service/impl/BlTeacherMainServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/blTeacherMain/service/impl/BlTeacherMainServiceImpl.java index c07ce446..7bea93f8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/blTeacherMain/service/impl/BlTeacherMainServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/blTeacherMain/service/impl/BlTeacherMainServiceImpl.java @@ -26,10 +26,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.io.Serializable; -import java.util.Date; -import java.util.List; -import java.util.Collection; -import java.util.Map; +import java.util.*; /** * @Description: 教师调查问卷 @@ -98,40 +95,88 @@ public class BlTeacherMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("main_id",id); - queryWrapper.last("limit 10"); - List dataList = blTeacherTjfxMapper.selectList(queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("main_id",id); +// queryWrapper.last("limit 10"); +// List dataList = blTeacherTjfxMapper.selectList(queryWrapper); BlTeacherMain blTeacherMain = baseMapper.selectById(id); - + Random random = new Random(); Map result = Maps.newHashMap(); Map result2 = Maps.newHashMap(); result.put("title", blTeacherMain.getTitle()); - result.put("nan", blTeacherMain.getTitle());//男占比 - result.put("nan_zb", blTeacherMain.getTitle());//女占比 - result.put("nv", blTeacherMain.getTitle());//女 - result.put("nv_zb", blTeacherMain.getTitle());//女占比 - result.put("xlccjg1", blTeacherMain.getTitle());//研究生 - result.put("xlccjg1_zb", blTeacherMain.getTitle());//研究生 - result.put("gwlxjg1", blTeacherMain.getTitle());//教学科研型 - result.put("gwlxjg1_zb", blTeacherMain.getTitle());//教学科研型 - result.put("xyjg1", blTeacherMain.getTitle());//学院结构 - result.put("xyjg1_zb", blTeacherMain.getTitle());//学院结构 + result.put("nan", random.nextInt(900) + 100+"");//男占比 + result.put("nan_zb", random.nextInt(900) + 10+"");//女占比 + result.put("nv", random.nextInt(900) + 100+"");//女 + result.put("nv_zb", random.nextInt(900) + 10+"");//女占比 + result.put("xlccjg1", random.nextInt(900) + 100+"");//研究生 + result.put("xlccjg2", random.nextInt(900) + 100+"");//研究生 + result.put("xlccjg3", random.nextInt(900) + 100+"");//研究生 + result.put("xlccjg1_zb", random.nextInt(900) + 10+"");//研究生 + result.put("xlccjg2_zb", random.nextInt(900) + 10+"");//研究生 + result.put("xlccjg3_zb", random.nextInt(900) + 10+"");//研究生 + + result.put("zcjg1", random.nextInt(900) + 100+"");//教学科研型 + result.put("zcjg2", random.nextInt(900) + 100+"");//教学科研型 + result.put("zcjg3", random.nextInt(900) + 100+"");//教学科研型 + result.put("zcjg4", random.nextInt(900) + 100+"");//教学科研型 + result.put("zcjg1_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("zcjg2_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("zcjg3_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("zcjg4_zb", random.nextInt(900) + 10+"");//教学科研型 + + result.put("gwlxjg1", random.nextInt(900) + 100+"");//教学科研型 + result.put("gwlxjg2", random.nextInt(900) + 100+"");//教学科研型 + result.put("gwlxjg3", random.nextInt(900) + 100+"");//教学科研型 + result.put("gwlxjg4", random.nextInt(900) + 100+"");//教学科研型 + result.put("gwlxjg1_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("gwlxjg2_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("gwlxjg3_zb", random.nextInt(900) + 10+"");//教学科研型 + result.put("gwlxjg4_zb", random.nextInt(900) + 10+"");//教学科研型 + + result.put("xyjg1", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg2", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg3", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg4", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg5", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg6", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg7", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg8", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg9", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg10", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg11", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg12", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg13", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg14", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg15", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg16", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg17", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg18", random.nextInt(900) + 100+"");//学院结构 + result.put("xyjg1_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg2_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg3_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg4_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg5_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg6_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg7_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg8_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg9_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg10_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg11_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg12_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg13_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg14_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg15_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg16_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg17_zb", random.nextInt(900) + 10+"");//学院结构 + result.put("xyjg18_zb", random.nextInt(900) + 10+"");//学院结构 // 创建数据集 DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - dataset.addValue(100, "Series1", "Category1"); - dataset.addValue(150, "Series1", "Category2"); - dataset.addValue(200, "Series1", "Category3"); - dataset.addValue(200, "Series1", "Category4"); - dataset.addValue(200, "Series1", "Category5"); - dataset.addValue(100, "Series2", "Category1"); - dataset.addValue(150, "Series2", "Category2"); - dataset.addValue(200, "Series2", "Category3"); - dataset.addValue(200, "Series2", "Category4"); - dataset.addValue(200, "Series2", "Category5"); + dataset.addValue(random.nextInt(900) + 10, "tjfx", "tjfx1"); + dataset.addValue(random.nextInt(900) + 10, "tjfx", "tjfx2"); + dataset.addValue(random.nextInt(900) + 10, "tjfx", "tjfx3"); // 创建图表 JFreeChart chart = ChartFactory.createBarChart( @@ -155,23 +200,49 @@ public class BlTeacherMainServiceImpl extends ServiceImpl> oneList = Lists.newArrayList(); List> twoList = Lists.newArrayList(); //-------拼装list-------------- - for(BlTeacherTjfx tjfxPar:dataList){ List list = Lists.newArrayList(); list.add("依法依规，履行教师职责"); - list.add("4.80"); - list.add("4.66"); - list.add("4.82"); - list.add("4.85"); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + oneList.add(list); + list = Lists.newArrayList(); + list.add("关心爱护学生"); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + oneList.add(list); + list = Lists.newArrayList(); + list.add("精神面貌及品德修养良好"); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); + list.add(String.format("%.2f", (double) random.nextInt(10))); oneList.add(list); List list2 = Lists.newArrayList(); - list2.add("1111111"); - list2.add("4.80"); - list2.add("4.66"); - list2.add("4.82"); - list2.add("4.85"); + list2.add("依法依规，履行教师职责"); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + twoList.add(list2); + list2 = Lists.newArrayList(); + list2.add("关心爱护学生"); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + twoList.add(list2); + list2 = Lists.newArrayList(); + list2.add("精神面貌及品德修养良好"); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); + list2.add(String.format("%.2f", (double) random.nextInt(10))); twoList.add(list2); - } wo.insert2Table(1, 1, true, oneList); wo.insert2Table(2, 1, true, twoList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java index 1af74f87..139b1fbf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java @@ -90,6 +90,13 @@ public class KcDetectionMainController extends JeecgController '$.hh'", kcDetectionMain.getSearchHh()); } + if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){ + queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh()); + } + + if(StringUtils.isNotBlank(kcDetectionMain.getSkjs())){ + queryWrapper.like("ketangbiao_info -> '$.skjs'", kcDetectionMain.getSkjs()); + } Page page = new Page<>(pageNo, pageSize); IPage pageList = kcDetectionMainService.page(page, queryWrapper); //补充查询子列表 @@ -108,7 +115,7 @@ public class KcDetectionMainController extends JeecgController qw = new QueryWrapper<>(); qw.lambda().in(KcDetectionDetailed::getPid,pidSet); // qw.orderByAsc("detection_num"); - qw.orderByDesc("create_time"); + qw.orderByAsc("create_time"); List detailedList = kcDetectionDetailedService.list(qw); detailedList.forEach(x -> { if(detectionMainMap.containsKey(x.getPid())){ @@ -117,9 +124,52 @@ public class KcDetectionMainController extends JeecgController alist = pageList.getRecords(); + for(KcDetectionMain par: alist){ + List blist = par.getDetectionDetailedList(); + int anum = 0;//第一次抓取人数 + int bnum = 0;//第二次抓取人数 + int cnum = 0;//第三次抓取人数 + if(blist.size()>=2){ + for(int i=0;i threadService = ThreadUtil.newCompletionService(Executors.newFixedThreadPool(2)); + + List> calls = Lists.newArrayList(); + + //新版，查询当前是否有课 -// KcZhihuijiaoshi jiaoshi = new KcZhihuijiaoshi(); -// jiaoshi.setXm("学生全景"); -// jiaoshi.setChangshang("奥威亚"); -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq("xm","学生全景"); -// queryWrapper.eq("changshang","奥威亚"); + KcZhihuijiaoshi jiaoshi = new KcZhihuijiaoshi(); + jiaoshi.setXm("学生全景"); + jiaoshi.setChangshang("奥威亚"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("xm","学生全景"); + queryWrapper.eq("changshang","奥威亚"); String hh = ""; KcJieci kcJieci = new KcJieci(); @@ -103,20 +113,21 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl page = new Page<>(1, -1); IPage pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao); @@ -145,7 +156,9 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl res = SFTPUtil.upload(sftpConfig, false, outImagePathDir, outImagePath, outImagePathName ); - if(!StringUtils.equals(res.get("code"),"0")){ - log.error("上传文件出现错误：{}", res.get("msg")); - - } + String finalFileName = fileName; + calls.add(() -> { + FileUtil.copy(outImagePath,fileBak.getPath() + File.separator + finalFileName, true); + log.info("sftpConfig: {}, outImagePathDir:{}, outImagePath:{}, outImagePathName:{}",sftpConfig, outImagePathDir, outImagePath, outImagePathName); + Map res = SFTPUtil.upload(sftpConfig, false, outImagePathDir, outImagePath, outImagePathName ); + log.info("res: {}",res); + if(!StringUtils.equals(res.get("code"),"0")){ + log.error("上传文件出现错误：{}", res.get("msg")); + } + return true; + }); } } @@ -254,6 +270,15 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl { + try { + threadService.take(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); } } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/controller/WjxDjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/controller/WjxDjxxController.java index e1db2fd2..9b3cd4fd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/controller/WjxDjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/controller/WjxDjxxController.java @@ -15,6 +15,7 @@ import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.wjxDjxx.entity.StudentCyglSys; +import org.jeecg.modules.kc.wjxDjxx.entity.StudentWjglSys; import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmlbPage; import org.jeecg.modules.kc.wjxDjxx.service.IWjxDjxxService; @@ -189,4 +190,104 @@ public class WjxDjxxController extends JeecgController mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } + + + + @ApiOperation(value="教学大纲-分页列表查询", notes="教学大纲-分页列表查询") + @GetMapping(value = "/sysWjglList") + public Result> sysList(StudentWjglSys studentWjglSys, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin 1教务秘书 + for(String role :roleList){ + if(org.apache.commons.lang.StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + QueryWrapper queryWrapper = new QueryWrapper(); + if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){ + QueryWrapper queryWrapperCon = new QueryWrapper(); + queryWrapperCon.eq("gh",sysUser.getUsername()); + queryWrapperCon.orderByDesc("create_time"); + queryWrapperCon.last("limit 1"); + KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon); + queryWrapper.eq("kkdw",kcExportConfigTpkwcqkjzglx.getDwmc()); + } + + if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(studentWjglSys.getXqxn())){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + queryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + }else{ + queryWrapper.eq("xqxn",studentWjglSys.getXqxn()); + } + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKkdw()),"kkdw",studentWjglSys.getKkdw()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKcmc()),"kcmc",studentWjglSys.getKcmc()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKcbh()),"kcbh",studentWjglSys.getKcbh()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getSkjs()),"skjs",studentWjglSys.getSkjs()); + + + Page page = new Page(pageNo, pageSize); + IPage pageList = wjxDjxxService.sysWjglList(page, queryWrapper,studentWjglSys); + return Result.OK(pageList); + } + + + @RequestMapping(value = "/exportWjglSysXls") + public ModelAndView exportWjglSysXls(HttpServletRequest request, StudentWjglSys studentWjglSys) { + String title = "学生作业管理"; + // Step.1 组装查询条件 + QueryWrapper queryWrapper = new QueryWrapper<>(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin 1教务秘书 + for(String role :roleList){ + if(org.apache.commons.lang.StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){ + QueryWrapper queryWrapperCon = new QueryWrapper(); + queryWrapperCon.eq("gh",sysUser.getUsername()); + queryWrapperCon.orderByDesc("create_time"); + queryWrapperCon.last("limit 1"); + KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon); + queryWrapper.eq("kkdw",kcExportConfigTpkwcqkjzglx.getDwmc()); + } + + if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(studentWjglSys.getXqxn())){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + queryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + }else{ + queryWrapper.eq("xqxn",studentWjglSys.getXqxn()); + } + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKkdw()),"kkdw",studentWjglSys.getKkdw()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKcmc()),"kcmc",studentWjglSys.getKcmc()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getKcbh()),"kcbh",studentWjglSys.getKcbh()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(studentWjglSys.getSkjs()),"skjs",studentWjglSys.getSkjs()); + + // Step.2 获取导出数据 + List exportList = service.exportWjglSysXls(queryWrapper,studentWjglSys); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, StudentWjglSys.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/StudentCyglSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/StudentCyglSys.java index 38456e4a..11867d47 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/StudentCyglSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/StudentCyglSys.java @@ -48,5 +48,6 @@ public class StudentCyglSys implements Serializable { private String pdfPath; private String jgh; + private String atype; private String ywId; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java index 5506a860..f988a671 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.kc.wjxDjxx.entity.StudentCyglSys; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxDj; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx; +import org.jeecg.modules.kc.wjxDjxx.entity.*; import java.util.List; @@ -44,4 +41,8 @@ public interface WjxDjxxMapper extends BaseMapper { IPage sysList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper, StudentCyglSys studentCyglSys); List exportSysXls(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, StudentCyglSys studentCyglSys); + + List exportWjglSysXls(@Param(Constants.WRAPPER)QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); + + IPage sysWjglList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index a23f1f37..22f92909 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -232,7 +232,7 @@ + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/IWjxDjxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/IWjxDjxxService.java index c9cb3823..e0a49dd6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/IWjxDjxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/IWjxDjxxService.java @@ -3,10 +3,7 @@ package org.jeecg.modules.kc.wjxDjxx.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.kc.wjxDjxx.entity.StudentCyglSys; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxDj; -import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmlbPage; +import org.jeecg.modules.kc.wjxDjxx.entity.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -30,4 +27,8 @@ public interface IWjxDjxxService extends IService { IPage sysList(Page page, QueryWrapper queryWrapper, StudentCyglSys studentCyglSys); List exportSysXls(QueryWrapper queryWrapper, StudentCyglSys studentCyglSys); + + List exportWjglSysXls(QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); + + IPage sysWjglList(Page page, QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index 2380b7ea..6f8f0008 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -462,4 +462,14 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl return baseMapper.exportSysXls(queryWrapper, studentCyglSys); } + @Override + public List exportWjglSysXls(QueryWrapper queryWrapper, StudentWjglSys studentWjglSys) { + return baseMapper.exportWjglSysXls(queryWrapper, studentWjglSys); + } + + @Override + public IPage sysWjglList(Page page, QueryWrapper queryWrapper, StudentWjglSys studentWjglSys) { + return baseMapper.sysWjglList(page, queryWrapper, studentWjglSys); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java index c02607b4..88eeb9db 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java @@ -39,7 +39,7 @@ public class KccyglSys implements Serializable { private String skdd; @Excel(name = "选课学生", width = 15) private String xkrs; - @Excel(name = "测验数量", width = 15) + @Excel(name = "数量", width = 15) private String num; private String jgh; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java index 4898a3d5..f7ccf162 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java @@ -322,21 +322,31 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl JSONObject jsonResult = JSONObject.parseObject(result); System.out.println("1----------->"+jsonResult.toString()); if(StringUtils.equals("true",jsonResult.getString("result"))){ - try { - Thread.sleep(2000L); - }catch (Exception e){ - e.printStackTrace(); + for(int i=0;i<10;i++){ + try { + Thread.sleep(1000L); + }catch (Exception e){ + e.printStackTrace(); + } + JSONObject data = jsonResult.getJSONObject("data"); + String taskid = data.getString("taskid"); + Map map2 = new HashMap<>(); + map2.put("vid",Integer.valueOf(vid)); + map2.put("suffix",2); + map2.put("taskid",taskid); + String result2 = wjxUtil.openapi(map2,"1001004"); + System.out.println("result2----------->"+result2); + JSONObject jsonResult2 = JSONObject.parseObject(result2); + String result3 = jsonResult2.getString("data"); + System.out.println("result3----------->"+result3); + JSONObject jsonResult3 = JSONObject.parseObject(result3); + System.out.println("jsonResult3----------->"+jsonResult3); + if(StringUtils.isNotEmpty(jsonResult3.getString("download_url"))){ + jsonResult = jsonResult2; + break; + } } - JSONObject data = jsonResult.getJSONObject("data"); - String taskid = data.getString("taskid"); - Map map2 = new HashMap<>(); - map2.put("vid",Integer.valueOf(vid)); - map2.put("suffix",2); - map2.put("taskid",taskid); -// map.put("suffix",2); - String result2 = wjxUtil.openapi(map2,"1001004"); - JSONObject jsonResult2 = JSONObject.parseObject(result2); - System.out.println("2----------->"+jsonResult2.toString()); + } return jsonResult; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 757bebe5..4c636f04 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -370,6 +370,7 @@ public class ZyInfoStudentController extends JeecgController roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index 1384fb9c..eaa183ba 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -55,6 +55,12 @@ public class ZyInfoStudent implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "createTime") private java.util.Date createTime; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "发布时间", width = 15) + private java.util.Date publishTime; + @Excel(name = "评分", width = 15) private java.lang.String score; /**外网相似律*/ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentSys.java index 69f0d83d..9827a9dc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentSys.java @@ -1,9 +1,11 @@ package org.jeecg.modules.kc.zyInfoStudent.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -35,7 +37,10 @@ public class ZyInfoStudentSys implements Serializable { private String stuNo; @Excel(name = "作业状态", width = 15) private String status; - + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "发布时间", width = 15) + private java.util.Date publishTime; @Excel(name = "网络相似率", width = 15) private String wwxsl; @@ -64,4 +69,10 @@ public class ZyInfoStudentSys implements Serializable { private String jgh; private String ywId; + + private String wwcc; + private String nwcc; + private String aigccc; + private String xncc; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml index b8f4693b..a537f124 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml @@ -30,8 +30,8 @@