lzy 2 days ago
parent
commit
bc1b7f66c5
28 changed files with 207 additions and 325 deletions
  1. 1 1
      .idea/dataSources.local.xml
  2. 2 2
      .idea/jarRepositories.xml
  3. 4 4
      .idea/libraries/Maven__cn_hutool_hutool_all_5_7_15.xml
  4. 13 0
      .idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
  5. 13 0
      .idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
  6. 13 0
      .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
  7. 13 0
      .idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
  8. 13 0
      .idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
  9. 13 0
      .idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
  10. 13 0
      .idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
  11. 13 0
      .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
  12. 13 0
      .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
  13. 3 0
      .idea/misc.xml
  14. 43 26
      .idea/workspace.xml
  15. 0 6
      Marketplace/pom.xml
  16. 5 1
      Marketplace/src/main/java/com/dt/child/controller/VideoController.java
  17. 2 0
      Marketplace/src/main/java/com/dt/common/domain/HxwVaccineDiscussions.java
  18. 0 192
      Marketplace/src/main/java/com/dt/common/domain/User.java
  19. 0 18
      Marketplace/src/main/java/com/dt/common/mapper/UserMapper.java
  20. 2 0
      Marketplace/src/main/java/com/dt/common/service/FoodRecordService.java
  21. 0 13
      Marketplace/src/main/java/com/dt/common/service/UserService.java
  22. 1 1
      Marketplace/src/main/java/com/dt/common/service/VideoService.java
  23. 16 5
      Marketplace/src/main/java/com/dt/common/service/impl/FoodRecordServiceImpl.java
  24. 2 0
      Marketplace/src/main/java/com/dt/common/service/impl/HxwVaccinesServiceImpl.java
  25. 2 0
      Marketplace/src/main/java/com/dt/common/service/impl/ToiletRecordServiceImpl.java
  26. 0 22
      Marketplace/src/main/java/com/dt/common/service/impl/UserServiceImpl.java
  27. 7 0
      Marketplace/src/main/java/com/dt/common/service/impl/VideoServiceImpl.java
  28. 0 34
      Marketplace/src/main/resources/com/dt/common/mapper/UserMapper.xml

+ 1 - 1
.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-223.8836.41">
+  <component name="dataSourceStorageLocal" created-in="IU-223.8617.56">
     <data-source name="child_care_system@101.200.59.170" uuid="fd176a36-ef08-4a83-8661-b49f428c6381">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
       <schema-mapping />

+ 2 - 2
.idea/jarRepositories.xml

@@ -4,12 +4,12 @@
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />

+ 4 - 4
.idea/libraries/Maven__cn_hutool_hutool_all_5_8_16.xml → .idea/libraries/Maven__cn_hutool_hutool_all_5_7_15.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: cn.hutool:hutool-all:5.8.16">
+  <library name="Maven: cn.hutool:hutool-all:5.7.15">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.16/hutool-all-5.8.16.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.15/hutool-all-5.7.15.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.16/hutool-all-5.8.16-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.15/hutool-all-5.7.15-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.16/hutool-all-5.8.16-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.15/hutool-all-5.7.15-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 13 - 0
.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.virtuald:curvesapi:1.06">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:SparseBitSet:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-collections4:4.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-math3:3.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 3 - 0
.idea/misc.xml

@@ -7,4 +7,7 @@
       </list>
     </option>
   </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>

+ 43 - 26
.idea/workspace.xml

@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3f2000c2-42b7-447e-b73a-483e2fa2247f" name="更改" comment="'lzy'" />
+    <list default="true" id="3c5a5105-3913-4393-becf-10eafba5d8e8" name="Changes" comment="'lzy'" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -43,33 +43,36 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/java文件/实训一/Marketplace/Marketplace&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_interpreter_path&quot;: &quot;D:/Program Files/nodejs/npm.cmd&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;spring.configuration.checksum&quot;: &quot;675e31b94580e2642405e2f8586d112e&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "D:/java文件/实训一/Marketplace/Marketplace",
+    "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_interpreter_path": "D:/Program Files/nodejs/npm.cmd",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.2",
+    "settings.editor.selected.configurable": "MavenSettings",
+    "spring.configuration.checksum": "675e31b94580e2642405e2f8586d112e",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mysql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mysql"
     ]
   }
