From 5e1e1b7799f57508521a5cfafc2ef392a3eda87b Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期五, 10 十月 2025 23:16:05 +0800
Subject: [PATCH] 修改了对应的代码
---
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 11 +
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java | 20 +++
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java | 2
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java | 96 ++++++++++++++++
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 6
archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java | 3
archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java | 21 +++
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java | 2
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 18 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 97 ++++++++++++---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 24 +++
12 files changed, 266 insertions(+), 39 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
index 5aed5c0..50de4dd 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
@@ -31,7 +31,7 @@
private String recordId;
/** 鍙戦棶鍙� */
- @Excel(name = "鍙戦棶鍙�")
+ @Excel(name = "鍙戞枃鍙�")
private String inquiryNumber;
public String getEveryProjectName() {
@@ -42,7 +42,7 @@
this.everyProjectName = everyProjectName;
}
- @Excel(name = "姣忎釜妗堝嵎灞炰簬鐨勯」鐩悕绉�")
+ @Excel(name = "椤圭洰鍚嶇О")
private String everyProjectName;
/** 妗堝嵎棰樺悕 */
@@ -68,6 +68,7 @@
/** 瀵嗙骇 */
@Excel(name = "瀵嗙骇")
+
private String securityClassification;
@Excel(name = "妗堝嵎鐘舵��")
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java
new file mode 100644
index 0000000..6cccebc
--- /dev/null
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java
@@ -0,0 +1,20 @@
+package com.ruoyi.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class ArchiveRecordModelExp {
+ /** 妗ｆ鍙� */
+ @Excel(name = "妗ｆ鍙�")
+ private String recordId;
+
+ /** 鍙戦棶鍙� */
+ @Excel(name = "鍙戞枃鍙�")
+ private String inquiryNumber;
+
+
+ @Excel(name = "椤圭洰鍚嶇О")
+
+ private String everyProjectName;
+}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java
new file mode 100644
index 0000000..e524965
--- /dev/null
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java
@@ -0,0 +1,96 @@
+package com.ruoyi.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class ArchiveRecordModelOther {
+
+
+
+ /** 妗ｆ鍙� */
+ @Excel(name = "妗ｆ鍙�")
+ private String recordId;
+
+
+
+
+ /** 妗堝嵎棰樺悕 */
+ @Excel(name = "妗堝嵎棰樺悕")
+ private String caseTitle;
+
+ /** 鍏紑灞炴�� */
+ @Excel(name = "鍏紑灞炴��")
+ private String publicAttribute;
+
+ /** 缂栧埗鍗曚綅 */
+ @Excel(name = "缂栧埗鍗曚綅")
+ private String preparationUnit;
+
+ /** 缂栧埗鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date preparationDate;
+
+ /** 淇濈鏈熼檺 */
+ @Excel(name = "淇濈鏈熼檺")
+ private String retentionPeriod;
+
+ /** 瀵嗙骇 */
+ @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��")
+ private String securityClassification;
+
+ @Excel(name = "妗堝嵎鐘舵��")
+ private String recordStatus;
+
+ /** 妗堝嵎椤垫暟 */
+ @Excel(name = "妗堝嵎椤垫暟")
+ private Long pageCount;
+
+ /** 绔嬫鍙� */
+ @Excel(name = "绔嬫鍙�")
+ private String filingNumber;
+
+ /** 寤鸿鍗曚綅 */
+ @Excel(name = "寤鸿鍗曚綅")
+ private String constructionUnit;
+
+ /** 寤鸿鍦板潃 */
+ @Excel(name = "寤鸿鍦板潃")
+ private String constructionAddress;
+
+ /** 寤鸿椤圭洰鍚嶇О */
+ @Excel(name = "寤鸿椤圭洰鍚嶇О")
+ private String projectName;
+
+ /** 椤圭洰缂栧彿 */
+ @Excel(name = "椤圭洰缂栧彿")
+ private String projectNumber;
+
+ /** 鎵弿鍔犲伐鍏徃 */
+ @Excel(name = "鎵弿鍔犲伐鍏徃")
+ private String scanningCompany;
+
+ /** 妗ｆ绠�(瀹�)鍙� */
+ @Excel(name = "妗ｆ绠�(瀹�)鍙�")
+ private String archiveRoomNumber;
+
+ /** 缂╁井鍙� */
+ @Excel(name = "缂╁井鍙�")
+ private String microfilmNumber;
+
+ /** 澶囨敞 */
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+
+
+
+ /** 鍘嗗彶鐩稿叧鍙戞枃鍙� */
+ @Excel(name = "鍘嗗彶鐩稿叧鍙戞枃鍙�")
+ private String historicalReferenceNumber;
+}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
index 5edec76..55f6900 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
@@ -51,7 +51,7 @@
private String retentionPeriod;
/** $column.columnComment */
- @Excel(name = "瀵嗙骇")
+ @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��")
private String securityLevel;
/** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
index 728b605..ba2c4f6 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
@@ -271,7 +271,7 @@
private String retentionPeriod;
/** $column.columnComment */
- @Excel(name = "瀵嗙骇")
+ @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��")
private String securityLevel;
/** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index 03505f9..518b1ff 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -24,12 +24,15 @@
//鏍规嵁棰樺悕鎷垮埌鏈�澶х殑pageOrder
- @Select("select count(*) from document_materials where title=#{title} and page_number<#{pageNumber} and stage=#{stage}")
- Long getMaxPageOrder(@Param("title")String title,@Param("pageNumber") Long pageNumber,@Param("stage") String stage);
+ @Select("select count(*) from document_materials where title=#{title} and page_number<#{pageNumber} and stage=#{stage} and record_id=#{recordId}")
+ Long getMaxPageOrder(@Param("title")String title,@Param("pageNumber") Long pageNumber,@Param("stage") String stage, @Param("recordId") Long recordId);
//璁＄畻鏂囦欢鐨勫簭鍙�
- @Select("select count(distinct(title))-1 from document_materials where page_number<=#{pageNumber}")
- Long getFileNumber(@Param("pageNumber") Long pageNumber);
+ @Select("select count(distinct(title))-1 from document_materials where page_number<=#{pageNumber} and record_id=#{recordId}")
+ Long getFileNumber(@Param("pageNumber") Long pageNumber, @Param("recordId") Long recordId);
+
+
+
//鏌ヨ鍗峰唴鐩綍
@Select(
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
index ade6ce7..683921d 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
@@ -88,4 +88,7 @@
public int updateStatusByIds(Long [] ids);
public List<ArchiveRecordSmall> findByIds(ArchiveRecords archiveRecords);
+
+
+
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index a89b71d..a3a910a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -69,7 +69,7 @@
* @return 缁撴灉
*/
public int deleteDocumentMaterialsByMaterialId(String materialId);
- public Long getFiNum(Long pageNumber);
+ public Long getFiNum(Long pageNumber, Long recordId);
public int updateByPageNumber(Long pageNumber,String sizeType, Long fileNumber, int wid, int hei, int wdpi, int hdpi, double sz,String url,String format, Long recordId);
public List<DocumentMaterialsVo> findArchMInfo(String recordId);
@@ -77,4 +77,8 @@
public List<DocumentMaterialFileStyle> findFileStyleInfo(@Param("recordId") int recordId);
public AjaxResult importExcel(MultipartFile file, String recordId);
+
+
+ //鏍规嵁pageNumber鎷垮埌document_materials鐨勪俊鎭�
+ DocumentMaterials selectByPageNumber(Long pageNumber, Integer recordId);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index c7c3d40..5c6b943 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -282,6 +282,11 @@
for (ArchiveRecords archiveRecords : dataList) {
// physcialService.mySave(physcial);
+ archiveRecords.setRecordStatus("鏈綍鍏�");
+ LocalDateTime time = LocalDateTime.now();
+
+ Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
+ archiveRecords.setCreateTime(date);
this.mySave(archiveRecords);
}
@@ -326,16 +331,25 @@
if (list.size() > 0) {
// throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
//濡傛灉鏈夐噸澶嶆暟鎹紝鍒欐牴鎹畆ecordId杩涜鏁版嵁淇敼
- this.baseMapper.update(archiveRecords, lqw);
- return AjaxResult.success();
+ // if()
+
+ this.baseMapper.update(archiveRecords, lqw);
+ return AjaxResult.success();
+
+
}
else {
+ Long userid = SecurityUtils.getUserId();
+ if(userid==1) {
if (save(archiveRecords)) {
return AjaxResult.success();
} else {
return AjaxResult.error();
}
}
+ else
+ return AjaxResult.error("妗ｆ鍙蜂笉瀛樺湪锛�");
+ }
}
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index 183d7c5..eb969ee 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -44,8 +44,10 @@
.like(!StringUtils.isEmpty(documentMaterials.getRetentionPeriod()), DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod())
.like(!StringUtils.isEmpty(documentMaterials.getSecurityLevel()), DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel())
.eq(documentMaterials.getDate()!=null, DocumentMaterials::getDate, documentMaterials.getDate())
- .eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
-// .like(!StringUtils.isEmpty(archiveRecords.getFilingNumber()), ArchiveRecords::getFilingNumber, archiveRecords.getFilingNumber())
+ .eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId())
+ .eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
+
+ // .like(!StringUtils.isEmpty(archiveRecords.getFilingNumber()), ArchiveRecords::getFilingNumber, archiveRecords.getFilingNumber())
// .like(!StringUtils.isEmpty(archiveRecords.getArchiveRoomNumber()), ArchiveRecords::getArchiveRoomNumber, archiveRecords.getArchiveRoomNumber())
// .like(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId, archiveRecords.getRecordId());
// // .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
@@ -168,8 +170,8 @@
}
@Override
- public Long getFiNum(Long pageNumber) {
- return this.baseMapper.getFileNumber(pageNumber);
+ public Long getFiNum(Long pageNumber, Long recordId) {
+ return this.baseMapper.getFileNumber(pageNumber, recordId);
}
@Override
@@ -183,7 +185,7 @@
if(pageNumber.equals(1))
pageOrder = 1L;
else {
- Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), pageNumber, records.get(0).getStage());
+ Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), pageNumber, records.get(0).getStage(), recordId);
if (maxPOrder != null)
pageOrder = maxPOrder + 1;
}
@@ -224,4 +226,16 @@
}
return AjaxResult.success(); }
+
+ @Override
+ public DocumentMaterials selectByPageNumber(Long pageNumber, Integer recordId) {
+ LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(pageNumber!=null, DocumentMaterials::getPageNumber, pageNumber);
+ lqw.eq(recordId!=null, DocumentMaterials::getRecordId, recordId);
+ List<DocumentMaterials> ls = list(lqw);
+ if(!ls.isEmpty())
+ return ls.get(0);
+ else
+ return null;
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index f913288..4140d52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.archive;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -10,6 +11,9 @@
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.vo.AnalysisResult;
+import com.ruoyi.domain.vo.ArchiveRecordModelExp;
+import com.ruoyi.domain.vo.ArchiveRecordModelOther;
+import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.service.IArchiveRecordsService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -179,4 +183,21 @@
{
return new AjaxResult(200, archiveRecordsService.updateArchiveById(Long.parseLong(id))+"");
}
+
+
+
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchiveRecordModelExp> list = Collections.singletonList(new ArchiveRecordModelExp());
+ ExcelUtil<ArchiveRecordModelExp> util = new ExcelUtil<>(ArchiveRecordModelExp.class);
+ util.exportExcel(response,list,"妗ｆ淇℃伅瀵煎叆妯℃澘");
+ }
+
+
+ @PostMapping("/modelOther")
+ public void getExportModelOther(HttpServletResponse response){
+ List<ArchiveRecordModelOther> list = Collections.singletonList(new ArchiveRecordModelOther());
+ ExcelUtil<ArchiveRecordModelOther> util = new ExcelUtil<>(ArchiveRecordModelOther.class);
+ util.exportExcel(response,list,"妗ｆ淇℃伅瀵煎叆妯℃澘");
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 23498b4..5830c54 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -4,6 +4,11 @@
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import javax.imageio.ImageIO;
@@ -21,6 +26,7 @@
import com.ruoyi.domain.DocumentMaterials;
import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.service.IDocumentMaterialsService;
import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
import org.apache.commons.imaging.ImageInfo;
@@ -143,8 +149,8 @@
return "A0";
}
- @PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file, Long recordId) throws Exception
+ @PostMapping("/upload/{recordId}")
+ public AjaxResult uploadFile(MultipartFile file, @PathVariable Long recordId) throws Exception
{
// System.out.println("sdfd9999999999999999999999999999999");
try
@@ -163,30 +169,75 @@
//鍒嗗壊鏂囦欢鍚�
String [] nams = fname.split("\\.");
Long nam = Long.parseLong(nams[0]);
- //鏂囦欢鍚嶇О
- String pname = nams[1];
- ajax.put("url", url);
- //鎷垮埌鍥惧儚灞炴��
- BufferedImage bufferedImage = ImageIO.read(file.getInputStream());
- int wid = bufferedImage.getWidth();
- int hei = bufferedImage.getHeight();
- double sz = Double.parseDouble(String.format("%.2f", file.getSize()*1.0/1024));
- System.out.println(wid+":"+hei+":"+sz);
- //鎷垮埌鍥惧儚鐨刣pi淇℃伅
+ //鏍规嵁椤靛彿鎷垮埌妗堝嵎鐨勮缁嗕俊鎭�
+ System.out.println("0-------------");
+ System.out.println(recordId);
+ DocumentMaterials doc = documentMaterialsService.selectByPageNumber(nam, Math.toIntExact(recordId));
+ if(doc==null)
+ return AjaxResult.error("鏃犲搴旈〉鍙凤紝璇锋鏌ユ竻妤氶檮浠朵互鍙婂搴旂殑杈撳叆锛�");
+ else{
+ if(doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
+ {
+ //鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
+ //璇诲彇鏈嶅姟鍣ㄤ笂鐨勫浘鍍�
+ // new InputStream();
+ String fp = filePath + "\\0071.jpg";
+ Path path = Paths.get(fp);
+ File fil = new File(fp);
+ //鎷垮埌鍥惧儚灞炴��
+ BufferedImage bufferedImage = ImageIO.read(Files.newInputStream(path));
+ int wid = bufferedImage.getWidth();
+ int hei = bufferedImage.getHeight();
+ double sz = Double.parseDouble(String.format("%.2f", Files.size(path)*1.0/1024));
+ System.out.println("ddsdsdsd");
+ System.out.println(wid+":"+hei+":"+sz);
- ImageInfo info = Imaging.getImageInfo(file.getBytes());
+ //鎷垮埌鍥惧儚鐨刣pi淇℃伅
+
+ ImageInfo info = Imaging.getImageInfo(Files.readAllBytes(path));
- int wdpi = info.getPhysicalWidthDpi() ;
- int hdpi = info.getPhysicalHeightDpi();
- System.out.println("DPI: " + info.getPhysicalWidthDpi());
- //璁＄畻fileNumber
- Long fileNumber = documentMaterialsService.getFiNum(nam);
- //璁＄畻sizeType
- String sizeType = getPageSize(wid*hei);
- //鎻掑叆鏁版嵁搴撳搴旂殑url褰撲腑
- documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, fileName, pname, recordId);
-// System.out.println(url);
+ int wdpi = info.getPhysicalWidthDpi() ;
+ int hdpi = info.getPhysicalHeightDpi();
+ System.out.println("DPI: " + info.getPhysicalWidthDpi());
+ //璁＄畻fileNumber
+ Long fileNumber = documentMaterialsService.getFiNum(nam,recordId);
+ //璁＄畻sizeType
+ String sizeType = getPageSize(wid*hei);
+ String us = "/profile/upload/0071.jpg";
+ documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, us, "jpg", recordId);
+
+
+ }
+ else
+ {
+ //鏂囦欢鍚嶇О
+ String pname = nams[1];
+ ajax.put("url", url);
+ //鎷垮埌鍥惧儚灞炴��
+ BufferedImage bufferedImage = ImageIO.read(file.getInputStream());
+ int wid = bufferedImage.getWidth();
+ int hei = bufferedImage.getHeight();
+ double sz = Double.parseDouble(String.format("%.2f", file.getSize()*1.0/1024));
+ System.out.println(wid+":"+hei+":"+sz);
+ //鎷垮埌鍥惧儚鐨刣pi淇℃伅
+
+ ImageInfo info = Imaging.getImageInfo(file.getBytes());
+
+
+ int wdpi = info.getPhysicalWidthDpi() ;
+ int hdpi = info.getPhysicalHeightDpi();
+ System.out.println("DPI: " + info.getPhysicalWidthDpi());
+ //璁＄畻fileNumber
+ Long fileNumber = documentMaterialsService.getFiNum(nam, recordId);
+ //璁＄畻sizeType
+ String sizeType = getPageSize(wid*hei);
+ //鎻掑叆鏁版嵁搴撳搴旂殑url褰撲腑
+ documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, fileName, pname, recordId);
+//
+ }
+ }
+ System.out.println(url);
// System.out.println(fileName);
ajax.put("fileName", fileName);
// System.out.println(FileUtils.getName(fileName));
--
Gitblit v1.9.1