百科V1.3.3热搜词，分类管理功能开发

src/main/java/com/caimei/modules/baike/entity/CmBaikeType.java

@@ -20,7 +20,9 @@ public class CmBaikeType extends DataEntity<CmBaikeType> {
 	private Integer status;		// 状态：0停用，1启用
 	private Date addTime;		// 添加时间
 	private Integer addBy;		// 添加人
-
+    private String pcBanner;	//pc端banner
+	private String appBanner;	//移动端banner
+	private String bannerLink;	//banner跳转链接
 	private String addUserName;		//添加人名称
 	
 	public CmBaikeType() {
@@ -88,4 +90,28 @@ public class CmBaikeType extends DataEntity<CmBaikeType> {
 	public void setAddUserName(String addUserName) {
 		this.addUserName = addUserName;
 	}
+
+	public void setPcBanner(String pcBanner) {
+		this.pcBanner = pcBanner;
+	}
+
+	public void setAppBanner(String appBanner) {
+		this.appBanner = appBanner;
+	}
+
+	public void setBannerLink(String bannerLink) {
+		this.bannerLink = bannerLink;
+	}
+
+	public String getPcBanner() {
+		return pcBanner;
+	}
+
+	public String getAppBanner() {
+		return appBanner;
+	}
+
+	public String getBannerLink() {
+		return bannerLink;
+	}
 }

src/main/java/com/caimei/modules/baike/service/CmBaikeHotSearchService.java

@@ -58,13 +58,13 @@ public class CmBaikeHotSearchService extends CrudService<CmBaikeHotSearchDao, Cm
 
 	@Transactional(readOnly = false)
 	public void saveBanner(CmBaikeBanner cmBaikeBanner) {
-        if (1 == cmBaikeBanner.getBannerType()) {
+//        if (1 == cmBaikeBanner.getBannerType()) {
             cmBaikeBanner.setProductPcBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getProductPcBanner()));
             cmBaikeBanner.setProductAppBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getProductAppBanner()));
-        } else {
-            cmBaikeBanner.setInstrumentPcBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getInstrumentPcBanner()));
-            cmBaikeBanner.setInstrumentAppBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getInstrumentAppBanner()));
-        }
+//        } else {
+//            cmBaikeBanner.setInstrumentPcBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getInstrumentPcBanner()));
+//            cmBaikeBanner.setInstrumentAppBanner(UploadPicUtils.saveImageToServer(cmBaikeBanner.getInstrumentAppBanner()));
+//        }
 		cmBaikeHotSearchDao.saveBanner(cmBaikeBanner);
 	}
 }

src/main/resources/mappings/modules/baike/CmBaikeHotSearchMapper.xml

@@ -52,7 +52,8 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				order by -sort desc, a.addTime desc
+-- 				-sort desc,
+				order by  a.addTime desc
 			</otherwise>
 		</choose>
 	</select>

src/main/resources/mappings/modules/baike/CmBaikeTypeMapper.xml

@@ -10,6 +10,9 @@
 		a.status AS "status",
 		a.addTime AS "addTime",
 		a.addBy AS "addBy",
+        a.pcBanner As pcBanner,
+		a.appBanner As appBanner,
+		a.bannerLink As bannerLink,
 		su.name as "addUserName"
 	</sql>
 	
@@ -82,14 +85,20 @@
 			sort,
 			status,
 			addTime,
-			addBy
+			addBy,
+			pcBanner,
+			appBanner,
+			bannerLink,
 		) VALUES (
 			#{typeSort},
 			#{name},
 			#{sort},
 			#{status},
 			NOW(),
-			#{createBy.id}
+			#{createBy.id},
+			#{pcBanner},
+			#{appBanner},
+			#{bannerLink}
 		)
 	</insert>
 	
@@ -97,6 +106,9 @@
 		UPDATE cm_baike_type SET 	
 			name = #{name},
 			sort = #{sort},
+			pcBanner=#{pcBanner},
+			appBanner=#{appBanner},
+			bannerLink=#{bannerLink},
 			status = #{status}
 		WHERE id = #{id}
 	</update>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeHotSearchForm.jsp

@@ -52,18 +52,18 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>跳转方式：</label>
 			<div class="controls">
 				<form:radiobutton path="jumpType"  name="jumpType" value="1" label="仅搜索" checked="true" onclick="changeJumpType()"/>
-				<br> <br>
-				<form:radiobutton path="jumpType" name="jumpType" value="2" label="产品" onclick="changeJumpType()"/>
-				<form:select path="productId" class="input-xlarge productList">
-					<form:option value="" label="请选择"/>
-					<form:options items="${productList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
-				</form:select>
-				<br> <br>
-				<form:radiobutton path="jumpType" name="jumpType" value="3" label="仪器" onclick="changeJumpType()"/>
-				<form:select path="instrumentId" class="input-xlarge productList">
-					<form:option value="" label="请选择"/>
-					<form:options items="${instrumentList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
-				</form:select>
+<%--				<br> <br>--%>
+<%--				<form:radiobutton path="jumpType" name="jumpType" value="2" label="产品" onclick="changeJumpType()"/>--%>
+<%--				<form:select path="productId" class="input-xlarge productList">--%>
+<%--					<form:option value="" label="请选择"/>--%>
+<%--					<form:options items="${productList}" itemLabel="name" itemValue="id" htmlEscape="false"/>--%>
+<%--				</form:select>--%>
+<%--				<br> <br>--%>
+<%--				<form:radiobutton path="jumpType" name="jumpType" value="3" label="仪器" onclick="changeJumpType()"/>--%>
+<%--				<form:select path="instrumentId" class="input-xlarge productList">--%>
+<%--					<form:option value="" label="请选择"/>--%>
+<%--					<form:options items="${instrumentList}" itemLabel="name" itemValue="id" htmlEscape="false"/>--%>
+<%--				</form:select>--%>
 				<br> <br>
 				<form:radiobutton path="jumpType" name="jumpType" value="4" label="链接" onclick="changeJumpType()"/>
 				<form:input path="jumpLink" htmlEscape="false" class="input-xlarge jumpType"/>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeTypeForm.jsp

