添加首页统计模块

bill-manager/db/add.sql

@@ -224,4 +224,10 @@ CREATE TABLE `mortals_xhx_stat` (
     ,KEY `year` (`year`) USING BTREE
     ,KEY `month` (`month`) USING BTREE
     ,KEY `day` (`day`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='汇总统计';
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='汇总统计';
\ No newline at end of file
+
+
+
+
+INSERT INTO mortals_xhx_task VALUES (null, '报表统计', 'SiteStatTask', 0, 'SiteStatTask', '', '', 1, 3600, '21:00', '', '192.168.1.107', '2024-05-18 16:05:00', 0, '2024-03-01 10:59:53', 1, '系统管理员');
+

bill-manager/src/main/java/com/mortals/xhx/daemon/task/SitePjStatTaskImpl.java → bill-manager/src/main/java/com/mortals/xhx/daemon/task/SiteStatTaskImpl.java

@@ -5,20 +5,15 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.xhx.common.code.PlatformTypeEnum;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
-import com.mortals.xhx.module.ph.service.PhQueueService;
 import com.mortals.xhx.module.ph.service.PhQueueStatService;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
-import com.mortals.xhx.module.pj.service.PjEvaluateService;
 import com.mortals.xhx.module.pj.service.PjEvaluateStatService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,7 +26,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("SiteStatTask")
-public class SitePjStatTaskImpl implements ITaskExcuteService {
+public class SiteStatTaskImpl implements ITaskExcuteService {
 
 
     @Autowired

bill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -15,11 +15,8 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service("SyncUserTask")
-@ConditionalOnExpression("'${platform.type:null}'=='cloud'")
 public class SyncUserTaskImpl implements ITaskExcuteService {
 
-    @Autowired
-    private IUserFeign userFeign;
     @Autowired
     private UserService userService;
 

bill-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -13,6 +13,6 @@
   },
 
   "yibin-web": {
-    "baseUrl": "http://112.19.80.237:11091/bill"
+    "baseUrl": "http://112.19.80.237:11078/bill"
   }
 }
\ No newline at end of file

bill-manager/src/test/java/com/mortals/httpclient/system.http

@@ -47,8 +47,8 @@ POST {{baseUrl}}/pj/evaluate/stat/stat
 Content-Type: application/json
 
 {
-  "pjTimeStart": "2023-04-01",
-  "pjTimeEnd": "2024-07-04"
+  "pjTimeStart": "2023-01-01",
+  "pjTimeEnd": "2024-07-10"
 }
 
 ###排队
@@ -56,8 +56,8 @@ POST {{baseUrl}}/ph/queue/stat/stat
 Content-Type: application/json
 
 {
-  "taketimeStart": "2023-04-01",
-  "taketimeEnd": "2024-07-04"
+  "taketimeStart": "2023-01-01",
+  "taketimeEnd": "2024-07-10"
 }
 
 
@@ -67,7 +67,7 @@ Content-Type: application/json
 
 {
   "createTimeStart": "2023-04-01",
-  "createTimeEnd": "2024-07-4"
+  "createTimeEnd": "2024-07-10"
 }