代码提交

杜洪波

2024-08-23 a64a8cd39c6fa141931f71b55c95b068f928d18f

代码提交

 src/main/java/com/product/file/config/CmnConst.java

@@ -27,6 +27,8 @@
    public static final String PRODUCT_SYS_PRINT_TEMPLATE_RECORD = "product_sys_print_template_reocrd";// æ‰“印模板记录表
    public static final String PRODUCT_SYS_STAFFS = "product_sys_staffs";
    public static final String TABLE_PRODUCT_SYS_ORG_LEVELS = "product_sys_org_levels";// ç»„织机构表
    public static final String PRODUCT_OA_DOCUMENT_COLLECTION = "product_oa_document_collection";    // æ–‡æ¡£æ”¶è—
    public static final String PRODUCT_OA_DOCUMENT_HISTORY = "product_oa_document_history";

    public static final String ATTACHMENT_CAPACITY = "attachment_capacity";
    public static final String RESULT = "result";

 src/main/java/com/product/file/config/DocumentCode.java

@@ -29,6 +29,10 @@
    DOCUMENT_LOG_FAIL("获取日志失败", ModuleEnum.FILE.getValue() + "008"),
    DOCUMENT_USER_RIGHT_FAIL("用户没有该目录权限", ModuleEnum.FILE.getValue() + "009"),
    DOCUMENT_DIRECTORY_NAME_FAIL("文档目录重命名失败", ModuleEnum.FILE.getValue() + "010"),
	
    DOCUMENT_COLLECTION_FAIL("文档收藏失败：", ModuleEnum.FILE.getValue() + "011"),
    DOCUMENT_CANCEL_COLLECTION_FAIL("文档取消收藏失败", ModuleEnum.FILE.getValue() + "012"),
    DOCUMENT_OPERATE_FAIL("文档操作失败", ModuleEnum.FILE.getValue() + "013"),
    ;
    
    private String text;

 src/main/java/com/product/file/config/FileCode.java

@@ -78,8 +78,8 @@
    DOC_MERGE_FALL("文档合同并失败", ModuleEnum.FILE.getValue() + "055"),
    DOC_CONVERT_FILE_NOT_EXIST_FALL("文档转换失败,文件不存在", ModuleEnum.FILE.getValue() + "056"),
    DOC_CONVERT_NOT_SUPPORT_FILE_FALL("文档转换失败,不支持的文档类型", ModuleEnum.FILE.getValue() + "057"),
    ;

    ;

    private String text;
    private String value;

 src/main/java/com/product/file/controller/DocumentController.java

ÎļþÃû´Ó src/main/java/com/product/file/controller/DocumentConstoller.java ÐÞ¸Ä
@@ -39,7 +39,7 @@
 */
@RequestMapping("/api/document")
@RestController
public class DocumentConstoller extends AbstractBaseController {
public class DocumentController extends AbstractBaseController {
    @Autowired
    public DocumentService documentService;

@@ -54,18 +54,7 @@
    public String addDocument(HttpServletRequest request) {
        try {
            //获取参数
            FieldSetEntity fse = null;
            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
            if (bean != null) {
                RequestParameterEntity reqp = (RequestParameterEntity) bean;
                fse = reqp.getFormData();
            }
            //判断参数是否为空
            if (fse == null) {
                SpringMVCContextHolder
                        .getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
                return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
            }
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
            IDocumentService service = (IDocumentService) getProxyInstance(documentService);
            String uuids = service.addDocument(fse);
            return OK_Add(uuids);
@@ -383,6 +372,50 @@
        }
    }

