ignore

.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.activation:javax.activation-api:1.2.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.xml.bind:jaxb-api:2.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.m2/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/service.iml

@@ -100,8 +100,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.56" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />

.idea/workspace.xml

@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="6505dcd2-5659-45fa-bd90-6fe6ec1b2379" name="Default  Changelist" comment="">
       <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
+=======
+    <list default="true" id="6505dcd2-5659-45fa-bd90-6fe6ec1b2379" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/service.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/service.iml" 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.huiju.welcome/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" 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" />
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
     </list>
+    <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,6 +31,58 @@
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
   </component>
+<<<<<<< HEAD
+=======
+  <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.huiju.welcome/controller/TaSnapBackgroundController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="589">
+              <caret line="55" column="27" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="4047">
+              <caret line="245" column="15" selection-start-line="245" selection-start-column="15" selection-end-line="245" selection-end-column="15" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/base/ResponseBean.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="454">
+              <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaNoticeController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSnapshotPersonController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="266">
+              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -28,6 +94,16 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWxPersonController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" />
+      </list>
+    </option>
+  </component>
   <component name="MavenImportPreferences">
     <option name="importingSettings">
       <MavenImportingSettings>
@@ -35,6 +111,25 @@
       </MavenImportingSettings>
     </option>
   </component>
+<<<<<<< HEAD
+=======
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="mainbiz" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="mainbiz" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
+  </component>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
@@ -43,6 +138,77 @@
   </component>
   <component name="ProjectId" id="1UBu0ww4AgC7m7mGvKYOUpGKwmo" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showExcludedFiles" value="true" />
@@ -95,6 +261,18 @@
       <recent name="com.huiju.welcome.service.impl" />
     </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">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -175,10 +353,55 @@
       <workItem from="1575454478943" duration="611000" />
       <workItem from="1575508290475" duration="946000" />
       <workItem from="1575510190395" duration="665000" />
+<<<<<<< HEAD
       <workItem from="1575513615922" duration="83000" />
+=======
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
     </task>
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="8260000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2739872" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Spring" order="7" />
+      <window_info anchor="bottom" id="Terminal" order="8" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Maven" order="3" sideWeight="0.49838188" visible="true" weight="0.07356077" />
+      <window_info anchor="right" id="Palette" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+      <window_info anchor="right" id="Coverage" order="10" sideWeight="0.50161815" side_tool="true" weight="0.07356077" />
+    </layout>
+  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -188,6 +411,12 @@
         <entry key="MAIN">
           <value>
             <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
               <option name="COLUMN_ORDER" />
             </State>
           </value>
@@ -211,6 +440,71 @@
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/service_welcome3$MainbizApplication.ic" NAME="MainbizApplication Coverage Results" MODIFIED="1575510263453" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+<<<<<<< HEAD
+=======
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="760">
+          <caret line="47" column="31" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomWords.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="421">
+          <caret line="150" column="49" selection-start-line="150" selection-start-column="49" selection-end-line="150" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWxPersonController.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSnapBackgroundController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="589">
+          <caret line="55" column="27" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4047">
+          <caret line="245" column="15" selection-start-line="245" selection-start-column="15" selection-end-line="245" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaNoticeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSnapshotPersonController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/base/ResponseBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="454">
+          <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com.huiju.welcome/controller/SysUserController.java

