修改访客管理接口

.idea/workspace.xml

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/VisitorTjVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/DriverStockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/DriverStockController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/DriverStockMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/DriverStockMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/DriverStockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/DriverStockService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/DriverStockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/DriverStockServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/DriverStockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/DriverStockMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/classes/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -17,103 +22,6 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="782">
-              <caret line="41" column="34" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2967">
-              <caret line="175" column="65" selection-start-line="175" selection-start-column="65" selection-end-line="175" selection-end-column="65" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="407">
-              <caret line="4851" column="15" lean-forward="true" selection-start-line="4845" selection-start-column="4" selection-end-line="4851" selection-end-column="15" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="120" column="44" selection-start-line="120" selection-start-column="44" selection-end-line="120" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2162">
-              <caret line="107" column="30" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="50" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/DingtalkController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2369">
-              <caret line="122" selection-start-line="122" selection-end-line="122" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14835">
-              <caret line="679" column="35" selection-start-line="679" selection-start-column="8" selection-end-line="679" selection-end-column="35" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1288">
-              <caret line="70" column="40" selection-start-line="70" selection-start-column="40" selection-end-line="70" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="989">
-              <caret line="62" column="78" selection-start-line="62" selection-start-column="78" selection-end-line="62" selection-end-column="78" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1058">
-              <caret line="46" column="35" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="35" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -222,12 +130,15 @@
       </list>
     </option>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="D:\Software\Develop\Maven\repository" />
-        <option name="mavenHome" value="D:/Software/Develop/Maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.3.9\conf\settings.xml" />
+        <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
+        <option name="useMavenConfig" value="true" />
+        <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -255,6 +166,7 @@
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
+  <component name="ProjectId" id="2gOThA61fILRHASRGC3x7YhJqeK" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -386,18 +298,27 @@
       <pane id="PackagesPane" />
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+  <component name="ProjectViewState">
+    <option name="showExcludedFiles" value="false" />
+    <option name="showLibraryContents" value="true" />
   </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "MavenSettings"
+  }
+}]]></component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
@@ -415,18 +336,6 @@
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
@@ -441,12 +350,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TimeExchange" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.TimeExchange" />
+    <configuration name="DriverStockController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.controller.DriverStockController" />
       <module name="mybatis_plus" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.template.common.utils.*" />
+          <option name="PATTERN" value="com.template.controller.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -461,13 +370,22 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <list>
+      <item itemvalue="Application.DriverStockController" />
+      <item itemvalue="Application.AutoCode" />
+      <item itemvalue="Spring Boot.MybatisPlusApplication" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.TimeExchange" />
+        <item itemvalue="Application.DriverStockController" />
         <item itemvalue="Application.AutoCode" />
       </list>
     </recent_temporary>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SshConsoleOptionsProvider">
+    <option name="myEncoding" value="UTF-8" />
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -500,6 +418,7 @@
       <workItem from="1715410926468" duration="801000" />
       <workItem from="1715412104079" duration="1298000" />
       <workItem from="1715415419191" duration="619000" />
+      <workItem from="1715567741475" duration="8720000" />
     </task>
     <servers />
   </component>
@@ -598,90 +517,26 @@
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
-          <line>83</line>
-          <properties />
-          <option name="timeStamp" value="58" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
-          <line>314</line>
-          <properties />
-          <option name="timeStamp" value="113" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
-          <line>303</line>
-          <properties />
-          <option name="timeStamp" value="117" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>844</line>
-          <properties />
-          <option name="timeStamp" value="125" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>678</line>
-          <properties />
-          <option name="timeStamp" value="126" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3952</line>
-          <properties />
-          <option name="timeStamp" value="137" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3566</line>
-          <properties />
-          <option name="timeStamp" value="159" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3763</line>
-          <properties />
-          <option name="timeStamp" value="173" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java</url>
-          <line>458</line>
-          <properties />
-          <option name="timeStamp" value="177" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>154</line>
-          <properties />
-          <option name="timeStamp" value="178" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java</url>
-          <line>528</line>
-          <properties />
-          <option name="timeStamp" value="180" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
-          <line>253</line>
-          <properties />
-          <option name="timeStamp" value="222" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java">
       <provider selected="true" editor-type-id="text-editor">

