wwh 2 سال پیش
والد
کامیت
8f84181ebe

+ 7 - 2
admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/PdfUtil.java

@@ -41,15 +41,20 @@ public class PdfUtil {
         }
     }*/
     public static void returnPdfStream2(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
         try {
-            File file = new File(pathName );
-            InputStream in = new BufferedInputStream(new FileInputStream(file));
+            File file = new File(pathName);
+             in = new BufferedInputStream(new FileInputStream(file));
             String filename = new String((subsidyNane+".pdf").getBytes(), "ISO8859_1");
             response.setContentType("application/binary;charset=ISO8859_1");
             response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
             IoUtil.copy(in, response.getOutputStream());
         } catch (Exception e) {
             System.out.println(e);
+        }finally {
+            if (in != null) {
+                in.close();
+            }
         }
     }
 

+ 11 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillSubsidyController.java

@@ -11,6 +11,7 @@ import com.huimv.farm.damsubsidy.common.utils.PdfUtil;
 import com.huimv.farm.test.Print;
 import com.spire.xls.FileFormat;
 import com.spire.xls.Workbook;
+import org.apache.tomcat.util.http.fileupload.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -149,6 +153,12 @@ public class BillSubsidyController {
         wb.saveToFile(pdfPath, FileFormat.PDF);
         PdfUtil.returnPdfStream2(response,pdfPath,subsidy.getFarmerName());
         //文件删除 TODO
-
+//        File file = new File("G://"+subsidy.getFarmerName() + ".pdf");
+//
+//        FileUtils.forceDelete(file);
+        Path path1 = Paths.get("G://"+subsidy.getFarmerName()+".pdf");
+        Files.delete(path1);
+        Path path2 = Paths.get("G://"+"order_contract"+".xls");
+        Files.delete(path2);
     }
 }

+ 9 - 5
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -156,11 +156,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotEmpty(user2)) {
             return new Result(ResultCode.FAIL, "");
         }
-        userMapper.insert(user);
-        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", paramsMap.get("phone"));
-        SysUser user1 = userMapper.selectOne(queryWrapper);
-        return new Result(ResultCode.SUCCESS,user1);
+        QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("phone", paramsMap.get("phone"));
+        SysUser sysUser = userMapper.selectOne(queryWrapper2);
+        if (ObjectUtil.isNotEmpty(sysUser)) {
+            return new Result(ResultCode.FAIL, "");
+        }
+        userMapper.insert(sysUser);
+
+        return new Result(ResultCode.SUCCESS,userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone",paramsMap.get("phone"))));
     }
 
     @Override