From edbb3c915f30eb476c86f77676e25b3ca81d9033 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Tue, 10 Jul 2018 16:56:04 +0800
Subject: [PATCH] 浏览产品

---
 WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp         |  12 ++++++------
 WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp     | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp         |   5 ++---
 resources/mybatis1/software/FirmwareMapper.xml                  |   6 +++++-
 src/com/fh/controller/software/firmware/FirmwareController.java |  27 +++++++++++++++++++++++----
 5 files changed, 271 insertions(+), 14 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp

diff --git a/WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp b/WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp
index ab283a5..b485225 100644
--- a/WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp
+++ b/WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp
@@ -67,27 +67,27 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">产品功能:</td>
-								<td><input type="text" name="PRODUCT_FUNC" id="PRODUCT_FUNC" value="${pd.PRODUCT_FUNC}" maxlength="1000" placeholder="这里输入产品功能" title="产品功能" style="width:98%;"/></td>
+								<td><textarea rows="3" cols="100" name="PRODUCT_FUNC" id="PRODUCT_FUNC" value="${pd.PRODUCT_FUNC}" maxlength="1000" placeholder="这里输入产品功能" title="产品功能" style="width:98%;">${pd.PRODUCT_FUNC}</textarea></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">产品性能:</td>
-								<td><input type="text" name="PRODUCT_PERF" id="PRODUCT_PERF" value="${pd.PRODUCT_PERF}" maxlength="255" placeholder="这里输入产品性能" title="产品性能" style="width:98%;"/></td>
+								<td><textarea rows="3" cols="100" name="PRODUCT_PERF" id="PRODUCT_PERF" value="${pd.PRODUCT_PERF}" maxlength="255" placeholder="这里输入产品性能" title="产品性能" style="width:98%;">${pd.PRODUCT_PERF}</textarea></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">适配硬件:</td>
-								<td><input type="text" name="ADAPTABLE_HARDWARE" id="ADAPTABLE_HARDWARE" value="${pd.ADAPTABLE_HARDWARE}" maxlength="500" placeholder="这里输入适配硬件" title="适配硬件" style="width:98%;"/></td>
+								<td><textarea rows="3" cols="100" name="ADAPTABLE_HARDWARE" id="ADAPTABLE_HARDWARE" value="${pd.ADAPTABLE_HARDWARE}" maxlength="500" placeholder="这里输入适配硬件" title="适配硬件" style="width:98%;">${pd.ADAPTABLE_HARDWARE}</textarea></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">适配软件:</td>
-								<td><input type="text" name="ADAPTABLE_SOFTWARE" id="ADAPTABLE_SOFTWARE" value="${pd.ADAPTABLE_SOFTWARE}" maxlength="255" placeholder="这里输入适配软件" title="适配软件" style="width:98%;"/></td>
+								<td><textarea rows="3" cols="100" name="ADAPTABLE_SOFTWARE" id="ADAPTABLE_SOFTWARE" value="${pd.ADAPTABLE_SOFTWARE}" maxlength="255" placeholder="这里输入适配软件" title="适配软件" style="width:98%;">${pd.ADAPTABLE_SOFTWARE}</textarea></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">产品认证:</td>
-								<td><input type="text" name="PRODUCT_CERT" id="PRODUCT_CERT" value="${pd.PRODUCT_CERT}" maxlength="255" placeholder="这里输入产品认证" title="产品认证" style="width:98%;"/></td>
+								<td><textarea rows="3" cols="100" name="PRODUCT_CERT" id="PRODUCT_CERT" value="${pd.PRODUCT_CERT}" maxlength="255" placeholder="这里输入产品认证" title="产品认证" style="width:98%;">${pd.PRODUCT_CERT}</textarea></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">注意事项:</td>
-								<td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入注意事项" title="注意事项" style="width:98%;"/>
+								<td><textarea rows="3" cols="100" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入注意事项" title="注意事项" style="width:98%;">${pd.REMARK}</textarea>
 								</td>
 							</tr>
 							<tr>
