Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/KnowledgeBaseBO.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.medical.common.bo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @author soft01
  * @time 2023/5/14 19:01
@@ -14,14 +16,17 @@ public class KnowledgeBaseBO {
 
     @ApiModelProperty(value = "id")
     private String id;
+    @NotBlank(message = "文件名称不可为空")
     @ApiModelProperty(value = "文件名称")
     private String fileName;
     @ApiModelProperty(value = "源文件名称")
     private String srcFileName;
+    @NotBlank(message = "文件分类不可为空")
     @ApiModelProperty(value = "文件分类")
     private String classification;
     @ApiModelProperty(value = "文件分类显示")
     private String classificationText;
+    @NotBlank(message = "文件保存路径不可为空")
     @ApiModelProperty(value = "文件保存路径")
     private String filePath;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsKnowledgeController.java

@@ -21,9 +21,11 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.Arrays;
+import java.util.Map;
 
- /**
+/**
  * @Description: medical_ins_knowledge
  * @Author: jeecg-boot
  * @Date:   2023-04-23
@@ -82,9 +84,9 @@ public class MedicalInsKnowledgeController extends JeecgController<MedicalInsKno
 	  */
 	 @AutoLog(value = "medical_ins_knowledge-添加")
 	 @ApiOperation(value="medical_ins_knowledge-添加", notes="medical_ins_knowledge-添加")
-	 @RequiresPermissions("medical:medical_ins_knowledge:add")
+//	 @RequiresPermissions("medical:medical_ins_knowledge:add")
 	 @PostMapping(value = "/add")
-	 public Result<String> add(HttpServletRequest request, @RequestBody KnowledgeBaseBO knowledgeBaseBO) {
+	 public Result<String> add(HttpServletRequest request, @RequestBody @Valid KnowledgeBaseBO knowledgeBaseBO) {
 		 String username = JwtUtil.getUserNameByToken(request);
 		 medicalInsKnowledgeService.fileUploadSave(username, knowledgeBaseBO);
 		 return Result.OK("添加成功！");
@@ -113,7 +115,7 @@ public class MedicalInsKnowledgeController extends JeecgController<MedicalInsKno
 	 */
 	@AutoLog(value = "medical_ins_knowledge-通过id删除")
 	@ApiOperation(value="medical_ins_knowledge-通过id删除", notes="medical_ins_knowledge-通过id删除")
-	@RequiresPermissions("medical:medical_ins_knowledge:delete")
+//	@RequiresPermissions("medical:medical_ins_knowledge:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		medicalInsKnowledgeService.removeById(id);
@@ -177,4 +179,10 @@ public class MedicalInsKnowledgeController extends JeecgController<MedicalInsKno
         return super.importExcel(request, response, MedicalInsKnowledge.class);
     }
 
+	@ApiOperation("医学知识库")
+	@GetMapping(value = "/knowledge/view")
+	public Result<Map<String, Object>> medicalKnowledgeBase() {
+		return Result.ok("请求成功");
+	}
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsKnowledge.java

@@ -51,7 +51,7 @@ public class MedicalInsKnowledge implements Serializable {
 	/**文件上传时间*/
 	@Excel(name = "文件上传时间", width = 15)
     @ApiModelProperty(value = "文件上传时间")
-    private java.lang.String fileUploadTime;
+    private Date fileUploadTime;
 
     @ApiModelProperty("文件分类code")
     private String classification;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MedicalInsKnowledgeServiceImpl.java

@@ -42,6 +42,7 @@ public class MedicalInsKnowledgeServiceImpl extends ServiceImpl<MedicalInsKnowle
         entity.setClassificationText(knowledgeBaseBO.getClassificationText());
         entity.setSysFileName(knowledgeBaseBO.getFileName());
         entity.setSrcFileName(knowledgeBaseBO.getSrcFileName());
+        entity.setFileUploadTime(nowDate);
         entity.setRevision(1);
         this.saveOrUpdate(entity);
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -29,6 +29,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 用户表 前端控制器
@@ -42,6 +45,7 @@ import java.net.URLDecoder;
 @RequestMapping("/sys/common")
 public class CommonController {
 
+
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
 
@@ -68,8 +72,9 @@ public class CommonController {
      */
     @PostMapping(value = "/upload")
     public Result<?> upload(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        Result<?> result = new Result<>();
+        Result<Map<?,?>> result = new Result<>();
         String savePath = "";
+        Map<String, String> fileUploadLocalResult =  new HashMap<>();
         String bizPath = request.getParameter("biz");
 
         //LOWCOD-2580 sys/common/upload接口存在任意文件上传漏洞
@@ -98,7 +103,9 @@ public class CommonController {
             FileTypeFilter.fileTypeFilter(file);
             //update-end-author:liusq date:20221102 for: 过滤上传文件类型
             //update-begin-author:lvdandan date:20200928 for:修改JEditor编辑器本地上传
-            savePath = this.uploadLocal(file,bizPath);
+            fileUploadLocalResult = this.uploadLocal(file,bizPath);
+//            savePath = this.uploadLocal(file,bizPath);
+            savePath = fileUploadLocalResult.get("filePath");
             //update-begin-author:lvdandan date:20200928 for:修改JEditor编辑器本地上传
             /**  富文本编辑器及markdown本地上传时，采用返回链接方式
             //针对jeditor编辑器如何使 lcaol模式，采用 base64格式存储
@@ -118,6 +125,7 @@ public class CommonController {
         }
         if(oConvertUtils.isNotEmpty(savePath)){
             result.setMessage(savePath);
+            result.setResult(fileUploadLocalResult);
             result.setSuccess(true);
         }else {
             result.setMessage("上传失败！");
@@ -132,7 +140,8 @@ public class CommonController {
      * @param bizPath  自定义路径
      * @return
      */
-    private String uploadLocal(MultipartFile mf,String bizPath){
+    private Map<String, String> uploadLocal(MultipartFile mf,String bizPath){
+        Map<String, String> result = new HashMap<>();
         try {
             String ctxPath = uploadpath;
             String fileName = null;
@@ -144,6 +153,7 @@ public class CommonController {
             // 获取文件名
             String orgName = mf.getOriginalFilename();
             orgName = CommonUtils.getFileName(orgName);
+            result.put("origFileName", orgName);
             if(orgName.indexOf(SymbolConstant.SPOT)!=-1){
                 fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
             }else{
@@ -161,11 +171,13 @@ public class CommonController {
             if (dbpath.contains(SymbolConstant.DOUBLE_BACKSLASH)) {
                 dbpath = dbpath.replace(SymbolConstant.DOUBLE_BACKSLASH, SymbolConstant.SINGLE_SLASH);
             }
-            return dbpath;
+            result.put("filePath", dbpath);
+//            return dbpath;
+            return result;
         } catch (IOException e) {
             log.error(e.getMessage(), e);
         }
-        return "";
+        return new HashMap<>();
     }
 
 //	@PostMapping(value = "/upload2")

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -181,7 +181,7 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: X:/medical
+    upload: d:/medical/file
     #webapp文件路径
     webapp: /Users/lanhongjie/Documents/temp/webapp
   shiro: