feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC103ApiRequestAndProcessing.java

@@ -45,7 +45,7 @@ public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtFjglxm::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtFjglxm::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtFjglxm::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtFjglxm::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtFjglxm::getXmmc));
         assembleData.add(setOrdinaryDate("zbzt", JtFjglxm::getZbztdw));
         assembleData.add(setOrdinaryDate("zbztdj", JtFjglxm::getZbztdj));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC105ApiRequestAndProcessing.java

@@ -47,7 +47,7 @@ public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtKcsjxm::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtKcsjxm::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtKcsjxm::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtKcsjxm::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtKcsjxm::getXmmc));
         assembleData.add(setOrdinaryDate("qdbh", JtKcsjxm::getQdbh));
         assembleData.add(setOrdinaryDate("qdmc", JtKcsjxm::getQdmc));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC107ApiRequestAndProcessing.java

@@ -48,7 +48,7 @@ public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtGzdg::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtGzdg::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtGzdg::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtGzdg::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtGzdg::getXmmc));
         assembleData.add(setOrdinaryDate("lx", JtGzdg::getType));
         assembleData.add(setOrdinaryDate("sdzrr", JtGzdg::getSdzrr));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC109ApiRequestAndProcessing.java

@@ -47,7 +47,7 @@ public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtZtfaps::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtZtfaps::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtZtfaps::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtZtfaps::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtZtfaps::getXmmc));
         assembleData.add(setOrdinaryDate("fabh", JtZtfaps::getFabh));
         assembleData.add(setOrdinaryDate("famc", JtZtfaps::getFamc));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC111ApiRequestAndProcessing.java

@@ -39,7 +39,7 @@ public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtWyys::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtWyys::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtWyys::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtWyys::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtWyys::getXmmc));
         assembleData.add(setOrdinaryDate("yzlx", JtWyys::getYzlx));
         assembleData.add(setOrdinaryDate("kcclswqxzlyzzrr", JtWyys::getZlyzzrr));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC113ApiRequestAndProcessing.java

@@ -50,7 +50,7 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtYjbhgl::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtYjbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtYjbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtYjbhgl::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtYjbhgl::getXmmc));
         assembleData.add(setOrdinaryDate("yjtcr", JtYjbhgl::getYjtcr));
         assembleData.add(setDatePattern("yjtcsj", JtYjbhgl::getYjtcsj,DATE_PATTERN_YMD));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC115ApiRequestAndProcessing.java

@@ -51,7 +51,7 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtScsdl::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtScsdl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtScsdl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtScsdl::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtScsdl::getXmmc));
         assembleData.add(setOrdinaryDate("qdbh", JtScsdl::getQdbh));
         assembleData.add(setOrdinaryDate("qdmc", JtScsdl::getQdmc));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC117ApiRequestAndProcessing.java

@@ -53,7 +53,7 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtWtbhgl::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtWtbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtWtbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtWtbhgl::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtWtbhgl::getXmmc));
         assembleData.add(setOrdinaryDate("wtfkfzr", JtWtbhgl::getWtfkfzr));
         assembleData.add(setOrdinaryDate("wttcr", JtWtbhgl::getWttcr));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC119ApiRequestAndProcessing.java

@@ -46,7 +46,7 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtScbhgl::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtScbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtScbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtScbhgl::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtScbhgl::getXmmc));
         assembleData.add(setOrdinaryDate("wbhfyjfzr", JtScbhgl::getWbhfyjfzr));
         assembleData.add(setOrdinaryDate("yjtcr", JtScbhgl::getYjtcr));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC121ApiRequestAndProcessing.java

@@ -53,7 +53,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtSjjdqd::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtSjjdqd::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtSjjdqd::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtSjjdqd::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtSjjdqd::getXmmc));
         assembleData.add(setOrdinaryDate("sjjdbghyjymc", JtSjjdqd::getName));
         assembleData.add(setDatePattern("jhjdsj", JtSjjdqd::getJhjdsj,DATE_PATTERN_YMD));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC123ApiRequestAndProcessing.java

@@ -44,7 +44,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("INDEXID", JtSjbgqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtSjbgqd::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtSjbgqd::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtSjbgqd::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtSjbgqd::getXmmc));
         assembleData.add(setOrdinaryDate("bgsxmc", JtSjbgqd::getBgsxmc));
         assembleData.add(setOrdinaryDate("bgtcr", JtSjbgqd::getBgtcr));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC131ApiRequestAndProcessing.java

@@ -45,7 +45,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
         assembleData.add(setOrdinaryDate("INDEXID", JtZdxmszmn::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtZdxmszmn::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtZdxmszmn::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtZdxmszmn::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtZdxmszmn::getXmmc));
         assembleData.add(setOrdinaryDate("szmncl", JtZdxmszmn::getSzmncl));
         JtZdxmszmn jtZdxmszmn = jtZdxmszmnService.getById(id);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC133ApiRequestAndProcessing.java

@@ -44,7 +44,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
         assembleData.add(setOrdinaryDate("INDEXID", JtXcjhqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtXcjhqd::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtXcjhqd::getXmbh));
