yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-06-18 19:49:11 +08:00
parent 02f1f13a05
commit 40f2908a2c
32 changed files with 186 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
View File

@ -721,4 +721,17 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
return mv;
}
@AutoLog(value = "根据gh获取教职工信息")
@ApiOperation(value="根据gh获取教职工信息", notes="根据gh获取教职工信息")
@RequestMapping(value = "/getTeacherInfo", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<KcExportConfigTpkwcqkjzglx> getTeacherInfo(@RequestBody KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
queryWrapper.eq("gh", kcExportConfigTpkwcqkjzglx.getGh());
queryWrapper.last("limit 1");
kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapper);
return Result.OK(kcExportConfigTpkwcqkjzglx);
}
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java
View File

@ -156,9 +156,9 @@ public class KcDetectionMainController extends JeecgController<KcDetectionMain,
}
if(cnum!=0){
if(bnum-cnum<0){
par.setZtrs(String.valueOf(bnum-cnum));
}else{
par.setZtrs("0");
}else{
par.setZtrs(String.valueOf(bnum-cnum));
}
}else{
par.setZtrs("0");

39
jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/service/impl/KcDetectionDetailedServiceImpl.java
View File

@ -150,6 +150,11 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
List<KcZhihuijiaoshi> 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<KcDetectionDetai
miniOutImagePath = StringUtils.replace(miniOutImagePath,"\\","/");
boolean isSuccess = _FFmpegTools.videoScreenshot(x.getPullUrl(), outImagePath);
FileUtil.copy(outImagePath,fileBak.getPath() + File.separator + fileName, true);
if(isSuccess){
//转存文件到ftp
//miniOutImagePath
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(() -> {
FileUtil.copy(outImagePath,fileBak.getPath() + File.separator + finalFileName, true);
log.info("sftpConfig: {}, outImagePathDir:{}, outImagePath:{}, outImagePathName:{}",sftpConfig, outImagePathDir, outImagePath, outImagePathName);
Map<String, String> 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<String, String> 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;
// });
// }
}
//查找主表，

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java
View File

@ -267,12 +267,13 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
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){

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java
View File

@ -122,4 +122,7 @@ public class WjxWjxx implements Serializable {
private Date zyEndTime;
@TableField(exist = false)
private String teano;
@TableField(exist = false)
private String skjs;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java
View File

@ -26,4 +26,6 @@ public interface WjxWjxxMapper extends BaseMapper<WjxWjxx> {
IPage<KccyglSys> sysList(Page<KccyglSys> page, @Param(Constants.WRAPPER) QueryWrapper<KccyglSys> queryWrapper, KccyglSys kccyglSys);
List<KccyglSys> exportSysXls(@Param(Constants.WRAPPER) QueryWrapper<KccyglSys> queryWrapper, KccyglSys kccyglSys);
WjxWjxx getByKechengId(@Param("id") String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
View File

@ -141,4 +141,9 @@
GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs
</select>
<select id="getByKechengId" resultType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx">
select a.*,b.skjs from wjx_wjxx a ,kc_kechengbiao b
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = b.xqxn and a.id = #{id} limit 1
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java
View File

@ -30,4 +30,6 @@ public interface IWjxWjxxService extends IService<WjxWjxx> {
IPage<KccyglSys> sysList(Page<KccyglSys> page, QueryWrapper<KccyglSys> queryWrapper,KccyglSys kccyglSys);
List<KccyglSys> exportSysXls(QueryWrapper<KccyglSys> queryWrapper,KccyglSys kccyglSys);
WjxWjxx getByKechengId(String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java
View File

@ -361,5 +361,10 @@ public class WjxWjxxServiceImpl extends ServiceImpl<WjxWjxxMapper, WjxWjxx> impl
return baseMapper.exportSysXls(queryWrapper,kccyglSys);
}
@Override
public WjxWjxx getByKechengId(String id) {
return baseMapper.getByKechengId(id);
}
}

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java
View File

@ -190,4 +190,11 @@ public class ZyDbtxController extends JeecgController<ZyDbtx, IZyDbtxService> {
return Result.OK(null);
}
@AutoLog(value = "代办提醒-通过id删除")
@ApiOperation(value="代办提醒-通过id删除", notes="代办提醒-通过id删除")
@PostMapping(value = "/deleteById")
public Result<ZyDbtx> deleteById(@RequestBody ZyDbtx zyDbtx) {
zyDbtxService.removeById(zyDbtx.getId());
return Result.OK(null);
}
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java
View File

@ -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)

38
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java
View File

@ -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;
@ -36,6 +44,11 @@ public class ZyGonggaoController extends JeecgController<ZyGonggao, IZyGonggaoSe
@Autowired
private IZyGonggaoService zyGonggaoService;
@Autowired
private IXxhbbksService xxhbbksService;
@Autowired
private IZyDbtxService zyDbtxService;
/**
* 分页列表查询
*
@ -89,6 +102,31 @@ public class ZyGonggaoController extends JeecgController<ZyGonggao, IZyGonggaoSe
if(zyGonggao.getFlag()!=null){
if(zyGonggao.getFlag().equals("1")){
res = "发布成功!";
ZyGonggao par=zyGonggaoService.getByKechengId(zyGonggao.getId());
QueryWrapper<Xxhbbks> queryWrapper = new QueryWrapper<>();
queryWrapper.apply("a.xh = b.xh");
queryWrapper.eq("b.KCAPZBBH",par.getRwbh());
List<Xxhbbks> 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 = "撤回成功!";

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java
View File

@ -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;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/ZyGonggaoMapper.java
View File

@ -17,4 +17,6 @@ import org.jeecg.modules.zyk.entity.ZykInfo;
public interface ZyGonggaoMapper extends BaseMapper<ZyGonggao> {
void addHistory(ZyGonggao zyGonggao);
List<ZyGonggao> findHistoryPage(Page<ZyGonggao> page, ZyGonggao params);
ZyGonggao getByKechengId(@Param("id") String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/mapper/xml/ZyGonggaoMapper.xml
View File

@ -54,4 +54,9 @@
order by update_time desc
</select>
<select id="getByKechengId" resultType="org.jeecg.modules.kc.zyGonggao.entity.ZyGonggao">
select a.*,b.kcmc,b.skjs from zy_gonggao a ,kc_kechengbiao b
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = b.xqxn and a.id = #{id}
limit 1
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/IZyGonggaoService.java
View File

@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IZyGonggaoService extends IService<ZyGonggao> {
void addHistory(ZyGonggao zyGonggao);
Page<ZyGonggao> findHistoryPage(ZyGonggao zyGonggao, Page<ZyGonggao> page);
ZyGonggao getByKechengId(String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/service/impl/ZyGonggaoServiceImpl.java
View File

@ -34,4 +34,9 @@ public class ZyGonggaoServiceImpl extends ServiceImpl<ZyGonggaoMapper, ZyGonggao
page.setRecords(list);
return page;
}
@Override
public ZyGonggao getByKechengId(String id) {
return baseMapper.getByKechengId(id);
}
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java
View File

@ -156,7 +156,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
public Result<ZyInfo> 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<Xxhbbks> queryWrapper = new QueryWrapper<>();
queryWrapper.apply("a.xh = b.xh");
queryWrapper.eq("b.KCAPZBBH",zyInfo.getRwbh());
@ -175,7 +175,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
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());

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java
View File

@ -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;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java
View File

@ -24,4 +24,6 @@ public interface ZyInfoMapper extends BaseMapper<ZyInfo> {
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, @Param(Constants.WRAPPER) QueryWrapper<ZyInfoSys> queryWrapper);
List<ZyInfoSys> exportSysXls(@Param(Constants.WRAPPER) QueryWrapper<ZyInfoSys> queryWrapper);
ZyInfo getKechengById(@Param("id") String id);
}

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
View File

@ -56,4 +56,10 @@
</select>
<select id="getKechengById" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfo">
select a.*,b.kcmc,b.skjs from zy_info a ,kc_kechengbiao b
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xnxq = b.xqxn and a.id = #{id}
limit 1
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java
View File

@ -22,4 +22,6 @@ public interface IZyInfoService extends IService<ZyInfo> {
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, QueryWrapper<ZyInfoSys> queryWrapper);
List<ZyInfoSys> exportSysXls(QueryWrapper<ZyInfoSys> queryWrapper);
ZyInfo getKechengById(String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java
View File

@ -36,4 +36,9 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
public List<ZyInfoSys> exportSysXls(QueryWrapper<ZyInfoSys> queryWrapper) {
return baseMapper.exportSysXls(queryWrapper);
}
@Override
public ZyInfo getKechengById(String id) {
return baseMapper.getKechengById(id);
}
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
View File

@ -193,14 +193,14 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
ZyInfoStudent zyInfoStudentPar = zyInfoStudentService.getById(zyInfoStudent.getId());
if(StringUtils.isNotEmpty(score)){
ZyInfo zyInfo = zyInfoService.getById(zyInfoStudentPar.getMainId());
ZyInfo zyInfo = zyInfoService.getKechengById(zyInfoStudentPar.getMainId());
//作业代办提醒
ZyDbtx zyDbtx = new ZyDbtx();
zyDbtx.setCreateBy(zyInfoStudentPar.getCreateBy());
zyDbtx.setType("1");//0发布作业 1评分 2测验 3问卷 4讨论
zyDbtx.setMainId(zyInfoStudentPar.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());

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml
View File

@ -54,7 +54,7 @@
and a.score is not null and a.file_path != ''
</if>
<if test='zyInfoStudentSys.status == "已提交"'>
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
</if>
<if test='zyInfoStudentSys.status == "未提交"'>
and a.file_path is null
@ -100,7 +100,7 @@
and a.score is not null and a.file_path != ''
</if>
<if test='zyInfoStudentSys.status == "已提交"'>
and a.file_path != null
and a.file_path != null and a.score is null
</if>
<if test='zyInfoStudentSys.status == "未提交"'>
and a.file_path == null

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java
View File

@ -211,7 +211,7 @@ public class ZyTlqController extends JeecgController<ZyTlq, IZyTlqService> {
ZyTlq par=zyTlqService.getById(zyTlq.getId());
ZyTlq par=zyTlqService.getByKechengId(zyTlq.getId());
QueryWrapper<Xxhbbks> queryWrapper = new QueryWrapper<>();
queryWrapper.apply("a.xh = b.xh");
queryWrapper.eq("b.KCAPZBBH",par.getRwbh());
@ -224,7 +224,7 @@ public class ZyTlqController extends JeecgController<ZyTlq, IZyTlqService> {
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());

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java
View File

@ -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;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/ZyTlqMapper.java
View File

@ -20,4 +20,6 @@ import org.jeecg.modules.kc.zyTlq.entity.ZyTlqSys;
public interface ZyTlqMapper extends BaseMapper<ZyTlq> {
IPage<ZyTlqSys> sysList(Page<ZyTlqSys> page, @Param(Constants.WRAPPER) QueryWrapper<ZyTlqSys> queryWrapper, ZyTlqSys zyTlqSys);
ZyTlq getByKechengId(@Param("id") String id);
}

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/mapper/xml/ZyTlqMapper.xml
View File

@ -25,4 +25,11 @@
</if>
</where>
</select>
<select id="getByKechengId" resultType="org.jeecg.modules.kc.zyTlq.entity.ZyTlq">
select a.*,b.kcmc,b.skjs from zy_tlq a ,kc_kechengbiao b
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = b.xqxn and a.id = #{id}
limit 1
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/IZyTlqService.java
View File

@ -16,4 +16,6 @@ import org.jeecg.modules.kc.zyTlq.entity.ZyTlqSys;
public interface IZyTlqService extends IService<ZyTlq> {
IPage<ZyTlqSys> sysList(Page<ZyTlqSys> page, QueryWrapper<ZyTlqSys> queryWrapper, ZyTlqSys zyTlqSys);
ZyTlq getByKechengId(String id);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/service/impl/ZyTlqServiceImpl.java
View File

@ -24,4 +24,9 @@ public class ZyTlqServiceImpl extends ServiceImpl<ZyTlqMapper, ZyTlq> implements
public IPage<ZyTlqSys> sysList(Page<ZyTlqSys> page, QueryWrapper<ZyTlqSys> queryWrapper, ZyTlqSys zyTlqSys) {
return baseMapper.sysList(page, queryWrapper, zyTlqSys);
}
@Override
public ZyTlq getByKechengId(String id) {
return baseMapper.getByKechengId(id);
}
}

12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
View File

@ -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<SysUserMapper, SysUser> impl
@Autowired
private ISysJwmsService jwmsService;
@Autowired
private IBlLoginLogService blLoginLogService;
@Override
public Result<IPage<SysUser>> queryPageList(HttpServletRequest req, QueryWrapper<SysUser> queryWrapper, Integer pageSize, Integer pageNo) {
@ -543,6 +546,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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;
}