-}</component>
+}]]></component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -145,7 +148,21 @@
       <option name="project" value="LOCAL" />
       <updated>1751528983173</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="'lzy'">
+      <created>1751683404015</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1751683404015</updated>
+    </task>
+    <task id="LOCAL-00007" summary="'lzy'">
+      <created>1751687748539</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1751687748539</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 0 - 6
Marketplace/pom.xml

@@ -92,12 +92,6 @@
 
 
 
-
-
-
-
-
-
         <!-- Hibernate Validator (Bean Validation 实现) -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>

+ 5 - 1
Marketplace/src/main/java/com/dt/child/controller/VideoController.java

@@ -29,7 +29,11 @@ public class VideoController {
     public Result selVideo(){
         return videoService.selVideo();
     }
-//
+//  查询精选视频
+    @PostMapping("selVideoChoice")
+    public Result selVideoChoice(){
+        return videoService.selVideoByIsHighlighted();
+    }
 
 
 

+ 2 - 0
Marketplace/src/main/java/com/dt/common/domain/HxwVaccineDiscussions.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import com.dt.user.pojo.User;
 import lombok.Data;
 
 /**

+ 0 - 192
Marketplace/src/main/java/com/dt/common/domain/User.java

@@ -1,192 +0,0 @@
-package com.dt.common.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 用户表
- * @TableName user
- */
-@TableName(value ="user")
-@Data
-public class User {
-    /**
-     * 用户ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 密码(BCrypt加密)
-     */
-    private String password;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 头像URL
-     */
-    private String avatar;
-
-    /**
-     * 性别(0-未知,1-男,2-女)
-     */
-    private Integer gender;
-
-    /**
-     * 出生日期
-     */
-    private Date birthDate;
-
-    /**
-     * 状态(0-禁用,1-正常)
-     */
-    private Integer status;
-
-    /**
-     * 最后登录时间
-     */
-    private Date lastLoginTime;
-
-    /**
-     * 最后登录IP
-     */
-    private String lastLoginIp;
-
-    /**
-     * 最后登录设备
-     */
-    private String lastLoginDevice;
-
-    /**
-     * 人脸图片URL
-     */
-    private String faceImageUrl;
-
-    /**
-     * 是否启用人脸登录(0-禁用,1-启用)
-     */
-    private Integer faceLoginEnabled;
-
-    /**
-     * 创建时间
-     */
-    private Date createdAt;
-
-    /**
-     * 更新时间
-     */
-    private Date updatedAt;
-
-    /**
-     * 是否删除(0-未删除,1-已删除)
-     */
-    private Integer deleted;
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        User other = (User) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
-            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
-            && (this.getRealName() == null ? other.getRealName() == null : this.getRealName().equals(other.getRealName()))
-            && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
-            && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
-            && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
-            && (this.getGender() == null ? other.getGender() == null : this.getGender().equals(other.getGender()))
-            && (this.getBirthDate() == null ? other.getBirthDate() == null : this.getBirthDate().equals(other.getBirthDate()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getLastLoginTime() == null ? other.getLastLoginTime() == null : this.getLastLoginTime().equals(other.getLastLoginTime()))
-            && (this.getLastLoginIp() == null ? other.getLastLoginIp() == null : this.getLastLoginIp().equals(other.getLastLoginIp()))
-            && (this.getLastLoginDevice() == null ? other.getLastLoginDevice() == null : this.getLastLoginDevice().equals(other.getLastLoginDevice()))
-            && (this.getFaceImageUrl() == null ? other.getFaceImageUrl() == null : this.getFaceImageUrl().equals(other.getFaceImageUrl()))
-            && (this.getFaceLoginEnabled() == null ? other.getFaceLoginEnabled() == null : this.getFaceLoginEnabled().equals(other.getFaceLoginEnabled()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()))
-            && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
-        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
-        result = prime * result + ((getRealName() == null) ? 0 : getRealName().hashCode());
-        result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
-        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
-        result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
-        result = prime * result + ((getGender() == null) ? 0 : getGender().hashCode());
-        result = prime * result + ((getBirthDate() == null) ? 0 : getBirthDate().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode());
-        result = prime * result + ((getLastLoginIp() == null) ? 0 : getLastLoginIp().hashCode());
-        result = prime * result + ((getLastLoginDevice() == null) ? 0 : getLastLoginDevice().hashCode());
-        result = prime * result + ((getFaceImageUrl() == null) ? 0 : getFaceImageUrl().hashCode());
-        result = prime * result + ((getFaceLoginEnabled() == null) ? 0 : getFaceLoginEnabled().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", username=").append(username);
-        sb.append(", password=").append(password);
-        sb.append(", realName=").append(realName);
-        sb.append(", phone=").append(phone);
-        sb.append(", email=").append(email);
-        sb.append(", avatar=").append(avatar);
-        sb.append(", gender=").append(gender);
-        sb.append(", birthDate=").append(birthDate);
-        sb.append(", status=").append(status);
-        sb.append(", lastLoginTime=").append(lastLoginTime);
-        sb.append(", lastLoginIp=").append(lastLoginIp);
-        sb.append(", lastLoginDevice=").append(lastLoginDevice);
-        sb.append(", faceImageUrl=").append(faceImageUrl);
-        sb.append(", faceLoginEnabled=").append(faceLoginEnabled);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append(", deleted=").append(deleted);
-        sb.append("]");
-        return sb.toString();
-    }
-}

+ 0 - 18
Marketplace/src/main/java/com/dt/common/mapper/UserMapper.java

@@ -1,18 +0,0 @@
-package com.dt.common.mapper;
-
-import com.dt.common.domain.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author sunday
-* @description 针对表【user(用户表)】的数据库操作Mapper
-* @createDate 2025-07-01 16:33:35
-* @Entity com.dt.common.domain.User
-*/
-public interface UserMapper extends BaseMapper<User> {
-
-}
-
-
-
-

+ 2 - 0
Marketplace/src/main/java/com/dt/common/service/FoodRecordService.java

@@ -3,6 +3,8 @@ package com.dt.common.service;
 import com.dt.common.domain.FoodRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.io.InputStream;
+
 /**
 * @author sunday
 * @description 针对表【food_record(饮食记录表)】的数据库操作Service

+ 0 - 13
Marketplace/src/main/java/com/dt/common/service/UserService.java

@@ -1,13 +0,0 @@
-package com.dt.common.service;
-
-import com.dt.common.domain.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author sunday
-* @description 针对表【user(用户表)】的数据库操作Service
-* @createDate 2025-07-01 16:33:35
-*/
-public interface UserService extends IService<User> {
-
-}

+ 1 - 1
Marketplace/src/main/java/com/dt/common/service/VideoService.java

@@ -20,6 +20,6 @@ public interface VideoService extends IService<Video> {
     Result selVideo();
 
 //    查询精选视频
-
+    Result selVideoByIsHighlighted();
 
 }

+ 16 - 5
Marketplace/src/main/java/com/dt/common/service/impl/FoodRecordServiceImpl.java

@@ -1,10 +1,25 @@
 package com.dt.common.service.impl;
 
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.sax.handler.RowHandler;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dt.common.domain.Child;
 import com.dt.common.domain.FoodRecord;
+import com.dt.common.mapper.ChildMapper;
 import com.dt.common.service.FoodRecordService;
 import com.dt.common.mapper.FoodRecordMapper;
+import com.dt.user.mapper.UserMapper;
+import com.dt.user.pojo.User;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
 * @author sunday
@@ -12,13 +27,10 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-07-01 16:33:35
 */
 @Service
+@Slf4j
 public class FoodRecordServiceImpl extends ServiceImpl<FoodRecordMapper, FoodRecord>
     implements FoodRecordService {
 
-    @Slf4j
-    public class FoodRecordServiceImpl extends ServiceImpl<FoodRecordMapper, FoodRecord>
-            implements FoodRecordService {
-
 
         @Resource
         private ChildMapper childMapper;
@@ -114,7 +126,6 @@ public class FoodRecordServiceImpl extends ServiceImpl<FoodRecordMapper, FoodRec
 
 
     }
-}
 
 
 

+ 2 - 0
Marketplace/src/main/java/com/dt/common/service/impl/HxwVaccinesServiceImpl.java

@@ -7,6 +7,8 @@ import com.dt.care.dto.VaccinesDto;
 import com.dt.common.domain.*;
 import com.dt.common.mapper.*;
 import com.dt.common.service.HxwVaccinesService;
+import com.dt.user.mapper.UserMapper;
+import com.dt.user.pojo.User;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

+ 2 - 0
Marketplace/src/main/java/com/dt/common/service/impl/ToiletRecordServiceImpl.java

@@ -6,6 +6,8 @@ import com.dt.common.service.ToiletRecordService;
 import com.dt.common.mapper.ToiletRecordMapper;
 import org.springframework.stereotype.Service;
 
+import java.io.InputStream;
+
 /**
 * @author sunday
 * @description 针对表【toilet_record(如厕记录表)】的数据库操作Service实现

+ 0 - 22
Marketplace/src/main/java/com/dt/common/service/impl/UserServiceImpl.java

@@ -1,22 +0,0 @@
-package com.dt.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dt.common.domain.User;
-import com.dt.common.service.UserService;
-import com.dt.common.mapper.UserMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author sunday
-* @description 针对表【user(用户表)】的数据库操作Service实现
-* @createDate 2025-07-01 16:33:35
-*/
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User>
-    implements UserService{
-
-}
-
-
-
-

+ 7 - 0
Marketplace/src/main/java/com/dt/common/service/impl/VideoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dt.common.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dt.common.domain.Video;
 import com.dt.common.service.VideoService;
@@ -49,6 +50,12 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video>
         return Result.ok(videos, "查询成功");
     }
 