src/main/java/com/template/controller/DriverStockController.java

@@ -1,10 +1,8 @@
 package com.template.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.template.annotation.DESRespondSecret;
@@ -16,15 +14,16 @@ import com.template.model.pojo.SmartWarning;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.tongji.*;
+import com.template.model.vo.VisitorTjVo;
 import com.template.services.DriverStockService;
 import com.template.services.SmartUserService;
 import com.template.services.SmartWarningService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -51,8 +50,60 @@ public class DriverStockController implements DriverStockControllerAPI {
     @PassToken
     @DESRespondSecret(validated = false)
     public CommonResult getVisitorTj() {
-        List<Tj> list = driverStockService.getVisitorTj();
-        return CommonResult.ok(list);
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        ArrayList<VisitorTjVo> visitorTjVos = new ArrayList<>();
+//  近1年数据
+        LocalDateTime localDateTime = LocalDateTime.now().withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).plusMonths(1);
+        ArrayList<Tj> tjs = new ArrayList<>();
+        Tj tj2 = new Tj();
+        tj2.setName("家长");
+        tj2.setNum(0);
+        tjs.add(tj2);
+        Tj tj3 = new Tj();
+        tj3.setName("其他");
+        tj3.setNum(0);
+        tjs.add(tj3);
+        for (int i = 0; i < 11; i++) {
+            VisitorTjVo visitorTjVo = new VisitorTjVo();
+            LocalDateTime start = localDateTime.minusMonths(i + 1);
+            LocalDateTime end = localDateTime.minusMonths(i);
+            String dataTime = start.format(dateTimeFormatter);
+            List<Tj> list = driverStockService.getVisitorTj(start, end);
+            if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
+                if (list.size()<2) {
+                    ArrayList<Tj> tjs2 = new ArrayList<>();
+                    for (Tj tj : list) {
+                        tjs2.add(tj);
+                        String name = tj.getName();
+                        if ("家长".equals(name)) {
+                            tjs2.add(tj3);
+                        }else {
+                            tjs2.add(tj2);
+                        }
+                    }
+                    visitorTjVo.setTjs(tjs2);
+                }else {
+                    visitorTjVo.setTjs(list);
+                }
+            } else {
+                visitorTjVo.setTjs(tjs);
+            }
+
+            visitorTjVo.setDataTime(dataTime);
+            visitorTjVos.add(visitorTjVo);
+        }
+        return CommonResult.ok(visitorTjVos);
+    }
+
+    public static void main(String[] args) {
+        LocalDateTime start = LocalDateTime.now().withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
+        int year = start.getYear();
+        System.out.println("year = " + year);
+        int monthValue = start.getMonthValue();
+        System.out.println("monthValue = " + monthValue);
+        DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM");
+        String format = start.format(dateTimeFormatter2);
+        System.out.println("format = " + format);
     }
 
     @Override
@@ -81,7 +132,7 @@ public class DriverStockController implements DriverStockControllerAPI {
         queryWrapper.eq("deleted", 0);
         Integer userNum = smartUserService.list(queryWrapper).size();
         for (int i = 0; i < list.size(); i++) {
-            list.get(i).setNum(list.get(i).getNum()/userNum);
+            list.get(i).setNum(list.get(i).getNum() / userNum);
         }
         return CommonResult.ok(list);
     }
