feats

src/main/java/com/yunzhi/training/common/JWTUtils.java

@@ -69,7 +69,7 @@ public class JWTUtils {
             Date[] datePair = getDatePair();
             Date iat = datePair[0];
             Date exp = datePair[1];
-            jwt.setIssuedAt(iat).setExpiresAt(exp);
+            jwt.setIssuedAt(iat).setExpiresAt(exp).setKey(key);
 
             return jwt.sign();
         } catch (Exception e) {

src/main/java/com/yunzhi/training/controller/LoginController.java

@@ -180,18 +180,6 @@ public class LoginController extends BaseController {
         return ResponseBean.success(res);
     }
 
-//    @PutMapping("/admin/reset-password/{userId}")
-//    @ApiOperation(value="重置密码", notes = "重置密码", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean resetPassword(@ApiParam("用户ID") @PathVariable String userId) throws Exception {
-//        SysLogin sysLogin = iSysLoginService.getByUser(userId);
-//
-//        String newPassword = EncryptUtils.md5(EncryptUtils.md5(Constants.DEFAULT_PASSWORD), userId);
-//        sysLogin.setPassword(newPassword);
-//        iSysLoginService.updateById(sysLogin);
-//
-//        return ResponseBean.success("重置密码成功");
-//    }
-
     private boolean checkPassword(String src, String targ, String salt) {
         return EncryptUtils.md5(src, salt).equals(targ);
     }

src/main/java/com/yunzhi/training/controller/TaSignPlainController.java

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.BaseController;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
+import com.yunzhi.training.entity.TaSignIn;
+import com.yunzhi.training.entity.TaStudent;
+import com.yunzhi.training.service.ITaSignInService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +24,9 @@ import com.yunzhi.training.service.ITaSignPlainService;
 import com.yunzhi.training.entity.TaSignPlain;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
     * 预签到人员 前端控制器
@@ -39,6 +46,9 @@ public class TaSignPlainController extends BaseController {
     @Autowired
     public ITaSignPlainService iTaSignPlainService;
 
+    @Autowired
+    public ITaSignInService iTaSignInService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +56,27 @@ public class TaSignPlainController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taSignPlain",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/sign-plain",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taSignPlainList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @ApiParam("签到") @RequestParam(value ="signId") String signId,
+                                        @ApiParam("学期") @RequestParam(value ="termId", required = false) String termId,
+                                        @ApiParam("班级") @RequestParam(value ="classId", required = false) String classId,
+                                        @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
+                                        @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
-		    IPage<TaSignPlain> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaSignPlain> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaSignPlain> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaSignPlain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sign_id", signId);
+        queryWrapper.eq(!StringUtils.isEmpty(termId), "term_id", termId);
+        queryWrapper.eq(!StringUtils.isEmpty(classId), "class_id", classId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%");
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaSignPlain> result = iTaSignPlainService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaSignPlain> result = iTaSignPlainService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,12 +84,36 @@ public class TaSignPlainController extends BaseController {
      * @param taSignPlain 实体对象
      * @return
      */
-    @RequestMapping(value="/taSignPlain",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/sign-plain/{signId}/with-students",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taSignPlainAdd(@ApiParam("保存内容") @RequestBody TaSignPlain taSignPlain) throws Exception{
+    public ResponseBean taSignPlainAdd(@ApiParam("签到ID") @PathVariable String signId,
+                                       @ApiParam("保存内容") @RequestBody List<TaStudent> studentList) throws Exception{
 
-        if (iTaSignPlainService.save(taSignPlain)){
-            return ResponseBean.success(taSignPlain);
+        TaSignIn taSignIn = iTaSignInService.getExistBy("sign_id", signId, false, true);
+        if (null == taSignIn) {
+            return ResponseBean.error("当前签到不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null == studentList || studentList.size() < 1) {
+            return ResponseBean.error("签到人员池为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<TaSignPlain> signPlains = new ArrayList<>();
+        for(TaStudent student : studentList) {
+            TaSignPlain signPlain = new TaSignPlain();
+            signPlain.setSignId(signId);
+            signPlain.setPersonId(student.getPersonId());
+            signPlain.setStudentId(student.getStudentId());
+            signPlain.setTermId(student.getTermId());
+            signPlain.setClassId(student.getClassId());
+            signPlain.setName(student.getName());
+            signPlain.setPhone(student.getPhone());
+            signPlains.add(signPlain);
+        }
+
+
+        if (iTaSignPlainService.saveBatch(signPlains)){
+            return ResponseBean.success("success");
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -77,43 +121,43 @@ public class TaSignPlainController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     * @param signId  实体ID
      */
-    @RequestMapping(value="/taSignPlain/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/sign-plain/{signId}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taSignPlainDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaSignPlainService.removeById(id)){
+    public ResponseBean taSignPlainDelete(@ApiParam("签到ID") @PathVariable String signId) throws Exception{
+        if(iTaSignPlainService.removeBySignId(signId)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taSignPlain 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taSignPlainUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaSignPlain taSignPlain) throws Exception{
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taSignPlain 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taSignPlainUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaSignPlain taSignPlain) throws Exception{
+//
+//        if (iTaSignPlainService.updateById(taSignPlain)){
+//            return ResponseBean.success(iTaSignPlainService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
 
-        if (iTaSignPlainService.updateById(taSignPlain)){
-            return ResponseBean.success(iTaSignPlainService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taSignPlainGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaSignPlainService.getById(id));
-    }
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taSignPlainGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaSignPlainService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/training/entity/TaSignPlain.java

@@ -47,4 +47,6 @@ public class TaSignPlain implements Serializable {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
 }

src/main/java/com/yunzhi/training/mapper/TaSignPlainMapper.java

@@ -3,6 +3,7 @@ package com.yunzhi.training.mapper;
 import com.yunzhi.training.entity.TaSignPlain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSignPlainMapper extends BaseMapper<TaSignPlain> {
 
+    int deleteBySignId(@Param("signId") String signId);
 }

src/main/java/com/yunzhi/training/service/ITaSignPlainService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaSignPlainService extends IService<TaSignPlain> {
 
+    boolean removeBySignId(String signId);
 }

src/main/java/com/yunzhi/training/service/impl/TaSignPlainServiceImpl.java

@@ -17,4 +17,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaSignPlainServiceImpl extends ServiceImpl<TaSignPlainMapper, TaSignPlain> implements ITaSignPlainService {
 
+    @Override
+    public boolean removeBySignId(String signId) {
+        baseMapper.deleteBySignId(signId);
+        return true;
+    }
 }

src/main/resources/mapper/TaSignPlainMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.training.mapper.TaSignPlainMapper">
 
+    <delete id="deleteBySignId">
+        DELETE t
+        FROM
+            ta_sign_plain t
+        WHERE
+            t.sign_id = #{signId}
+    </delete>
 </mapper>