添加教师寄语接口，修改访客统计接口

.idea/workspace.xml

@@ -5,14 +5,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <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/api/SmartScoreControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" 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/java/com/template/controller/HikvisionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/tongji/userPage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/tongji/userPage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateStudentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateStudentService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateStudentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateStudentServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.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" />
+      <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -418,7 +424,7 @@
       <workItem from="1715410926468" duration="801000" />
       <workItem from="1715412104079" duration="1298000" />
       <workItem from="1715415419191" duration="619000" />
-      <workItem from="1715567741475" duration="8720000" />
+      <workItem from="1715567741475" duration="21293000" />
     </task>
     <servers />
   </component>
@@ -530,6 +536,27 @@
       </map>
     </option>
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateStudentController2.java</url>
+          <line>210</line>
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateStudentController2.java</url>
+          <line>216</line>
+          <option name="timeStamp" value="15" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
+          <line>669</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

src/main/java/com/template/api/SmartScoreControllerAPI.java

@@ -111,5 +111,9 @@ public interface SmartScoreControllerAPI {
     @ApiOperation(value = "各科成绩的平均分", notes = "各科成绩的平均分", httpMethod = "GET")
     CommonResult averageScore(@RequestParam int userId);
 
+    @GetMapping(value = "/teacherMessage")
+    @ApiOperation(value = "老师寄语", notes = "老师寄语", httpMethod = "GET")
+    CommonResult teacherMessage(@RequestParam String cardNo);
+
 
 }

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

@@ -63,7 +63,7 @@ public class DriverStockController implements DriverStockControllerAPI {
         tj3.setName("其他");
         tj3.setNum(0);
         tjs.add(tj3);
-        for (int i = 0; i < 11; i++) {
+        for (int i = 0; i < 12; i++) {
             VisitorTjVo visitorTjVo = new VisitorTjVo();
             LocalDateTime start = localDateTime.minusMonths(i + 1);
             LocalDateTime end = localDateTime.minusMonths(i);

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

@@ -45,6 +45,7 @@ public class HikvisionController implements HikvisionAPI {
     SmartNotificationService smartNotificationService;
 
 
+
     /**
      * 事件订阅
      *
@@ -237,7 +238,11 @@ public class HikvisionController implements HikvisionAPI {
                     String name = reserve_field.getString("name");
                     smartFaceDiscern.setName(name);
 
-//                  todo  通过身份证查询是谁
+//                   通过身份证,学号查询是谁
+                    SmartUser one = smartUserService.getCard(certificateNumber);
+                    if (ObjectUtils.isNotEmpty(one)) {
+                        smartFaceDiscern.setUserId(one.getId());
+                    }
 
                     smartFaceDiscernService.save(smartFaceDiscern);
 

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

@@ -9,6 +9,7 @@ import com.template.common.utils.AesUtils;
 import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.paramUtils;
 import com.template.model.enumModel.*;
+import com.template.model.evaluate.student.SmartEvaluateStudent;
 import com.template.model.pojo.*;
 import com.template.model.request.deleteSmartScoreRequest;
 import com.template.model.request.insertScoreRequest;
@@ -77,6 +78,8 @@ public class SmartScoreController implements SmartScoreControllerAPI {
     @Autowired
     private SmartAuthorGroupService smartAuthorGroupService;
 
+    @Autowired
+    public SmartEvaluateStudentService smartEvaluateStudentService;
 
     @Override
     @DESRespondSecret(validated = true)
@@ -629,6 +632,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult averageScore(int userId) {
         LocalDateTime now = LocalDateTime.now();
         SmartSemester smartSemester = smartSemesterService.getSemester(now);
@@ -644,13 +648,37 @@ public class SmartScoreController implements SmartScoreControllerAPI {
             Integer smartSemesterId = smartSemester.getId();
             Double score =smartScoreService.getAverageScore(userId,semesterId,smartSemesterId);
             averageScoreVo.setSubjectName(smartSubject.getName());
-            averageScoreVo.setScore(score);
+            if (ObjectUtils.isNotEmpty(score)) {
+                averageScoreVo.setScore(score);
+            }else {
+                averageScoreVo.setScore(0.0);
+            }
+
             averageScoreVos.add(averageScoreVo);
         }
         System.out.println("averageScoreVos = " + averageScoreVos);
         return CommonResult.ok(averageScoreVos);
     }
 
+    @Override
+    public CommonResult teacherMessage(String cardNo) {
+        LocalDateTime now = LocalDateTime.now();
+        SmartSemester smartSemester = smartSemesterService.getSemester(now);
+        if (ObjectUtils.isEmpty(smartSemester)) {
+            return CommonResult.ok("当前时间不属于任何学期");
+        }
+        String name = smartSemester.getName();
+        SmartEvaluateStudent smartEvaluateStudent =smartEvaluateStudentService.getTeacherMessage(cardNo,name);
+        HashMap<String, String> map = new HashMap<>();
+        if (ObjectUtils.isNotEmpty(smartEvaluateStudent)) {
+            String scoreComment = smartEvaluateStudent.getScoreComment();
+            map.put("teacherMessage",scoreComment);
+        }else {
+            map.put("teacherMessage","暂无");
+        }
+        return CommonResult.ok(map);
+    }
+
     /**
      * 导入Xls文件方法
      *

src/main/java/com/template/model/tongji/userPage.java

@@ -1,7 +1,7 @@
 package com.template.model.tongji;
 
 public class userPage {
-
+    public Integer id;
     public String name;
     public String cardNo;
     public String departMent;

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

@@ -31,4 +31,11 @@ public interface SmartEvaluateStudentService extends IService<SmartEvaluateStude
 
     public List<SmartEvaluateStudent> getSmartEvaluateStudentByKey(QueryWrapper<SmartEvaluateStudent> queryWrapper);
 
+    /**
+     * 通过学期和卡号找到当前评语
+     * @param cardNo
+     * @param name
+     * @return
+     */
+    SmartEvaluateStudent getTeacherMessage(String cardNo, String name);
 }

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

@@ -114,4 +114,11 @@ public interface SmartUserService extends IService<SmartUser> {
      */
     List<SmartUser> getAffiliateUser(String affiliate);
 
+    /**
+     * 通过身份证号和学号查询对应的人
+     * @param certificateNumber
+     * @return
+     */
+    SmartUser getCard(String certificateNumber);
+
 }

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

@@ -1,5 +1,7 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -72,4 +74,13 @@ public class SmartEvaluateStudentServiceImpl extends ServiceImpl<SmartEvaluateSt
         return result;
     }
 
+    @Override
+    public SmartEvaluateStudent getTeacherMessage(String cardNo, String name) {
+        LambdaQueryWrapper<SmartEvaluateStudent> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(SmartEvaluateStudent::getTerm,name)
+                .eq(SmartEvaluateStudent::getCardNo,cardNo);
+        SmartEvaluateStudent ses = this.getOne(wrapper);
+        return ses;
+    }
+
 }

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

@@ -315,5 +315,16 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         return smartUserMapper.getAffiliateUser(affiliate);
     }
 