diff --git a/WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp b/WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp
new file mode 100644
index 0000000..a3971e2
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp
@@ -0,0 +1,235 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+	<title>${pd.PRODUCT_NAME}详细信息</title>
+	<base href="<%=basePath%>">
+	<!-- 下拉框 -->
+	<link rel="stylesheet" href="static/ace/css/chosen.css" />
+	<!-- jsp文件头和头部 -->
+	<%@ include file="../../system/index/top.jsp"%>
+	<!-- 日期框 -->
+	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+</head>
+<body class="no-skin">
+<!-- /section:basics/navbar.layout -->
+					
+
+<div class="main-container" id="main-container">
+	<!-- /section:basics/sidebar -->
+	<div class="main-content">
+		<div class="main-content-inner">
+			<div class="page-content">
+				<div class="row">
+					<div class="col-xs-12">
+					<div style="text-align:center;font:50px bolder;">${pd.PRODUCT_NAME}详细信息</div>
+					</br></br></br>
+					<div><center>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[0]}"/>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[1]}"/>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[2]}"/>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[3]}"/>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[4]}"/>
+					<img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[5]}"/>
+					</center></div>
+					</br></br></br>
+					<center>
+					<table id="table_report" class="table table-striped table-bordered table-hover">
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">货品编号:</td>
+								<td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_NO}</td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">应用行业:</td>
+								<td style="width:75px;text-align: left;padding-top: 13px;">${pd.INDUSTRY}</td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">产品状态:</td>
+								<td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_STATE}</td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">产品规格:</td>
+								<td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_SPEC}</td>
+							</tr>
+					</table>
+					</center></br></br></br>
+					<table class="table table-striped table-bordered table-hover">
+							<tr>
+								<td style="text-align: right;">产品功能:</td>
+								<td>${pd.PRODUCT_FUNC}</td>
+							</tr>
+							<tr>
+								<td style="text-align: right;">产品性能:</td>
+								<td>${pd.PRODUCT_PERF}</td>
+							</tr>
+							<tr>
+								<td style="text-align: right;">适配硬件:</td>
+								<td>${pd.ADAPTABLE_HARDWARE}</td>
+							</tr>
+							<tr>
+								<td style="text-align: right;">适配软件:</td>
+								<td>${pd.ADAPTABLE_SOFTWARE}</td>
+							</tr>
+							<tr>
+								<td style="text-align: right;">产品认证:</td>
+								<td>${pd.PRODUCT_CERT}</td>
+							</tr>
+							<tr>
+								<td style="text-align: right;">注意事项:</td>
+								<td>${pd.REMARK}
+								</td>
+							</tr>
+						</table>
+						</div>
+					</form>
+					</div>
+					<!-- /.col -->
+				</div>
+				<!-- /.row -->
+			</div>
+			<!-- /.page-content -->
+		</div>
+	</div>
+	<!-- /.main-content -->
+</div>
+<!-- /.main-container -->
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+		<script type="text/javascript">
+		$(top.hangge());
+		//保存
+		function save(){
+			if($("#PRODUCT_NAME").val()==""){
+				$("#PRODUCT_NAME").tips({
+					side:3,
+		            msg:'请输入产品名称',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_NAME").focus();
+			return false;
+			}
+			if($("#PRODUCT_NO").val()==""){
+				$("#PRODUCT_NO").tips({
+					side:3,
+		            msg:'请输入货品编号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_NO").focus();
+			return false;
+			}
+			if($("#INDUSTRY").val()==""){
+				$("#INDUSTRY").tips({
+					side:3,
+		            msg:'请输入应用行业',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#INDUSTRY").focus();
+			return false;
+			}
+			if($("#PRODUCT_STATE").val()==""){
+				$("#PRODUCT_STATE").tips({
+					side:3,
+		            msg:'请输入产品状态',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_STATE").focus();
+			return false;
+			}
+			if($("#PRODUCT_SPEC").val()==""){
+				$("#PRODUCT_SPEC").tips({
+					side:3,
+		            msg:'请输入产品规格',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_SPEC").focus();
+			return false;
+			}
+			if($("#PRODUCT_FUNC").val()==""){
+				$("#PRODUCT_FUNC").tips({
+					side:3,
+		            msg:'请输入产品功能',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_FUNC").focus();
+			return false;
+			}
+			if($("#PRODUCT_PERF").val()==""){
+				$("#PRODUCT_PERF").tips({
+					side:3,
+		            msg:'请输入产品性能',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_PERF").focus();
+			return false;
+			}
+			if($("#ADAPTABLE_HARDWARE").val()==""){
+				$("#ADAPTABLE_HARDWARE").tips({
+					side:3,
+		            msg:'请输入适配硬件',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#ADAPTABLE_HARDWARE").focus();
+			return false;
+			}
+			if($("#ADAPTABLE_SOFTWARE").val()==""){
+				$("#ADAPTABLE_SOFTWARE").tips({
+					side:3,
+		            msg:'请输入适配软件',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#ADAPTABLE_SOFTWARE").focus();
+			return false;
+			}
+			if($("#PRODUCT_CERT").val()==""){
+				$("#PRODUCT_CERT").tips({
+					side:3,
+		            msg:'请输入产品认证',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PRODUCT_CERT").focus();
+			return false;
+			}
+			if($("#REMARK").val()==""){
+				$("#REMARK").tips({
+					side:3,
+		            msg:'请输入注意事项',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#REMARK").focus();
+			return false;
+			}
+			
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		
+		$(function() {
+			//日期框
+			$('.date-picker').datepicker({autoclose: true,todayHighlight: true});
+		});
+		</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp b/WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp
index a6adc6a..63d0e31 100644
--- a/WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp
+++ b/WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp
@@ -94,7 +94,7 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.FIRMWARE_ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'><a href="javascrip:;">${var.PRODUCT_NAME}</a></td>
+											<td class='center'><a target="_blank" href="<%=basePath%>firmware/itemview.do?FIRMWARE_ID=${var.FIRMWARE_ID}">${var.PRODUCT_NAME}</a></td>
 											<td class='center'>${var.PRODUCT_NO}</td>
 											<td class='center'>${var.INDUSTRY}</td>
 											<td class='center'>${var.PRODUCT_STATE}</td>
@@ -320,8 +320,7 @@
 				diag.close();
 			 };
 			 diag.show(); 
-			<%-- var href = ("<%=basePath%>firmware/goEdit.do?FIRMWARE_ID="+Id);
-			 window.location.href = href ; --%>
+			
 		}
 		
 		//批量操作
diff --git a/resources/mybatis1/software/FirmwareMapper.xml b/resources/mybatis1/software/FirmwareMapper.xml
index 92a4f64..f9737d2 100644
--- a/resources/mybatis1/software/FirmwareMapper.xml
+++ b/resources/mybatis1/software/FirmwareMapper.xml
@@ -92,6 +92,8 @@
 		<include refid="tableName"></include>
 		where 
 			FIRMWARE_ID = #{FIRMWARE_ID}
+			
+			order by CREATE_DATE
 	</select>
 	
 	<!-- 列表 -->
@@ -127,7 +129,7 @@
 		<if test="pd.PRODUCT_STATE != null and pd.PRODUCT_STATE != ''">
 			and PRODUCT_STATE = #{pd.PRODUCT_STATE}
 		</if>
-		
+		order by CREATE_DATE
 	</select>
 	
 	<!-- 列表(全部) -->
@@ -136,6 +138,8 @@
 		<include refid="Field"></include>
 		from 
 		<include refid="tableName"></include>
+		
+		order by CREATE_DATE
 	</select>
 	
 	<!-- 批量删除 -->
diff --git a/src/com/fh/controller/software/firmware/FirmwareController.java b/src/com/fh/controller/software/firmware/FirmwareController.java
index e978607..0293066 100644
--- a/src/com/fh/controller/software/firmware/FirmwareController.java
+++ b/src/com/fh/controller/software/firmware/FirmwareController.java
@@ -63,7 +63,7 @@ public class FirmwareController extends BaseController {
 		String FIRM_PATH = "" ;
 		if (files != null) {
 			for (MultipartFile file : files) {
-				if (file != null) {
+				if (file != null && file.getSize() > 0) {
 					String name = pd.getString("FIRMWARE_ID")+ "_"	+ index	+ file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
 					File pathFile = new File(path);
 					pathFile.mkdirs();
@@ -74,6 +74,8 @@ public class FirmwareController extends BaseController {
 					saveFile.createNewFile();
 					file.transferTo(saveFile);
 					FIRM_PATH += name + ";";
+				}else{
+					FIRM_PATH += ";";
 				}
 				index++;
 			}
@@ -118,9 +120,7 @@ public class FirmwareController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername()+"修改Firmware");
 		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		
+		PageData pd = new PageData(request);
 		String path = request.getSession().getServletContext()
 				.getRealPath("/uploadFiles/uploadFile/");
 		int index = 0 ;
@@ -206,6 +206,25 @@ public class FirmwareController extends BaseController {
 	 * @param
 	 * @throws Exception
 	 */
+	@RequestMapping(value="/itemview")
+	public ModelAndView itemview()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = firmwareService.findById(pd);	//根据ID读取
+		String PRODUCT_IMAGE = pd.getString("PRODUCT_IMAGE");
+		String[] PRODUCT_IMAGEs = PRODUCT_IMAGE.split(";");
+		pd.put("PRODUCT_IMAGE", PRODUCT_IMAGEs);
+		mv.setViewName("software/firmware/firmware_itemview");
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
+	/**去修改页面
+	 * @param
+	 * @throws Exception
+	 */
 	@RequestMapping(value="/goEdit")
 	public ModelAndView goEdit()throws Exception{
 		ModelAndView mv = this.getModelAndView();
--
libgit2 0.21.4