@@ -48,7 +48,7 @@
 					}
 				})
 			});
-			for (var i = 0; i < 4; i++) {
+			for (var i = 0; i < 2; i++) {
 				var observeEle = document.getElementsByClassName('upload-content')[i];
 				observer.observe(observeEle, MutationObserverConfig)
 			}
@@ -174,38 +174,38 @@
 				<form:input path="name" htmlEscape="false" maxlength="30" class="input-xlarge required"/>
 			</div>
 		</div>
-<%--		<div class="control-group iconBox">--%>
-<%--			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端banner：</label>--%>
-<%--			<div class="controls upload-content" id="bannerBox1">--%>
-<%--				<div class="conList">--%>
-<%--					<hidden id="productPcBanner"  htmlEscape="false" maxlength="255" class="input-xlarge required"/>--%>
-<%--					<sys:ckfinder input="productPcBanner" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
-<%--								  maxHeight="100"/>--%>
-<%--					<br>--%>
-<%--					<label style="margin-left: 150px">建议图片分辨率1920px*510px</label>--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--		</div>--%>
-<%--		<div class="control-group iconBox">--%>
-<%--			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>移动端banner：</label>--%>
-<%--			<div class="controls upload-content" id="bannerBox2">--%>
-<%--				<div class="conList">--%>
-<%--					<hidden id="productAppBanner"  htmlEscape="false" maxlength="255"--%>
-<%--								 class="input-xlarge required"/>--%>
-<%--					<sys:ckfinder input="productAppBanner" type="images" uploadPath="/photo" selectMultiple="false"--%>
-<%--								  maxWidth="100" maxHeight="100"/>--%>
-<%--					<br>--%>
-<%--					<label style="margin-left: 150px">建议图片分辨率750px*366px</label>--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--		</div>--%>
-<%--		<div class="control-group">--%>
-<%--			<label class="control-label">banner跳转链接：</label>--%>
-<%--			<div class="controls">--%>
-<%--				<input  htmlEscape="false" placeholder="输入URL地址"--%>
-<%--							class="input-xlarge"/>--%>
-<%--			</div>--%>
-<%--		</div>--%>
+		<div class="control-group iconBox">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端banner：</label>
+			<div class="controls upload-content" id="bannerBox1">
+				<div class="conList">
+					<form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+					<sys:ckfinder input="pcBanner" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+								  maxHeight="100"/>
+					<br>
+					<label style="margin-left: 150px">建议图片分辨率1920px*510px</label>
+				</div>
+			</div>
+		</div>
+		<div class="control-group iconBox">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>移动端banner：</label>
+			<div class="controls upload-content" id="bannerBox2">
+				<div class="conList">
+					<form:hidden id="appBanner" path="appBanner" htmlEscape="false" maxlength="255"
+								 class="input-xlarge required"/>
+					<sys:ckfinder input="appBanner" type="images" uploadPath="/photo" selectMultiple="false"
+								  maxWidth="100" maxHeight="100"/>
+					<br>
+					<label style="margin-left: 150px">建议图片分辨率750px*366px</label>
+				</div>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">banner跳转链接：</label>
+			<div class="controls">
+				<form:input path="bannerLink" htmlEscape="false" placeholder="输入URL地址"
+							class="input-xlarge"/>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>排序：</label>
 			<div class="controls">

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeTypeList.jsp

@@ -22,8 +22,8 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class=${cmBaikeType.typeSort eq 1?"active":""}><a href="${ctx}/baike/cmBaikeType/?typeSort=1">产品分类</a></li>
-		<li class=${cmBaikeType.typeSort eq 2?"active":""}><a href="${ctx}/baike/cmBaikeType/?typeSort=2">仪器分类</a></li>
+		<li class=${cmBaikeType.typeSort eq 1?"active":""}><a href="${ctx}/baike/cmBaikeType/?typeSort=1">分类管理</a></li>
+<%--		<li class=${cmBaikeType.typeSort eq 2?"active":""}><a href="${ctx}/baike/cmBaikeType/?typeSort=2">仪器分类</a></li>--%>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmBaikeType" action="${ctx}/baike/cmBaikeType/" method="post" class="breadcrumb form-search">
 		<form:hidden path="typeSort" />
@@ -94,7 +94,7 @@
 					${cmBaikeType.addUserName}
 				</td>
 				<td>
-    				<a href="${ctx}/baike/cmBaikeType/form?id=${cmBaikeType.id}">编辑</a>
+    				<a href="${ctx}/baike/cmBaikeType/form?id=${cmBaikeType.id}&&pcBanner=${cmBaikeType.pcBanner}&&appBanner=${cmBaikeType.appBanner}&&bannerLink=${cmBaikeType.bannerLink}">编辑</a>
 					<a href="${ctx}/baike/cmBaikeType/delete?id=${cmBaikeType.id}" onclick="return confirmx('确认要删除该分类吗？', this.href)">删除</a>
 				</td>
 			</tr>