zhuzeyu 11 months ago
parent
commit
df9e82b043

+ 10 - 10
src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -161,7 +161,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         for(BizTechnologicalProcessDetailDrawing item: bizTechnologicalProcessDetailDrawing){
         for(BizTechnologicalProcessDetailDrawing item: bizTechnologicalProcessDetailDrawing){
             String url = "";
             String url = "";
             url = item.getUrl();
             url = item.getUrl();
-            url = url.substring("/profile/".length());
+            url = url.substring("/profile".length());
             if (item.getStatus() == null){
             if (item.getStatus() == null){
                 // 默认情况下执行新增的代码
                 // 默认情况下执行新增的代码
                 item.setProducerId(SecurityUtils.getLoginUser().getUser().getUserId());
                 item.setProducerId(SecurityUtils.getLoginUser().getUser().getUserId());
@@ -174,7 +174,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                 PdfUtils.reSized(filePath + url,filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),60,"height");
                 PdfUtils.reSized(filePath + url,filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),60,"height");
                 addText(filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),"制定人:",550,75,12,270);
                 addText(filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),"制定人:",550,75,12,270);
                 addImage(filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4),filePath+personalSeal,530,30,45,15,270);
                 addImage(filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4),filePath+personalSeal,530,30,45,15,270);
-                item.setUrl("/profile"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
+                item.setUrl("/profile/"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
                 bizTechnologicalProcessDetailDrawingService.save(item);
                 bizTechnologicalProcessDetailDrawingService.save(item);
                 break;
                 break;
             }else {
             }else {
@@ -187,7 +187,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                         addText(filePath+ url,filePath +url.substring(0, url.length()-4) + "审核" + url.substring(url.length()-4),"审核人:",470,75,12,270);
                         addText(filePath+ url,filePath +url.substring(0, url.length()-4) + "审核" + url.substring(url.length()-4),"审核人:",470,75,12,270);
 
 
                         addImage(filePath +url.substring(0, url.length()-4) + "审核" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "审核完成" + url.substring(url.length()-4),filePath+personalSeal,450,30,45,15,270);
                         addImage(filePath +url.substring(0, url.length()-4) + "审核" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "审核完成" + url.substring(url.length()-4),filePath+personalSeal,450,30,45,15,270);
-                        item.setUrl("/profile"+url.substring(0, url.length()-4) + "审核完成" + url.substring(url.length()-4));
+                        item.setUrl("/profile/"+url.substring(0, url.length()-4) + "审核完成" + url.substring(url.length()-4));
                         bizTechnologicalProcessDetailDrawingService.updateById(item);
                         bizTechnologicalProcessDetailDrawingService.updateById(item);
                         break;
                         break;
                     case 1:
                     case 1:
@@ -211,7 +211,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         item.setStatus(2);
         item.setStatus(2);
         String url = "";
         String url = "";
         url = item.getUrl();
         url = item.getUrl();
-        url = url.substring("/profile/".length());
+        url = url.substring("/profile".length());
         String filePath = RuoYiConfig.getProfile();
         String filePath = RuoYiConfig.getProfile();
         //查询公共章
         //查询公共章
         String reviewer = getPublicSeal("受控");
         String reviewer = getPublicSeal("受控");
@@ -240,7 +240,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             addImage(filePath+ urlItem,filePath +urlItem.substring(0, urlItem.length()-4) + "zf" + urlItem.substring(urlItem.length()-4),filePath+rem,275,810,40,15,300);
             addImage(filePath+ urlItem,filePath +urlItem.substring(0, urlItem.length()-4) + "zf" + urlItem.substring(urlItem.length()-4),filePath+rem,275,810,40,15,300);
             addText(filePath +urlItem.substring(0, urlItem.length()-4) + "zf" + urlItem.substring(urlItem.length()-4),filePath +urlItem.substring(0, urlItem.length()-4) + "zfr" + urlItem.substring(urlItem.length()-4),"作废人:",310,75,12,270);
             addText(filePath +urlItem.substring(0, urlItem.length()-4) + "zf" + urlItem.substring(urlItem.length()-4),filePath +urlItem.substring(0, urlItem.length()-4) + "zfr" + urlItem.substring(urlItem.length()-4),"作废人:",310,75,12,270);
             addImage(filePath +urlItem.substring(0, urlItem.length()-4) + "zfr" + urlItem.substring(urlItem.length()-4),filePath +urlItem.substring(0, urlItem.length()-4) + "zfover" + urlItem.substring(urlItem.length()-4),filePath+personalSeal,290,30,45,15,270);
             addImage(filePath +urlItem.substring(0, urlItem.length()-4) + "zfr" + urlItem.substring(urlItem.length()-4),filePath +urlItem.substring(0, urlItem.length()-4) + "zfover" + urlItem.substring(urlItem.length()-4),filePath+personalSeal,290,30,45,15,270);
-           byId.setUrl("/profile" +urlItem.substring(0, urlItem.length()-4) + "zfover" + urlItem.substring(urlItem.length()-4));
+           byId.setUrl("/profile/" +urlItem.substring(0, urlItem.length()-4) + "zfover" + urlItem.substring(urlItem.length()-4));
             bizTechnologicalProcessDetailDrawingService.updateById(byId);
             bizTechnologicalProcessDetailDrawingService.updateById(byId);
         }
         }
         //判断盖章逻辑
         //判断盖章逻辑
