From fc512dd5eaac63b39aa0c1c88a2a49c1d0c205cc Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 1 Jul 2020 14:58:10 +0800 Subject: [PATCH] project+wps --- .../ccsens/game/service/MessageService.java | 12 +- .../ccsens/mt/service/MessageServicer.java | 12 +- .../java/com/ccsens/tall/bean/dto/WpsDto.java | 25 ++ .../ccsens/tall/bean/po/ProProjectFile.java | 45 +++- .../tall/bean/po/ProProjectFileExample.java | 238 ++++++++++++++++-- .../java/com/ccsens/tall/bean/po/WpsFile.java | 11 + .../ccsens/tall/bean/po/WpsFileExample.java | 70 ++++++ .../ccsens/tall/bean/po/WpsFileVersion.java | 11 + .../tall/bean/po/WpsFileVersionExample.java | 70 ++++++ .../java/com/ccsens/tall/bean/vo/WpsVo.java | 9 + .../ccsens/tall/persist/dao/WpsFileDao.java | 8 + .../com/ccsens/tall/service/IWpsService.java | 17 ++ .../ccsens/tall/service/MessageService.java | 24 +- .../tall/service/ProjectMessageService.java | 24 +- .../tall/service/TaskDeliverService.java | 14 +- .../com/ccsens/tall/service/WpsService.java | 161 +++++++++--- .../com/ccsens/tall/web/FileController.java | 3 +- .../com/ccsens/tall/web/WpsController.java | 6 +- .../main/resources/mapper_dao/WpsFileDao.xml | 14 ++ .../mapper_raw/ProProjectFileMapper.xml | 76 ++++-- .../resources/mapper_raw/WpsFileMapper.xml | 31 ++- .../mapper_raw/WpsFileVersionMapper.xml | 25 +- .../java/com/ccsens/util/WebConstant.java | 25 +- .../com/ccsens/util/TestWpsSignature.java | 12 +- 24 files changed, 794 insertions(+), 149 deletions(-) diff --git a/game/src/main/java/com/ccsens/game/service/MessageService.java b/game/src/main/java/com/ccsens/game/service/MessageService.java index 466ba63d..8ecef036 100644 --- a/game/src/main/java/com/ccsens/game/service/MessageService.java +++ b/game/src/main/java/com/ccsens/game/service/MessageService.java @@ -36,13 +36,13 @@ public class MessageService implements IMessageService { @Override public void sendGameMessageWithGetUrl(ChromeMessageDto message) throws Exception { System.out.println(JacksonUtil.beanToJson(message)); - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, - JacksonUtil.beanToJson(message)); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, +// JacksonUtil.beanToJson(message)); -// InMessage inMessage = new InMessage(); -// inMessage.setTos(message.receiversTransTos()); -// inMessage.setData(JSONObject.toJSONString(message.getData())); -// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); + InMessage inMessage = new InMessage(); + inMessage.setTos(message.receiversTransTos()); + inMessage.setData(JSONObject.toJSONString(message.getData())); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); } @Override diff --git a/mt/src/main/java/com/ccsens/mt/service/MessageServicer.java b/mt/src/main/java/com/ccsens/mt/service/MessageServicer.java index df3bd0b9..341579a7 100644 --- a/mt/src/main/java/com/ccsens/mt/service/MessageServicer.java +++ b/mt/src/main/java/com/ccsens/mt/service/MessageServicer.java @@ -17,12 +17,12 @@ public class MessageServicer implements IMessageService{ @Override public void sendSyncMessageWithShow(SyncMessageWithShowDto message) throws Exception { System.out.println(JacksonUtil.beanToJson(message)); - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, - JacksonUtil.beanToJson(message)); -// InMessage inMessage = new InMessage(); -// inMessage.setTos(message.receiversTransTos()); -// inMessage.setData(JSONObject.toJSONString(message.getData())); -// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, +// JacksonUtil.beanToJson(message)); + InMessage inMessage = new InMessage(); + inMessage.setTos(message.receiversTransTos()); + inMessage.setData(JSONObject.toJSONString(message.getData())); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/WpsDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/WpsDto.java index cda8fb80..c11589a4 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/WpsDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/WpsDto.java @@ -158,4 +158,29 @@ public class WpsDto { @ApiModelProperty("应用id") private String _w_appid; } + + @Data + @ApiModel("业务和WPS") + public static class Business{ + @ApiModelProperty("业务ID") + private Long businessId; + @ApiModelProperty("wps文件ID") + private Long wpsFileId; + @ApiModelProperty("业务类型") + private Byte businessType; + @ApiModelProperty("用户ID") + private Long userId; + @ApiModelProperty("文件名") + private String fileName; + @ApiModelProperty("文件路径，默认在WebConstant.UPLOAD_PATH_BASE下") + private String filePath; + @ApiModelProperty("文件大小") + private Long fileSize; + @ApiModelProperty("操作类型 值：WebConstant Wps USER_OPERATION... ") + private byte operation; + @ApiModelProperty("操作权限 WebConstant Wps PROJECT_PRIVILEGE...") + private byte privilege; + @ApiModelProperty("操作权限查询路径") + private String privilegeQueryUrl; + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFile.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFile.java index 8a2e1302..b39fd592 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFile.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFile.java @@ -6,10 +6,16 @@ import java.util.Date; public class ProProjectFile implements Serializable { private Long id; - private Long projectId; + private Long businessId; private Long fileId; + private Byte businessType; + + private Byte privilege; + + private String privilegeQueryUrl; + private Date createdAt; private Date updatedAt; @@ -26,12 +32,12 @@ public class ProProjectFile implements Serializable { this.id = id; } - public Long getProjectId() { - return projectId; + public Long getBusinessId() { + return businessId; } - public void setProjectId(Long projectId) { - this.projectId = projectId; + public void setBusinessId(Long businessId) { + this.businessId = businessId; } public Long getFileId() { @@ -42,6 +48,30 @@ public class ProProjectFile implements Serializable { this.fileId = fileId; } + public Byte getBusinessType() { + return businessType; + } + + public void setBusinessType(Byte businessType) { + this.businessType = businessType; + } + + public Byte getPrivilege() { + return privilege; + } + + public void setPrivilege(Byte privilege) { + this.privilege = privilege; + } + + public String getPrivilegeQueryUrl() { + return privilegeQueryUrl; + } + + public void setPrivilegeQueryUrl(String privilegeQueryUrl) { + this.privilegeQueryUrl = privilegeQueryUrl == null ? null : privilegeQueryUrl.trim(); + } + public Date getCreatedAt() { return createdAt; } @@ -73,8 +103,11 @@ public class ProProjectFile implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", projectId=").append(projectId); + sb.append(", businessId=").append(businessId); sb.append(", fileId=").append(fileId); + sb.append(", businessType=").append(businessType); + sb.append(", privilege=").append(privilege); + sb.append(", privilegeQueryUrl=").append(privilegeQueryUrl); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFileExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFileExample.java index 49e87112..74481b0c 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFileExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProProjectFileExample.java @@ -165,63 +165,63 @@ public class ProProjectFileExample { return (Criteria) this; } - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); + public Criteria andBusinessIdIsNull() { + addCriterion("business_id is null"); return (Criteria) this; } - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); + public Criteria andBusinessIdIsNotNull() { + addCriterion("business_id is not null"); return (Criteria) this; } - public Criteria andProjectIdEqualTo(Long value) { - addCriterion("project_id =", value, "projectId"); + public Criteria andBusinessIdEqualTo(Long value) { + addCriterion("business_id =", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdNotEqualTo(Long value) { - addCriterion("project_id <>", value, "projectId"); + public Criteria andBusinessIdNotEqualTo(Long value) { + addCriterion("business_id <>", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdGreaterThan(Long value) { - addCriterion("project_id >", value, "projectId"); + public Criteria andBusinessIdGreaterThan(Long value) { + addCriterion("business_id >", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("project_id >=", value, "projectId"); + public Criteria andBusinessIdGreaterThanOrEqualTo(Long value) { + addCriterion("business_id >=", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdLessThan(Long value) { - addCriterion("project_id <", value, "projectId"); + public Criteria andBusinessIdLessThan(Long value) { + addCriterion("business_id <", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdLessThanOrEqualTo(Long value) { - addCriterion("project_id <=", value, "projectId"); + public Criteria andBusinessIdLessThanOrEqualTo(Long value) { + addCriterion("business_id <=", value, "businessId"); return (Criteria) this; } - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); + public Criteria andBusinessIdIn(List values) { + addCriterion("business_id in", values, "businessId"); return (Criteria) this; } - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); + public Criteria andBusinessIdNotIn(List values) { + addCriterion("business_id not in", values, "businessId"); return (Criteria) this; } - public Criteria andProjectIdBetween(Long value1, Long value2) { - addCriterion("project_id between", value1, value2, "projectId"); + public Criteria andBusinessIdBetween(Long value1, Long value2) { + addCriterion("business_id between", value1, value2, "businessId"); return (Criteria) this; } - public Criteria andProjectIdNotBetween(Long value1, Long value2) { - addCriterion("project_id not between", value1, value2, "projectId"); + public Criteria andBusinessIdNotBetween(Long value1, Long value2) { + addCriterion("business_id not between", value1, value2, "businessId"); return (Criteria) this; } @@ -285,6 +285,196 @@ public class ProProjectFileExample { return (Criteria) this; } + public Criteria andBusinessTypeIsNull() { + addCriterion("business_type is null"); + return (Criteria) this; + } + + public Criteria andBusinessTypeIsNotNull() { + addCriterion("business_type is not null"); + return (Criteria) this; + } + + public Criteria andBusinessTypeEqualTo(Byte value) { + addCriterion("business_type =", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotEqualTo(Byte value) { + addCriterion("business_type <>", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeGreaterThan(Byte value) { + addCriterion("business_type >", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("business_type >=", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeLessThan(Byte value) { + addCriterion("business_type <", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeLessThanOrEqualTo(Byte value) { + addCriterion("business_type <=", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeIn(List values) { + addCriterion("business_type in", values, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotIn(List values) { + addCriterion("business_type not in", values, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeBetween(Byte value1, Byte value2) { + addCriterion("business_type between", value1, value2, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotBetween(Byte value1, Byte value2) { + addCriterion("business_type not between", value1, value2, "businessType"); + return (Criteria) this; + } + + public Criteria andPrivilegeIsNull() { + addCriterion("privilege is null"); + return (Criteria) this; + } + + public Criteria andPrivilegeIsNotNull() { + addCriterion("privilege is not null"); + return (Criteria) this; + } + + public Criteria andPrivilegeEqualTo(Byte value) { + addCriterion("privilege =", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeNotEqualTo(Byte value) { + addCriterion("privilege <>", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeGreaterThan(Byte value) { + addCriterion("privilege >", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeGreaterThanOrEqualTo(Byte value) { + addCriterion("privilege >=", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeLessThan(Byte value) { + addCriterion("privilege <", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeLessThanOrEqualTo(Byte value) { + addCriterion("privilege <=", value, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeIn(List values) { + addCriterion("privilege in", values, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeNotIn(List values) { + addCriterion("privilege not in", values, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeBetween(Byte value1, Byte value2) { + addCriterion("privilege between", value1, value2, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeNotBetween(Byte value1, Byte value2) { + addCriterion("privilege not between", value1, value2, "privilege"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlIsNull() { + addCriterion("privilege_query_url is null"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlIsNotNull() { + addCriterion("privilege_query_url is not null"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlEqualTo(String value) { + addCriterion("privilege_query_url =", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlNotEqualTo(String value) { + addCriterion("privilege_query_url <>", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlGreaterThan(String value) { + addCriterion("privilege_query_url >", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlGreaterThanOrEqualTo(String value) { + addCriterion("privilege_query_url >=", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlLessThan(String value) { + addCriterion("privilege_query_url <", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlLessThanOrEqualTo(String value) { + addCriterion("privilege_query_url <=", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlLike(String value) { + addCriterion("privilege_query_url like", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlNotLike(String value) { + addCriterion("privilege_query_url not like", value, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlIn(List values) { + addCriterion("privilege_query_url in", values, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlNotIn(List values) { + addCriterion("privilege_query_url not in", values, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlBetween(String value1, String value2) { + addCriterion("privilege_query_url between", value1, value2, "privilegeQueryUrl"); + return (Criteria) this; + } + + public Criteria andPrivilegeQueryUrlNotBetween(String value1, String value2) { + addCriterion("privilege_query_url not between", value1, value2, "privilegeQueryUrl"); + return (Criteria) this; + } + public Criteria andCreatedAtIsNull() { addCriterion("created_at is null"); return (Criteria) this; diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFile.java b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFile.java index b023dfb1..3e9f8415 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFile.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFile.java @@ -14,6 +14,8 @@ public class WpsFile implements Serializable { private String downloadUrl; + private String saveUrl; + private Long creator; private Long modifier; @@ -66,6 +68,14 @@ public class WpsFile implements Serializable { this.downloadUrl = downloadUrl == null ? null : downloadUrl.trim(); } + public String getSaveUrl() { + return saveUrl; + } + + public void setSaveUrl(String saveUrl) { + this.saveUrl = saveUrl == null ? null : saveUrl.trim(); + } + public Long getCreator() { return creator; } @@ -117,6 +127,7 @@ public class WpsFile implements Serializable { sb.append(", name=").append(name); sb.append(", size=").append(size); sb.append(", downloadUrl=").append(downloadUrl); + sb.append(", saveUrl=").append(saveUrl); sb.append(", creator=").append(creator); sb.append(", modifier=").append(modifier); sb.append(", createdAt=").append(createdAt); diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileExample.java index 9292baca..f36e60a4 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileExample.java @@ -425,6 +425,76 @@ public class WpsFileExample { return (Criteria) this; } + public Criteria andSaveUrlIsNull() { + addCriterion("save_url is null"); + return (Criteria) this; + } + + public Criteria andSaveUrlIsNotNull() { + addCriterion("save_url is not null"); + return (Criteria) this; + } + + public Criteria andSaveUrlEqualTo(String value) { + addCriterion("save_url =", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotEqualTo(String value) { + addCriterion("save_url <>", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlGreaterThan(String value) { + addCriterion("save_url >", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlGreaterThanOrEqualTo(String value) { + addCriterion("save_url >=", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLessThan(String value) { + addCriterion("save_url <", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLessThanOrEqualTo(String value) { + addCriterion("save_url <=", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLike(String value) { + addCriterion("save_url like", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotLike(String value) { + addCriterion("save_url not like", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlIn(List values) { + addCriterion("save_url in", values, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotIn(List values) { + addCriterion("save_url not in", values, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlBetween(String value1, String value2) { + addCriterion("save_url between", value1, value2, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotBetween(String value1, String value2) { + addCriterion("save_url not between", value1, value2, "saveUrl"); + return (Criteria) this; + } + public Criteria andCreatorIsNull() { addCriterion("creator is null"); return (Criteria) this; diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersion.java b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersion.java index 039d3440..6bb0bcc3 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersion.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersion.java @@ -16,6 +16,8 @@ public class WpsFileVersion implements Serializable { private String downloadUrl; + private String saveUrl; + private Long modifier; private Date createdAt; @@ -74,6 +76,14 @@ public class WpsFileVersion implements Serializable { this.downloadUrl = downloadUrl == null ? null : downloadUrl.trim(); } + public String getSaveUrl() { + return saveUrl; + } + + public void setSaveUrl(String saveUrl) { + this.saveUrl = saveUrl == null ? null : saveUrl.trim(); + } + public Long getModifier() { return modifier; } @@ -118,6 +128,7 @@ public class WpsFileVersion implements Serializable { sb.append(", name=").append(name); sb.append(", size=").append(size); sb.append(", downloadUrl=").append(downloadUrl); + sb.append(", saveUrl=").append(saveUrl); sb.append(", modifier=").append(modifier); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersionExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersionExample.java index 3c8f7670..dc617762 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersionExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/WpsFileVersionExample.java @@ -485,6 +485,76 @@ public class WpsFileVersionExample { return (Criteria) this; } + public Criteria andSaveUrlIsNull() { + addCriterion("save_url is null"); + return (Criteria) this; + } + + public Criteria andSaveUrlIsNotNull() { + addCriterion("save_url is not null"); + return (Criteria) this; + } + + public Criteria andSaveUrlEqualTo(String value) { + addCriterion("save_url =", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotEqualTo(String value) { + addCriterion("save_url <>", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlGreaterThan(String value) { + addCriterion("save_url >", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlGreaterThanOrEqualTo(String value) { + addCriterion("save_url >=", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLessThan(String value) { + addCriterion("save_url <", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLessThanOrEqualTo(String value) { + addCriterion("save_url <=", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlLike(String value) { + addCriterion("save_url like", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotLike(String value) { + addCriterion("save_url not like", value, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlIn(List values) { + addCriterion("save_url in", values, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotIn(List values) { + addCriterion("save_url not in", values, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlBetween(String value1, String value2) { + addCriterion("save_url between", value1, value2, "saveUrl"); + return (Criteria) this; + } + + public Criteria andSaveUrlNotBetween(String value1, String value2) { + addCriterion("save_url not between", value1, value2, "saveUrl"); + return (Criteria) this; + } + public Criteria andModifierIsNull() { addCriterion("modifier is null"); return (Criteria) this; diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/WpsVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/WpsVo.java index 6ba1e3a0..8dc86199 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/WpsVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/WpsVo.java @@ -267,4 +267,13 @@ public class WpsVo { this.value = value; } } + + @ApiModel("业务关联的文件") + @Data + public static class BusinessFile{ + @ApiModelProperty("文件ID") + private Long fileId; + @ApiModelProperty("文件名字") + private String fileName; + } } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/WpsFileDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/WpsFileDao.java index a2eafafd..4f8991c2 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/WpsFileDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/WpsFileDao.java @@ -35,4 +35,12 @@ public interface WpsFileDao extends WpsFileMapper { * @return 历史文件信息 */ List queryFileHistory(WpsDto.FileHistoryBody body); + + /** + * 根据业务ID和类型查询文件相关 + * @param businessId 业务ID + * @param businessType 业务类型 + * @return 文件信息 + */ + List queryFileByBusiness(@Param("businessId") long businessId, @Param("businessType") byte businessType); } diff --git a/tall/src/main/java/com/ccsens/tall/service/IWpsService.java b/tall/src/main/java/com/ccsens/tall/service/IWpsService.java index b404c1b9..e36724e3 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IWpsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IWpsService.java @@ -74,6 +74,23 @@ public interface IWpsService { * wps通知 * @param token 身份识别 * @param body 通知内容 + * @throws Exception 异常 */ void notify(String token, WpsDto.NotifyBody body) throws Exception; + + /** + * 保存业务和文件记录， + * @param business 业务和文件关系 + */ + void saveFile(WpsDto.Business business); + + /** + * 根据业务ID和类型返回文件预览 + * + * @param businessId 业务ID + * @param businessType 业务类型 + * @param token token + * @return WPS访问路径 + */ + List queryVisitUrls(long businessId, byte businessType, String token); } diff --git a/tall/src/main/java/com/ccsens/tall/service/MessageService.java b/tall/src/main/java/com/ccsens/tall/service/MessageService.java index dfb21d6c..38a5e0e7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/MessageService.java +++ b/tall/src/main/java/com/ccsens/tall/service/MessageService.java @@ -62,13 +62,13 @@ public class MessageService implements IMessageService{ SyncMessageWithStartDto message = new SyncMessageWithStartDto(projectId, sender, receivers, roleId, taskId, null, time, duration,player); //FixMe 发送到消息队列 System.out.println("+++++++++++++"+JacksonUtil.beanToJson(message)); - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, - JacksonUtil.beanToJson(message)); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, +// JacksonUtil.beanToJson(message)); -// InMessage inMessage = new InMessage(); -// inMessage.setTos(message.receiversTransTos()); -// inMessage.setData(JSONObject.toJSONString(message.getData())); -// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); + InMessage inMessage = new InMessage(); + inMessage.setTos(message.receiversTransTos()); + inMessage.setData(JSONObject.toJSONString(message.getData())); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); } } @@ -99,12 +99,12 @@ public class MessageService implements IMessageService{ public void sendStartTaskMessage(SyncMessageWithStartDto syncMessage) throws Exception { System.out.println(JacksonUtil.beanToJson(syncMessage)); //FixMe 发送到消息队列 - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME , - JacksonUtil.beanToJson(syncMessage)); -// InMessage inMessage = new InMessage(); -// inMessage.setTos(syncMessage.receiversTransTos()); -// inMessage.setData(JSONObject.toJSONString(syncMessage.getData())); -// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME , +// JacksonUtil.beanToJson(syncMessage)); + InMessage inMessage = new InMessage(); + inMessage.setTos(syncMessage.receiversTransTos()); + inMessage.setData(JSONObject.toJSONString(syncMessage.getData())); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, inMessage); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java index ba4345e0..1ac4d5f9 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java @@ -104,21 +104,21 @@ public class ProjectMessageService implements IProjectMessageService { //mq-->ws // 操作发送 initMessageSend(userIds, oauthUserIds, operationId); -// InMessage inMessage = new InMessage(); -// inMessage.setTos(InMessage.transTos(userIds)); -// inMessage.setData(JSONObject.toJSONString(newMessages)); -// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, JSONObject.toJSONString(inMessage)); -// log.info("mq通知消息:{}", inMessage); - - com.ccsens.tall.bean.dto.message.ProjectMessageDto dto = new com.ccsens.tall.bean.dto.message.ProjectMessageDto(); - dto.setReceivers(BaseMessageDto.MessageUser.userIdToUsers(userIds)); - List messages = JSONObject.parseArray(JSONObject.toJSONString(newMessages), com.ccsens.tall.bean.dto.message.ProjectMessageDto.Message.class); - dto.getData().setMessages(messages); + InMessage inMessage = new InMessage(); + inMessage.setTos(InMessage.transTos(userIds)); + inMessage.setData(JSONObject.toJSONString(newMessages)); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, JSONObject.toJSONString(inMessage)); + log.info("mq通知消息:{}", inMessage); +// com.ccsens.tall.bean.dto.message.ProjectMessageDto dto = new com.ccsens.tall.bean.dto.message.ProjectMessageDto(); +// dto.setReceivers(BaseMessageDto.MessageUser.userIdToUsers(userIds)); +// List messages = JSONObject.parseArray(JSONObject.toJSONString(newMessages), com.ccsens.tall.bean.dto.message.ProjectMessageDto.Message.class); +// dto.getData().setMessages(messages); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, +// JacksonUtil.beanToJson(dto)); //更新ws消息发送成功 updateStatus(operationId, WebConstant.Message.SEND_WS); - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, - JacksonUtil.beanToJson(dto)); + //TODO 公众号通知消息 if (CollectionUtil.isEmpty(openids)) { log.info("项目{}下没有关注公众号的用户，未发送公众号关注", inform.getProjectId()); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index 2ddef5c7..c6197b7b 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -574,13 +574,13 @@ public class TaskDeliverService implements ITaskDeliverService { } checkerDto.setReceivers(messageUserList); log.info("检查交付物：{}",JacksonUtil.beanToJson(checkerDto)); - rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, - JacksonUtil.beanToJson(checkerDto)); -// MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User); -// String s = JacksonUtil.beanToJson(checkerDto); -// InMessage inMessage = InMessage.newToUserMessage(currentUserId.toString(),userIdSet,null,messageRule,s); -// -// messageService.sendDeliverMessageWithChecker(inMessage); +// rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, +// JacksonUtil.beanToJson(checkerDto)); + MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User); + String s = JacksonUtil.beanToJson(checkerDto); + InMessage inMessage = InMessage.newToUserMessage(currentUserId.toString(),userIdSet,null,messageRule,s); + + messageService.sendDeliverMessageWithChecker(inMessage); //检查完，返回数据 DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId()); diff --git a/tall/src/main/java/com/ccsens/tall/service/WpsService.java b/tall/src/main/java/com/ccsens/tall/service/WpsService.java index eaa2a905..ad1bfb88 100644 --- a/tall/src/main/java/com/ccsens/tall/service/WpsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/WpsService.java @@ -19,7 +19,6 @@ import com.ccsens.util.*; import com.ccsens.util.exception.BaseException; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -27,15 +26,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.Part; import java.io.File; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** - * @description: + * wps文件 * @author: whj - * @time: 2020/6/17 18:05 + * @date: 2020/6/17 18:05 */ @Slf4j @Service @@ -55,17 +51,78 @@ public class WpsService implements IWpsService { @Resource private WpsNotifyMapper wpsNotifyMapper; @Resource - private IProRoleService proRoleService; - @Resource private RedisUtil redisUtil; @Resource private Snowflake snowflake; - private String fileUrl = "http://wwo.wps.cn/office/{}/{}?_w_appid="+WebConstant.Wps.APPID+"&_w_signature={}"; + @Override + public List queryVisitUrls(long businessId, byte businessType, String token) { + log.info("查询访问路径：{}，{}", businessId, businessType); + List urls = new ArrayList<>(); + + List files = wpsFileDao.queryFileByBusiness(businessId, businessType); + files.forEach(file -> { + String name = file.getFileName(); + log.info("文件名：{}", name); + String url = getUrl(String.valueOf(file.getFileId()), name.substring(name.lastIndexOf(".") + 1), token); + urls.add(url); + }); + log.info("访问路径返回结果：{}", urls); + return urls; + } + + @Override + public void saveFile(WpsDto.Business business) { + ProProjectFile proProjectFile = null; + if (business.getWpsFileId() != null) { + ProProjectFileExample example = new ProProjectFileExample(); + example.createCriteria().andBusinessIdEqualTo(business.getBusinessId()) + .andBusinessTypeEqualTo(business.getBusinessType()) + .andFileIdEqualTo(business.getWpsFileId()); + List proProjectFiles = proProjectFileMapper.selectByExample(example); + if (CollectionUtil.isEmpty(proProjectFiles)) { + throw new BaseException(CodeEnum.PARAM_ERROR); + } + proProjectFile = proProjectFiles.get(0); + } + + // 保存文件版本信息 + WpsFile wpsFile = saveWpsFile(business.getWpsFileId() == null ? null : String.valueOf(business.getWpsFileId()), + business.getFileSize(), business.getUserId(), business.getFilePath(), + business.getFileName()); + // 更新文件记录 + WpsFileVersion version = saveVersion(wpsFile); + // 调用接口，更新数据项目接口（异步调用） + // 保存用户提交记录 + WpsFileUser wpsFileUser = initFileUser(business.getUserId(), version.getId()); + wpsFileUser.setOperation(business.getOperation()); + wpsFileUserMapper.insertSelective(wpsFileUser); + // 文件ID为空，保存文件和业务的关系 + if (proProjectFile == null) { + saveBusiness(business, wpsFile); + } + } + + /** + * 保存业务文件关联 + * @param business 业务信息 + * @param wpsFile 获取文件ID + */ + private void saveBusiness(WpsDto.Business business, WpsFile wpsFile) { + ProProjectFile proProjectFile; + proProjectFile = new ProProjectFile(); + proProjectFile.setId(snowflake.nextId()); + proProjectFile.setFileId(wpsFile.getId()); + proProjectFile.setBusinessId(business.getBusinessId()); + proProjectFile.setBusinessType(business.getBusinessType()); + proProjectFile.setPrivilege(business.getPrivilege()); + proProjectFile.setPrivilegeQueryUrl(business.getPrivilegeQueryUrl()); + proProjectFileMapper.insertSelective(proProjectFile); + } @Override public void notify(String token, WpsDto.NotifyBody body) throws Exception { - Long userId = getUserId(token); + getUserId(token); WpsNotify wpsNotify = new WpsNotify(); wpsNotify.setId(snowflake.nextId()); wpsNotify.setCmd(body.getCmd()); @@ -73,6 +130,7 @@ public class WpsService implements IWpsService { wpsNotifyMapper.insertSelective(wpsNotify); } + @Override public void fileRename(String token, long fileId, WpsDto.FileRenameBody renameBody) throws Exception { Long userId = getUserId(token); @@ -106,9 +164,8 @@ public class WpsService implements IWpsService { @Override public List queryFileHistory(String token, WpsDto.FileHistoryBody body) throws Exception { - Long userId = getUserId(token); - List msgs = wpsFileDao.queryFileHistory(body); - return msgs; + getUserId(token); + return wpsFileDao.queryFileHistory(body); } @Override @@ -132,17 +189,29 @@ public class WpsService implements IWpsService { WpsFile wpsFile = saveWpsFile(token, fileId, file,WebConstant.Wps.USER_OPERATION_NEW); String fileName = UploadFileUtil_Servlet3.getFileNameByPart(file); String ext = FileUtil.extName(fileName); + String url = getUrl(fileId, ext, token); + WpsVo.FileNew fileNew = new WpsVo.FileNew(); + fileNew.setRedirect_url(url); + fileNew.setUser_id(String.valueOf(wpsFile.getCreator())); + return fileNew; + } + + /** + * 返回WPS文件访问路径 + * @param fileId 文件ID + * @param ext 后缀 + * @param token token + * @return wps访问路径 + */ + private String getUrl(String fileId, String ext, String token) { String fileType = WebConstant.Wps.getFileType(ext); Map paramMap= new HashMap<>(); paramMap.put("_w_appid", WebConstant.Wps.APPID); // paramMap.put("_w_fname", fileName); // paramMap.put("_w_userid", String.valueOf(wpsFile.getCreator())); String newSignature = WpsSignature.getSignature(paramMap, WebConstant.Wps.APPKEY); - String url = StrUtil.format(fileUrl, fileType, wpsFile.getId(), newSignature); - WpsVo.FileNew fileNew = new WpsVo.FileNew(); - fileNew.setRedirect_url(url); - fileNew.setUser_id(String.valueOf(wpsFile.getCreator())); - return fileNew; + String fileUrl = "http://wwo.wps.cn/office/{}/{}?_w_appid=" + WebConstant.Wps.APPID + "&_w_signature={}&token={}"; + return StrUtil.format(fileUrl, fileType, fileId, newSignature, token); } @Override @@ -189,21 +258,39 @@ public class WpsService implements IWpsService { return fileInfo; } - int power = proRoleService.selectPowerByRoleName(userId, proProjectFiles.get(0).getId()); - log.info("权限：{}", power); - if (power > 1) { - user.setPermission(WebConstant.Wps.PERMISSION_WRITE); + ProProjectFile projectFile = proProjectFiles.get(0); + byte businessType = projectFile.getBusinessType(); + switch (businessType) { + case WebConstant.Wps.PROJECT_PRIVILEGE_READ : + user.setPermission(WebConstant.Wps.PERMISSION_READ); + break; + case WebConstant.Wps.PROJECT_PRIVILEGE_WRITE: + user.setPermission(WebConstant.Wps.PERMISSION_WRITE); + break; + default: + JSONObject json = new JSONObject(); + json.put("id", projectFile.getBusinessId()); + json.put("type", projectFile.getBusinessType()); + json.put("fileId", projectFile.getFileId()); + String result = RestTemplateUtil.postBody(projectFile.getPrivilegeQueryUrl(), json); + user.setPermission(result); } - wpsFileUser.setOperation(power > 1 ? WebConstant.Wps.USER_OPERATION_WRITE : WebConstant.Wps.USER_OPERATION_READ); + +// int power = proRoleService.selectPowerByRoleName(userId, proProjectFiles.get(0).getId()); +// log.info("权限：{}", power); +// if (power > 1) { +// user.setPermission(WebConstant.Wps.PERMISSION_WRITE); +// } + wpsFileUser.setOperation(WebConstant.Wps.PERMISSION_READ.equals(user.getPermission()) ? WebConstant.Wps.USER_OPERATION_READ : WebConstant.Wps.USER_OPERATION_WRITE); wpsFileUserMapper.insertSelective(wpsFileUser); return fileInfo; } /** * 初始化用户和文档（无操作类型） - * @param userId - * @param fileId - * @return + * @param userId 用户id + * @param fileId 文件id + * @return 用户操作文件记录 */ private WpsFileUser initFileUser(Long userId, Long fileId) { WpsFileUser wpsFileUser = new WpsFileUser(); @@ -238,7 +325,7 @@ public class WpsService implements IWpsService { String filePath = WebConstant.UPLOAD_PATH_WPS + File.separator + path; String name = UploadFileUtil_Servlet3.getFileNameByPart(file); // 保存文件版本信息 - WpsFile wpsFile = saveWpsFile(fileId, file, userId, filePath, name); + WpsFile wpsFile = saveWpsFile(fileId, file.getSize(), userId, filePath, name); // 更新文件记录 WpsFileVersion version = saveVersion(wpsFile); // 调用接口，更新数据项目接口（异步调用） @@ -257,6 +344,7 @@ public class WpsService implements IWpsService { version.setName(wpsFile.getName()); version.setSize(wpsFile.getSize()); version.setDownloadUrl(wpsFile.getDownloadUrl()); + version.setSaveUrl(wpsFile.getSaveUrl()); version.setModifier(wpsFile.getModifier()); wpsFileVersionMapper.insertSelective(version); return version; @@ -264,14 +352,14 @@ public class WpsService implements IWpsService { /** * 保存文件信息 - * @param fileId - * @param file - * @param userId - * @param filePath - * @param name - * @return + * @param fileId 文件ID，无则保存，有则修改 + * @param fileSize 文件大小 + * @param userId 用户id + * @param filePath 文件位置，默认在：WebConstant.UPLOAD_PATH_BASE 下 + * @param name 文件名字 + * @return wpsFile */ - private WpsFile saveWpsFile(String fileId, Part file, Long userId, String filePath, String name) { + private WpsFile saveWpsFile(String fileId, Long fileSize, Long userId, String filePath, String name) { WpsFile wpsFile; if (StrUtil.isEmpty(fileId)) { // 创建文件ID @@ -289,8 +377,9 @@ public class WpsService implements IWpsService { wpsFile.setCreatedAt(new Date()); wpsFile.setUpdatedAt(new Date()); wpsFile.setName(name); - wpsFile.setSize(file.getSize()); + wpsFile.setSize(fileSize); wpsFile.setDownloadUrl(PropUtil.domain + "file/download/" + name + "?path=" + filePath); + wpsFile.setSaveUrl(WebConstant.UPLOAD_PATH_BASE + File.separator + filePath); wpsFile.setModifier(userId); if (StrUtil.isEmpty(fileId)) { diff --git a/tall/src/main/java/com/ccsens/tall/web/FileController.java b/tall/src/main/java/com/ccsens/tall/web/FileController.java index aaeea0dc..c61ac494 100644 --- a/tall/src/main/java/com/ccsens/tall/web/FileController.java +++ b/tall/src/main/java/com/ccsens/tall/web/FileController.java @@ -3,7 +3,6 @@ package com.ccsens.tall.web; import com.ccsens.util.UploadFileUtil_Servlet3; import com.ccsens.util.WebConstant; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -22,7 +21,7 @@ import java.io.File; @RequestMapping("/file") public class FileController { - @ApiOperation(value = "文件下载", notes = "") + @ApiOperation(value = "文件下载") @GetMapping(value = "download/{fileName}") public void download(HttpServletResponse response, @PathVariable("fileName")String fileName, String path) throws Exception { String parentPath = WebConstant.UPLOAD_PATH_BASE + File.separator + path; diff --git a/tall/src/main/java/com/ccsens/tall/web/WpsController.java b/tall/src/main/java/com/ccsens/tall/web/WpsController.java index 6f848677..a8e41d71 100644 --- a/tall/src/main/java/com/ccsens/tall/web/WpsController.java +++ b/tall/src/main/java/com/ccsens/tall/web/WpsController.java @@ -191,7 +191,11 @@ public class WpsController { public static WpsHeader getHeader(HttpServletRequest request) { WpsHeader header = new WpsHeader(); header.setUserAgent(request.getHeader("User-Agent")); - header.setToken(request.getHeader("x-wps-weboffice-token")); + String token = request.getHeader("x-wps-weboffice-token"); + if (StrUtil.isEmpty(token)) { + token = request.getParameter("token"); + } + header.setToken(token); // header.setToken("eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTM0MTI5ODEsInN1YiI6IjEyMTgwMjUyNDk0OTMzNTY1NDQiLCJhdXRoSWQiOiIxMTgzNjM2MjkxNjQ5MTQ2ODgwIiwiZXhwIjoxNTkzNDk5MzgxfQ.c1kAovpN7tq6O4rykIoSF-VPgmYBAM2ZNeqH_jsipI4"); header.setFileId(request.getHeader("x-weboffice-file-id")); return header; diff --git a/tall/src/main/resources/mapper_dao/WpsFileDao.xml b/tall/src/main/resources/mapper_dao/WpsFileDao.xml index e9aafc20..89268ecd 100644 --- a/tall/src/main/resources/mapper_dao/WpsFileDao.xml +++ b/tall/src/main/resources/mapper_dao/WpsFileDao.xml @@ -79,4 +79,18 @@ v.version DESC LIMIT #{offset},#{count} + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProProjectFileMapper.xml b/tall/src/main/resources/mapper_raw/ProProjectFileMapper.xml index 8efe4a54..37d5f66e 100644 --- a/tall/src/main/resources/mapper_raw/ProProjectFileMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProProjectFileMapper.xml @@ -3,8 +3,11 @@ - + + + + @@ -68,7 +71,8 @@ - id, project_id, file_id, created_at, updated_at, rec_status + id, business_id, file_id, business_type, privilege, privilege_query_url, created_at, + updated_at, rec_status select @@ -107,13 +108,13 @@ insert into t_wps_file (id, current_version, name, - size, download_url, creator, - modifier, created_at, updated_at, - rec_status) + size, download_url, save_url, + creator, modifier, created_at, + updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{currentVersion,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, - #{size,jdbcType=BIGINT}, #{downloadUrl,jdbcType=VARCHAR}, #{creator,jdbcType=BIGINT}, - #{modifier,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + #{size,jdbcType=BIGINT}, #{downloadUrl,jdbcType=VARCHAR}, #{saveUrl,jdbcType=VARCHAR}, + #{creator,jdbcType=BIGINT}, #{modifier,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) insert into t_wps_file @@ -133,6 +134,9 @@ download_url, + + save_url, + creator, @@ -165,6 +169,9 @@ #{downloadUrl,jdbcType=VARCHAR}, + + #{saveUrl,jdbcType=VARCHAR}, + #{creator,jdbcType=BIGINT}, @@ -206,6 +213,9 @@ download_url = #{record.downloadUrl,jdbcType=VARCHAR}, + + save_url = #{record.saveUrl,jdbcType=VARCHAR}, + creator = #{record.creator,jdbcType=BIGINT}, @@ -233,6 +243,7 @@ name = #{record.name,jdbcType=VARCHAR}, size = #{record.size,jdbcType=BIGINT}, download_url = #{record.downloadUrl,jdbcType=VARCHAR}, + save_url = #{record.saveUrl,jdbcType=VARCHAR}, creator = #{record.creator,jdbcType=BIGINT}, modifier = #{record.modifier,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -257,6 +268,9 @@ download_url = #{downloadUrl,jdbcType=VARCHAR}, + + save_url = #{saveUrl,jdbcType=VARCHAR}, + creator = #{creator,jdbcType=BIGINT}, @@ -281,6 +295,7 @@ name = #{name,jdbcType=VARCHAR}, size = #{size,jdbcType=BIGINT}, download_url = #{downloadUrl,jdbcType=VARCHAR}, + save_url = #{saveUrl,jdbcType=VARCHAR}, creator = #{creator,jdbcType=BIGINT}, modifier = #{modifier,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, diff --git a/tall/src/main/resources/mapper_raw/WpsFileVersionMapper.xml b/tall/src/main/resources/mapper_raw/WpsFileVersionMapper.xml index 351a9680..d9bc3a23 100644 --- a/tall/src/main/resources/mapper_raw/WpsFileVersionMapper.xml +++ b/tall/src/main/resources/mapper_raw/WpsFileVersionMapper.xml @@ -8,6 +8,7 @@ + @@ -72,7 +73,7 @@ - id, file_id, version, name, size, download_url, modifier, created_at, updated_at, + id, file_id, version, name, size, download_url, save_url, modifier, created_at, updated_at, rec_status