lihong 1 年之前
父节点
当前提交
1a075eaf7a

+ 5 - 2
src/main/java/cn/hnthyy/thmz/controller/CommonController.java

@@ -124,8 +124,11 @@ public class CommonController {
         }
     }
 
-
-
+    @GetMapping("/getDownFilePlus")
+   public R getDownFilePlus(){
+        String data = dictDataService.queryDictVlaue("2.9", "down_file_puls", null);
+        return R.ok().put("data", data);
+   }
 
     /**
      * 查询所有可以使用的门诊挂号时间区间(没过时间段)

+ 4 - 4
src/main/java/cn/hnthyy/thmz/controller/mz/FileController.java

@@ -63,7 +63,7 @@ public class FileController {
         }
         headers.setContentType(new MediaType(primaryType, subType));
         response.setCharacterEncoding("UTF-8");
-        return new ResponseEntity<>(fileUpload.getFile(), headers, HttpStatus.OK);
+        return new ResponseEntity<>(fileUpload.getFileData(), headers, HttpStatus.OK);
     }
 
 
@@ -97,7 +97,7 @@ public class FileController {
             return new ResponseEntity<>("{}", HttpStatus.INTERNAL_SERVER_ERROR);
         }
         headers.setContentType(new MediaType(primaryType, subType));
-        return new ResponseEntity<>(fileUpload.getFile(), headers, HttpStatus.OK);
+        return new ResponseEntity<>(fileUpload.getFileData(), headers, HttpStatus.OK);
     }
 
 
@@ -153,7 +153,7 @@ public class FileController {
             return new ResponseEntity<>("{\"code\":-1}", HttpStatus.INTERNAL_SERVER_ERROR);
         }
         headers.setContentType(new MediaType(primaryType, subType));
-        return new ResponseEntity<>(fileUpload.getSquareFile() != null ? fileUpload.getSquareFile() : fileUpload.getFile(), headers, HttpStatus.OK);
+        return new ResponseEntity<>(fileUpload.getSquareFile() != null ? fileUpload.getSquareFile() : fileUpload.getFileData(), headers, HttpStatus.OK);
     }
 
 
@@ -183,7 +183,7 @@ public class FileController {
             return new ResponseEntity<>("{\"code\":-1}", HttpStatus.INTERNAL_SERVER_ERROR);
         }
         headers.setContentType(new MediaType(primaryType, subType));
-        return new ResponseEntity<>(fileUpload.getSquareFile() != null ? fileUpload.getSquareFile() : fileUpload.getFile(), headers, HttpStatus.OK);
+        return new ResponseEntity<>(fileUpload.getSquareFile() != null ? fileUpload.getSquareFile() : fileUpload.getFileData(), headers, HttpStatus.OK);
     }
 
 

+ 2 - 2
src/main/java/cn/hnthyy/thmz/entity/thmz/FileUpload.java

@@ -15,7 +15,7 @@ public class FileUpload extends PageParams {
     //前端提供的文件的名称
     private String fileName;
     //文件内容的字节数组
-    private byte[] file;
+    private byte[] fileData;
     //文件类型 0 - 头像  1-身份证正面  2 - 身份证背面
     private Integer fileType=0;
     // 文件格式,它将帮助浏览器建议在下载时打开文件的方法
@@ -27,7 +27,7 @@ public class FileUpload extends PageParams {
     //转码成方形的字节数组
     private byte[] squareFile;
     public FileUpload(String fileName, byte[] file, String mimeType) {
-        this.file = file;
+        this.fileData = file;
         this.fileName = fileName;
         this.mimeType = mimeType;
         this.createTime=new Date();

+ 4 - 4
src/main/java/cn/hnthyy/thmz/mapper/thmz/FileUploadMapper.java

@@ -16,7 +16,7 @@ public interface FileUploadMapper {
      * @param name 名称
      * @return
      */
-    @Select("select id,file_name, file, file_type, mime_type, create_time, create_user,square_file from t_file_upload where file_name=#{name}")
+    @Select("select id,file_name, file_data, file_type, mime_type, create_time, create_user,square_file from t_file_upload where file_name=#{name}")
     FileUpload selectUserByName(@Param("name") String name);
 
     /**
@@ -25,7 +25,7 @@ public interface FileUploadMapper {
      * @param id 主键
      * @return
      */
-    @Select("select id,file_name, file, file_type, mime_type, create_time, create_user,square_file from t_file_upload where id=#{id}")
+    @Select("select id,file_name, file_data, file_type, mime_type, create_time, create_user,square_file from t_file_upload where id=#{id}")
     FileUpload selectUserById(@Param("id") Long id);
 
     /**
@@ -34,8 +34,8 @@ public interface FileUploadMapper {
      * @param fileUpload
      * @return
      */
-    @Insert("INSERT INTO t_file_upload(file_name, file, file_type, mime_type, create_time, create_user,square_file) VALUES " +
-            "(#{fileName,jdbcType=VARCHAR}, #{file}, #{fileType,jdbcType=VARCHAR}, #{mimeType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},#{createUser,jdbcType=BIGINT}, #{squareFile}")
+    @Insert("INSERT INTO t_file_upload(file_name, file_data, file_type, mime_type, create_time, create_user,square_file) VALUES " +
+            "(#{fileName,jdbcType=VARCHAR}, #{fileData}, #{fileType,jdbcType=VARCHAR}, #{mimeType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},#{createUser,jdbcType=BIGINT}, #{squareFile}")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int insertFileUpload(FileUpload fileUpload);
 

+ 14 - 0
src/main/resources/static/js/menu.js

@@ -108,6 +108,7 @@ $(function () {
         }
 
     });
+    getDownFilePlus()
     //建立消息webSocket连接
     openNoticeWebSocket();
 });
@@ -189,6 +190,19 @@ function loginOut() {
 }
 
 
+function getDownFilePlus() {
+    getAjaxRequst("/thmz/getDownFilePlus",{},true,function (res) {
+        if(res.data !=null && res.data !='undefined'){
+            let resData = JSON.parse(res.data)
+            let strHtml = ''
+            for (let i = 0; i < resData.length; i++) {
+                strHtml +=`<li><a href="${resData[i].url}">${resData[i].name}</a></li>`
+            }
+            $('#fileMenu').html(strHtml)
+        }
+    })
+}
+
 /**
  * 编辑个人信息
  */

+ 0 - 5
src/main/resources/templates/menu.html

@@ -168,11 +168,6 @@
                                 <i class="fa fa-cloud-download"></i>
                             </a>
                             <ul id="fileMenu" class="dropdown-menu dropdown-usermenu" role="menu">
-                                <li><a href="javascript:;" onclick="downFile('/thmz/downloadByName?name=CLodop_Setup_for_Win32NT.zip')">打印控件驱动</a></li>
-                                <li><a href="javascript:;" onclick="downFile('/thmz/downloadByName?name=SFZ100.zip')">身份证读卡器驱动</a></li>
-                                <li><a href="javascript:;" onclick="downFile('/thmz/downloadByName?name=readCardDrive.msi')">医保读卡插件安装包</a></li>
-                                <li><a href="javascript:;" onclick="downFile('/thmz/downloadByName?name=NET Framework 4.6.1.exe')">.Net Framework</a></li>
-                                <li><a href="javascript:;" onclick="downFile('/thmz/downloadByName?name=chrome90.exe')">高版本Chrome浏览器</a></li>
                             </ul>
                         </li>
                         <li role="presentation" class="dropdown">