Browse Source

修复bug, 图片组件取值, script标签不能为text/javascript. 应该使用thymeleaf模板, th:inline="javascript"

Memory_LG 1 week ago
parent
commit
b684d61ab5

+ 3 - 3
qmjszx-admin/src/main/resources/templates/system/notice/edit.html

@@ -76,7 +76,7 @@
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: summernote-js"/>
 <th:block th:include="include :: image-upload-js"/>
-<script type="text/javascript">
+<script th:inline="javascript">
     var prefix = ctx + "system/notice";
 
     $(function () {
@@ -120,9 +120,9 @@
         $('#editor').summernote('code', content);
 
         // ============ 修复:初始化图片上传组件并回显已有图片 ============
-        console.log(typeof "${notice.noticeImg}")
+        console.log(typeof '${notice.noticeImg}')
         // 获取已有的封面图片数据(逗号分隔的字符串)
-        var imgStr = '[[${notice.noticeImg}]]';
+        var imgStr = [[${notice.noticeImg}]];
         var existingImages = [];
 
         console.log('原始图片字符串:', imgStr);

+ 0 - 20
qmjszx-business/src/main/java/beilv/competition/domain/Competition.java

@@ -159,24 +159,4 @@ public class Competition extends BaseEntity {
 
     private String userId;
 
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("competitionTitle", getCompetitionTitle())
-                .append("competitionType", getCompetitionType())
-                .append("personMax", getPersonMax())
-                .append("teamMax", getTeamMax())
-                .append("competitionPlace", getCompetitionPlace())
-                .append("applyStartTime", getApplyStartTime())
-                .append("applyEndTime", getApplyEndTime())
-                .append("applyBeforeTime", getApplyBeforeTime())
-                .append("competitionMaximum", getCompetitionMaximum())
-                .append("competitionExpense", getCompetitionExpense())
-                .append("competitionDetails", getCompetitionDetails())
-                .append("registrationNotes", getRegistrationNotes())
-                .append("competitionState", getCompetitionState())
-                .toString();
-    }
 }

+ 41 - 87
qmjszx-system/src/main/java/beilv/system/domain/SysNotice.java

@@ -1,119 +1,73 @@
 package beilv.system.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import beilv.common.core.domain.BaseEntity;
 import beilv.common.xss.Xss;
+import lombok.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.ibatis.type.Alias;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
  * 通知公告表 sys_notice
- * 
+ *
  * @author ruoyi
  */
-@Data
-public class SysNotice extends BaseEntity
-{
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("SysNotice")
+public class SysNotice extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 公告ID */
+    /**
+     * 公告ID
+     */
     private Long noticeId;
 
-    /** 公告标题 */
+    /**
+     * 公告标题
+     */
     private String noticeTitle;
 
-    /** 公告类型(1通知 2公告) */
+    /**
+     * 公告类型(1通知 2公告)
+     */
     private String noticeType;
 
-    /** 公告内容 */
+    /**
+     * 公告内容
+     */
     private String noticeContent;
 
-    /** 公告状态(0正常 1关闭) */
+    /**
+     * 公告状态(0正常 1关闭)
+     */
     private String status;
 
-    /** 是否置顶 */
+    /**
+     * 是否置顶
+     */
     private String topped;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     private String sort;
 
-    /** 发布时间 */
+    /**
+     * 发布时间
+     */
     private Date releaseTime;
 
-    /** 图片 */
+    /**
+     * 图片
+     */
     private String noticeImg;
 
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
-
-    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
-    }
-
-    public void setNoticeType(String noticeType)
-    {
-        this.noticeType = noticeType;
-    }
-
-    public String getNoticeType()
-    {
-        return noticeType;
-    }
-
-    public void setNoticeContent(String noticeContent)
-    {
-        this.noticeContent = noticeContent;
-    }
-
-    public String getNoticeContent()
-    {
-        return noticeContent;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }