孙向锦 / SunvoteEducation

Commit edbb3c915f30eb476c86f77676e25b3ca81d9033

Authored by 孙向锦
1 parent 7242423d

浏览产品

Inline Side-by-side
Showing 5 changed files with 271 additions and 14 deletions
WebRoot/WEB-INF/jsp/software/firmware/firmware_edit.jsp
  View file @edbb3c9
... ... @@ -67,27 +67,27 @@
67 67 </tr>
68 68 <tr>
69 69 <td style="width:75px;text-align: right;padding-top: 13px;">产品功能:</td>
70   - <td><input type="text" name="PRODUCT_FUNC" id="PRODUCT_FUNC" value="${pd.PRODUCT_FUNC}" maxlength="1000" placeholder="这里输入产品功能" title="产品功能" style="width:98%;"/></td>
  70 + <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>
71 71 </tr>
72 72 <tr>
73 73 <td style="width:75px;text-align: right;padding-top: 13px;">产品性能:</td>
74   - <td><input type="text" name="PRODUCT_PERF" id="PRODUCT_PERF" value="${pd.PRODUCT_PERF}" maxlength="255" placeholder="这里输入产品性能" title="产品性能" style="width:98%;"/></td>
  74 + <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>
75 75 </tr>
76 76 <tr>
77 77 <td style="width:75px;text-align: right;padding-top: 13px;">适配硬件:</td>
78   - <td><input type="text" name="ADAPTABLE_HARDWARE" id="ADAPTABLE_HARDWARE" value="${pd.ADAPTABLE_HARDWARE}" maxlength="500" placeholder="这里输入适配硬件" title="适配硬件" style="width:98%;"/></td>
  78 + <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>
79 79 </tr>
80 80 <tr>
81 81 <td style="width:75px;text-align: right;padding-top: 13px;">适配软件:</td>
82   - <td><input type="text" name="ADAPTABLE_SOFTWARE" id="ADAPTABLE_SOFTWARE" value="${pd.ADAPTABLE_SOFTWARE}" maxlength="255" placeholder="这里输入适配软件" title="适配软件" style="width:98%;"/></td>
  82 + <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>
83 83 </tr>
84 84 <tr>
85 85 <td style="width:75px;text-align: right;padding-top: 13px;">产品认证:</td>
86   - <td><input type="text" name="PRODUCT_CERT" id="PRODUCT_CERT" value="${pd.PRODUCT_CERT}" maxlength="255" placeholder="这里输入产品认证" title="产品认证" style="width:98%;"/></td>
  86 + <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>
87 87 </tr>
88 88 <tr>
89 89 <td style="width:75px;text-align: right;padding-top: 13px;">注意事项:</td>
90   - <td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入注意事项" title="注意事项" style="width:98%;"/>
  90 + <td><textarea rows="3" cols="100" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入注意事项" title="注意事项" style="width:98%;">${pd.REMARK}</textarea>
