From 50c01fb1221f5b1639176c1e7f55b4ab939c1f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 1 Feb 2024 16:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=91=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../srms/service/impl/SrmsApiServiceImpl.java | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java
index 3a85213d..64e3a8d3 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java
@@ -117,9 +117,10 @@ public class SrmsApiServiceImpl implements SrmsApiService {
     private static final String PUBLISH_OF_ORIGINAL = "publish_of_original";
     private static final String X_ACCESS_TOKEN = "X-Access-Token";
     private static final String ADD_NOT_NULL = "必填项不能为空";
-    private static final String PART_CATEGROY_NUM = "PartCategroyNum";
-    private static final String PART_CATEGROY_NAME = "PartCategroyName";
+    private static final String PART_CATEGORY_NUM = "PartCategoryNum";
+    private static final String PART_CATEGORY_NAME = "PartCategoryName";
     private static final String PARENT_NUM = "ParentNum";
+    private static final String PRINT_TOKEN = "token============================";
 
 
 
@@ -163,7 +164,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
         // 验证token
         String token = req.getHeader(X_ACCESS_TOKEN);
         try {
-            log.info("token============================" + token);
+            log.info(PRINT_TOKEN + token);
             // 验证Token有效性
             boolean tokenOK = TokenUtils.verifyToken(req, sysBaseAPI, redisUtil);
             if(!tokenOK){
@@ -310,7 +311,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
         // 验证token
         try {
             String token = req.getHeader(X_ACCESS_TOKEN);
-            log.info("token============================" + token);
+            log.info(PRINT_TOKEN + token);
             // 验证Token有效性
             boolean tokenOK = TokenUtils.verifyToken(req, sysBaseAPI, redisUtil);
             if(!tokenOK){
@@ -367,7 +368,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
         // 验证token
         try {
             String token = req.getHeader(X_ACCESS_TOKEN);
-            log.info("token============================" + token);
+            log.info(PRINT_TOKEN + token);
             // 验证Token有效性
             boolean tokenOK = TokenUtils.verifyToken(req, sysBaseAPI, redisUtil);
             if(!tokenOK){
@@ -451,7 +452,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
         // 验证token
         String token = req.getHeader(X_ACCESS_TOKEN);
         try {
-            log.info("token============================" + token);
+            log.info(PRINT_TOKEN + token);
             // 验证Token有效性
             boolean tokenOK = TokenUtils.verifyToken(req, sysBaseAPI, redisUtil);
             if(!tokenOK){
@@ -614,17 +615,17 @@ public class SrmsApiServiceImpl implements SrmsApiService {
             List<PartName> listPartName = new ArrayList<>();
             for (Object request : rows) {
                 JSONObject js = JSON.parseObject(JSON.toJSONString(request));
-                if(!js.containsKey(PART_CATEGROY_NUM) || !js.containsKey(PART_CATEGROY_NAME) || !js.containsKey(PARENT_NUM)){
+                if(!js.containsKey(PART_CATEGORY_NUM) || !js.containsKey(PART_CATEGORY_NAME) || !js.containsKey(PARENT_NUM)){
                     return Result.error(ADD_NOT_NULL);
                 }
-                if(StringUtils.isBlank(js.getString(PART_CATEGROY_NUM))
-                        || StringUtils.isBlank(js.getString(PART_CATEGROY_NAME))
+                if(StringUtils.isBlank(js.getString(PART_CATEGORY_NUM))
+                        || StringUtils.isBlank(js.getString(PART_CATEGORY_NAME))
                         || StringUtils.isBlank(js.getString(PARENT_NUM))){
                     return Result.error(ADD_NOT_NULL);
                 }
                 PartName partName = new PartName();
-                partName.setCode(js.getString(PART_CATEGROY_NUM));
-                partName.setName(js.getString(PART_CATEGROY_NAME));
+                partName.setCode(js.getString(PART_CATEGORY_NUM));
+                partName.setName(js.getString(PART_CATEGORY_NAME));
                 partName.setParentCode(js.getString(PARENT_NUM));
                 partName.setRemark1(js.getString("Remark1"));
                 partName.setRemark2(js.getString("Remark2"));
@@ -680,7 +681,7 @@ public class SrmsApiServiceImpl implements SrmsApiService {
             if(!CollectionUtils.isEmpty(listLawsPartStandard)){
                 for (LawsPartStandard lawsPartStandard : listLawsPartStandard) {
                     JSONObject rows = new JSONObject();
-                    rows.put(PART_CATEGROY_NUM,lawsPartStandard.getPartCategoryNum());
+                    rows.put(PART_CATEGORY_NUM,lawsPartStandard.getPartCategoryNum());
                     rows.put("StandardPdmType",lawsPartStandard.getStandardPdmType());
                     rows.put("StandardNumber",lawsPartStandard.getStandardNumber());
                     rows.put("Remark1",lawsPartStandard.getRemark1());