修改许可同步接口

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaLicenseBaseInfoServiceImpl.java

 package com.yeejoin.amos.api.openapi.face.service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -14,6 +16,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csoft.sdk.client.CsoftDefaultSdkClient;
 import com.csoft.sdk.domain.App;
 import com.csoft.sdk.domain.CsoftDataTzsbJbxxListParam;
@@ -21,6 +24,7 @@ import com.csoft.sdk.domain.request.CsoftDataTzsbJbxxListRequest;
 import com.csoft.sdk.domain.response.CsoftDataTzsbJbxxListResponse;
 import com.yeejoin.amos.api.openapi.face.model.TaLicenseBaseInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseBaseInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig;
 import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo;
 
 /**
@@ -32,6 +36,10 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo;
 @Service
 public class TaLicenseBaseInfoServiceImpl
 		extends BaseService<TaLicenseBaseInfoModel, TaLicenseBaseInfo, TaLicenseBaseInfoMapper> {
+
+	@Autowired
+	TaAccessConfigServiceImpl taAccessConfigServiceImpl;
+
 	/**
 	 *
 	 * 新增许可信息-许可基本信息表
@@ -61,18 +69,31 @@ public class TaLicenseBaseInfoServiceImpl
 		String appSecret = map.get("appSecret");
 		String server = map.get("server");
 		String startTime = map.get("startTime");
-		String endTime = map.get("endTime");
+		int isAll = Integer.valueOf(map.get("isAllBase"));
+		// String endTime = map.get("endTime");
 		App app = App.of(appId, appKey, appSecret, server);
 		int current = 1;
 		int size = Integer.valueOf(map.get("pageSize"));
+		
 		// 2.初始化请求客户端
 		CsoftDefaultSdkClient client = CsoftDefaultSdkClient.of(app);
 		// 3.设置参数，发送请求，并处理结果
 		CsoftDataTzsbJbxxListParam csoftDataTzsbJbxxListParam = new CsoftDataTzsbJbxxListParam();
-		csoftDataTzsbJbxxListParam.setStaTime(startTime);
-		// 开始日期
-		csoftDataTzsbJbxxListParam.setEndTime(endTime);
-		// 结束日期
+		if (isAll == 0) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			// 开始日期
+			csoftDataTzsbJbxxListParam.setStaTime(startTime);
+			// 结束日期
+			csoftDataTzsbJbxxListParam.setEndTime(sdf.format(new Date()));
+		} else {
+			SimpleDateFormat sdfsta = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+			SimpleDateFormat sdfend = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+			// 开始日期
+			csoftDataTzsbJbxxListParam.setStaTime(sdfsta.format(new Date()));
+			// 结束日期
+			csoftDataTzsbJbxxListParam.setEndTime(sdfend.format(new Date()));
+		}
+		
 		csoftDataTzsbJbxxListParam.setPageSize(size); // 每 页记录数
 		csoftDataTzsbJbxxListParam.setCurrentPage(current); // 当前页码
 		CsoftDataTzsbJbxxListRequest request = new CsoftDataTzsbJbxxListRequest(csoftDataTzsbJbxxListParam);
@@ -103,6 +124,12 @@ public class TaLicenseBaseInfoServiceImpl
 				csoftDataTzsbJbxxListParam.setCurrentPage(++current);
 				saveData(client, csoftDataTzsbJbxxListParam);
 			}
+
+			if (isAll == 0) {
+				taAccessConfigServiceImpl
+						.update(new LambdaUpdateWrapper<TaAccessConfig>().eq(TaAccessConfig::getBizType, "license")
+								.eq(TaAccessConfig::getBizKey, "isAllBase").set(TaAccessConfig::getBizValue, 1));
+			}
 		} else {
 			System.out.println("失败：" + response.getErrorMsg());
 			System.out.println("失败：" + response.getErrorCode());

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaLicenseDetailInfoServiceImpl.java

 package com.yeejoin.amos.api.openapi.face.service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +17,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csoft.sdk.client.CsoftDefaultSdkClient;
 import com.csoft.sdk.domain.App;
 import com.csoft.sdk.domain.CsoftDataTzsbXkxxListParam;
@@ -22,6 +25,7 @@ import com.csoft.sdk.domain.request.CsoftDataTzsbXkxxListRequest;
 import com.csoft.sdk.domain.response.CsoftDataTzsbXkxxListResponse;
 import com.yeejoin.amos.api.openapi.face.model.TaLicenseDetailInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseDetailInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig;
 import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo;
 
 /**
@@ -32,7 +36,8 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo;
  */
 @Service
 public class TaLicenseDetailInfoServiceImpl extends BaseService<TaLicenseDetailInfoModel, TaLicenseDetailInfo, TaLicenseDetailInfoMapper> {
-
+	@Autowired
+	TaAccessConfigServiceImpl taAccessConfigServiceImpl;
     /**
      *
      * 新增许可信息-许可详细信息表
@@ -62,7 +67,8 @@ public class TaLicenseDetailInfoServiceImpl extends BaseService<TaLicenseDetailI
 		String appSecret = map.get("appSecret");
 		String server = map.get("server");
 		String startTime = map.get("startTime");
-		String endTime = map.get("endTime");
+		//String endTime = map.get("endTime");
+		int isAll = Integer.valueOf(map.get("isAllDetail"));
 		App app = App.of(appId, appKey, appSecret, server);
 		int current = 1;
 		int size = Integer.valueOf(map.get("pageSize"));
@@ -70,10 +76,20 @@ public class TaLicenseDetailInfoServiceImpl extends BaseService<TaLicenseDetailI
 		CsoftDefaultSdkClient client = CsoftDefaultSdkClient.of(app);
 		// 3.设置参数，发送请求，并处理结果
 		CsoftDataTzsbXkxxListParam csoftDataTzsbXKxxListParam = new CsoftDataTzsbXkxxListParam();
-		csoftDataTzsbXKxxListParam.setStaTime(startTime);
-		// 开始日期
-		csoftDataTzsbXKxxListParam.setEndTime(endTime);
-		// 结束日期
+		if (isAll == 0) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			// 开始日期
+			csoftDataTzsbXKxxListParam.setStaTime(startTime);
+			// 结束日期
+			csoftDataTzsbXKxxListParam.setEndTime(sdf.format(new Date()));
+		} else {
+			SimpleDateFormat sdfsta = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+			SimpleDateFormat sdfend = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+			// 开始日期
+			csoftDataTzsbXKxxListParam.setStaTime(sdfsta.format(new Date()));
+			// 结束日期
+			csoftDataTzsbXKxxListParam.setEndTime(sdfend.format(new Date()));
+		}
 		csoftDataTzsbXKxxListParam.setPageSize(size); // 每 页记录数
 		csoftDataTzsbXKxxListParam.setCurrentPage(current); // 当前页码
 		CsoftDataTzsbXkxxListRequest request = new CsoftDataTzsbXkxxListRequest(csoftDataTzsbXKxxListParam);
@@ -104,6 +120,12 @@ public class TaLicenseDetailInfoServiceImpl extends BaseService<TaLicenseDetailI
 				csoftDataTzsbXKxxListParam.setCurrentPage(++current);
 				saveData(client, csoftDataTzsbXKxxListParam);
 			}
+			
+			if (isAll == 0) {
+				taAccessConfigServiceImpl
+						.update(new LambdaUpdateWrapper<TaAccessConfig>().eq(TaAccessConfig::getBizType, "license")
+								.eq(TaAccessConfig::getBizKey, "isAllDetail").set(TaAccessConfig::getBizValue, 1));
+			}
 		} else {
 			System.out.println("失败：" + response.getErrorMsg());
 			System.out.println("失败：" + response.getErrorCode());