91 91 </td>
92 92 </tr>
93 93 <tr>
... ...
WebRoot/WEB-INF/jsp/software/firmware/firmware_itemview.jsp 0 → 100644
  View file @edbb3c9
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
  8 +%>
  9 +<!DOCTYPE html>
  10 +<html lang="en">
  11 + <head>
  12 + <title>${pd.PRODUCT_NAME}详细信息</title>
  13 + <base href="<%=basePath%>">
  14 + <!-- 下拉框 -->
  15 + <link rel="stylesheet" href="static/ace/css/chosen.css" />
  16 + <!-- jsp文件头和头部 -->
  17 + <%@ include file="../../system/index/top.jsp"%>
  18 + <!-- 日期框 -->
  19 + <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  20 +</head>
  21 +<body class="no-skin">
  22 +<!-- /section:basics/navbar.layout -->
  23 +
  24 +
  25 +<div class="main-container" id="main-container">
  26 + <!-- /section:basics/sidebar -->
  27 + <div class="main-content">
  28 + <div class="main-content-inner">
  29 + <div class="page-content">
  30 + <div class="row">
  31 + <div class="col-xs-12">
  32 + <div style="text-align:center;font:50px bolder;">${pd.PRODUCT_NAME}详细信息</div>
  33 + </br></br></br>
  34 + <div><center>
  35 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[0]}"/>
  36 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[1]}"/>
  37 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[2]}"/>
  38 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[3]}"/>
  39 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[4]}"/>
  40 + <img style="width:15%" src="<%=basePath%>/uploadFiles/uploadFile/${pd.PRODUCT_IMAGE[5]}"/>
  41 + </center></div>
  42 + </br></br></br>
  43 + <center>
  44 + <table id="table_report" class="table table-striped table-bordered table-hover">
  45 + <tr>
  46 + <td style="width:75px;text-align: right;padding-top: 13px;">货品编号:</td>
  47 + <td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_NO}</td>
  48 + <td style="width:75px;text-align: right;padding-top: 13px;">应用行业:</td>
  49 + <td style="width:75px;text-align: left;padding-top: 13px;">${pd.INDUSTRY}</td>
  50 + </tr>
  51 + <tr>
  52 + <td style="width:75px;text-align: right;padding-top: 13px;">产品状态:</td>
  53 + <td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_STATE}</td>
  54 + <td style="width:75px;text-align: right;padding-top: 13px;">产品规格:</td>
  55 + <td style="width:75px;text-align: left;padding-top: 13px;">${pd.PRODUCT_SPEC}</td>
  56 + </tr>
  57 + </table>
  58 + </center></br></br></br>
  59 + <table class="table table-striped table-bordered table-hover">
  60 + <tr>
  61 + <td style="text-align: right;">产品功能:</td>
  62 + <td>${pd.PRODUCT_FUNC}</td>
  63 + </tr>
  64 + <tr>
  65 + <td style="text-align: right;">产品性能:</td>
  66 + <td>${pd.PRODUCT_PERF}</td>
  67 + </tr>
  68 + <tr>
  69 + <td style="text-align: right;">适配硬件:</td>
  70 + <td>${pd.ADAPTABLE_HARDWARE}</td>
  71 + </tr>
  72 + <tr>
  73 + <td style="text-align: right;">适配软件:</td>
  74 + <td>${pd.ADAPTABLE_SOFTWARE}</td>
  75 + </tr>
  76 + <tr>
  77 + <td style="text-align: right;">产品认证:</td>
  78 + <td>${pd.PRODUCT_CERT}</td>
  79 + </tr>
  80 + <tr>
  81 + <td style="text-align: right;">注意事项:</td>
  82 + <td>${pd.REMARK}
  83 + </td>
  84 + </tr>
  85 + </table>
  86 + </div>
  87 + </form>
  88 + </div>
  89 + <!-- /.col -->
  90 + </div>
  91 + <!-- /.row -->
  92 + </div>
  93 + <!-- /.page-content -->
  94 + </div>
  95 + </div>
  96 + <!-- /.main-content -->
  97 +</div>
  98 +<!-- /.main-container -->
  99 +
  100 +
  101 + <!-- 页面底部js¨ -->
  102 + <%@ include file="../../system/index/foot.jsp"%>
  103 + <!-- 下拉框 -->
  104 + <script src="static/ace/js/chosen.jquery.js"></script>
  105 + <!-- 日期框 -->
  106 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  107 + <!--提示框-->
  108 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  109 + <script type="text/javascript">
  110 + $(top.hangge());
  111 + //保存
  112 + function save(){
  113 + if($("#PRODUCT_NAME").val()==""){
  114 + $("#PRODUCT_NAME").tips({
  115 + side:3,
  116 + msg:'请输入产品名称',
  117 + bg:'#AE81FF',
  118 + time:2
  119 + });
  120 + $("#PRODUCT_NAME").focus();
  121 + return false;
  122 + }
  123 + if($("#PRODUCT_NO").val()==""){
  124 + $("#PRODUCT_NO").tips({
  125 + side:3,
  126 + msg:'请输入货品编号',
  127 + bg:'#AE81FF',
  128 + time:2
  129 + });
  130 + $("#PRODUCT_NO").focus();
  131 + return false;
  132 + }
  133 + if($("#INDUSTRY").val()==""){
  134 + $("#INDUSTRY").tips({
  135 + side:3,
  136 + msg:'请输入应用行业',
  137 + bg:'#AE81FF',
  138 + time:2
  139 + });
  140 + $("#INDUSTRY").focus();
  141 + return false;
  142 + }
  143 + if($("#PRODUCT_STATE").val()==""){
  144 + $("#PRODUCT_STATE").tips({
  145 + side:3,
  146 + msg:'请输入产品状态',
  147 + bg:'#AE81FF',
  148 + time:2
  149 + });
  150 + $("#PRODUCT_STATE").focus();
  151 + return false;
  152 + }
  153 + if($("#PRODUCT_SPEC").val()==""){
  154 + $("#PRODUCT_SPEC").tips({
  155 + side:3,
  156 + msg:'请输入产品规格',
  157 + bg:'#AE81FF',
  158 + time:2
  159 + });
  160 + $("#PRODUCT_SPEC").focus();
  161 + return false;
  162 + }
  163 + if($("#PRODUCT_FUNC").val()==""){
  164 + $("#PRODUCT_FUNC").tips({
  165 + side:3,
  166 + msg:'请输入产品功能',
  167 + bg:'#AE81FF',
  168 + time:2
  169 + });
  170 + $("#PRODUCT_FUNC").focus();
  171 + return false;
  172 + }
  173 + if($("#PRODUCT_PERF").val()==""){
  174 + $("#PRODUCT_PERF").tips({
  175 + side:3,
  176 + msg:'请输入产品性能',
  177 + bg:'#AE81FF',
  178 + time:2
  179 + });
  180 + $("#PRODUCT_PERF").focus();
  181 + return false;
  182 + }
  183 + if($("#ADAPTABLE_HARDWARE").val()==""){
  184 + $("#ADAPTABLE_HARDWARE").tips({
  185 + side:3,
  186 + msg:'请输入适配硬件',
  187 + bg:'#AE81FF',
  188 + time:2
  189 + });
  190 + $("#ADAPTABLE_HARDWARE").focus();
  191 + return false;
  192 + }
  193 + if($("#ADAPTABLE_SOFTWARE").val()==""){
  194 + $("#ADAPTABLE_SOFTWARE").tips({
  195 + side:3,
  196 + msg:'请输入适配软件',
  197 + bg:'#AE81FF',
  198 + time:2
  199 + });
  200 + $("#ADAPTABLE_SOFTWARE").focus();
  201 + return false;
  202 + }
  203 + if($("#PRODUCT_CERT").val()==""){
  204 + $("#PRODUCT_CERT").tips({
  205 + side:3,
  206 + msg:'请输入产品认证',
  207 + bg:'#AE81FF',
  208 + time:2
  209 + });
  210 + $("#PRODUCT_CERT").focus();
  211 + return false;
  212 + }
  213 + if($("#REMARK").val()==""){
  214 + $("#REMARK").tips({
  215 + side:3,
  216 + msg:'请输入注意事项',
  217 + bg:'#AE81FF',
  218 + time:2
  219 + });
  220 + $("#REMARK").focus();
  221 + return false;
  222 + }
  223 +
  224 + $("#Form").submit();
  225 + $("#zhongxin").hide();
  226 + $("#zhongxin2").show();
  227 + }
  228 +
  229 + $(function() {
  230 + //日期框
  231 + $('.date-picker').datepicker({autoclose: true,todayHighlight: true});
  232 + });
  233 + </script>
  234 +</body>
  235 +</html>
