Merge remote-tracking branch 'origin/master'

delivery-framework/delivery-spring-boot-starter-web/src/main/java/com/unis/framework/jackson/core/databind/StringLocalDateTimeSerializer.java

@@ -0,0 +1,29 @@
+package com.unis.framework.jackson.core.databind;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import static com.unis.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 自定义序列化器:
+ *  LocalDateTime类型对象返回给前端时，返回的时间格式为：yyyy-MM-dd HH:mm:ss
+ *  应用:在需要转换的字段上添加:@JsonSerialize(using = CustomLocalDateTimeSerializer.class) // 使用自定义序列化器
+ */
+public class StringLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value != null) {
+            gen.writeString(value.format(formatter));
+        } else {
+            gen.writeNull();
+        }
+    }
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/TaskController.java

@@ -88,7 +88,7 @@ public class TaskController {
 
     @PostMapping("/setDkxxByKqId")
     @Operation(summary = "打卡(传 id 是变更(传图片),不传 id 是新增")
-    public CommonResult<Boolean> setDkxxByKqId(@RequestBody TaskDkxxSaveVO saveVO) {
+    public CommonResult<TaskDkxxRespVO> setDkxxByKqId(@RequestBody TaskDkxxSaveVO saveVO) {
         return success(taskService.setDkxxByKqId(saveVO));
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxRespVO.java

@@ -1,6 +1,8 @@
 package com.unis.module.coding.controller.admin.task.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.unis.framework.jackson.core.databind.StringLocalDateTimeSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -21,6 +23,7 @@ public class TaskDkxxRespVO {
     private Long userId;
 
     @Schema(description = "打卡时间")
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class) // 使用自定义序列化器
     private LocalDateTime dksj;
 
     @Schema(description = "打卡地点")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskService.java

@@ -29,7 +29,7 @@ public interface TaskService {
 
     TaskDkxxRespVO getDkxxByKqId(TaskPageReqVO reqVO);
 
-    Boolean setDkxxByKqId(TaskDkxxSaveVO saveVO);
+    TaskDkxxRespVO setDkxxByKqId(TaskDkxxSaveVO saveVO);
 
     Boolean getStoreroom(TaskPageReqVO reqVO);
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -83,9 +84,7 @@ public class TaskServiceImpl implements TaskService {
         addParamDeptIds(pageReqVO);
 
         IPage<TaskRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        dkMapper.getTaskList(page, pageReqVO);
-
-        return page;
+        return dkMapper.getTaskList(page, pageReqVO);
     }
 
     @Override
@@ -254,37 +253,45 @@ public class TaskServiceImpl implements TaskService {
         return BeanUtils.toBean(dkDO, TaskDkxxRespVO.class);
     }
 
+    /**
+     * 打卡(传 id 是变更(传图片),不传 id 是新增
+     * @param saveVO 打卡对象
+     * @return 结果
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean setDkxxByKqId(TaskDkxxSaveVO saveVO) {
+    public TaskDkxxRespVO setDkxxByKqId(TaskDkxxSaveVO saveVO) {
 
         if(ObjectUtils.isEmpty(saveVO) || ObjectUtils.isEmpty(saveVO.getKqId())) {
             throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
         }
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserIdNotNull();
         DkDO dkDO = dkMapper.selectByKqIdAndUserId(saveVO.getKqId(), loginUserId);
+        synchronized (loginUserId){ //上锁 避免重复提交
+            if(ObjectUtils.isEmpty(saveVO.getId())) {
+                if(ObjectUtils.isNotEmpty(dkDO)) {
+                    throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR_RETRY);
+                }
 
-        if(ObjectUtils.isEmpty(saveVO.getId())) {
-            if(ObjectUtils.isNotEmpty(dkDO)) {
-                throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR_RETRY);
-            }
-
-            // 查询登录人角色标识,填充[打卡类型]
-            setDkType(saveVO, loginUserId);
+                // 查询登录人角色标识,填充[打卡类型]
+                setDkType(saveVO, loginUserId);
 
-            //新增
-            DkDO saveDo = getDkDO(saveVO, loginUserId);
-            dkMapper.insert(saveDo);
-        } else {
-            //变更
-            if(ObjectUtils.isNotEmpty(dkDO) && dkDO.getId().equals(saveVO.getId())) {
-                dkMapper.updateById(BeanUtils.toBean(saveVO, DkDO.class));
+                //新增
+                DkDO saveDo = getDkDO(saveVO, loginUserId);
+                dkMapper.insert(saveDo);
+                return BeanUtils.toBean(saveDo, TaskDkxxRespVO.class); //返回打卡对象
             } else {
-                throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
+                //变更
+                if(ObjectUtils.isNotEmpty(dkDO) && dkDO.getId().equals(saveVO.getId())) {
+                    DkDO updateDo = BeanUtils.toBean(saveVO, DkDO.class);
+                    updateDo.setDksj(LocalDateTime.now());
+                    dkMapper.updateById(updateDo);
+                    return BeanUtils.toBean(updateDo, TaskDkxxRespVO.class);
+                } else {
+                    throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
+                }
             }
         }
-
-        return null;
     }
 
     @Override
@@ -319,6 +326,7 @@ public class TaskServiceImpl implements TaskService {
         DkDO saveDo = BeanUtils.toBean(saveVO, DkDO.class);
         saveDo.setId(YitIdHelper.nextId());// 雪花id
         saveDo.setUserId(loginUserId);
+        saveDo.setDksj(LocalDateTime.now());
         return saveDo;
     }
 
@@ -343,7 +351,7 @@ public class TaskServiceImpl implements TaskService {
 
         IPage<TaskRespVO> taskList = getTaskList(pageReqVO);
 
-        if(taskList.getTotal() != reqVO.getKqIds().size()) {
+        if(taskList.getRecords().size() != reqVO.getKqIds().size()) {
             throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR);
         }
     }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -1,15 +1,7 @@
 <?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">
-<!--suppress SqlNoDataSourceInspection -->
 <mapper namespace="com.unis.module.coding.dal.mysql.dk.DkMapper">
 
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
     <select id="getTaskList" resultType="com.unis.module.coding.controller.admin.task.vo.TaskRespVO">
         SELECT
             dk.ID AS kqId,