请假相关

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/LeaveSheetController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -77,9 +76,9 @@ public class LeaveSheetController {
      * @return
      */
     @RequestMapping("/add")
-    public HttpRespMsg add(LeaveSheet sheet, @RequestParam(value = "files",required = false) MultipartFile[] files) {
+    public HttpRespMsg add(LeaveSheet sheet) {
         String userId = request.getHeader("Token");
-        return leaveSheetService.add(sheet, userId,files);
+        return leaveSheetService.add(sheet, userId);
 
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/LeaveSheet.java

@@ -13,7 +13,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -162,8 +161,12 @@ public class LeaveSheet extends Model<LeaveSheet> {
     @TableField(exist = false)
     private String dept;
 
-    @TableField(exist = false)
-    private List<LeaveSheetFiles> leaveSheetFiles;
+//    @TableField(exist = false)
+//    private List<LeaveSheetFiles> leaveSheetFiles;
+
+    /**请假凭证 逗号分隔*/
+    @TableField("file_urls")
+    private String fileUrls;
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/LeaveSheetFiles.java

@@ -1,59 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class LeaveSheetFiles extends Model<LeaveSheetFiles> {
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @TableField("leave_sheet_id")
-    private Integer leaveSheetId;
-
-    @TableField("document_name")
-    private String documentName;
-
-    @TableField("server_name")
-    private String serverName;
-
-    @TableField("url")
-    private String url;
-
-    @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date indate;
-
-    @TableField("size")
-    private String size;
-
-    @TableField("document_type")
-    private Integer documentType;
-
-    /**
-     * 上传人id
-     */
-    @TableField("creator_id")
-    private String creatorId;
-
-    /**
-     * 上传人姓名
-     */
-    @TableField("creator_name")
-    private String creatorName;
-
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/LeaveSheetFilesMapper.java

@@ -1,7 +0,0 @@
-package com.management.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.management.platform.entity.LeaveSheetFiles;
-
-public interface LeaveSheetFilesMapper extends BaseMapper<LeaveSheetFiles> {
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/LeaveSheetService.java

@@ -3,7 +3,6 @@ package com.management.platform.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.entity.LeaveSheet;
 import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -18,7 +17,7 @@ import java.util.List;
  */
 public interface LeaveSheetService extends IService<LeaveSheet> {
 
-    HttpRespMsg add(LeaveSheet sheet, String userId, MultipartFile[] files);
+    HttpRespMsg add(LeaveSheet sheet, String userId);
 
     HttpRespMsg delete(Integer id);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -11,23 +11,19 @@ import com.management.platform.controller.AuditWorkflowSettingController;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.entity.vo.UserRestTimeVO;
-import com.management.platform.exception.FileCheckException;
 import com.management.platform.mapper.*;
 import com.management.platform.service.*;
-import com.management.platform.task.SFTPAsyncUploader;
-import com.management.platform.util.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.MessageUtils;
+import com.management.platform.util.WorkDayCalculateUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -84,37 +80,9 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
     @Value(value = "${upload.path}")
     private String path;
 
-    @Autowired
-    private SFTPAsyncUploader sftpAsyncUploader;
-
-    @Resource
-    private LeaveSheetFilesMapper leaveSheetFilesMapper;
-
-    public void checkFile(MultipartFile file) throws FileCheckException {
-        if(file.isEmpty()){
-            throw new FileCheckException("文件大小不能为0");
-        }
-        if(org.apache.commons.lang3.StringUtils.isBlank(file.getOriginalFilename())){
-            throw new FileCheckException("文件名不能为空");
-        }
-        if(file.getOriginalFilename().split("\\.").length > 2){
-            throw new FileCheckException("文件名中.不能出现多个");
-        }
-    }
-
     @Override
-    public HttpRespMsg add(LeaveSheet sheet, String userId, MultipartFile[] files) {
+    public HttpRespMsg add(LeaveSheet sheet, String userId) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(null != files && files.length > 0){
-            try {
-                for (MultipartFile file : files) {
-                    checkFile(file);
-                }
-            } catch (FileCheckException e) {
-                msg.setError(e.getMessage());
-                return msg;
-            }
-        }
         boolean isNew = false;
         if (sheet.getId() == null) {
             isNew = true;
@@ -186,55 +154,6 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         if (wxCorpInfo != null) {
             sendAuditNotifyMsg(wxCorpInfo, user, sheet);
         }
-        if(null != files && files.length > 0){
-            for (MultipartFile file : files) {
-                LeaveSheetFiles leaveSheetFiles = new LeaveSheetFiles();
-                leaveSheetFiles.setDocumentName(file.getOriginalFilename());
-                leaveSheetFiles.setLeaveSheetId(sheet.getId());
-                leaveSheetFiles.setCreatorId(userId);
-                leaveSheetFiles.setCreatorName(user.getName());
-                String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-                leaveSheetFiles.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
-                //处理文件
-                File dir = new File(path);
-                if (!dir.exists()) {
-                    dir.mkdir();
-                }
-                String fileName = "";
-                if (file != null && !file.isEmpty()) {
-                    fileName = file.getOriginalFilename();
-
-                    int pos = fileName.lastIndexOf(".");
-                    String suffix = fileName.substring(pos).toLowerCase();
-                    //用uuid替换原始的文件名
-                    String purFName = UUID.randomUUID().toString().replaceAll("-", "");
-                    fileName = purFName + suffix;
-                    File saveFile = new File(dir, fileName);
-                    try {
-                        saveFile.createNewFile();
-                        file.transferTo(saveFile);
-                        //异步上传到备份服务器
-                        sftpAsyncUploader.uploadFileAsync(saveFile);
-                        //计算文件大小
-                        long fileSize = saveFile.length();
-                        String fileLength = FileUtil.getReadableFileSize(fileSize);
-                        leaveSheetFiles.setServerName(path + fileName);
-                        leaveSheetFiles.setSize(fileLength);
-                        String pathPrefix = "/upload/";
-                        leaveSheetFiles.setUrl(pathPrefix + fileName);
-                        leaveSheetFilesMapper.insert(leaveSheetFiles);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage() + ", path=" + dir.getAbsolutePath());
-                    }
-                }
-            }
-        }
 
         return msg;
     }
@@ -411,18 +330,6 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                 }
             });
         }
-        if(!CollectionUtils.isEmpty(records)){
-            List<Integer> leavesheetIds = records.stream().map(LeaveSheet::getId).collect(Collectors.toList());
-            List<LeaveSheetFiles> leaveSheetFiles = leaveSheetFilesMapper.selectList(new LambdaQueryWrapper<LeaveSheetFiles>()
-                            .select(LeaveSheetFiles::getDocumentName,LeaveSheetFiles::getServerName,LeaveSheetFiles::getUrl)
-                    .in(LeaveSheetFiles::getLeaveSheetId, leavesheetIds)
-            );
-            Map<Integer, List<LeaveSheetFiles>> collect = leaveSheetFiles.stream().collect(Collectors.groupingBy(LeaveSheetFiles::getLeaveSheetId));
-            for (LeaveSheet record : records) {
-                List<LeaveSheetFiles> tmpList = collect.get(record.getId());
-                record.setLeaveSheetFiles(tmpList);
-            }
-        }
 
         Long total = listIPager.getTotal();
 

fhKeeper/formulahousekeeper/ops-platform/src/main/resources/application-prod.yml

@@ -13,9 +13,9 @@ spring:
       max-request-size: 100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.100.37.243:7644/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
+    url: jdbc:mysql://localhost:3306/man_xin?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
-    password: Ziyu20141026!@@
+    password: 123456
     hikari:
       maximum-pool-size: 10
       minimum-idle: 3