更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/DateUtils.java → FullCardClient/src/main/java/com/zhongshu/card/client/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.util;
+package com.zhongshu.card.client.utils;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -1,6 +1,5 @@
 package com.zhongshu.card.server.core.domain.payment;
 
-import cn.hutool.json.JSONObject;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.models.type.PaymentDeviceType;
 import com.github.microservice.models.type.PaymentType;
@@ -9,7 +8,7 @@ import com.zhongshu.card.client.utils.type.RefundState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -88,7 +87,7 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "月份，如：6")
     private Integer month;
 
-    @Schema(description = "第几周,如：32")
+    @Schema(description = "今年第几周,如：32")
     private Integer week;
 
     @Schema(description = "当前月的第几天")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/SuperService.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/mqtt/MqttServiceImpl.java

@@ -19,7 +19,7 @@ import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.mqtt.mqttConfig.client.MQClient;
 import com.zhongshu.card.server.core.service.mqtt.mqttConfig.constant.MQConstant;
 import com.zhongshu.card.server.core.util.BeanUtils;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import jakarta.jms.Message;
 import jakarta.jms.TextMessage;
 import lombok.extern.slf4j.Slf4j;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -17,6 +17,7 @@ import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.OrganizationService;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.type.*;
 import com.zhongshu.card.server.core.dao.org.*;
 import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
@@ -24,7 +25,6 @@ import com.zhongshu.card.server.core.domain.org.*;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.sync.ProjectSyncIotCenterService;
 import com.zhongshu.card.server.core.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -15,6 +15,7 @@ import com.zhongshu.card.client.model.payment.statistic.StatisticSearch;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.payment.ExpenseFlowService;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.type.*;
 import com.zhongshu.card.client.utils.type.school.CardState;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
@@ -51,7 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/RequestInfoService.java

@@ -5,7 +5,7 @@ import com.zhongshu.card.client.utils.type.payment.RequestType;
 import com.zhongshu.card.server.core.dao.payment.RequestInfoDao;
 import com.zhongshu.card.server.core.domain.payment.RequestInfo;
 import com.zhongshu.card.server.core.httpRequest.apiConf.APIResponseModel;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/WalletService.java

@@ -6,10 +6,7 @@ import com.zhongshu.card.client.model.payment.WalletModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeParam;
 import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
-import com.zhongshu.card.client.model.school.BookInfoModel;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
 import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RechargeType;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
@@ -18,12 +15,11 @@ import com.zhongshu.card.server.core.dao.payment.WalletRechargeDao;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.Wallet;
 import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/sync/DeviceSyncFromIotService.java

@@ -4,7 +4,6 @@ import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
-import com.github.microservice.models.type.CommonState;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.client.utils.type.DataState;
@@ -17,7 +16,7 @@ import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.org.GateWayInfoServiceImpl;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.CommonUtil;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/OperationLogsService.java

@@ -11,7 +11,7 @@ import com.zhongshu.card.server.core.dao.user.OperationLogsDao;
 import com.zhongshu.card.server.core.domain.operlog.OperationLogs;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
-import com.zhongshu.card.server.core.util.DateUtils;
+import com.zhongshu.card.client.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/test/Test.java

@@ -2,15 +2,13 @@ package com.zhongshu.card.server.core.test;
 
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.json.JSONUtil;
-import com.zhongshu.card.client.utils.type.DataState;
-import com.zhongshu.card.server.core.util.CommonUtil;
-import com.zhongshu.card.server.core.util.DateUtils;
 import com.zhongshu.card.server.core.util.ValidateResult;
 import com.zhongshu.card.server.core.util.ValidateUtils;
 import groovy.lang.GroovyShell;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,18 +37,20 @@ public class Test {
         BigDecimal b2 = BigDecimal.valueOf(564.32);
         System.out.println("m= " + b1.divide(b2, 5, RoundingMode.HALF_UP));
 
-        BigDecimal per = BigDecimal.ZERO;
-        if (b1.compareTo(BigDecimal.ZERO) > 0 && b2.compareTo(BigDecimal.ZERO) > 0) {
-            per = (b1.subtract(b2)).divide(b2, 4, BigDecimal.ROUND_HALF_UP)
-                    .multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
-        }
-
-        System.out.println("per: " + per);
-
         GroovyShell groovyShell = new GroovyShell();
         String res = " println 'Hello, Groovy!' ";
         Object result1 = groovyShell.evaluate(res);
         System.out.println("result1 = " + result1);
 
+        try {
+            String stt = "我是";
+            byte[] encoded = Base64.getEncoder().encode(stt.getBytes("utf-8"));
+            System.out.println("base64 = " + new String(encoded));
+            byte[] stt1 = Base64.getDecoder().decode(encoded);
+            System.out.println("stt1 = " + new String(stt1));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/CommonUtil.java

@@ -5,8 +5,8 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.ITree;
-import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.Sex;
 import com.zhongshu.card.client.utils.type.school.CardType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;