commit: file upload rename image

inspur-common/src/main/java/com/inspur/common/utils/LibreOfficeConvertUtil.java

@@ -60,7 +60,7 @@ public class LibreOfficeConvertUtil {
      * @param pdfPath PDF路径
      * @return pdf 页数
      */
-    public static int convertToImage(String pdfPath) throws Exception {
+    public static int convertToImage(String pdfPath,long timeMillis) throws Exception {
         BufferedImage imageResult;
         File pdfFile = new File(pdfPath);
         PDDocument pdDocument = PDDocument.load(pdfFile);
@@ -74,7 +74,7 @@ public class LibreOfficeConvertUtil {
 
         int shiftHeight = 0;
         int[] singleImgRGB;
-
+        String pdfFileName = pdfPath.substring(pdfPath.lastIndexOf("/") + 1);
         for (int i = 0; i < pages; i++) {
             BufferedImage image = pdfRenderer.renderImageWithDPI(i, DEFAULT_DPI, ImageType.RGB);
             width = image.getWidth();
@@ -84,7 +84,8 @@ public class LibreOfficeConvertUtil {
             // 写入流中
             imageResult.setRGB(0, shiftHeight, width, imageHeight, singleImgRGB, 0, width);
             // 写图片
-            ImageIO.write(imageResult, DEFAULT_IMAGE_FORMAT.replace(".", ""), new File(pdfPath + "." + i + DEFAULT_IMAGE_FORMAT));
+            String imgPath = pdfPath.replace(pdfFileName, String.valueOf(timeMillis));
+            ImageIO.write(imageResult, DEFAULT_IMAGE_FORMAT.replace(".", ""), new File(imgPath + "." + i + DEFAULT_IMAGE_FORMAT));
         }
 
         pdDocument.close();

inspur-party/src/main/java/com/inspur/domain/partywork/PartyAttendanceRecord.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 /**
  * 考勤记录对象 party_attendance_record
- * 
+ *
  * @author inspur
  * @date 2022-09-24
  */
@@ -54,6 +54,9 @@ public class PartyAttendanceRecord extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date signTime;
 
+    /**签名时间*/
+    private String signTimeStr;
+
     /**签名时间*/
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date attence_time;

inspur-party/src/main/java/com/inspur/service/partywork/impl/PartyMeetingInfoServiceImpl.java

@@ -577,16 +577,19 @@ public class PartyMeetingInfoServiceImpl implements IPartyMeetingInfoService
             {
                 try {
                     String pdfFile =LibreOfficeConvertUtil.convertToPdf(sourceFile,tarPdfFile,officeManage);
-                    int pageSize = LibreOfficeConvertUtil.convertToImage(pdfFile);
+                    long timeMillis = System.currentTimeMillis();
+                    int pageSize = LibreOfficeConvertUtil.convertToImage(pdfFile,timeMillis);
+                    String pdfFileName = pdfFile.substring(pdfFile.lastIndexOf("/") + 1);
                     Long followId = partyMeetingFollow.getId();
                     for (int i = 0; i < pageSize; i++) {
                         partyMeetingFollow.setFollowId(followId);
-                        String filePath = pdfFile + "." + i + ".png";
-                        String fileUrl = filePath.replace("/home/inspur/party-admin/uploadPath",filePre + "/profile");
+                        // String filePath = pdfFile + "." + i + ".png";
+                        String imgPath = pdfFile.replace(pdfFileName, String.valueOf(timeMillis)) + "." + i + ".png";
+                        String fileUrl = imgPath.replace("/home/inspur/party-admin/uploadPath",filePre + "/profile");
                         partyMeetingFollow.setId(null);
                         partyMeetingFollow.setFileUrl(fileUrl);
                         partyMeetingFollow.setFileIndex(i);
-                        partyMeetingFollow.setFileName(filePath.substring(filePath.lastIndexOf("/") + 1));
+                        partyMeetingFollow.setFileName(imgPath.substring(imgPath.lastIndexOf("/") + 1));
                         partyMeetingFollow.setFileType(2);
                         partyMeetingFollowMapper.insertPartyMeetingFollow(partyMeetingFollow);
                     }
@@ -1150,7 +1153,7 @@ public class PartyMeetingInfoServiceImpl implements IPartyMeetingInfoService
                 PartyAttendanceRecord attendanceRecord = partyAttendanceRecordMapper.selectAttendanced(meetingId,memberId);
                 if (null != attendanceRecord && attendanceRecord.getAttendanceStatus() == 0) {
                     partyAttendanceRecordMapper.updateStatusByMeetingIdAndMemberId(meetingId, memberId, attendanceStatus);
-                    attendanceRecord.setSignTime(DateUtils.getNowDate());
+                    attendanceRecord.setSignTimeStr(DateUtils.parseDateToStr("HH:mm",attendanceRecord.getSignTime()));
                     newAttendanceRecordList.add(attendanceRecord);
                 } else {
                     log.info("memberId:{}已经签到过,meetingId:{}",memberId,meetingId);