diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java index 35d5c4ce..a137d416 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java @@ -59,6 +59,7 @@ public class WjxDjxxTmxx implements Serializable { @ApiModelProperty(value = "答卷人ID") private String userId; private String picPath; + private String fwqPath; @ApiModelProperty(value = "题目类型") @TableField(exist = false) 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 30c71032..dc8dfe3c 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 @@ -67,4 +67,9 @@ public interface WjxDjxxMapper extends BaseMapper { WjxDjxx getInfoByVidUser(WjxDjxx wjxDjxx); WjxDjxxTmxx getSfysj( @Param("wjxDjxxTmxx")WjxDjxxTmxx wjxDjxxTmxx); + + List getDjxxTmxxWjt(@Param("jid")String jid); + + + void updateDjxxTmxxFwqpath(WjxDjxxTmxx wjxDjxxTmxx); } 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 4a19ad3c..f37a97f6 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 @@ -408,6 +408,14 @@ where id = #{id} + + + update wjx_djxx_tmxx + set + fwq_path = #{fwqPath} + where id = #{id} + + update wjx_djxx set score = #{score},sfxysdpy = #{sfxysdpy} @@ -435,4 +443,8 @@ + + \ No newline at end of file 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 d2bd3c44..8b8f0169 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 @@ -12,6 +12,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SFTPUtil; +import org.jeecg.common.util.SftpConfig; import org.jeecg.common.util.text.StringUtils; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; @@ -38,6 +39,7 @@ import org.jeecg.modules.kc.zyInfoScjl.entity.ZyInfoScjl; import org.jeecg.modules.kc.zyInfoScjl.service.IZyInfoScjlService; import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -79,6 +81,26 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl @Autowired private IZyInfoScjlService zyInfoScjlService; + + @Autowired + SftpConfig sftpConfig; + + private static String uploadpath; + + @Value("${jeecg.path.upload}") + public void setUploadPath(String uploadPath) { + this.uploadpath = uploadPath; + } + + @Value(value="${jeecg.uploadType}") + private String uploadType; + @Value(value = "${jeecg.path.webapp}") + private String downloadpath; + + + @Value("${jeecg.path.upload}") + private String upLoadPath; + @Override public Page findPage(WjxWjxx wjxWjxx, Page page){ List list = baseMapper.findPage(page,wjxWjxx); @@ -532,7 +554,11 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl public void batchZyinfoKhcl(String ids) { try { String idsList[] = ids.split(","); + if(idsList.length>0){ + + String yyyy = DateUtils.formatDate(new Date(),"yyyy"); + String mm = DateUtils.formatDate(new Date(),"MM"); for(String zyId:idsList){ WjxWjxx wjxWjxx = baseMapper.selectById(zyId); @@ -549,6 +575,19 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl queryWrapper.eq("sfsckhcl","0"); List list = wjxDjxxMapper.selectList(queryWrapper); for(WjxDjxx wjxDjxx:list){ + + + List djxxTmxxList = wjxDjxxMapper.getDjxxTmxxWjt(wjxDjxx.getJid()); + if(djxxTmxxList!=null){ + for(WjxDjxxTmxx djxxTmxx:djxxTmxxList){ + //上传作业文件 + Map uploadMap = SFTPUtil.upload(sftpConfig,upLoadPath+"/"+djxxTmxx.getAnswerText(),yyyy+"/"+mm+"/"+wjxWjxx.getVid()+"/"+djxxTmxx.getAnswerText().replace("temp/","/")); + if(org.apache.commons.lang3.StringUtils.equals(uploadMap.get("code"),"0")){ + djxxTmxx.setFwqPath(uploadMap.get("data")); + wjxDjxxMapper.updateDjxxTmxxFwqpath(djxxTmxx); + } + } + } wjxDjxx.setSfsckhcl("1"); wjxDjxx.setSfsckhclTime(new Date()); wjxDjxxMapper.updateById(wjxDjxx);