feat: 验证零部件是否可以新增接口使用PDM返回的提示信息

laws-modules-docking/src/main/java/com/jero/modules/docking/bindPart/controller/LawsBindPartController.java

@@ -59,8 +59,10 @@ public class LawsBindPartController {
     @AutoLog(value = "绑定零部件-是否显示使用绑定关系")
     @ApiOperation(value="绑定零部件-是否显示使用绑定关系", notes="绑定零部件-是否显示使用绑定关系")
     @GetMapping(value = "/isShowUseBindRelation")
-    public Result<LawsBindPart> isShowUseBindRelation(LawsBindPart lawsBindPart) {
+    public Result<?> isShowUseBindRelation(LawsBindPart lawsBindPart) {
-        return Result.OK(lawsBindPartService.isShowUseBindRelation(lawsBindPart));
+        LawsBindPart showUseBindRelation = lawsBindPartService.isShowUseBindRelation(lawsBindPart);
+
+        return Result.OK();
     }
 
     @AutoLog(value = "绑定零部件-使用绑定关系")

laws-modules-docking/src/main/java/com/jero/modules/docking/bindPart/service/impl/LawsBindPartServiceImpl.java

@@ -95,11 +95,12 @@ public class LawsBindPartServiceImpl extends ServiceImpl<LawsBindPartMapper, Law
     @Override
     public void add(LawsBindPart lawsBindPart) {
         // 访问PDM校验该零部件号是否可以修改
-        boolean canEdit = srmsApiService.validPartNoEdit(lawsBindPart.getPartNo(),
+        try {
+            srmsApiService.validPartNoEdit(lawsBindPart.getPartNo(),
                     lawsBindPart.getPartName(),
                     getBindUsernameAndRealName(lawsBindPart.getBindUser()));
-        if (!canEdit) {
+        } catch (Exception e) {
-            throw new JeroBootException("零部件号" + lawsBindPart.getPartNo() + "不可新增");
+            throw new JeroBootException(e.getMessage());
         }
         lawsBindPart.setBindTime(new Date());
         save(lawsBindPart);
@@ -144,10 +145,11 @@ public class LawsBindPartServiceImpl extends ServiceImpl<LawsBindPartMapper, Law
         // 访问PDM校验该零部件号是否可以修改
         for (String id : ids) {
             LawsBindPart existBindPart = lawsBindPartMap.get(id);
-            boolean canEdit = srmsApiService.validPartNoEdit(existBindPart.getPartNo(),
+            try {
+                srmsApiService.validPartNoEdit(existBindPart.getPartNo(),
                         existBindPart.getPartName(),
                         getBindUsernameAndRealName(existBindPart.getBindUser()));
-            if (!canEdit) {
+            } catch (Exception e) {
                 errPartSet.add(existBindPart.getPartNo());
             }
         }

laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/SrmsApiService.java

@@ -118,7 +118,7 @@ public interface SrmsApiService {
      * @author CHH
      * @date 2024/4/28 15:08
      */
-    boolean validPartNoEdit(String partNo, String partName, String bindUserInfo);
+    void validPartNoEdit(String partNo, String partName, String bindUserInfo);
 
     /**
      * PDM校验某个零部件是否所属于某个零部件分类

laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java

@@ -157,8 +157,6 @@ public class SrmsApiServiceImpl implements SrmsApiService {
     private static final String PRINT_TOKEN = "token============================";
 
 
-
-
     @Override
     public Result<JSONObject> getByToken(JSONObject json) {
         try {
@@ -806,8 +804,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
     }
 
     @Override
-    public boolean validPartNoEdit(@NotNull String partNo, String partName, @NotNull String bindUserInfo) {
+    public void validPartNoEdit(@NotNull String partNo, String partName, @NotNull String bindUserInfo) {
-        try {
         JSONObject all = new JSONObject();
         all.put(MESSAGE_HANDLER, getMessageHandler("CNHTC_PO1000495", null));
         JSONObject requests = new JSONObject();
@@ -830,22 +827,28 @@ public class SrmsApiServiceImpl implements SrmsApiService {
 
         JSONObject reData = restTemplate.postForObject(pdmIp + editValidUrl, entity, JSONObject.class);
         log.info("接收验证零部件是否可修改请求返回");
-            log.info("Response: " + JSON.toJSONString(reData));
+        log.info("返回报文: " + JSON.toJSONString(reData));
-            if (!Objects.isNull(reData) && reData.containsKey("Success")) {
+        JSONObject response = null;
-                String success = reData.getString("Success");
+        if (!Objects.isNull(reData) && reData.containsKey("Responses")) {
+            response = reData.getJSONObject("Responses");
+        }
+        if (!Objects.isNull(response) && response.containsKey("Success")) {
+            String success = response.getString("Success");
+            String message = "";
+            if (response.containsKey("Message")) {
+                message = response.getString("Message");
+            }
             if ("true".equals(success)) {
                 log.info("验证零部件号是否可修改接口成功");
-                    return true;
+                return;
             }
             if ("false".equals(success)) {
                 log.error("验证零部件号是否可修改接口失败");
-                    return false;
+                log.error("验证零部件号是否可修改接口失败原因: " + message);
+                throw new JeroBootException(message);
             }
         }
-        } catch (Exception e) {
+        throw new JeroBootException("零部件号" + partNo + "不可新增");
-            log.error("验证零部件号是否可修改异常", e);
-        }
-        return false;
     }
 
     @Override
@@ -877,12 +880,17 @@ public class SrmsApiServiceImpl implements SrmsApiService {
             log.info("Response: " + JSON.toJSONString(reData));
             if (!Objects.isNull(reData) && reData.containsKey("Success")) {
                 String success = reData.getString("Success");
+                String message = "";
+                if (reData.containsKey("Message")) {
+                    message = reData.getString("Message");
+                }
                 if ("true".equals(success)) {
                     log.info("校验某个零部件是否所属于某个零部件分类接口成功");
                     return true;
                 }
                 if ("false".equals(success)) {
                     log.error("校验某个零部件是否所属于某个零部件分类接口失败");
+                    log.error("失败原因: " + message);
                     return false;
                 }
             }