diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index cf4fb31d..fc19fadb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -721,4 +721,17 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController getTeacherInfo(@RequestBody KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("gh", kcExportConfigTpkwcqkjzglx.getGh()); + queryWrapper.last("limit 1"); + kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapper); + return Result.OK(kcExportConfigTpkwcqkjzglx); + } + } 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 139b1fbf..c8aebd83 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 @@ -156,9 +156,9 @@ public class KcDetectionMainController extends JeecgController zhihuijiaoshiList = zhihuijiaoshiService.list(zhjsQW); zhihuijiaoshiList.forEach(x -> { + try { + Thread.sleep(1000L); + } catch (InterruptedException e) { + e.printStackTrace(); + } KcKetangbiao ketangbiao = KcKetangbiaoMap.get(x.getJsbh()); String rwbh = ketangbiao.getRwbh(); @@ -180,27 +185,27 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl { - 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; - }); - } +// if(StringUtils.equals(CommonConstant.UPLOAD_TYPE_SFTP, global.uploadType)){ +// //miniOutImagePath = +// int index = miniOutImagePath.lastIndexOf("/"); +// String outImagePathDir = miniOutImagePath.substring(0,index); +// String outImagePathName = miniOutImagePath.substring(index+1); +// String finalFileName = fileName; +// calls.add(() -> { +// 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; +// }); +// } } //查找主表， diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 04ab3d5b..609d30b3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -267,12 +267,13 @@ public class WjxWjxxController extends JeecgController String type = ""; String content = ""; + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(StringUtils.equals(wjlx,"6")){ type = "2"; - content = "您有一条测验需要提交！"; + content = " ["+wjxWjxx.getKcmc()+"] "+sysUser.getRealname()+" 发布了一篇新的测验，请及时提交！"; }else{ type = "3"; - content = "您有一条问卷需要提交！"; + content = " ["+wjxWjxx.getKcmc()+"] "+sysUser.getRealname()+" 发布了一篇新的问卷，请及时提交！"; } for(Xxhbbks xxhbbks:list){ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java index 1377f75f..8b75ec87 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java @@ -122,4 +122,7 @@ public class WjxWjxx implements Serializable { private Date zyEndTime; @TableField(exist = false) private String teano; + + @TableField(exist = false) + private String skjs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java index 8d89a257..0d189c90 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java @@ -26,4 +26,6 @@ public interface WjxWjxxMapper extends BaseMapper { IPage sysList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, KccyglSys kccyglSys); List exportSysXls(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, KccyglSys kccyglSys); + + WjxWjxx getByKechengId(@Param("id") String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml index edb3d0e4..b832f5f5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml @@ -141,4 +141,9 @@ GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java index 79c00e1d..7037b1a9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java @@ -30,4 +30,6 @@ public interface IWjxWjxxService extends IService { IPage sysList(Page page, QueryWrapper queryWrapper,KccyglSys kccyglSys); List exportSysXls(QueryWrapper queryWrapper,KccyglSys kccyglSys); + + WjxWjxx getByKechengId(String id); } 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 f7ccf162..fac5d7d8 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 @@ -361,5 +361,10 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl return baseMapper.exportSysXls(queryWrapper,kccyglSys); } + @Override + public WjxWjxx getByKechengId(String id) { + return baseMapper.getByKechengId(id); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java index b3c64216..52fa5594 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java @@ -190,4 +190,11 @@ public class ZyDbtxController extends JeecgController { return Result.OK(null); } + @AutoLog(value = "代办提醒-通过id删除") + @ApiOperation(value="代办提醒-通过id删除", notes="代办提醒-通过id删除") + @PostMapping(value = "/deleteById") + public Result deleteById(@RequestBody ZyDbtx zyDbtx) { + zyDbtxService.removeById(zyDbtx.getId()); + return Result.OK(null); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java index 882d60af..4c3f95a1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java @@ -55,7 +55,7 @@ public class ZyDbtx implements Serializable { /**通知类型（0发布作业 1评分 2测验 3问卷 4讨论）*/ @Excel(name = "通知类型（0发布作业 1评分 2测验 3问卷 4讨论）", width = 15, dicCode = "dbtx_type") @Dict(dicCode = "dbtx_type") - @ApiModelProperty(value = "通知类型（0发布作业 1评分 2测验 3问卷 4讨论）") + @ApiModelProperty(value = "通知类型（学生接收 0发布作业 1评分 2测验 3问卷 4讨论 9通知通告 5，6，7是教师通知）") private java.lang.String type; /**任务编号*/ @Excel(name = "任务编号", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java index 8ce24d5f..a9c21bd3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java @@ -1,12 +1,19 @@ package org.jeecg.modules.kc.zyGonggao.controller; import java.util.Arrays; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; +import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx; +import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService; import org.jeecg.modules.kc.zyGonggao.entity.ZyGonggao; import org.jeecg.modules.kc.zyGonggao.service.IZyGonggaoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.kc.zyTlq.entity.ZyTlq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,7 +43,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class ZyGonggaoController extends JeecgController { @Autowired private IZyGonggaoService zyGonggaoService; - + + @Autowired + private IXxhbbksService xxhbbksService; + + @Autowired + private IZyDbtxService zyDbtxService; /** * 分页列表查询 * @@ -89,6 +102,31 @@ public class ZyGonggaoController extends JeecgController queryWrapper = new QueryWrapper<>(); + queryWrapper.apply("a.xh = b.xh"); + queryWrapper.eq("b.KCAPZBBH",par.getRwbh()); + List list = xxhbbksService.getXsxkbAllList(queryWrapper); + for(Xxhbbks xxhbbks:list){ + + //作业代办提醒 + ZyDbtx zyDbtx = new ZyDbtx(); + zyDbtx.setCreateBy(xxhbbks.getXh()); + zyDbtx.setType("9");//0发布作业 1评分 2测验 3问卷 4讨论 9通知通告 + zyDbtx.setMainId(par.getId()); + zyDbtx.setRwbh(par.getRwbh()); + zyDbtx.setContent(" ["+par.getKcmc()+"] "+par.getSkjs()+" 发布了一篇新的通告，请及时查阅！"); + zyDbtx.setFlag("0"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + zyDbtx.setFbr(user.getUsername()); + zyDbtxService.save(zyDbtx); + + } + + + } if(zyGonggao.getFlag().equals("0")){ res = "撤回成功!"; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java index b2f9548b..f794585d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java @@ -84,4 +84,9 @@ public class ZyGonggao implements Serializable { @TableField(exist = false) private String teano; + + @TableField(exist = false) + private String kcmc; + @TableField(exist = false) + private String skjs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/ZyGonggaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/ZyGonggaoMapper.java index b1b783f0..6315503e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/ZyGonggaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/ZyGonggaoMapper.java @@ -17,4 +17,6 @@ import org.jeecg.modules.zyk.entity.ZykInfo; public interface ZyGonggaoMapper extends BaseMapper { void addHistory(ZyGonggao zyGonggao); List findHistoryPage(Page page, ZyGonggao params); + + ZyGonggao getByKechengId(@Param("id") String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/xml/ZyGonggaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/xml/ZyGonggaoMapper.xml index 38a06e5a..388c774a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/xml/ZyGonggaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/xml/ZyGonggaoMapper.xml @@ -54,4 +54,9 @@ order by update_time desc + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/IZyGonggaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/IZyGonggaoService.java index eb216182..5b781550 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/IZyGonggaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/IZyGonggaoService.java @@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IZyGonggaoService extends IService { void addHistory(ZyGonggao zyGonggao); Page findHistoryPage(ZyGonggao zyGonggao, Page page); + + ZyGonggao getByKechengId(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/impl/ZyGonggaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/impl/ZyGonggaoServiceImpl.java index 699125e7..9d020a08 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/impl/ZyGonggaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/impl/ZyGonggaoServiceImpl.java @@ -34,4 +34,9 @@ public class ZyGonggaoServiceImpl extends ServiceImpl { public Result editStudent(@RequestParam(name="id",required=true) String id) { ZyInfo zyInfo = zyInfoService.getById(id); if(zyInfo!=null) { - zyInfo = zyInfoService.getById(zyInfo.getId()); + zyInfo = zyInfoService.getKechengById(zyInfo.getId()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.apply("a.xh = b.xh"); queryWrapper.eq("b.KCAPZBBH",zyInfo.getRwbh()); @@ -175,7 +175,7 @@ public class ZyInfoController extends JeecgController { zyDbtx.setType("0");//0发布作业 1评分 2测验 3问卷 4讨论 zyDbtx.setMainId(zyInfo.getId()); zyDbtx.setRwbh(zyInfo.getRwbh()); - zyDbtx.setContent("您有一条作业需要提交！"); + zyDbtx.setContent(" ["+zyInfo.getKcmc()+"] "+zyInfo.getSkjs()+" 发布了一篇作业，请及时完成！"); zyDbtx.setFlag("0"); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); zyDbtx.setFbr(user.getUsername()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java index a8bcf8c1..0dba1924 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java @@ -153,5 +153,11 @@ public class ZyInfo implements Serializable { @TableField(exist = false) private String teano; + @TableField(exist = false) + private String kcmc; + @TableField(exist = false) + private String skjs; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java index 8fa36281..23ce1981 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java @@ -24,4 +24,6 @@ public interface ZyInfoMapper extends BaseMapper { IPage sysList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List exportSysXls(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + ZyInfo getKechengById(@Param("id") String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml index ffe6ab87..04a58d57 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml @@ -56,4 +56,10 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java index 5e8a5dc1..e2c347b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java @@ -22,4 +22,6 @@ public interface IZyInfoService extends IService { IPage sysList(Page page, QueryWrapper queryWrapper); List exportSysXls(QueryWrapper queryWrapper); + + ZyInfo getKechengById(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java index 59db6a89..585af055 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java @@ -36,4 +36,9 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme public List exportSysXls(QueryWrapper queryWrapper) { return baseMapper.exportSysXls(queryWrapper); } + + @Override + public ZyInfo getKechengById(String id) { + return baseMapper.getKechengById(id); + } } 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 4c636f04..6f35df89 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 @@ -193,14 +193,14 @@ public class ZyInfoStudentController extends JeecgController - and a.file_path is not null and a.file_path != '' + and a.file_path is not null and a.file_path != '' and a.score is null and a.file_path is null @@ -100,7 +100,7 @@ and a.score is not null and a.file_path != '' - and a.file_path != null + and a.file_path != null and a.score is null and a.file_path == null diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java index 7eda7c37..767fa5f8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java @@ -211,7 +211,7 @@ public class ZyTlqController extends JeecgController { - ZyTlq par=zyTlqService.getById(zyTlq.getId()); + ZyTlq par=zyTlqService.getByKechengId(zyTlq.getId()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.apply("a.xh = b.xh"); queryWrapper.eq("b.KCAPZBBH",par.getRwbh()); @@ -224,7 +224,7 @@ public class ZyTlqController extends JeecgController { zyDbtx.setType("4");//0发布作业 1评分 2测验 3问卷 4讨论 zyDbtx.setMainId(par.getId()); zyDbtx.setRwbh(par.getRwbh()); - zyDbtx.setContent("您有一条新的讨论话题，请即时进行讨论"); + zyDbtx.setContent(" ["+par.getKcmc()+"] "+par.getSkjs()+" 发布了一篇新的讨论，请及时参与！"); zyDbtx.setFlag("0"); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); zyDbtx.setFbr(user.getUsername()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java index 00f5e5ee..24771553 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java @@ -72,4 +72,10 @@ public class ZyTlq implements Serializable { @TableField(exist = false) private String teano; + + @TableField(exist = false) + private String kcmc; + @TableField(exist = false) + private String skjs; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/ZyTlqMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/ZyTlqMapper.java index 313fb334..3cef1d46 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/ZyTlqMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/ZyTlqMapper.java @@ -20,4 +20,6 @@ import org.jeecg.modules.kc.zyTlq.entity.ZyTlqSys; public interface ZyTlqMapper extends BaseMapper { IPage sysList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, ZyTlqSys zyTlqSys); + + ZyTlq getByKechengId(@Param("id") String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/xml/ZyTlqMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/xml/ZyTlqMapper.xml index 64485218..d1196223 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/xml/ZyTlqMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/xml/ZyTlqMapper.xml @@ -25,4 +25,11 @@ + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/IZyTlqService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/IZyTlqService.java index f08dbbd1..562b501f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/IZyTlqService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/IZyTlqService.java @@ -16,4 +16,6 @@ import org.jeecg.modules.kc.zyTlq.entity.ZyTlqSys; public interface IZyTlqService extends IService { IPage sysList(Page page, QueryWrapper queryWrapper, ZyTlqSys zyTlqSys); + + ZyTlq getByKechengId(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/impl/ZyTlqServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/impl/ZyTlqServiceImpl.java index f18d1475..f1676490 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/impl/ZyTlqServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/impl/ZyTlqServiceImpl.java @@ -24,4 +24,9 @@ public class ZyTlqServiceImpl extends ServiceImpl implements public IPage sysList(Page page, QueryWrapper queryWrapper, ZyTlqSys zyTlqSys) { return baseMapper.sysList(page, queryWrapper, zyTlqSys); } + + @Override + public ZyTlq getByKechengId(String id) { + return baseMapper.getByKechengId(id); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index b39a7368..fd6a88fa 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -30,6 +30,7 @@ import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.cas.util.XmlUtils; import org.jeecg.modules.jwms.entity.SysJwms; import org.jeecg.modules.jwms.service.ISysJwmsService; +import org.jeecg.modules.kc.blLoginLog.service.IBlLoginLogService; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.SysUserSysDepartModel; @@ -101,6 +102,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Autowired private ISysJwmsService jwmsService; + @Autowired + private IBlLoginLogService blLoginLogService; @Override public Result> queryPageList(HttpServletRequest req, QueryWrapper queryWrapper, Integer pageSize, Integer pageNo) { @@ -543,6 +546,15 @@ public class SysUserServiceImpl extends ServiceImpl impl result.error500("该用户已冻结"); return result; } + +// +// baseCommonService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null); + try { + blLoginLogService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null,sysUser); + }catch (Exception e) { + System.out.println("Error---------->: " + sysUser.getUsername()); + } + return result; }