@@ -127,6 +127,7 @@ public class SysUserController extends BaseController {
             String name,
             String phone,
             Integer isSales,
+            Integer isWechatAdmin,
             HttpServletRequest request
     ) {
         ResponseBean responseBean = new ResponseBean();
@@ -150,6 +151,10 @@ public class SysUserController extends BaseController {
             queryWrapper.eq("is_sales", isSales);
         }
 
+      if (null != isWechatAdmin && isWechatAdmin.intValue() > 0 ) {
+        queryWrapper.eq("is_wechat_admin", isWechatAdmin);
+      }
+
         // 取消传递密码字段
         IPage<SysUser> nwPg = sysUserService.page(pg, queryWrapper);
         List<SysUser> usrList = nwPg.getRecords();

src/main/java/com.huiju.welcome/controller/TaPersonController.java

@@ -241,6 +241,29 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+  @ApiOperation(value = "统计人员", notes = "统计人员")
+  @RequestMapping(value = "/wx/stats/person", method = RequestMethod.GET)
+  public ResponseBean statsWxPerson() {
+    ResponseBean responseBean = new ResponseBean();
+
+    List<Map<String, String>> person = taPersonService.statsPerson();
+    if (null == person) {
+      person = new ArrayList<>();
+    }
+    if (person.size() == 0) {
+      Map<String, String> mp = new HashMap<>();
+      person.add(mp);
+    }
+
+    Long regularClients = taVisitingLogService.getRegularClientTodayAmount();
+    if (null ==  regularClients) regularClients = 0l;
+
+    person.get(0).put("regular", String.valueOf(regularClients));
+
+    responseBean.addSuccess(person);
+    return responseBean;
+  }
+
     @PutMapping("/wx/loginPhone")
     public ResponseBean loginPhone(HttpServletRequest request,@RequestParam String phone,@RequestParam String code,@RequestParam String openId) {
         ResponseBean responseBean = new ResponseBean();

src/main/java/com.huiju.welcome/model/SysUser.java

@@ -44,4 +44,6 @@ public class SysUser implements Serializable {
     private LocalDateTime createDate;
 
     private String phone;
+
+  private Boolean isWechatAdmin;
 }

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,101 +1,101 @@
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaContentLibMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaVisitingLog.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageContentService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSnapshotPersonMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaVisitingWordsServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSyncLogService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\CameraServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSnapBackgroundServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaPerson.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\SysUserController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\StatusUtils.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\config\SMSProperties.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\common\base\ResponseBean.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\SMSUtils.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaVisitingWords.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\common\uuid\IdGen.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ISysUserService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\MainbizApplication.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaPersonServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\config\AccessConfig.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSyncLogController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSnapshotPersonController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaPersonMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\common\base\BaseController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaVisitingWordsController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageContentController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpage.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaContentLibController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaVisitingLogService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\SysParamServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpageContent.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\config\WebSocketConfig.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\SysParamController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\SysUserMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSyncLogMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\FileUtil.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageContentServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaNoticeServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSnapBackgroundController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaDeviceService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\AudioController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\config\MybatisPlusConfig.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaVisitingWordsService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaPersonType.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSnapshotPersonService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\SAWeather.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSnapBackgroundMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaPersonTypeService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaSnapBackground.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\CameraController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaCustomWordsMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaDeviceController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageContentMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\XFYun.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\SysUserServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaVisitingLogServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageNoticeServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaPersonService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaCustomWordsService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaSnapshotPerson.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\SysParamMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\SysParam.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSnapshotPersonImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaNoticeService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\utils\Encrypt.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\common\WebSocketServer.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaSyncLog.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaCustomWords.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\SysUser.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaPersonTypeController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaCustomWordsServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSnapBackgroundService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaVisitingLogMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaNoticeController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaContentLib.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaContentLibService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpageNotice.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaContentLibServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageNoticeController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaVisitingLogController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaPersonTypeServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ICameraService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageNoticeMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaNoticeMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ISysParamService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\ImgController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaImages.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSyncLogServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaPersonTypeMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\controller\TaPersonController.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\interceptor\AccessInterceptor.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaDevice.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\model\TaNotice.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaVisitingWordsMapper.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageNoticeService.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaDeviceServiceImpl.java
-D:\CODE\ycweclome\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaDeviceMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaVisitingWordsController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\common\base\ResponseBean.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaPersonTypeMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\Encrypt.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaVisitingLogMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaSnapshotPerson.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpage.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\SysParamMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageContentController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaPerson.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageNoticeServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSyncLogMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaNotice.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\XFYun.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\config\AccessConfig.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ISysParamService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSnapBackgroundService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaPersonTypeController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaVisitingLog.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSyncLogServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSnapBackgroundMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\SysUserController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\MainbizApplication.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpageContent.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaPersonController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaVisitingLogController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\SysParamController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaVisitingLogService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\SysUser.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSnapshotPersonImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaFirstpageNotice.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaPersonType.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaPersonTypeService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaSyncLog.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaDeviceService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaDeviceServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaFirstpageContentServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ISysUserService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaPersonMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaSnapshotPersonMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaVisitingWordsServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaNoticeController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaCustomWordsService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\config\MybatisPlusConfig.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaVisitingWords.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageContentService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\FileUtil.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\CameraController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaCustomWordsServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageNoticeService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSyncLogService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaPersonService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\common\base\BaseController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\SysUserMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaPersonServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\ImgController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaSnapBackgroundServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaDevice.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaVisitingWordsMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaDeviceMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\SMSUtils.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaContentLibMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaPersonTypeServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaNoticeService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ICameraService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaDeviceController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\SysParamServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaVisitingLogServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\StatusUtils.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaContentLib.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaContentLibServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\interceptor\AccessInterceptor.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\SysParam.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaCustomWords.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaContentLibService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaSnapBackground.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSnapBackgroundController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaNoticeMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaFirstpageService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\config\WebSocketConfig.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\CameraServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaFirstpageNoticeController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaContentLibController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\utils\SAWeather.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\config\SMSProperties.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\TaNoticeServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaCustomWordsMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\model\TaImages.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaVisitingWordsService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\common\WebSocketServer.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSnapshotPersonController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\TaSyncLogController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageContentMapper.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\impl\SysUserServiceImpl.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\common\uuid\IdGen.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\service\ITaSnapshotPersonService.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\controller\AudioController.java
+E:\sen\service-welcome3\src\main\java\com.huiju.welcome\mapper\TaFirstpageNoticeMapper.java