开启开发者模式

java110-interface/src/main/resources/logback-dev.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+<!--    <include resource="org/springframework/boot/logging/logback/base.xml"/>-->
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -64,27 +64,30 @@
     <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
+    <logger name="com.java110.api" level="ERROR">
+        <appender-ref ref="STDOUT_FILE"/>
+    </logger>
     <logger name="com.java110.order" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG">
+    <logger name="com.apache.ibatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.mybatis" level="DEBUG">
+    <logger name="org.mybatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.Statement" level="DEBUG">
+    <logger name="druid.sql.Statement" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.ResultSet" level="DEBUG">
+    <logger name="druid.sql.ResultSet" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
 
-    <logger name="com.java110" level="DEBUG">
+    <logger name="com.java110" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

java110-interface/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-<!--    <include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -64,30 +64,27 @@
     <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="com.java110.api" level="ERROR">
-        <appender-ref ref="STDOUT_FILE"/>
-    </logger>
     <logger name="com.java110.order" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR">
+    <logger name="com.apache.ibatis" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.mybatis" level="ERROR">
+    <logger name="org.mybatis" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.Statement" level="ERROR">
+    <logger name="druid.sql.Statement" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.ResultSet" level="ERROR">
+    <logger name="druid.sql.ResultSet" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
 
-    <logger name="com.java110" level="ERROR">
+    <logger name="com.java110" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

java110-service/src/main/java/com/java110/service/init/ServiceStartInit.java

@@ -24,8 +24,8 @@ public class ServiceStartInit {
             ApplicationContextFactory.setApplicationContext(context);
             env = context.getEnvironment();
 
-            String logSwitch = env.getProperty(EnvironmentConstant.LOG_SWITCH);
-            //String logSwitch = "ON";
+            //String logSwitch = env.getProperty(EnvironmentConstant.LOG_SWITCH);
+            String logSwitch = "ON";
             if (!StringUtil.isEmpty(logSwitch)) {
                 //设置日志级别
                 SystemLogDto.setLogSwatch(logSwitch);

service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java

@@ -26,6 +26,7 @@ import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
 import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
@@ -35,6 +36,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
@@ -67,6 +69,12 @@ public class ListCarInoutPaymentCmd extends Cmd {
 
         CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
         carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+
+        if(!StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
+            Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
+            carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
+        }
+
         int count = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentsCount(carInoutPaymentDto);
 
         List<CarInoutPaymentDto> carInoutPaymentDtos = null;

service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentSummaryCmd.java

@@ -77,7 +77,7 @@ public class ListCarInoutPaymentSummaryCmd extends Cmd {
             carInoutPaymentDto.setStartTime(DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_B));
         }
         if(StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
-            carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B) + " 23:59:59");
+            carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(new Date(),1));
         }else{
             Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
             carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));

springboot/src/test/java/com/java110/AppTest.java

@@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue;
 import com.java110.utils.util.DateUtil;
 import org.junit.Test;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -19,13 +20,9 @@ public class AppTest
     public void shouldAnswerWithTrue()
     {
 
-        Date startTime = DateUtil.getDateFromStringA("2022-08-29 11:47:20");
-        Date endTime = DateUtil.getDateFromStringA("2022-08-29 11:48:21");
-
-
-
-       double min = (endTime.getTime() - startTime.getTime()) / (60 * 1000* 1.00);
-
-        System.out.println(new Double(Math.ceil(min)).longValue());
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH,-1);
+        System.out.println(DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_B));
+        System.out.println(DateUtil.getAddDayStringB(new Date(),1));
     }
 }