Browse Source

看板的switchFrequent改为switchFrequency

sunyj 8 years ago
parent
commit
aed7cc72fb

+ 6 - 6
kanban-console/src/main/java/com/uas/kanban/model/Kanban.java

@@ -36,7 +36,7 @@ public class Kanban extends BaseEntity {
 	/**
 	 * 切换频率(ms)
 	 */
-	private Long switchFrequent;
+	private Long switchFrequency;
 
 	/**
 	 * 看板图标样式
@@ -67,12 +67,12 @@ public class Kanban extends BaseEntity {
 		this.display = display;
 	}
 
-	public Long getSwitchFrequent() {
-		return switchFrequent;
+	public Long getSwitchFrequency() {
+		return switchFrequency;
 	}
 
-	public void setSwitchFrequent(Long switchFrequent) {
-		this.switchFrequent = switchFrequent;
+	public void setSwitchFrequency(Long switchFrequency) {
+		this.switchFrequency = switchFrequency;
 	}
 
 	public String getIconStyle() {
@@ -86,7 +86,7 @@ public class Kanban extends BaseEntity {
 	@Override
 	public String toString() {
 		return "Kanban [name=" + name + ", templateCodes=" + templateCodes + ", display=" + display
-				+ ", switchFrequent=" + switchFrequent + ", iconStyle=" + iconStyle + ", id=" + id + ", createTime="
+				+ ", switchFrequency=" + switchFrequency + ", iconStyle=" + iconStyle + ", id=" + id + ", createTime="
 				+ createTime + ", lastModified=" + lastModified + ", version=" + version + ", code=" + code + "]";
 	}
 

+ 2 - 2
kanban-console/src/main/java/com/uas/kanban/service/impl/KanbanServiceImpl.java

@@ -79,12 +79,12 @@ public class KanbanServiceImpl extends BaseService<Kanban> {
 		if (display != null) {
 			switch (display) {
 			case AutoSwitch:
-				if (kanban.getSwitchFrequent() == null) {
+				if (kanban.getSwitchFrequency() == null) {
 					throw new IllegalArgumentException("展示方式为“自动切换”时,请指定切换频率(ms)");
 				}
 				break;
 			case SplitScreen:
-				if (kanban.getSwitchFrequent() != null) {
+				if (kanban.getSwitchFrequency() != null) {
 					throw new IllegalArgumentException("展示方式为“分屏展示”时,不可指定切换频率");
 				}
 				break;

+ 1 - 1
kanban-console/src/main/webapp/WEB-INF/views/console.html

@@ -56,7 +56,7 @@
 			</ol>
 			<strong><li class="title">看版</li></strong>
 			<ol>
-				<li><a target="_blank">kanban/save?json={"name": "name","templateCodes":["4FF1AD1C411","4FF1F024412"],"display":"AutoSwitch","switchFrequent":5000, "iconStyle":"style='width:10px;'"}</a></li>
+				<li><a target="_blank">kanban/save?json={"name": "name","templateCodes":["4FF1AD1C411","4FF1F024412"],"display":"AutoSwitch","switchFrequency":5000, "iconStyle":"style='width:10px;'"}</a></li>
 				<!-- "templateCodes":"4ED1EA76E16" 或 "templateCodes":["4ED1EA76E16"]-->
 				<li><a target="_blank">kanban/update?json={"code":"506C9FB0311","name": "name","templateCodes":["4FF1AD1C411","4FF1F024412"],"display":"SplitScreen"}</a></li>
 				<li><a target="_blank">kanban/delete/all</a></li>