+    @Override
+    public SmartUser getCard(String certificateNumber) {
+        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getIdCard,certificateNumber)
+                .or()
+                .eq(SmartUser::getCardNo,certificateNumber);
+        SmartUser one = this.getOne(wrapper);
+
+        return one;
+    }
+
 
 }

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

@@ -83,7 +83,7 @@
 
     <!--用户汇总学生-->
     <select id="getUserPage" resultMap="userPage">
-        select a.name,a.`card_no`,b.`name` as depart_ment from `smart_user` a
+        select a.id, a.name,a.`card_no`,b.`name` as depart_ment from `smart_user` a
              left join `smart_department` b on a.`department_id`=b.id
              where a.`deleted`=0 and a.identity_id=#{identityId}
         <if test="key != null and key != ''">

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

@@ -146,6 +146,7 @@ com\template\model\weixin\AuthorAndGroup2.class
 com\template\mapper\SmartIdentityMapper.class
 com\template\common\utils\TimeExchange.class
 com\template\model\seewo\ClassServiceBatchSaveClassParam$JSONRequestBody$JSONRequestBodyBuilder.class
+com\template\model\vo\AverageScoreVo.class
 com\template\model\seewo\OrgClassOpenSeewoUcOpenV1ClassFullParam$JSONRequestBody$JSONRequestBodyBuilder.class
 com\template\services\SmartUploadService.class
 com\template\model\seewo\PhotoServiceSavePhotosParam$PhotoServiceSavePhotosParamBuilder.class
@@ -245,6 +246,7 @@ com\template\model\seewo\StudentServiceUpdateStudentInfoParam$RequestBody$Reques
 com\template\model\vo\AffiliateUserVo.class
 com\template\services\impl\SmartApplyServiceImpl.class
 com\template\model\vo\UserDeleteVo.class
+com\template\model\vo\VisitorTjVo.class
 com\template\model\enumModel\eSubjectStatu.class
 com\template\model\seewo\TeacherServiceBatchSaveOrUpdateTeacherParam.class
 com\template\api\ExcelControllerAPI.class
@@ -707,6 +709,7 @@ com\template\mapper\SmartNotificationMapper.class
 com\template\services\impl\SmartSemesterServiceImpl.class
 com\template\common\utils\JWTUtil.class
 com\template\model\enumModel\eLogOff.class
+com\template\model\vo\HistoricalAttendanceVo.class
 com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsParam$RequestBody.class
 com\template\model\evaluate\teacher\SmartEvaluateTdetailList.class
 com\template\model\pojo\SmartSubject.class