    /**
     *     æ–‡æ¡£æ”¶è—
     * @param request
     * @return
     */
    @RequestMapping(value = "/collection/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String documentCollection(HttpServletRequest request) {
        try {
            //获取参数
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION);
            return OK_Add(documentService.documentCollection(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            return this.error(e);
        } catch (Exception e) {
            e.printStackTrace();
            return this.error(DocumentCode.DOCUMENT_COLLECTION_FAIL.getValue(), DocumentCode.DOCUMENT_COLLECTION_FAIL.getText() + e.getMessage());
        }
    }
    /**
     *     æ–‡æ¡£å–消收藏
     * @param request
     * @return
     */
    @RequestMapping(value = "/cancel-collection/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String documentCancelCollection(HttpServletRequest request) {
        try {
            //获取参数
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION);
            if (documentService.documentCancelCollection(fse.getString("document_uuid"))) {
                return OK();
            }
            return error(DocumentCode.DOCUMENT_CANCEL_COLLECTION_FAIL.getValue(), DocumentCode.DOCUMENT_CANCEL_COLLECTION_FAIL.getText());
        } catch (BaseException e) {
            e.printStackTrace();
            return this.error(e);
        } catch (Exception e) {
            e.printStackTrace();
            return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
        }
    }


    @RequestMapping(value = "/getApplyDocument/{version}", method = RequestMethod.POST)
    @ApiVersion(1)

 src/main/java/com/product/file/controller/DocumentDirectoryController.java

ÎļþÃû´Ó src/main/java/com/product/file/controller/DocumentDirectoryConstoller.java ÐÞ¸Ä
@@ -35,7 +35,7 @@
 */
@RequestMapping("/api/directory")
@RestController
public class DocumentDirectoryConstoller extends AbstractBaseController {
public class DocumentDirectoryController extends AbstractBaseController {
    
    @Autowired
    DocumentDirectoryService documentDirectoryService;

 src/main/java/com/product/file/service/DocumentService.java

@@ -54,35 +54,42 @@

    @Override
    @Transactional
    public String addDocument(FieldSetEntity fieldSetEntity) throws BaseException {
        //文件附件表uuid
        String uuIds = fieldSetEntity.getString(CmnConst.ATTACHMENTS_UUID);
        String directory_uuid = fieldSetEntity.getString(CmnConst.DIRECTORY_UUID);
        String[] uuid = uuIds.split(",");
    public String addDocument(FieldSetEntity fse) throws BaseException {
        //获取附件目录和附件uuid
        String directory_uuid = fse.getString(CmnConst.DIRECTORY_UUID);
        String fileUUIDs = fse.getString(CmnConst.ATTACHMENTS_UUID);
        String[] fileUUIDArray = fileUUIDs.split(",");
        //获取附件信息
        DataTableEntity attachments = baseDao.listTable(CmnConst.PRODUCT_SYS_ATTACHMENTS, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuid.length, true), uuid);
        DataTableEntity attachments = baseDao.listTable(CmnConst.PRODUCT_SYS_ATTACHMENTS, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, fileUUIDArray, true));
        List<String> uuidList = ListUtils.newArrayList();
        List<String> fileNameList = ListUtils.newArrayList();
        //循环附件信息，生成文档信息
        for (int i = 0, length = attachments.getRows(); i < length; i++) {
            FieldSetEntity fieldSet = new FieldSetEntity();
            fieldSet.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
            FieldSetEntity fse = attachments.getFieldSetEntity(i);
            //文件目录uuid
            fieldSet.setValue(CmnConst.DIRECTORY_UUID, directory_uuid);
            //文件大小
            fieldSet.setValue(CmnConst.FILE_SIZE, fse.getString(CmnConst.ATTACHMENT_SIZE));
            FieldSetEntity attachment = attachments.getFieldSetEntity(i);
            //创建文档数据容器
            FieldSetEntity fseDocument = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT);
            fseDocument.setValue(CmnConst.ATTACHMENTS_UUID, attachment.getUUID());
            fseDocument.setValue(CmnConst.DIRECTORY_UUID, directory_uuid);
            fseDocument.setValue(CmnConst.FILE_SIZE, attachment.getString(CmnConst.ATTACHMENT_SIZE));
            fseDocument.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
            fseDocument.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());
            //文件名称
            String file_name = fse.getString(CmnConst.FILE_NAME);
            fieldSet.setValue(CmnConst.FILE_NAME, file_name);
            String file_name = attachment.getString(CmnConst.FILE_NAME);
            fseDocument.setValue(CmnConst.FILE_NAME, file_name);
            //文件类型
            String file_type = file_name.substring(file_name.lastIndexOf(".") + 1);
            fieldSet.setValue(CmnConst.FILE_TYPE, file_type);
            //附件uuid
            fieldSet.setValue(CmnConst.ATTACHMENTS_UUID, fse.getString(CmnConst.UUID));
            fieldSet.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());// åˆ›å»ºäºº
            fieldSet.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());// åˆ›å»ºæ—¶é—´
            String file_uuid = baseDao.add(fieldSet);
            uuidList.add(file_uuid);
            fseDocument.setValue(CmnConst.FILE_TYPE, file_type);
            //保存数据
            String documentUUID = baseDao.add(fseDocument);
            