@@ -92,11 +143,11 @@ public class DriverStockController implements DriverStockControllerAPI {
     public CommonResult getEnergyMonth(Integer type) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
         List<JSONObject> jList = new ArrayList<>();
-        for (int i=-5; i<=0; i++) {
+        for (int i = -5; i <= 0; i++) {
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.MONTH, i);
             String date = simpleDateFormat.format(calendar.getTime());
-            List<TjFloat> list = driverStockService.getEnergyMonth(date,type);
+            List<TjFloat> list = driverStockService.getEnergyMonth(date, type);
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("month", date);
             jsonObject.put("data", list);
@@ -108,7 +159,7 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getDeviceT(){
+    public CommonResult getDeviceT() {
         List<JSONObject> list = new ArrayList<>();
         JSONObject jsonObject1 = new JSONObject();
         List<TjFloat> allList = driverStockService.getTotalDevice();
@@ -126,7 +177,7 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getMeterPage(int currentPage, int pageCount,Integer meterType) {
+    public CommonResult getMeterPage(int currentPage, int pageCount, Integer meterType) {
         PageHelper.startPage(currentPage, pageCount);
         PageInfo<MeterPage> list = driverStockService.getMeterDetail(meterType);
         return CommonResult.ok(list);
@@ -143,24 +194,24 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getUserPage(int currentPage, int pageCount,String key,Integer identityId){
+    public CommonResult getUserPage(int currentPage, int pageCount, String key, Integer identityId) {
         PageHelper.startPage(currentPage, pageCount);
-        PageInfo<userPage> list = driverStockService.getUserPage(key,identityId);
+        PageInfo<userPage> list = driverStockService.getUserPage(key, identityId);
         return CommonResult.ok(list);
     }
 
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getScorePer(String examName,String updateUser){
-        List<Tj> list = driverStockService.getScorePer(examName,updateUser);
+    public CommonResult getScorePer(String examName, String updateUser) {
+        List<Tj> list = driverStockService.getScorePer(examName, updateUser);
         return CommonResult.ok(list);
     }
 
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getExamName(){
+    public CommonResult getExamName() {
         List<Tj> list = driverStockService.getExamName();
         return CommonResult.ok(list);
     }
@@ -168,7 +219,7 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getTeacherExam(String cardNo){
+    public CommonResult getTeacherExam(String cardNo) {
         Tj list = driverStockService.getTeacherExam(cardNo);
         return CommonResult.ok(list);
     }

src/main/java/com/template/mapper/DriverStockMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
@@ -16,7 +17,7 @@ public interface DriverStockMapper extends BaseMapper<T> {
     public List<Tj> getClassTj();
 
     // 访客统计
-    public List<Tj> getVisitorTj();
+    public List<Tj> getVisitorTj(@Param("start") LocalDateTime start,@Param("end") LocalDateTime end);
 
     // 能耗总量统计
     public List<TjFloat> getEnergyTj();

src/main/java/com/template/model/vo/VisitorTjVo.java

@@ -0,0 +1,14 @@
+package com.template.model.vo;
+
+import com.template.model.tongji.Tj;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VisitorTjVo {
+    private List<Tj> tjs;
+
+   private String dataTime;
+
+}

src/main/java/com/template/services/DriverStockService.java

@@ -7,6 +7,7 @@ import com.template.model.tongji.TjFloat;
 import com.template.model.tongji.userPage;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface DriverStockService {
@@ -15,7 +16,7 @@ public interface DriverStockService {
     public List<Tj> getClassTj();
 
     // 访客统计
-    public List<Tj> getVisitorTj();
+    public List<Tj> getVisitorTj(LocalDateTime start,LocalDateTime end);
 
     // 能耗总量统计
     public List<TjFloat> getEnergyTj();

src/main/java/com/template/services/impl/DriverStockServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -23,8 +24,8 @@ public class DriverStockServiceImpl implements DriverStockService {
     }
 
     // 访客统计
-    public List<Tj> getVisitorTj(){
-        return driverStockMapper.getVisitorTj();
+    public List<Tj> getVisitorTj(LocalDateTime start, LocalDateTime end){
+        return driverStockMapper.getVisitorTj(start,end);
     }
 
     // 能耗总量统计

src/main/resources/mapper/template/DriverStockMapper.xml

@@ -34,7 +34,7 @@
     <!--访客统计-->
     <select id="getVisitorTj" resultMap="Tj">
         select case visitor_type when '1' then '家长' when '2' then '其他'
-            end as `name`,COUNT(*) as num from `smart_visitor` group by visitor_type
+            end as `name`, COUNT(*) as num from `smart_visitor` WHERE visitor_time>#{start} and #{end}>visitor_time  group by visitor_type
     </select>
 
     <!--能耗总量统计-->

target/classes/mapper/template/SmartUserMapper.xml

@@ -236,4 +236,12 @@
         </if>
     </select>
 
+    <select id="getAffiliateUser" resultType="com.template.model.pojo.SmartUser">
+        SELECT * FROM `smart_user`
+        where deleted = 0 and is_cancel=0
+        <if test="affiliate != null and affiliate != ''">
+            and FIND_IN_SET(id,#{affiliate})
+        </if>
+    </select>
+
 </mapper>