Merge remote-tracking branch 'origin/master'

logs/pas/pas-info.log

@@ -285,3 +285,51 @@
 [pas:0.0.0.0:8877] [,] 2024-01-30 14:05:27.539 INFO 28164 [SpringApplicationShutdownHook] org.quartz.core.QuartzScheduler Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED shutdown complete.
 [pas:0.0.0.0:8877] [,] 2024-01-30 14:05:27.552 INFO 28164 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closing ...
 [pas:0.0.0.0:8877] [,] 2024-01-30 14:05:27.556 INFO 28164 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:36.716 INFO 24424 [main] cn.cslg.pas.Application Starting Application using Java 18.0.2 with PID 24424 (E:\IDEAProject\PAS\target\classes started by Admin in E:\IDEAProject\PAS)
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:36.717 INFO 24424 [main] cn.cslg.pas.Application The following 1 profile is active: "dev"
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.496 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.497 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Elasticsearch repositories in DEFAULT mode.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.534 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 33 ms. Found 0 Elasticsearch repository interfaces.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.538 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.539 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Reactive Elasticsearch repositories in DEFAULT mode.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.555 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 15 ms. Found 0 Reactive Elasticsearch repository interfaces.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.563 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.564 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:37.584 INFO 24424 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 15 ms. Found 0 Redis repository interfaces.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.243 INFO 24424 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.248 INFO 24424 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.249 INFO 24424 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.249 INFO 24424 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/10.1.12]
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.331 INFO 24424 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:38.331 INFO 24424 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1581 ms
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:44.691 INFO 24424 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.788 INFO 24424 [main] org.quartz.impl.StdSchedulerFactory Using ConnectionProvider class 'org.quartz.utils.C3p0PoolingConnectionProvider' for data source 'default'
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.797 INFO 24424 [MLog-Init-Reporter] com.mchange.v2.log.MLog MLog clients using slf4j logging.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.816 INFO 24424 [main] com.mchange.v2.c3p0.C3P0Registry Initializing c3p0-0.9.5.2 [built 08-December-2015 22:06:04 -0800; debug? true; trace: 10]
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.840 INFO 24424 [main] org.quartz.impl.StdSchedulerFactory Using default implementation for ThreadExecutor
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.841 INFO 24424 [main] org.quartz.simpl.SimpleThreadPool Job execution threads will use class loader of thread: main
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.846 INFO 24424 [main] org.quartz.core.SchedulerSignalerImpl Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.847 INFO 24424 [main] org.quartz.core.QuartzScheduler Quartz Scheduler v.2.3.2 created.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.848 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Using db table-based data access locking (synchronization).
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.849 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore JobStoreCMT initialized.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.850 INFO 24424 [main] org.quartz.core.QuartzScheduler Scheduler meta-data: Quartz Scheduler (v2.3.2) 'DefaultQuartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is not clustered.
+
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.850 INFO 24424 [main] org.quartz.impl.StdSchedulerFactory Quartz scheduler 'DefaultQuartzScheduler' initialized from an externally provided properties instance.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.850 INFO 24424 [main] org.quartz.impl.StdSchedulerFactory Quartz scheduler version: 2.3.2
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:48.850 INFO 24424 [main] org.quartz.core.QuartzScheduler JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@3c3f0f2e
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.136 INFO 24424 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.144 INFO 24424 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.145 INFO 24424 [main] org.springframework.scheduling.quartz.SchedulerFactoryBean Starting Quartz Scheduler now
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.176 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Freed 0 triggers from 'acquired' / 'blocked' state.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.189 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Recovering 0 jobs that were in-progress at the time of the last shut-down.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.189 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Recovery complete.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.192 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Removed 0 'complete' triggers.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.198 INFO 24424 [main] org.springframework.scheduling.quartz.LocalDataSourceJobStore Removed 0 stale fired job entries.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.222 INFO 24424 [main] org.quartz.core.QuartzScheduler Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED started.
+[pas:0.0.0.0:8877] [,] 2024-02-27 11:05:49.261 INFO 24424 [main] cn.cslg.pas.Application Started Application in 12.949 seconds (process running for 13.565)

src/main/java/cn/cslg/pas/common/dto/business/UpdateProductMarketDataDTO.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.common.dto.business;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -24,6 +26,11 @@ public class UpdateProductMarketDataDTO {
     /**
      * 营销时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @JsonFormat(
+            pattern = "yyyy-MM",
+            timezone = "GMT+8"
+    )
     private Date saleTime;
 
     /**

src/main/java/cn/cslg/pas/service/business/ProductCategoryService.java

@@ -77,7 +77,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest,"productCategory");
-        sqls =this.loadSearchSql(sqls);
+        sqls = this.loadSearchSql(sqls);
         //根据sql查询产品类别信息
         List<ProductCategoryVO> productCategoryVOS = productCategoryMapper.getProductCategory(sqls.get(0),sqls.get(1),sqls.get(2));
         //查询总数
@@ -524,9 +524,9 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         }
 
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+            sqls.set(0, "("+rootSql+")" + " and" + "(" + sqls.get(0) + ")");
         } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
-            sqls.set(0, rootSql);
+            sqls.set(0, "("+rootSql+")");
         }
 
 

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -559,9 +559,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         }
 
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+            sqls.set(0, "("+rootSql+")" + " and" + "(" + sqls.get(0) + ")");
         } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
-            sqls.set(0, rootSql);
+            sqls.set(0, "("+rootSql+")");
         }
 
         return sqls;