+        assembleData.add(setOrdinaryDate("xmbh", JtXcjhqd::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xcxmmc", JtXcjhqd::getXmmc));
         assembleData.add(setOrdinaryDate("xcbh", JtXcjhqd::getXcbh));
         assembleData.add(setOrdinaryDate("bxcdw", JtXcjhqd::getBxcdw));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java

@@ -10,6 +10,7 @@ import com.rongwei.bscommon.sys.service.RedisService;
 import com.rongwei.bscommon.sys.service.SysConfigService;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
+import com.rongwei.bsentity.dto.ApiReturnTokenDto;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.Constants;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -214,7 +215,7 @@ public class AttendanceAssessmentSdk {
             body = HttpRequest.post(url).header("Content-Type", "application/json").body(JSONUtil.toJsonStr(postData)).execute().body();
             logger.info("接口返回: {}", body);
 
-            ApiReturnDto response = JSONUtil.toBean(body, ApiReturnDto.class);
+            ApiReturnTokenDto response = JSONUtil.toBean(body, ApiReturnTokenDto.class);
             token = response.getToken();
             // 将 token 放入redis;
             redisService.redisCatchInit(REDIS_KEY_NAME, token, TOKEN_EXPIRED_SECONDS);

jsglkh-entity/src/main/java/com/rongwei/bsentity/dto/ApiReturnDto.java

@@ -2,6 +2,7 @@ package com.rongwei.bsentity.dto;
 
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,19 +15,19 @@ import java.util.Map;
 public class ApiReturnDto {
 
     private StandardReturn STANDARD_RETURN;
-    private BusinessReturn BUSINESS_RETURN;
+    private List<BusinessReturn> BUSINESS_RETURN;
     private boolean successful = false;
 
-    public String getToken() {
-        return this.getBUSINESS_RETURN().getDATA().getOrDefault("TOKEN", "");
-    }
 
     /**
      * 获取接口请求成功返回的数据
      * @return
      */
     public Map<String, String> getApiReturnData() {
-        return this.getBUSINESS_RETURN() == null ? null : this.getBUSINESS_RETURN().getDATA();
+        if(this.getBUSINESS_RETURN() == null|| this.getBUSINESS_RETURN().isEmpty()){
+            return null;
+        }
+        return this.getBUSINESS_RETURN().get(0).getDATA();
     }
 
     /**
@@ -51,7 +52,10 @@ public class ApiReturnDto {
      * @return
      */
     public int getSuccessCode() {
-        return this.getBUSINESS_RETURN() == null ? 0 : this.getBUSINESS_RETURN().getCODE();
+        if(this.getBUSINESS_RETURN() == null|| this.getBUSINESS_RETURN().isEmpty()){
+            return 0;
+        }
+        return this.getBUSINESS_RETURN().get(0).getCODE();
     }
 
     /**

jsglkh-entity/src/main/java/com/rongwei/bsentity/dto/ApiReturnTokenDto.java

@@ -0,0 +1,77 @@
+package com.rongwei.bsentity.dto;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * TokenDato class
+ *
+ * @author XH
+ * @date 2024/11/30
+ */
+@Data
+public class ApiReturnTokenDto {
+
+    private StandardReturn STANDARD_RETURN;
+    private BusinessReturn BUSINESS_RETURN;
+    private boolean successful = false;
+
+    public String getToken() {
+        return this.getBUSINESS_RETURN().getDATA().getOrDefault("TOKEN", "");
+    }
+
+    /**
+     * 获取接口请求成功返回的数据
+     * @return
+     */
+    public Map<String, String> getApiReturnData() {
+        return this.getBUSINESS_RETURN() == null ? null : this.getBUSINESS_RETURN().getDATA();
+    }
+
+    /**
+     * 获取接口请求状态
+     * 000：请求成功
+     * 001：token校验失败
+     * 002：单位编码为空
+     * 003：接口无权限
+     * 004：token过期
+     * 006：数据超过最大处理数量
+     * @return
+     */
+    public String getApsStat() {
+        return this.getSTANDARD_RETURN() == null ? null : this.getSTANDARD_RETURN().getZZSTAT();
+    }
+
+    /**
+     * 接口成功请求后返回的编码
+     * 1100：接口执行成功
+     * 101：必填项xxx为空
+     * 103：数据主键或数据编码有误，数据操作失败
+     * @return
+     */
+    public int getSuccessCode() {
+        return this.getBUSINESS_RETURN() == null ? 0 : this.getBUSINESS_RETURN().getCODE();
+    }
+
+    /**
+     * 请求响应业务数据
+     */
+    @Data
+    public class BusinessReturn {
+        private int CODE;
+        private String MSG;
+        private Map<String, String> DATA;
+    }
+
+    /**
+     * 请求响应标准信息
+     */
+    @Data
+    public class StandardReturn {
+        private String ZINSTID;
+        private String ZZRESTIME;
+        private String ZZSTAT;
+        private String ZZMSG;
+    }
+}