pdf添加自定义文件夹兼容

sapi/src/main/java/com/xhkjedu/sapi/controller/scantron/ScantronController.java

@@ -40,16 +40,16 @@ public class ScantronController {
      * @Return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/list_my")
-    public ResultVo listMy(@RequestBody TScantron scantron){
+    public ResultVo listMy(@RequestBody TScantron scantron) {
         Integer page = scantron.getPage();
         Integer pageSize = scantron.getPageSize();
         Integer createid = scantron.getCreateid();
         Integer schoolid = scantron.getSchoolid();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"用户id",1,schoolid,"学校id",1});
+        N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1, createid, "用户id", 1, schoolid, "学校id", 1});
         PageHelper.startPage(page, pageSize);
-        List<Map<String,Object>> list = scantronService.listScantrons(scantron);
+        List<Map<String, Object>> list = scantronService.listScantrons(scantron);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"查询成功",pageResult);
+        return new ResultVo(0, "查询成功", pageResult);
     }
 
     /*
@@ -60,96 +60,96 @@ public class ScantronController {
      * @Return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/list")
-    public ResultVo list(@RequestBody TScantron scantron){
+    public ResultVo list(@RequestBody TScantron scantron) {
         Integer page = scantron.getPage();
         Integer pageSize = scantron.getPageSize();
         Integer createid = scantron.getCreateid();
         Integer schoolid = scantron.getSchoolid();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1,schoolid,"学校id",1});
+        N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1, createid, "教师id", 1, schoolid, "学校id", 1});
 
-        //获取用户类型
+        // 获取用户类型
         UserVo userVo = userService.getUserTypeAndSubjectid(createid);
-        if(userVo.getUsertype() == 1){
-            //设置教师科目
+        if (userVo.getUsertype() == 1) {
+            // 设置教师科目
             scantron.setSubjectid(userVo.getSubjectid());
         }
-        if(userVo.getUsertype() == 0){
-            //管理员看到学校所有
+        if (userVo.getUsertype() == 0) {
+            // 管理员看到学校所有
             scantron.setCreateid(null);
         }
-        scantron.setPubliched(1);//全部查看公开的
+        scantron.setPubliched(1);// 全部查看公开的
 
         PageHelper.startPage(page, pageSize);
-        List<Map<String,Object>> list = scantronService.listScantrons(scantron);
+        List<Map<String, Object>> list = scantronService.listScantrons(scantron);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"查询成功",pageResult);
+        return new ResultVo(0, "查询成功", pageResult);
     }
 
-    //答题卡-新增
+    // 答题卡-新增
     @PostMapping("/add")
-    public ResultVo add(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getCreateid(),"创建人id",1,scantron.getSchoolid(),"学校id",1,
-                scantron.getSubjectid(),"科目id",1,scantron.getSname(),"答题卡名称",2});
+    public ResultVo add(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getCreateid(), "创建人id", 1, scantron.getSchoolid(), "学校id", 1,
+                scantron.getSubjectid(), "科目id", 1, scantron.getSname(), "答题卡名称", 2});
         try {
-            scantronService.save(scantron);
-            return new ResultVo(0,"保存成功");
-        }catch (Exception e){
-            return new ResultVo(1,"保存失败");
+            String pdfpath = scantronService.save(scantron);
+            return new ResultVo(0, "保存成功", pdfpath);
+        } catch (Exception e) {
+            return new ResultVo(1, "保存失败");
         }
     }
 
-    //答题卡-修改
+    // 答题卡-修改
     @PostMapping("/update")
-    public ResultVo update(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
+    public ResultVo update(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1});
 
         try {
-            scantronService.update(scantron);
-            return new ResultVo(0,"保存成功");
-        }catch (Exception e){
-            return new ResultVo(1,"保存失败");
+            String pdfpath = scantronService.update(scantron);
+            return new ResultVo(0, "保存成功", pdfpath);
+        } catch (Exception e) {
+            return new ResultVo(1, "保存失败");
         }
     }
 
-    //答题卡-删除
+    // 答题卡-删除
     @PostMapping("/delete")
-    public ResultVo delete(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
+    public ResultVo delete(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1});
         scantronService.delete(scantron.getSid());
-        return new ResultVo(0,"删除成功");
+        return new ResultVo(0, "删除成功");
     }
-    //答题卡-详情
+
+    // 答题卡-详情
     @PostMapping("/detail")
-    public ResultVo detail(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
+    public ResultVo detail(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1});
         TScantron st = scantronService.detail(scantron.getSid());
-        return new ResultVo(0,"获取成功",st);
+        return new ResultVo(0, "获取成功", st);
     }
 
-    //答题卡-公开
+    // 答题卡-公开
     @PostMapping("/pub")
-    public ResultVo updatePubliched(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
-        scantronService.updateScantronPubliched(scantron.getSid(),1);
-        return new ResultVo(0,"设置成功");
+    public ResultVo updatePubliched(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1});
+        scantronService.updateScantronPubliched(scantron.getSid(), 1);
+        return new ResultVo(0, "设置成功");
     }
-    //答题卡-取消公开
+
+    // 答题卡-取消公开
     @PostMapping("/unpub")
-    public ResultVo updateUnPubliched(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
-        scantronService.updateScantronPubliched(scantron.getSid(),2);
-        return new ResultVo(0,"设置成功");
+    public ResultVo updateUnPubliched(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1});
+        scantronService.updateScantronPubliched(scantron.getSid(), 2);
+        return new ResultVo(0, "设置成功");
     }
 
-    //答题卡-复用
+    // 答题卡-复用
     @PostMapping("/copy")
-    public ResultVo copyScantron(@RequestBody TScantron scantron){
-        N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1,scantron.getCreateid(),"创建人id",1});
+    public ResultVo copyScantron(@RequestBody TScantron scantron) {
+        N_Utils.validation(new Object[]{scantron.getSid(), "答题卡id", 1, scantron.getCreateid(), "创建人id", 1});
         TScantron st = scantronService.copyScantron(scantron);
-        return new ResultVo(0,"复用成功",st);
+        return new ResultVo(0, "复用成功", st);
     }
 
 
-
-
 }

sapi/src/main/java/com/xhkjedu/sapi/service/scantron/ScantronService.java

@@ -37,7 +37,7 @@ public class ScantronService {
 
     //答题卡-保存
     @Transactional(rollbackFor = Exception.class)
-    public void save(TScantron tScantron) throws Exception{
+    public String save(TScantron tScantron) throws Exception{
         tScantron.setCreatetime(N_Utils.getSecondTimestamp());
         if(tScantron.getSlayout() > 1){
             tScantron.setPapertype(1);
@@ -49,19 +49,20 @@ public class ScantronService {
         scantronMapper.insertUseGeneratedKeys(tScantron);
 
         Integer sid = tScantron.getId();
-        String pdfpath = saveScantronPdf(base64Path,sid,tScantron.getSlayout(),tScantron.getSchoolid());
+        String pdfpath = saveScantronPdf(base64Path,tScantron.getSname(),sid,tScantron.getSlayout(),tScantron.getSchoolid());
         if(N_Utils.isNotEmpty(pdfpath)){
             scantronMapper.updatePdfpath(sid,pdfpath);//更改转为路径的pdf地址
         }
+        return pdfpath;
     }
 
     //答题卡-保存pdf
-    private String saveScantronPdf(String pdfpath,Integer sid,Integer column,Integer schoolid) throws Exception {
+    private String saveScantronPdf(String pdfpath,String sname,Integer sid,Integer column,Integer schoolid) throws Exception {
         String cloudcode = scantronMapper.getSchoolCloud();
 
         String pdfbase64 = URLEncoder.encode(pdfpath,"UTF-8");
         String savefolder = cloudcode + "/" + schoolid + "/scantron/";
-        String params = "base64path=" + pdfbase64 + "&savefolder=" + savefolder + "&column=" + column + "&filename=" + sid;
+        String params = "base64path=" + pdfbase64 + "&savefolder=" + savefolder + "&column=" + column + "&filename=" + sname + "&customefolder=" + sid;
         String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + "bs/topdf", params);
         if(N_Utils.isEmpty(fileInfoStr)){
             return "";
@@ -75,7 +76,7 @@ public class ScantronService {
     }
 
     //答题卡-修改
-    public void update(TScantron tScantron) throws Exception{
+    public String update(TScantron tScantron) throws Exception{
         if(N_Utils.isTrueInteger(tScantron.getSlayout()) && tScantron.getSlayout() > 1){
             tScantron.setPapertype(1);
         }else{
@@ -83,13 +84,20 @@ public class ScantronService {
         }
 
         TScantron oldScantron = scantronMapper.selectByPrimaryKey(tScantron.getSid());
+        String rtnPdfpath = oldScantron.getPdfpath();
         if(N_Utils.isEmpty(oldScantron.getPdfpath()) || !oldScantron.getPdfpath().equals(tScantron.getPdfpath())){
             String base64Path = tScantron.getPdfpath();
-            String pdfpath = saveScantronPdf(base64Path,tScantron.getSid(),tScantron.getSlayout(),oldScantron.getSchoolid());
+            String sname = tScantron.getSname();
+            if(N_Utils.isEmpty(sname)){
+                sname = oldScantron.getSname();
+            }
+            String pdfpath = saveScantronPdf(base64Path,sname,tScantron.getSid(),tScantron.getSlayout(),oldScantron.getSchoolid());
             tScantron.setPdfpath(pdfpath);
+            rtnPdfpath = pdfpath;
         }
 
         scantronMapper.updateByPrimaryKeySelective(tScantron);
+        return rtnPdfpath;
     }
 
     //答题卡-删除