+    @Override
+    public Result selVideoByIsHighlighted() {
+        List<Video> videos = this.baseMapper.selectList(new LambdaQueryWrapper<Video>().eq(Video::getIsFeatured, 1));
+        return Result.ok(videos, "查询成功");
+    }
+
 
 }
 

+ 0 - 34
Marketplace/src/main/resources/com/dt/common/mapper/UserMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dt.common.mapper.UserMapper">
-
-    <resultMap id="BaseResultMap" type="com.dt.common.domain.User">
-            <id property="id" column="id" />
-            <result property="username" column="username" />
-            <result property="password" column="password" />
-            <result property="realName" column="real_name" />
-            <result property="phone" column="phone" />
-            <result property="email" column="email" />
-            <result property="avatar" column="avatar" />
-            <result property="gender" column="gender" />
-            <result property="birthDate" column="birth_date" />
-            <result property="status" column="status" />
-            <result property="lastLoginTime" column="last_login_time" />
-            <result property="lastLoginIp" column="last_login_ip" />
-            <result property="lastLoginDevice" column="last_login_device" />
-            <result property="faceImageUrl" column="face_image_url" />
-            <result property="faceLoginEnabled" column="face_login_enabled" />
-            <result property="createdAt" column="created_at" />
-            <result property="updatedAt" column="updated_at" />
-            <result property="deleted" column="deleted" />
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,username,password,real_name,phone,email,
-        avatar,gender,birth_date,status,last_login_time,
-        last_login_ip,last_login_device,face_image_url,face_login_enabled,created_at,
-        updated_at,deleted
-    </sql>
-</mapper>