提交 aaa48f4b 作者: 洪东保

加注释

父级 0cafdd27
...@@ -8,25 +8,6 @@ ...@@ -8,25 +8,6 @@
<artifactId>cmeeting </artifactId> <artifactId>cmeeting </artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<!--<profiles>
<profile>
<id>allow-snapshots</id>
<activation><activeByDefault>true</activeByDefault></activation>
<repositories>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
</profile>
</profiles>-->
<!-- <activeProfiles>
<activeProfile>central</activeProfile>
<activeProfile>allow-snapshots</activeProfile>
</activeProfiles>-->
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
...@@ -229,26 +210,6 @@ ...@@ -229,26 +210,6 @@
<version>1.34.0</version> <version>1.34.0</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>com.util</groupId>-->
<!-- <artifactId>llm-api</artifactId>-->
<!-- <version>1.0-SNAPSHOT</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- <artifactId>jackson-databind</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- <artifactId>jackson-annotations</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- <artifactId>jackson-core</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
...@@ -261,12 +222,6 @@ ...@@ -261,12 +222,6 @@
<version>2.8.6</version> <version>2.8.6</version>
</dependency> </dependency>
<!-- 显式引入 jackson-dataformat-xml(版本由 Spring Boot 管理) -->
<!-- <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.3</version>
</dependency>-->
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
......
package com.cmeeting.constant; package com.cmeeting.constant;
public class RecordTemplateConstant { public interface RecordTemplateConstant {
public static final String TEMPLATE_TYPE_SYSTEM = "system"; String TEMPLATE_TYPE_SYSTEM = "system";
public static final String TEMPLATE_TYPE_CUSTOM = "custom"; String TEMPLATE_TYPE_CUSTOM = "custom";
public static final String REL_TYPE_DEPT = "1"; String REL_TYPE_DEPT = "1";
public static final String REL_TYPE_USER = "2"; String REL_TYPE_USER = "2";
} }
...@@ -161,8 +161,10 @@ public class EmailPushTask { ...@@ -161,8 +161,10 @@ public class EmailPushTask {
//特殊处理map格式 //特殊处理map格式
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
Map<String,Object> value = (Map<String, Object>) entry.getValue(); Map<String,Object> value = (Map<String, Object>) entry.getValue();
Object realValue = value.get(""); //取出正确的value并设置
entry.setValue(realValue); String realValue = String.valueOf(value.get("")).replaceAll("^\\n+","");
//内容段首移除换行,段末追加换行(会议名称结尾不换行
entry.setValue(realValue.endsWith("\n") || "meeting_name".equals(entry.getKey()) || "meeting_purpose".equals(entry.getKey()) ? realValue : realValue + "\n");
} }
return map; return map;
} }
......
package com.cmeeting.pojo; package com.cmeeting.pojo;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date; import java.util.Date;
...@@ -8,6 +10,8 @@ import java.util.Date; ...@@ -8,6 +10,8 @@ import java.util.Date;
* 核心模块权限实体类 * 核心模块权限实体类
*/ */
@Data @Data
@AllArgsConstructor
@NoArgsConstructor
public class CoreModulePermissions { public class CoreModulePermissions {
/** /**
* 主键ID * 主键ID
...@@ -54,25 +58,6 @@ public class CoreModulePermissions { ...@@ -54,25 +58,6 @@ public class CoreModulePermissions {
*/ */
private String tenantId; private String tenantId;
// 无参构造方法
public CoreModulePermissions() {
}
// 全参构造方法
public CoreModulePermissions(String id, Integer type, Integer userType, Integer source,
String relId, Date createTime, Date updateTime,
String targetId, String tenantId) {
this.id = id;
this.type = type;
this.userType = userType;
this.source = source;
this.relId = relId;
this.createTime = createTime;
this.updateTime = updateTime;
this.targetId = targetId;
this.tenantId = tenantId;
}
@Override @Override
public String toString() { public String toString() {
return "CoreModulePermissions{" + return "CoreModulePermissions{" +
......
...@@ -55,7 +55,7 @@ public class MeetingInfo implements Serializable { ...@@ -55,7 +55,7 @@ public class MeetingInfo implements Serializable {
private String host; private String host;
/** /**
* 主持人uid * 主持人uid-腾讯会议用户id
*/ */
private String hostUid; private String hostUid;
......
...@@ -10,7 +10,7 @@ import java.io.Serializable; ...@@ -10,7 +10,7 @@ import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
* 会议纪要模板实体类 * 会议纪要模板权限实体类
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
......
...@@ -27,7 +27,7 @@ public class RecordTemplateVO { ...@@ -27,7 +27,7 @@ public class RecordTemplateVO {
private String name; private String name;
/** /**
* 模板类型(系统模板/自定义模板 * 模板类型(系统模板 system/自定义模板 custom
*/ */
private String type; private String type;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论