            //创建文档版本数据容器
            FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
            BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
            fseDocument.setValue("document_uuid", documentUUID);
            fseDocument.setValue("attachment_uuid", attachment.getUUID());
            baseDao.add(fseDocumentHistory);
            
            uuidList.add(documentUUID);
            fileNameList.add(file_name);
        }
        this.documentation(uuidList.toArray(), "新增", fileNameList.toArray(), null);
@@ -133,16 +140,20 @@
            queryFilter = " AND " + queryFilter;
        }
        StringBuffer sql = new StringBuffer();
        sql.append(" SELECT ")
                .append(" a.*,CONCAT(CONVERT(a.file_size / 1024, decimal(10,2)), 'KB') file_size_kb,b.show_name name")
                //    .append(" concat(c.attachment_domain,'/',c.attachment_container,'/',c.module_uuid,'/',c.attachment_title,?) path ")
                .append(" FROM ")
                .append(" (SELECT * FROM PRODUCT_OA_document WHERE directory_uuid = ? ")
                .append(queryFilter)
                .append(" ) a LEFT JOIN product_sys_staffs b ON a.created_by = b.user_id ")
                .append(" LEFT JOIN product_sys_attachments c ON b.staff_avatar=c.uuid ");
        String sostoken = Global.getSystemConfig("upload.key", "");
        DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
        sql.append("SELECT \n");
        sql.append("  A.*,B.show_name name, \n");
        sql.append("  CONCAT(CONVERT(a.file_size / 1024, decimal(10,2)), 'KB') file_size_kb, \n");
        sql.append("  CASE WHEN D.document_uuid IS NOT NULL THEN '1' ELSE '0' END AS is_collection \n");
        sql.append("FROM( \n");
        sql.append("  SELECT * FROM product_oa_document \n");
        sql.append("  WHERE directory_uuid = ? \n");
        sql.append(queryFilter);
        sql.append(")A \n");
        sql.append("LEFT JOIN product_sys_staffs B ON B.user_id = A.created_by \n");
        sql.append("LEFT JOIN product_sys_attachments C ON C.uuid = B.staff_avatar \n");
        sql.append("LEFT JOIN product_oa_document_collection D ON D.document_uuid = A.uuid AND D.created_by = ?");
        DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid, SpringMVCContextHolder.getCurrentUserId()},
                fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
        baseDao.listInternationDataTable(documentData, null);
        return documentData;
    }
@@ -470,6 +481,26 @@
                new String[]{fieldSetEntity.getString(CmnConst.DOCUMENT_UUID)}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
    }

    /**
     *     æ–‡æ¡£æ”¶è—
     * @param fse
     * @return
     */
    public String documentCollection(FieldSetEntity fse) {
        BaseUtil.createCreatorAndCreationTime(fse);
        fse.setValue("document_collector", SpringMVCContextHolder.getCurrentUserId());
        return baseDao.add(fse);
    }
    
    /**
     *     æ–‡æ¡£å–消收藏
     * @param documentUUID
     * @return
     */
    public boolean documentCancelCollection(String documentUUID) {
        return baseDao.delete(CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION, "document_uuid = ? AND document_collector = ?", new Object[] {documentUUID, SpringMVCContextHolder.getCurrentUserId()});
    }

    @Override
    public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {


 src/main/java/com/product/file/service/ide/IDocumentService.java

@@ -4,7 +4,6 @@
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import org.jsoup.Connection;

/**
 * Copyright LX-BASE