@@ -249,7 +249,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             addImage(filePath+ url,filePath +url.substring(0, url.length()-4) + "zf" + url.substring(url.length()-4),filePath+rem,290,820,40,15,300);
             addImage(filePath+ url,filePath +url.substring(0, url.length()-4) + "zf" + url.substring(url.length()-4),filePath+rem,290,820,40,15,300);
             addText(filePath +url.substring(0, url.length()-4) + "zf" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "zfr" + url.substring(url.length()-4),"作废人:",310,75,12,270);
             addText(filePath +url.substring(0, url.length()-4) + "zf" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "zfr" + url.substring(url.length()-4),"作废人:",310,75,12,270);
             addImage(filePath +url.substring(0, url.length()-4) + "zfr" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "zfover" + url.substring(url.length()-4),filePath+personalSeal,290,30,45,15,270);
             addImage(filePath +url.substring(0, url.length()-4) + "zfr" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "zfover" + url.substring(url.length()-4),filePath+personalSeal,290,30,45,15,270);
-            item.setUrl("/profile"+url.substring(0, url.length()-4) + "zfover" + url.substring(url.length()-4));
+            item.setUrl("/profile/"+url.substring(0, url.length()-4) + "zfover" + url.substring(url.length()-4));
             bizTechnologicalProcessDetailDrawingService.updateById(item);
             bizTechnologicalProcessDetailDrawingService.updateById(item);
             return;
             return;
         }
         }
@@ -263,7 +263,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         addImage(filePath +url.substring(0, url.length()-4) + "pzdate" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "pzr" + url.substring(url.length()-4),filePath+personalSeal,370,30,45,15,270);
         addImage(filePath +url.substring(0, url.length()-4) + "pzdate" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "pzr" + url.substring(url.length()-4),filePath+personalSeal,370,30,45,15,270);
         //受控章
         //受控章
         addImage(filePath +url.substring(0, url.length()-4) + "pzr" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4),filePath+reviewer,465,810,45,28,300);
         addImage(filePath +url.substring(0, url.length()-4) + "pzr" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4),filePath+reviewer,465,810,45,28,300);
-        item.setUrl("/profile" +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4));
+        item.setUrl("/profile/" +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4));
         if (item.getIdentification()){
         if (item.getIdentification()){
             //盖重章
             //盖重章
             addImage(filePath +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "z" + url.substring(url.length()-4),filePath+heavy,320,810,40,40,300);
             addImage(filePath +url.substring(0, url.length()-4) + "pzover" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "z" + url.substring(url.length()-4),filePath+heavy,320,810,40,40,300);
@@ -277,7 +277,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             }else {
             }else {
                 addImage(filePath +url.substring(0, url.length()-4) + "z" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "dover" + url.substring(url.length()-4),filePath+D,365,810,40,40,300);
                 addImage(filePath +url.substring(0, url.length()-4) + "z" + url.substring(url.length()-4),filePath +url.substring(0, url.length()-4) + "dover" + url.substring(url.length()-4),filePath+D,365,810,40,40,300);
             }
             }
-            item.setUrl("/profile" +url.substring(0, url.length()-4) + "dover" + url.substring(url.length()-4));
+            item.setUrl("/profile/" +url.substring(0, url.length()-4) + "dover" + url.substring(url.length()-4));
 
 
         }
         }
         bizTechnologicalProcessDetailDrawingService.updateById(item);
         bizTechnologicalProcessDetailDrawingService.updateById(item);
@@ -382,7 +382,7 @@ public String getPublicSeal(String code) {
         processDetailDrawing.setProducer(SecurityUtils.getLoginUser().getUser().getNickName());
         processDetailDrawing.setProducer(SecurityUtils.getLoginUser().getUser().getNickName());
         String url = "";
         String url = "";
         url = processDetailDrawing.getUrl();
         url = processDetailDrawing.getUrl();
-        url = url.substring("/profile/".length());
+        url = url.substring("/profile".length());
         processDetailDrawing.setPattern("替换");
         processDetailDrawing.setPattern("替换");
         processDetailDrawing.setProducerId(SecurityUtils.getLoginUser().getUser().getUserId());
         processDetailDrawing.setProducerId(SecurityUtils.getLoginUser().getUser().getUserId());
         processDetailDrawing.setProducer(SecurityUtils.getLoginUser().getUser().getNickName());
         processDetailDrawing.setProducer(SecurityUtils.getLoginUser().getUser().getNickName());
@@ -391,7 +391,7 @@ public String getPublicSeal(String code) {
         PdfUtils.reSized(filePath + url,filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),60,"height");
         PdfUtils.reSized(filePath + url,filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),60,"height");
         addText(filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),"制定人:",550,75,12,270);
         addText(filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),"制定人:",550,75,12,270);
         addImage(filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4),filePath+personalSeal,530,30,45,15,270);
         addImage(filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4),filePath+personalSeal,530,30,45,15,270);
-        processDetailDrawing.setUrl("/profile"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
+        processDetailDrawing.setUrl("/profile/"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
 
 
         return toAjax(bizTechnologicalProcessDetailDrawingService.save(processDetailDrawing));
         return toAjax(bizTechnologicalProcessDetailDrawingService.save(processDetailDrawing));