feats

deploy/template.yml

@@ -11,7 +11,7 @@ Resources:
       Properties:
         Handler: com.yunzhi.demo.SpringApplication::main
         Runtime: custom
-        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.3.zip'
+        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.4.zip'
         MemorySize: 1024
         Timeout: 30
         InitializationTimeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>medical-plat</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 	<name>medical-plat</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/java/com/yunzhi/demo/controller/TaPostTestController.java

@@ -11,6 +11,7 @@ import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.service.ITaPointsLogService;
 import com.yunzhi.demo.service.ITaPostService;
+import com.yunzhi.demo.service.ITaReadLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,6 +49,9 @@ public class TaPostTestController extends BaseController {
     @Autowired
     ITaPointsLogService iTaPointsLogService;
 
+    @Autowired
+    ITaReadLogService iTaReadLogService;
+
     @PostMapping("/ma/answer-test")
     public ResponseBean answerPostTest(@ApiParam("答题内容") @RequestBody String paramStr) throws Exception {
         List<TaPostTest> postTestList = JSONObject.parseArray(paramStr, TaPostTest.class);
@@ -88,6 +92,9 @@ public class TaPostTestController extends BaseController {
             return ResponseBean.error("部分题目作答错误, 请再接再厉!", ResponseBean.ERROR_UNAVAILABLE, postTestList);
         }
 
+        // 读取记录
+        iTaReadLogService.updateReadLog(taPost, getCurrentPerson());
+
         // 奖励积分
         iTaPointsLogService.sendPoints(taPost, getCurrentPerson());
 

src/main/java/com/yunzhi/demo/controller/TaStudentController.java

@@ -72,8 +72,28 @@ public class TaStudentController extends BaseController {
             throw new Exception("校验人员信息失败");
         }
 
+        if (StringUtils.isEmpty(taStudent.getName())) {
+            throw new Exception("姓名不能为空");
+        }
+
+        if (StringUtils.isEmpty(taStudent.getPhone())) {
+            throw new Exception("手机号不能为空");
+        }
+
+        if (StringUtils.isEmpty(taStudent.getSchoolId())) {
+            throw new Exception("学校不能为空");
+        }
+
+        if (StringUtils.isEmpty(taStudent.getSpecialtyId())) {
+            throw new Exception("专业不能为空");
+        }
+
+        if (StringUtils.isEmpty(taStudent.getStudentNo())) {
+            throw new Exception("学号不能为空");
+        }
+
         // 解决人员跟学生映射问题
-        if (!StringUtils.isEmpty(taStudent.getStudentId())) {
+        if (StringUtils.isEmpty(taStudent.getStudentId())) {
             TaStudent origin = iTaStudentService.getByPersonId(currentPerson.getPersonId());
             if (null != origin) {
                 taStudent.setStudentId(origin.getStudentId());

src/main/java/com/yunzhi/demo/mapper/TaReadLogMapper.java

@@ -20,7 +20,7 @@ import java.util.Map;
 @Mapper
 public interface TaReadLogMapper extends BaseMapper<TaReadLog> {
 
-    TaReadLog getReadBy(String personId, String postId);
+    List<TaReadLog> getReadBy(String personId, String postId);
 
     IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
 

src/main/java/com/yunzhi/demo/service/ITaReadLogService.java

@@ -2,6 +2,8 @@ package com.yunzhi.demo.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.MyReadLog;
+import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -27,4 +29,6 @@ int
     List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate);
 
     IPage<TaReadLog> getReadList(IPage<TaReadLog> pg, String personId);
+
+    void updateReadLog(TaPost taPost, TaPerson currentPerson);
 }

src/main/java/com/yunzhi/demo/service/impl/TaPostDataServiceImpl.java

@@ -43,8 +43,8 @@ public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostD
     @Override
     public void recordBy(String postId, TaPerson taPerson) {
         // 先查询当前人员以前有没有阅读过
-        TaReadLog taReadLog = taReadLogMapper.getReadBy(taPerson.getPersonId(), postId);
-        boolean readed = null != taReadLog;
+        List<TaReadLog> logList = taReadLogMapper.getReadBy(taPerson.getPersonId(), postId);
+        boolean readed = null != logList && logList.size() > 0;
 
         int addPv = 1;
         int addUv = readed ? 0 : 1;
@@ -59,12 +59,13 @@ public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostD
 
         // 如果当前人员以前未读过
         if (!readed) {
-            taReadLog = new TaReadLog();
+            TaReadLog taReadLog = new TaReadLog();
             taReadLog.setPostId(postId);
             taReadLog.setPersonId(taPerson.getPersonId());
             taReadLog.setStatus(Constants.READ_READY);
             taReadLogMapper.insert(taReadLog);
         } else {
+            TaReadLog taReadLog = logList.get(0);
             taReadLog.setUpdateDate(LocalDateTime.now());
             taReadLogMapper.updateById(taReadLog);
         }

src/main/java/com/yunzhi/demo/service/impl/TaReadLogServiceImpl.java

@@ -1,13 +1,17 @@
 package com.yunzhi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.DateUtils;
 import com.yunzhi.demo.entity.MyReadLog;
+import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.yunzhi.demo.mapper.TaReadLogMapper;
 import com.yunzhi.demo.service.ITaReadLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -42,7 +46,7 @@ public class TaReadLogServiceImpl extends ServiceImpl<TaReadLogMapper, TaReadLog
     public List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate) {
         LocalDateTime dt1 = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
         LocalDateTime dt2 = DateUtils.from(endDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
-        long days = DateUtils.daysBetween(dt1, dt2);
+        long days = DateUtils.daysBetween(dt1, dt2) + 1;
         return taReadLogMapper.getIndexPostPV(startDate, endDate, days);
     }
 
@@ -50,7 +54,7 @@ public class TaReadLogServiceImpl extends ServiceImpl<TaReadLogMapper, TaReadLog
     public List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate) {
         LocalDateTime dt1 = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
         LocalDateTime dt2 = DateUtils.from(endDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
-        long days = DateUtils.daysBetween(dt1, dt2);
+        long days = DateUtils.daysBetween(dt1, dt2) + 1;
         return taReadLogMapper.getIndexPostUV(startDate, endDate, days);
     }
 
@@ -59,4 +63,19 @@ public class TaReadLogServiceImpl extends ServiceImpl<TaReadLogMapper, TaReadLog
         return taReadLogMapper.getPersonReadList(pg, personId);
     }
 
+    @Async
+    @Override
+    public void updateReadLog(TaPost taPost, TaPerson currentPerson) {
+        try {
+            List<TaReadLog> logList = taReadLogMapper.getReadBy(currentPerson.getPersonId(), taPost.getPostId());
+            TaReadLog taReadLog = logList.get(0);
+
+            taReadLog.setStatus(Constants.STATUS_NORMAL);
+            taReadLog.setUpdateDate(LocalDateTime.now());
+            updateById(taReadLog);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 ###
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /api
 

src/main/resources/mapper/TaReadLogMapper.xml

@@ -25,7 +25,8 @@
         WHERE
             t.person_id = #{personId}
           AND t.post_id = #{postId}
-          AND t.status = 1
+          AND t.status > -1
+        ORDER BY t.create_date DESC
     </select>
     <select id="getMyReadList" resultType="com.yunzhi.demo.entity.MyReadLog">
         SELECT