Merge branch 'developer' of http://115.159.76.241/data-hook/gic-cloud into developer

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/AlarmController.java

@@ -43,9 +43,15 @@ public class AlarmController {
         EnterpriseDTO enterprise = this.enterpriseService.getEnterpriseById(SessionContextUtils.getLoginUserEnterpriseId());
         Integer alarmWay = enterprise.getAlarmWay();
         FreeQuerySource freeQuerySource = this.freeQueryService.getFreeQuerySource(SessionContextUtils.getLoginUserEnterpriseId());
-        Date expireTime = freeQuerySource.getDbExpiration();
-        Map<String, Object> alarmResult = this.getAlarmResult(expireTime, alarmWay);
-        alarmResult.put("isPrivate", freeQuerySource.getIsPrivate());
+        Map<String, Object> alarmResult = new HashMap<>();
+        if(freeQuerySource == null){
+            alarmResult.put("type", 0);
+            alarmResult.put("remain", 0);
+        }else {
+            Date expireTime = freeQuerySource.getDbExpiration();
+            alarmResult = this.getAlarmResult(expireTime, alarmWay);
+            alarmResult.put("isPrivate", freeQuerySource.getIsPrivate());
+        }
         alarmResult.put("customSearch", 0);
         List<RightMenuDTO> list = this.rightService.listSuperAdminAllGicWebMenu(SessionContextUtils.getLoginUserEnterpriseId(), ThirdProjectEnum.DATA_HOOK.getCode());
         if(org.apache.commons.collections.CollectionUtils.isNotEmpty(list)){

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FreeQueryController.java

@@ -122,10 +122,14 @@ public class FreeQueryController {
 	public GeneralResult getFreeQueryCount(String sql, String enterpriseId, HttpServletRequest request, HttpServletResponse response) {
 		GeneralResult result = new GeneralResult();
 		FreeQuerySource freeQuerySource = this.freeQueryService.getFreeQuerySource(SessionContextUtils.getLoginUserEnterpriseId());
-		Date expireTime = freeQuerySource.getDbExpiration();
-		Integer isPrivate = freeQuerySource.getIsPrivate();
-		if(isPrivate != null && isPrivate == 1 && expireTime != null && expireTime.before(new Date())){
-			result.setInfo("0");
+		if(freeQuerySource != null){
+			Date expireTime = freeQuerySource.getDbExpiration();
+			Integer isPrivate = freeQuerySource.getIsPrivate();
+			if(isPrivate != null && isPrivate == 1 && expireTime != null && expireTime.before(new Date())){
+				result.setInfo("0");
+			}else {
+				result.setInfo(String.valueOf(this.freeQueryService.getFreeQueryCount(sql, enterpriseId)));
+			}
 		}else {
 			result.setInfo(String.valueOf(this.freeQueryService.getFreeQueryCount(sql, enterpriseId)));
 		}
@@ -177,6 +181,10 @@ public class FreeQueryController {
 	public FreeQuerySource getCustomDatabase(){
 		FreeQuerySource freeQuerySource = this.freeQueryService.getFreeQuerySource(SessionContextUtils.getLoginUserEnterpriseId());
 		System.out.println(JSON.toJSONString(freeQuerySource));
+		if(freeQuerySource == null){
+			freeQuerySource = new FreeQuerySource();
+			freeQuerySource.setDatabase(this.enterpriseService.getEnterpriseById(SessionContextUtils.getLoginUserEnterpriseId()).getFactoryCode());
+		}
 		return freeQuerySource;
 	}