Sfoglia il codice sorgente

fix of 下单制2.0 on 2021.1.22

jiequan.bi 4 anni fa
parent
commit
697b49bac5

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformFileCtrl.java

@@ -81,7 +81,7 @@ public class PlatformFileCtrl {
         Result<Object> result = new Result<>();
         try {
             // 脚本上传成功需要返回脚本id,更新物料表,更新完成后去更新脚本库的绑定项目
-            PlatformScript script = platformScriptService.saveScript(file);
+            PlatformScript script = platformScriptService.saveScript(file,projectId);
             if (null == script) {
                 result.error500("脚本上传失败");
                 return result;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformScript.java

@@ -25,11 +25,11 @@ public class PlatformScript {
 	/**creator*/
 	private String creator;
 	/**createTime*/
-	private long createTime;
+	private Long createTime;
 	/**modifier*/
 	private String modifier;
 	/**modifyTime*/
-	private long modifyTime;
+	private Long modifyTime;
 	/**downloadUrl*/
 	private Object downloadUrl;
 	/**projectId*/
@@ -42,7 +42,7 @@ public class PlatformScript {
 	public PlatformScript(){super();}
 
 	public PlatformScript(String name, int version, int size, String creator,
-				   String modifier, long createTime, long modifyTime, String downloadUrl) {
+				   String modifier, Long createTime, Long modifyTime, String downloadUrl ,Long projectId) {
 		this.name = name;
 		this.version = version;
 		this.size = size;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformScriptService.java

@@ -9,6 +9,6 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface IPlatformScriptService extends IService<PlatformScript> {
 
-    PlatformScript saveScript(MultipartFile file);
+    PlatformScript saveScript(MultipartFile file ,Long projectId);
 
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformScriptServiceImpl.java

@@ -27,13 +27,13 @@ public class PlatformScriptServiceImpl extends ServiceImpl<PlatformScriptMapper,
     private IWpsFileWatermarkService wpsFileWatermarkService;
 
     @Override
-    public PlatformScript saveScript(MultipartFile file) {
+    public PlatformScript saveScript(MultipartFile file,Long projectId) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //上传文件到cos
         ResFileDTO resFileDTO = CosUtils.uploadMultipartFile(file,"script-lib/wps/");
         //构造下单制脚本库参数
         PlatformScript script=new PlatformScript(resFileDTO.getFileName(),1,((int) resFileDTO.getFileSize()),
-                user.getId(),user.getId(),System.currentTimeMillis(),System.currentTimeMillis(), resFileDTO.getFileUrl());
+                user.getId(),user.getId(),System.currentTimeMillis(),System.currentTimeMillis(), resFileDTO.getFileUrl(),projectId);
         this.save(script);
         // 处理权限
         wpsUserAclService.saveUserFileAcl(user.getId(),script.getId());