Merge pull request #8 from roselle-luo/main

roselle-luo · web-flow · commit db389003b791 · 2025-04-07T20:07:04.000+08:00
feat: 增加了被举报后的申诉补时长功能，让各部长和主席团的成员有权限去为同学们补时长
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     kotlin("jvm")
 }
 
+
 repositories {
     mavenLocal()
     maven {
@@ -24,13 +25,16 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation("org.apache.httpcomponents:httpclient:4.5.13")
     implementation("com.opencsv:opencsv:5.9")
+    implementation("io.minio:minio:8.5.17")
     implementation("com.alibaba:druid-spring-boot-starter:1.1.17")
     implementation("com.baomidou:mybatis-plus-boot-starter:3.4.2")
     implementation("org.springframework.boot:spring-boot-starter:2.3.4.RELEASE")
     implementation("org.springframework.boot:spring-boot-starter-aop:2.3.4.RELEASE")
     implementation("org.springframework.boot:spring-boot-starter-web:2.3.4.RELEASE")
-
+    implementation("javax.validation:validation-api:2.0.1.Final")
+    implementation("org.hibernate.validator:hibernate-validator:6.0.13.Final")
     // 如果出现 Bug , see https://mp.weixin.qq.com/s?__biz=MzAwMjk5NTY3Mw==&mid=2247483950&idx=1&sn=47c6c1fed54b134f46f6dedafd34db0c&chksm=9ac0a698adb72f8e769bcfbff5a4fb0450f181bb754a2ad615dc17002f14d7ec039c0e24a1d7&token=395785991&lang=zh_CN#rd
     implementation("com.alibaba:easyexcel:3.3.4")
     implementation("mysql:mysql-connector-java:8.0.18")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/AppealDealDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/AppealDealDTO.java
@@ -0,0 +1,18 @@
+package org.sanyuankexie.attendance.common.DTO;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AppealDealDTO {
+    @NotNull(message = "处理人不能为空")
+    private Long operatorId; // 处理人ID
+    @NotNull(message = "处理的申诉编号不能为空")
+    private String dealAppealId; // 此次处理的申诉编号ID
+    @NotNull(message = "处理结果不能为空")
+    private Boolean result; // 处理结果
+    private String failedReason; // 如果不通过的话，本次不通过原因
+    private String realAddTime; // 实际应该补加的时长，若为空则是默认同意为申请者的申请时长
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/AppealQueryDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/AppealQueryDTO.java
@@ -0,0 +1,14 @@
+package org.sanyuankexie.attendance.common.DTO;
+
+import lombok.Data;
+
+@Data
+public class AppealQueryDTO {
+    private String appealId; // 对应申诉编号
+    private String name; // 申诉人姓名
+    private String department; // 申诉人部门
+    private String term;
+    private Long studentId; //申诉人学号
+    private Integer status; // 申诉状态
+    private Long operator; // 申诉处理者的学号
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/RankDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/RankDTO.java
@@ -12,6 +12,4 @@ public class RankDTO {
     private Object totalTime;
     private Object accumulatedTime;
     private int week;
-
-
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/RecordDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/RecordDTO.java
@@ -12,6 +12,7 @@
 @TableName( autoResultMap = true ) //开启处理器
 public class RecordDTO  {
 
+    private String id;
     private Long userId;
     private String userName;
     private String userDept;
diff --git a/src/main/java/org/sanyuankexie/attendance/common/exception/CExceptionEnum.java b/src/main/java/org/sanyuankexie/attendance/common/exception/CExceptionEnum.java
@@ -4,6 +4,7 @@
 
 public enum CExceptionEnum {
     UNKNOWN(-1, "Unknown exception"),
+    LOGIN_FAILED(-100, "验证失败"),
     USER_NO_EXIST(-200, "用户名不存在"),
     USER_ONLINE(-201, "不许重复签到"),
     USER_OFFLINE(-202, "宁没有签到噢"),
diff --git a/src/main/java/org/sanyuankexie/attendance/config/BeanConfig.java b/src/main/java/org/sanyuankexie/attendance/config/BeanConfig.java
@@ -32,7 +32,6 @@ public TimeHelper getTimerHelper(){
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         try {
             Date w0 = simpleDateFormat.parse(systemInfo.getWeek());
-
             return new TimeHelper(w0.getTime());
         } catch (ParseException e) {
             e.printStackTrace();
diff --git a/src/main/java/org/sanyuankexie/attendance/controller/AppealController.java b/src/main/java/org/sanyuankexie/attendance/controller/AppealController.java
@@ -0,0 +1,53 @@
+package org.sanyuankexie.attendance.controller;
+
+import org.sanyuankexie.attendance.common.DTO.AppealDealDTO;
+import org.sanyuankexie.attendance.common.DTO.AppealQueryDTO;
+import org.sanyuankexie.attendance.common.DTO.RankDTO;
+import org.sanyuankexie.attendance.common.api.ResultVO;
+import org.sanyuankexie.attendance.common.aspect.annotation.ConvertTime;
+import org.sanyuankexie.attendance.common.helper.ResultHelper;
+import org.sanyuankexie.attendance.model.AppealRecord;
+import org.sanyuankexie.attendance.model.AppealRequest;
+import org.sanyuankexie.attendance.service.AppealService;
+import org.sanyuankexie.attendance.service.MinioService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/api/appeal")
+public class AppealController {
+
+    @Resource
+    private AppealService appealService;
+    @Resource
+    private MinioService minioService;
+
+    @ConvertTime
+    @PostMapping(value = "/uploadImage")
+    public ResultVO<List<String>> uploadImage(@RequestParam("images") MultipartFile[] images) throws Exception {
+        return ResultHelper.success(minioService.uploadImages(images),"上传成功");
+    }
+
+    @ConvertTime
+    @PostMapping(value = "/uploadAppeal")
+    public Object uploadAppeal(@Valid @RequestBody AppealRequest appealInfo) {
+        return ResultHelper.success(appealService.uploadAppeal(appealInfo).toString(),"上传成功");
+    }
+
+    @ConvertTime
+    @GetMapping(value = "/getAppeal")
+    public ResultVO<List<AppealRecord>> getAppeal(@ModelAttribute @Valid AppealQueryDTO dto) {
+        return ResultHelper.success(appealService.getAppealList(dto),"获取成功");
+    }
+
+    @ConvertTime
+    @PostMapping(value = "/dealAppeal")
+    public ResultVO<String> dealAppeal(@Valid @RequestBody AppealDealDTO appealDealDTO) {
+        return ResultHelper.success(appealService.dealAppeal(appealDealDTO),"处理完成");
+    }
+
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/controller/UserController.java b/src/main/java/org/sanyuankexie/attendance/controller/UserController.java
@@ -48,6 +48,7 @@ public Object complaint(@RequestBody JSONObject jsonObject) {
     @PostMapping(value = "/modify")
     public ResultVO<RankDTO> modifyTime(@RequestBody JSONObject jsonObject) {
         return ResultHelper.success(userService.modifyTime(
+
                 jsonObject.getString("operation"),
                 jsonObject.getLong("userId"),
                 jsonObject.getString("time"),
@@ -71,4 +72,14 @@ public void exportUsers(HttpServletResponse response, @Param("password") String
         userService.exportUsersToCsv(response, password, grade);
     }
 
+//    @PostMapping("/sendCode")
+//    public ResultVO<String> sendCode(@RequestParam("studentId") Long studentId) {
+//        return ResultHelper.success(userService.sendCode(studentId));
+//    }
+
+    @PostMapping("/login")
+    public ResultVO<String> login(@RequestBody JSONObject jsonObject) {
+        return ResultHelper.success(userService.login(jsonObject.getLong("id"), jsonObject.getString("password")));
+    }
+
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/mapper/AppealRecordMapper.java b/src/main/java/org/sanyuankexie/attendance/mapper/AppealRecordMapper.java
@@ -0,0 +1,66 @@
+package org.sanyuankexie.attendance.mapper;
+
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import org.apache.ibatis.annotations.*;
+import org.sanyuankexie.attendance.common.DTO.AppealQueryDTO;
+import org.sanyuankexie.attendance.model.AppealRecord;
+
+import java.util.List;
+
+@Mapper
+public interface AppealRecordMapper {
+
+    @Insert("INSERT INTO appeal_record " +
+            "(id, sign_record_id, appeal_user_id, require_add_time, status, appeal_image_urls, " +
+            "reason, operator_id, appeal_time, deal_time, real_add_time, failed_reason, term) " +
+            "VALUES (#{id}, #{signRecordId}, #{appealUser.id}, #{requireAddTime}, #{status}, " +
+            "#{appealImageUrls, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}, " +
+            "#{reason}, #{operator.id}, #{appealTime}, #{dealTime}, #{realAddTime}, #{failedReason}, #{term})")
+    void insert(AppealRecord record);
+
+    @Select("SELECT * FROM appeal_record WHERE id = #{id}")
+    @Results(id = "appealRecordSingle", value = {
+            @Result(property = "appealUser", column = "appeal_user_id",
+                    one = @One(select = "org.sanyuankexie.attendance.mapper.UserMapper.selectByUserId")),
+            @Result(property = "operator", column = "operator_id",
+                    one = @One(select = "org.sanyuankexie.attendance.mapper.UserMapper.selectByUserId")),
+            @Result(property = "appealImageUrls", column = "appeal_image_urls",
+                    typeHandler = JacksonTypeHandler.class)
+    })
+    AppealRecord selectById(@Param("id") String id);
+
+    @Select("<script>" +
+            "SELECT * FROM appeal_record ar " +
+            "JOIN user u ON ar.appeal_user_id = u.id " +
+            "WHERE 1=1 " +
+            "<if test='appealId != null and appealId != \"\"'>AND ar.id = #{appealId} </if>" +
+            "<if test='status != null'>AND ar.status = #{status} </if>" +
+            "<if test='term != null and term != \"\"'>AND ar.term = #{term} </if>" +
+            "<if test='studentId != null'>AND u.id = #{studentId} </if>" +
+            "<if test='name != null and name != \"\"'>AND u.name = #{name} </if>" +
+            "<if test='department != null and department != \"\"'>AND u.dept = #{department} </if>" +
+            "<if test='operator != null'>AND ar.operator_id = #{operator} </if>" +
+            "</script>")
+    @Results(id = "appealRecordResultMap", value = {
+            @Result(property = "appealUser", column = "appeal_user_id", one = @One(select = "org.sanyuankexie.attendance.mapper.UserMapper.selectByUserId")),
+            @Result(property = "operator", column = "operator_id", one = @One(select = "org.sanyuankexie.attendance.mapper.UserMapper.selectByUserId")),
+            @Result(property = "appealImageUrls", column = "appeal_image_urls", typeHandler = JacksonTypeHandler.class)
+    })
+    List<AppealRecord> selectAppealRecords(
+            @Param("appealId") String appealId,
+            @Param("name") String name,
+            @Param("department") String department,
+            @Param("term") String term,
+            @Param("studentId") Long studentId,
+            @Param("status") Integer status,
+            @Param("operator") Long operator
+    );
+
+
+    @Update("UPDATE appeal_record SET " +
+            "status = #{status}, operator_id = #{operator.id}, deal_time = #{dealTime}, " +
+            "real_add_time = #{realAddTime}, failed_reason = #{failedReason} " +
+            "WHERE id = #{id}")
+    void updateById(AppealRecord record);
+
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/mapper/AttendanceRecordMapper.java b/src/main/java/org/sanyuankexie/attendance/mapper/AttendanceRecordMapper.java
@@ -44,7 +44,7 @@ public interface AttendanceRecordMapper extends BaseMapper<RecordDTO>     {
     //手写语句需要映射+继承base
     @ResultMap( MYBATIS_PLUS + UNDERSCORE + "RecordDTO")
     @Select("SELECT " +
-            "r.user_id user_id, r.start start, r.end end, r.status status, " +
+            "r.id id, r.user_id user_id, r.start start, r.end end, r.status status, " +
             "u.name user_name, u.dept user_dept, u.location user_location, r.accumulated_time accumulated_time " +
             "FROM attendance_record r " +
             "LEFT JOIN user u ON u.id=r.user_id " +
diff --git a/src/main/java/org/sanyuankexie/attendance/model/AppealRecord.java b/src/main/java/org/sanyuankexie/attendance/model/AppealRecord.java
@@ -0,0 +1,27 @@
+package org.sanyuankexie.attendance.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+import org.sanyuankexie.attendance.common.handler.UserStatusHandler;
+
+import java.util.List;
+
+@Data
+@TableName(autoResultMap = true)
+public class AppealRecord {
+    private String id; // 本次申诉编号
+    private String signRecordId; // 关联的本次申诉对应的签到记录
+    private User appealUser; // 申诉人
+    private String requireAddTime; // 申诉需要补加的时长
+    private int status; // 2 -> 申诉审核不通过, 1 -> 申诉审核通过, 0 -> 申诉审核中, -1 -> 申诉提交失败, -2 -> 状态异常
+    private List<String> appealImageUrls; // 申诉附带的证明图片地址
+    private String reason; // 此次申诉的原因理由
+    private User operator; // 此次申诉的处理人
+    private long appealTime; // 此次申诉提交的时间戳
+    private long dealTime; // 此次申诉的处理时间戳
+    private String realAddTime; // 此次申诉实际批准补加的时长
+    private String failedReason; // 此次申诉不通过的理由
+    private String term; // 此次申诉的学期
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/model/AppealRequest.java b/src/main/java/org/sanyuankexie/attendance/model/AppealRequest.java
@@ -0,0 +1,20 @@
+package org.sanyuankexie.attendance.model;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class AppealRequest {
+    private String signRecordId; // 关联的本次申诉对应的签到记录
+    @Valid
+    @NotNull(message = "申诉人不能为空")
+    private User appealUser; // 申诉人
+    @NotNull(message = "需要补加的时长不能为空")
+    private String requireAddTime; // 申诉需要补加的时长
+    private List<String> appealImageUrls; // 申诉附带的证明图片地址
+    @NotNull(message = "申诉理由不能为空")
+    private String reason; // 此次申诉的原因理由
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/model/MinioConfig.java b/src/main/java/org/sanyuankexie/attendance/model/MinioConfig.java
@@ -0,0 +1,15 @@
+package org.sanyuankexie.attendance.model;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "minio")
+@Component
+@Data
+public class MinioConfig {
+    String endPoint;
+    String accessKey;
+    String secretKey;
+    String bucketName;
+}
diff --git a/src/main/java/org/sanyuankexie/attendance/model/SystemInfo.java b/src/main/java/org/sanyuankexie/attendance/model/SystemInfo.java
@@ -14,4 +14,5 @@ public class SystemInfo {
     String term;
     int grade;
     String password;
+
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/model/User.java b/src/main/java/org/sanyuankexie/attendance/model/User.java
@@ -5,22 +5,32 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class User {
     @ExcelProperty("学号")
-    private   Long id;
+    @NotNull(message = "userId 不能为空")
+    private Long id;
+    @NotNull(message = "userName 不能为空")
     @ExcelProperty("姓名")
     private String name;
+    @NotNull(message = "部门不能为空")
     @ExcelProperty("部门")
     private String dept;
+    @NotNull(message = "位置不能为空")
     @ExcelProperty("位置")
     private String location;
+    @NotNull(message = "邮箱地址不能为空")
     @ExcelProperty("邮箱地址")
     private String email;
     @ExcelProperty("github")
-    private   String githubId;
+    private String githubId;
     @ExcelProperty("年级(例如：22级填22)")
     private String grade;
+    @NotNull(message = "学习方向不能为空")
     @ExcelProperty("方向")
     private String learn;
+    @ExcelProperty("权限")
+    private Integer role;
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/service/AppealService.java b/src/main/java/org/sanyuankexie/attendance/service/AppealService.java
diff --git a/src/main/java/org/sanyuankexie/attendance/service/MinioService.java b/src/main/java/org/sanyuankexie/attendance/service/MinioService.java
diff --git a/src/main/java/org/sanyuankexie/attendance/service/UserService.java b/src/main/java/org/sanyuankexie/attendance/service/UserService.java
diff --git a/src/main/resources/templates/complaint.html b/src/main/resources/templates/complaint.html

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,4 @@ public class RankDTO {`
`12`	`12`	`private Object totalTime;`
`13`	`13`	`private Object accumulatedTime;`
`14`	`14`	`private int week;`
`15`		`-`
`16`		`-`
`17`	`15`	`}`