0 236 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/software/firmware/firmware_list.jsp
  View file @edbb3c9
... ... @@ -94,7 +94,7 @@
94 94 <label class="pos-rel"><input type='checkbox' name='ids' value="${var.FIRMWARE_ID}" class="ace" /><span class="lbl"></span></label>
95 95 </td>
96 96 <td class='center' style="width: 30px;">${vs.index+1}</td>
97   - <td class='center'><a href="javascrip:;">${var.PRODUCT_NAME}</a></td>
  97 + <td class='center'><a target="_blank" href="<%=basePath%>firmware/itemview.do?FIRMWARE_ID=${var.FIRMWARE_ID}">${var.PRODUCT_NAME}</a></td>
98 98 <td class='center'>${var.PRODUCT_NO}</td>
99 99 <td class='center'>${var.INDUSTRY}</td>
100 100 <td class='center'>${var.PRODUCT_STATE}</td>
... ... @@ -320,8 +320,7 @@
320 320 diag.close();
321 321 };
322 322 diag.show();
323   - <%-- var href = ("<%=basePath%>firmware/goEdit.do?FIRMWARE_ID="+Id);
324   - window.location.href = href ; --%>
  323 +
325 324 }
326 325  
327 326 //批量操作
... ...
resources/mybatis1/software/FirmwareMapper.xml
  View file @edbb3c9
