|
@@ -183,7 +183,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
}else if(blongType==5){
|
|
}else if(blongType==5){
|
|
content = "模具报废文档";
|
|
content = "模具报废文档";
|
|
}
|
|
}
|
|
- newsNotice.setContent("有新的"+content+"待您审批");
|
|
|
|
|
|
+ newsNotice.setContent("有新的"+content+",待您审批。");
|
|
newsNoticeMapper.insert(newsNotice);
|
|
newsNoticeMapper.insert(newsNotice);
|
|
NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
|
|
NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
|
|
newsNoticeUser.setUserId(user.getId());
|
|
newsNoticeUser.setUserId(user.getId());
|
|
@@ -457,7 +457,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
ZipEntry ze = null;
|
|
ZipEntry ze = null;
|
|
for (int i = 0; i < files.length; i++) {//将所有需要下载的pdf文件都写入临时zip文件
|
|
for (int i = 0; i < files.length; i++) {//将所有需要下载的pdf文件都写入临时zip文件
|
|
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(files[i]));
|
|
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(files[i]));
|
|
- ze = new ZipEntry(files[i].getName());
|
|
|
|
|
|
+ ze = new ZipEntry(mouldFiles.get(i).getFileName());
|
|
zos.putNextEntry(ze);
|
|
zos.putNextEntry(ze);
|
|
int s = -1;
|
|
int s = -1;
|
|
while ((s = bis.read()) != -1) {
|
|
while ((s = bis.read()) != -1) {
|
|
@@ -470,9 +470,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
-//以上,临时压缩文件创建完成
|
|
|
|
-//进行浏览器下载
|
|
|
|
-//获得浏览器代理信息
|
|
|
|
|
|
+ //以上,临时压缩文件创建完成
|
|
|
|
+ //进行浏览器下载
|
|
|
|
+ //获得浏览器代理信息
|
|
final String userAgent = request.getHeader("USER-AGENT");
|
|
final String userAgent = request.getHeader("USER-AGENT");
|
|
//判断浏览器代理并分别设置响应给浏览器的编码格式
|
|
//判断浏览器代理并分别设置响应给浏览器的编码格式
|
|
String finalFileName = null;
|
|
String finalFileName = null;
|