Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/base/entity/SysProxyAddress.java

@@ -0,0 +1,46 @@
+package com.spring.modules.base.entity;
+
+import org.apache.ibatis.type.Alias;
+
+@Alias("SysProxyAddress")
+public class SysProxyAddress {
+    /**
+     *
+     */
+    private String physicalAddress;
+
+    /**
+     *
+     */
+    private String proxyAddress;
+
+    /**
+     *
+     */
+    private String remark;
+
+    public String getPhysicalAddress() {
+        return physicalAddress;
+    }
+
+    public void setPhysicalAddress(String physicalAddress) {
+        this.physicalAddress = physicalAddress;
+    }
+
+    public String getProxyAddress() {
+        return proxyAddress;
+    }
+
+    public void setProxyAddress(String proxyAddress) {
+        this.proxyAddress = proxyAddress;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
+

src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@@ -1099,4 +1099,11 @@ public class TechnicalSpecificationController {
         technicalSpecificationService.updateBMRemarkPage(data);
         return R.ok();
     }
+
+    @PostMapping(value="/checkUrl")
+    @ResponseBody
+    public R checkUrl(@RequestBody BmUrlData data){
+        BmUrlData result= technicalSpecificationService.checkUrl(data);
+        return R.ok().put("url", result.getUrl());
+    }
 }

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.PlmBmPageBaseData;
+import com.spring.modules.base.entity.SysProxyAddress;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.BomHeaderEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
@@ -1119,4 +1120,6 @@ public interface TechnicalSpecificationMapper {
     void updateBMRemarkPage(PlmTechnicalSpecificationSheetData inData);
 
     List<QuotationHeader> searchPartLastQuotationNo(QuotationDetailVo data);
+
+    List<SysProxyAddress> getSysProxyAddress();
 }

src/main/java/com/spring/modules/sampleManagement/data/BmUrlData.java

@@ -0,0 +1,16 @@
+package com.spring.modules.sampleManagement.data;
+
+import org.apache.ibatis.type.Alias;
+
+@Alias("BmUrlData")
+public class BmUrlData {
+    private String url;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -9,10 +9,7 @@ import com.spring.modules.base.data.PlmBmModelHeaderData;
 import com.spring.modules.base.data.PlmBmPropertiesValueData;
 import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData;
 import com.spring.modules.base.data.PlmPropertiesItemAvailableData;
-import com.spring.modules.base.entity.PlmBmModelHeader;
-import com.spring.modules.base.entity.PlmBmPageBaseData;
-import com.spring.modules.base.entity.PlmBmPropertiesValueHeader;
-import com.spring.modules.base.entity.PlmPropertiesItemAvailable;
+import com.spring.modules.base.entity.*;
 import com.spring.modules.base.service.TransNoControlService;
 import com.spring.modules.part.entity.*;
 import com.spring.modules.part.mapper.BomManagementMapper;
@@ -961,4 +958,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     public List<QuotationHeader> searchPartLastQuotationNo(QuotationDetailVo data){
         return technicalSpecificationMapper.searchPartLastQuotationNo(data);
     }
+
+    @Override
+    public BmUrlData checkUrl(BmUrlData data){
+        List<SysProxyAddress> addresses=technicalSpecificationMapper.getSysProxyAddress();
+        for (int i = 0; i <addresses.size() ; i++) {
+            data.setUrl(data.getUrl().replaceAll(addresses.get(i).getPhysicalAddress(), addresses.get(i).getProxyAddress()));
+        }
+        return data;
+    }
 }

src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@@ -939,4 +939,7 @@ public interface TechnicalSpecificationService {
     void updateBMRemarkPage(PlmTechnicalSpecificationSheetData inData);
 
     List<QuotationHeader> searchPartLastQuotationNo(QuotationDetailVo data);
+
+    BmUrlData checkUrl(BmUrlData data);
+
 }

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -833,4 +833,9 @@ a.routing_alternative_no alternativeNo,b.final_part_no  partNo
     where b.site=#{site} and b.product_no=#{productNo}  order by a.create_time desc
 </select>
 
+<select id="getSysProxyAddress" resultType="SysProxyAddress">
+    select physicalAddress,proxyAddress,remark from sys_proxy_address
+
+</select>
+
 </mapper>