更新

FullCardClient/pom.xml

@@ -68,6 +68,12 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.microservice.components</groupId>
+			<artifactId>MongodbData</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 	</dependencies>
 
 </project>

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/BaseImpl.java → FullCardClient/src/main/java/com/zhongshu/card/client/dao/BaseImpl.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.dao;
+package com.zhongshu.card.client.dao;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
 import org.apache.commons.lang3.ObjectUtils;

FullCardClient/src/main/java/com/zhongshu/card/client/utils/DateUtils.java

@@ -40,6 +40,8 @@ public class DateUtils {
 
     public final static String patternMM = "MM";
 
+    public final static String patternWx  = "yyyy-MM-dd'T'HH:mm:ssXXX";
+
     public static Long timeToLong(String time) {
         return timeToLong(time, FORMAT_LONG);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.org.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.org.OrganizationSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.extend.OrganizationDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.util.CommonUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationRelationDaoImpl.java

@@ -2,14 +2,10 @@ package com.zhongshu.card.server.core.dao.org.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.org.OrganizationRelationSearch;
-import com.zhongshu.card.client.model.org.RoleSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.extend.OrganizationRelationDaoExtend;
-import com.zhongshu.card.server.core.dao.org.extend.RoleDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
-import com.zhongshu.card.server.core.domain.org.Role;
-import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.org.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.org.OrganizationUserSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.DepartmentDao;
 import com.zhongshu.card.server.core.dao.org.RoleDao;
 import com.zhongshu.card.server.core.dao.org.extend.OrganizationUserDaoExtend;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/RoleDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.org.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.org.RoleSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.extend.RoleDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Role;
 import com.zhongshu.card.server.core.util.CommonUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/UserCountDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.org.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.org.UserCountSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.extend.UserCountDaoExtend;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.util.CommonUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -3,14 +3,9 @@ package com.zhongshu.card.server.core.dao.payment.impl;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.payment.ExpenseFlowCount;
 import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
-import com.zhongshu.card.client.model.payment.statistic.StatisticItem;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.payment.extend.ExpenseFlowDaoExtend;
-import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/WalletRechargeDaoImpl.java

@@ -2,13 +2,9 @@ package com.zhongshu.card.server.core.dao.payment.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.payment.extend.WalletRechargeExtend;
-import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,11 +15,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
 
 /**
  * @Author TRX

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/BookInfoDaoImpl.java

@@ -2,13 +2,10 @@ package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.client.model.school.NoticeInfoSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
-import com.zhongshu.card.server.core.dao.school.extend.NoticeInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.school.BookInfo;
-import com.zhongshu.card.server.core.domain.school.NoticeInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/CardInfoDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.school.CardInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.CardInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
@@ -95,7 +95,7 @@ public class CardInfoDaoImpl extends BaseImpl implements CardInfoDaoExtend {
                     Criteria.where("phone").regex(pattern)
             );
         }
-        
+
         criteria.and("isDelete").is(Boolean.FALSE);
         Sort sort = buildSort(param);
         Query query = Query.query(criteria);

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/CardInfoPoolDaoImpl.java

@@ -1,13 +1,9 @@
 package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
 import com.zhongshu.card.client.model.school.CardInfoPoolSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
-import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.CardInfoPoolDaoExtend;
-import com.zhongshu.card.server.core.domain.org.Department;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.domain.school.CardInfoPool;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
@@ -16,10 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/DeviceBindDaoImpl.java

@@ -2,11 +2,8 @@ package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.school.DeviceBindSearch;
-import com.zhongshu.card.client.model.school.DeviceInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceBindDaoExtend;
-import com.zhongshu.card.server.core.dao.school.extend.DeviceInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
 import com.zhongshu.card.server.core.domain.school.Area;
 import com.zhongshu.card.server.core.domain.school.DeviceBind;
 import com.zhongshu.card.server.core.util.CommonUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/DeviceInfoDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.school.DeviceInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.school.Area;
 import com.zhongshu.card.server.core.domain.org.DeviceInfo;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/DictInfoDaoImpl.java

@@ -1,16 +1,10 @@
 package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.client.model.school.DictInfoParam;
 import com.zhongshu.card.client.model.school.DictInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
-import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.DictInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.Department;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.domain.school.DictInfo;
-import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +14,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/GateWayInfoDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.school.GateWayInfoSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.GateWayInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.school.Area;
 import com.zhongshu.card.server.core.domain.org.GateWayInfo;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/NoticeInfoDaoImpl.java

@@ -1,12 +1,9 @@
 package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.org.OrganizationSearchParam;
 import com.zhongshu.card.client.model.school.NoticeInfoSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
-import com.zhongshu.card.server.core.dao.org.extend.OrganizationDaoExtend;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.NoticeInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.school.NoticeInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/NoticeInfoViewDaoImpl.java

@@ -1,16 +1,12 @@
 package com.zhongshu.card.server.core.dao.school.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.school.NoticeInfoSearchParam;
 import com.zhongshu.card.client.model.school.NoticeInfoViewSearch;
-import com.zhongshu.card.server.core.dao.BaseImpl;
-import com.zhongshu.card.server.core.dao.school.extend.NoticeInfoDaoExtend;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.NoticeInfoViewDaoExtend;
 import com.zhongshu.card.server.core.domain.school.NoticeInfo;
 import com.zhongshu.card.server.core.domain.school.NoticeInfoView;
-import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -18,11 +14,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
 
 /**
  * @Author TRX

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/user/impl/OperationLogsDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.user.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.operLogs.OperationLogsSearchParam;
-import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.client.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.user.extend.OperationLogsDaoExtend;
 import com.zhongshu.card.server.core.domain.operlog.OperationLogs;
 import org.apache.commons.lang3.StringUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -80,17 +80,24 @@ public class HxzService extends SuperService {
         // 返回参数
         ConsumTransactionsResult resultModel = new ConsumTransactionsResult();
 
+        org.springframework.util.StopWatch stopWatch = new org.springframework.util.StopWatch();
+        stopWatch.start("t1");
+
         String mqttDataId = param.getMqttDataId();
         ExpenseFlow expenseFlow = expenseFlowService.init(mqttDataId);
+        stopWatch.stop();
 
         if (ObjectUtils.isEmpty(expenseFlow)) {
             resultModel.setFailed("重复订单");
             return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
         }
+        stopWatch.start("t2 创建订单");
         // 创建订单
         ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param, expenseFlow);
         expenseFlow = createResult.getContent();
+        stopWatch.stop();
 
+        stopWatch.start("t3 支付");
         // 支付
         ResultContent<ExpenseFlow> resultContent = expenseFlowService.walletPay(expenseFlow);
         if (resultContent.isFailed()) {
@@ -98,9 +105,16 @@ public class HxzService extends SuperService {
             requestInfoService.addRequestInfo(param, resultModel);
             return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
         }
+        stopWatch.stop();
+        stopWatch.start("t4 创建支付结果");
         // 构建返回结果
         resultModel = expenseFlowService.buildPayResult(expenseFlow.getOrderNo());
+        stopWatch.stop();
+        stopWatch.start("t5");
+
         requestInfoService.addRequestInfo(param, resultModel);
+        stopWatch.stop();
+        log.info("time; {}", stopWatch.prettyPrint());
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
     }