... ... @@ -92,6 +92,8 @@
92 92 <include refid="tableName"></include>
93 93 where
94 94 FIRMWARE_ID = #{FIRMWARE_ID}
  95 +
  96 + order by CREATE_DATE
95 97 </select>
96 98  
97 99 <!-- 列表 -->
... ... @@ -127,7 +129,7 @@
127 129 <if test="pd.PRODUCT_STATE != null and pd.PRODUCT_STATE != ''">
128 130 and PRODUCT_STATE = #{pd.PRODUCT_STATE}
129 131 </if>
130   -
  132 + order by CREATE_DATE
131 133 </select>
132 134  
133 135 <!-- 列表(全部) -->
... ... @@ -136,6 +138,8 @@
136 138 <include refid="Field"></include>
137 139 from
138 140 <include refid="tableName"></include>
  141 +
  142 + order by CREATE_DATE
139 143 </select>
140 144  
141 145 <!-- 批量删除 -->
... ...
src/com/fh/controller/software/firmware/FirmwareController.java
  View file @edbb3c9
... ... @@ -63,7 +63,7 @@ public class FirmwareController extends BaseController {
63 63 String FIRM_PATH = "" ;
64 64 if (files != null) {
65 65 for (MultipartFile file : files) {
66   - if (file != null) {
  66 + if (file != null && file.getSize() > 0) {
67 67 String name = pd.getString("FIRMWARE_ID")+ "_" + index + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
68 68 File pathFile = new File(path);
69 69 pathFile.mkdirs();
... ... @@ -74,6 +74,8 @@ public class FirmwareController extends BaseController {
74 74 saveFile.createNewFile();
75 75 file.transferTo(saveFile);
76 76 FIRM_PATH += name + ";";
  77 + }else{
  78 + FIRM_PATH += ";";
77 79 }
78 80 index++;
79 81 }
... ... @@ -118,9 +120,7 @@ public class FirmwareController extends BaseController {
118 120 logBefore(logger, Jurisdiction.getUsername()+"修改Firmware");
119 121 if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
120 122 ModelAndView mv = this.getModelAndView();
121   - PageData pd = new PageData();
122   - pd = this.getPageData();
123   -
  123 + PageData pd = new PageData(request);
124 124 String path = request.getSession().getServletContext()
125 125 .getRealPath("/uploadFiles/uploadFile/");
126 126 int index = 0 ;
... ... @@ -206,6 +206,25 @@ public class FirmwareController extends BaseController {
206 206 * @param
207 207 * @throws Exception
208 208 */
  209 + @RequestMapping(value="/itemview")
  210 + public ModelAndView itemview()throws Exception{
  211 + ModelAndView mv = this.getModelAndView();
  212 + PageData pd = new PageData();
  213 + pd = this.getPageData();
  214 + pd = firmwareService.findById(pd); //根据ID读取
  215 + String PRODUCT_IMAGE = pd.getString("PRODUCT_IMAGE");
  216 + String[] PRODUCT_IMAGEs = PRODUCT_IMAGE.split(";");
  217 + pd.put("PRODUCT_IMAGE", PRODUCT_IMAGEs);
  218 + mv.setViewName("software/firmware/firmware_itemview");
  219 + mv.addObject("msg", "edit");
  220 + mv.addObject("pd", pd);
  221 + return mv;
  222 + }
  223 +
  224 + /**去修改页面
  225 + * @param
  226 + * @throws Exception
  227 + */
209 228 @RequestMapping(value="/goEdit")
210 229 public ModelAndView goEdit()throws Exception{
211 230 ModelAndView mv = this.getModelAndView();
... ...