Browse Source

更新接口

夏文涛 1 year ago
parent
commit
1d04be29bd

+ 0 - 5
SmartNotificationMapper.xml

@@ -1,5 +0,0 @@
-<?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">
-<mapper namespace="com.template.mapper.SmartNotificationMapper">
-
-</mapper>

+ 1 - 1
src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -78,7 +78,7 @@ public interface SmartUserControllerAPI {
      */
     @PostMapping(value = "importExcelUpdateUsers")
     @ApiOperation(value = "批量更新学生信息", notes = "批量更新学生信息", httpMethod = "POST")
-    CommonResult importExcelUpdateUsers(@RequestParam("file") MultipartFile excelFile) throws Exception;
+    CommonResult importExcelUpdateUsers(@RequestParam("file") MultipartFile excelFile, @RequestParam String headImage) throws Exception;
 
     /**
      * 批量导入压缩包

+ 2 - 2
src/main/java/com/template/controller/SmartClassController.java

@@ -157,13 +157,13 @@ public class SmartClassController implements SmartClassControllerAPI {
 
         JSONObject jsonobject = new JSONObject();
         jsonobject.put("appid", appId);
-        String str = "{\"grade_no\":\"" + gradeNo + "\",\"classtab_name\":\"" + grade.getName() + className + "\"}";
+        String str = "{\"grade_no\":\"" + gradeNo + "\",\"classtab_name\":\"" + className + "\"}";
         String aesStr = URLEncoder.encode(AesTestOne.encrypt(str, controlConfig.getAppSecret()), "UTF-8");
         jsonobject.put("data", aesStr);
         jsonobject.put("schoolno", schoolno);
         jsonobject.put("timestamp", timestamp);
 
-        String md5Str = "appid=" + appId + "&data={\"grade_no\":\"" + gradeNo + "\",\"classtab_name\":\"" + grade.getName() + className + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
+        String md5Str = "appid=" + appId + "&data={\"grade_no\":\"" + gradeNo + "\",\"classtab_name\":\"" + className + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
         String sign = CommonUtil.MD5(md5Str);
         //sign签名
         jsonobject.put("sign", sign);

File diff suppressed because it is too large
+ 1153 - 229
src/main/java/com/template/controller/SmartUserController.java


+ 6 - 0
src/main/java/com/template/model/pojo/SmartUser.java

@@ -141,6 +141,12 @@ public class SmartUser implements Serializable {
     @TableField(exist = false)
     private String userhead;
 
+    /**
+     * 原来的班级uid 换班用
+     */
+    @TableField(exist = false)
+    private String oldClassUid;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

+ 177 - 0
src/main/java/com/template/model/seewo/MdmStudentApiStudentChangeClassParam.java

@@ -0,0 +1,177 @@
+package com.template.model.seewo;
+
+import java.util.*;
+import com.seewo.open.sdk.OpenApiParam;
+import com.seewo.open.sdk.ParameterPosition;
+
+/**
+ * seewo-open API: 学生转班
+ * 学生转班
+ *
+ * @author auto create
+ * @since 2.0.1 2024-9-3
+ */
+public class MdmStudentApiStudentChangeClassParam extends OpenApiParam {
+
+
+    /**
+     * 请求体,MimeType为 application/json
+     */
+
+    private JSONRequestBody requestBody;
+
+
+    public JSONRequestBody getRequestBody() {
+        return this.requestBody;
+    }
+
+    public void setRequestBody(JSONRequestBody requestBody) {
+        this.requestBody = requestBody;
+    }
+
+    public static MdmStudentApiStudentChangeClassParamBuilder builder(){
+        return new MdmStudentApiStudentChangeClassParamBuilder();
+    }
+
+    public static class MdmStudentApiStudentChangeClassParamBuilder{
+        private JSONRequestBody requestBody;
+
+        public MdmStudentApiStudentChangeClassParamBuilder requestBody(JSONRequestBody requestBody){
+            this.requestBody = requestBody;
+            return this;
+        }
+
+        public MdmStudentApiStudentChangeClassParam build(){
+            MdmStudentApiStudentChangeClassParam result = new MdmStudentApiStudentChangeClassParam();
+            result.setRequestBody(requestBody);
+            return result;
+        }
+    }
+
+    public static class JSONRequestBody {
+        /**
+         *
+         */
+        private StudentChangeClassReqDto reqDto;
+
+        public StudentChangeClassReqDto getReqDto() {
+            return this.reqDto;
+        }
+
+        public void setReqDto(StudentChangeClassReqDto reqDto) {
+            this.reqDto = reqDto;
+        }
+
+
+        public static JSONRequestBodyBuilder builder(){
+            return new JSONRequestBodyBuilder();
+        }
+
+        public static class JSONRequestBodyBuilder{
+            private StudentChangeClassReqDto reqDto;
+
+            public JSONRequestBodyBuilder reqDto(StudentChangeClassReqDto reqDto){
+                this.reqDto = reqDto;
+                return this;
+            }
+
+            public JSONRequestBody build(){
+                JSONRequestBody result = new JSONRequestBody();
+                result.setReqDto(reqDto);
+                return result;
+            }
+        }
+    }
+
+    public static class StudentChangeClassReqDto {
+        /**
+         * 所属组织uid
+必填
+         */
+        private String orgUid;
+        /**
+         * 学生uid
+         */
+        private String studentUid;
+        /**
+         * 旧班级uid
+         */
+        private String oldClassUid;
+        /**
+         * 新班级uid
+         */
+        private String newClassUid;
+
+        public String getOrgUid() {
+            return this.orgUid;
+        }
+
+        public void setOrgUid(String orgUid) {
+            this.orgUid = orgUid;
+        }
+
+        public String getStudentUid() {
+            return this.studentUid;
+        }
+
+        public void setStudentUid(String studentUid) {
+            this.studentUid = studentUid;
+        }
+
+        public String getOldClassUid() {
+            return this.oldClassUid;
+        }
+
+        public void setOldClassUid(String oldClassUid) {
+            this.oldClassUid = oldClassUid;
+        }
+
+        public String getNewClassUid() {
+            return this.newClassUid;
+        }
+
+        public void setNewClassUid(String newClassUid) {
+            this.newClassUid = newClassUid;
+        }
+
+
+        public static StudentChangeClassReqDtoBuilder builder(){
+            return new StudentChangeClassReqDtoBuilder();
+        }
+
+        public static class StudentChangeClassReqDtoBuilder{
+            private String orgUid;
+            private String studentUid;
+            private String oldClassUid;
+            private String newClassUid;
+
+            public StudentChangeClassReqDtoBuilder orgUid(String orgUid){
+                this.orgUid = orgUid;
+                return this;
+            }
+            public StudentChangeClassReqDtoBuilder studentUid(String studentUid){
+                this.studentUid = studentUid;
+                return this;
+            }
+            public StudentChangeClassReqDtoBuilder oldClassUid(String oldClassUid){
+                this.oldClassUid = oldClassUid;
+                return this;
+            }
+            public StudentChangeClassReqDtoBuilder newClassUid(String newClassUid){
+                this.newClassUid = newClassUid;
+                return this;
+            }
+
+            public StudentChangeClassReqDto build(){
+                StudentChangeClassReqDto result = new StudentChangeClassReqDto();
+                result.setOrgUid(orgUid);
+                result.setStudentUid(studentUid);
+                result.setOldClassUid(oldClassUid);
+                result.setNewClassUid(newClassUid);
+                return result;
+            }
+        }
+    }
+
+
+}

+ 37 - 0
src/main/java/com/template/model/seewo/MdmStudentApiStudentChangeClassRequest.java

@@ -0,0 +1,37 @@
+package com.template.model.seewo;
+
+import java.util.*;
+import com.seewo.open.sdk.OpenApiParam;
+import com.seewo.open.sdk.OpenApiRequest;
+
+/**
+ * seewo-open API: 学生转班
+ * 学生转班
+ *
+ * @author auto create
+ * @since 2.0.1 2024-9-3
+ */
+public class MdmStudentApiStudentChangeClassRequest extends OpenApiRequest<MdmStudentApiStudentChangeClassParam, MdmStudentApiStudentChangeClassResult> {
+
+    public MdmStudentApiStudentChangeClassRequest(MdmStudentApiStudentChangeClassParam param) {
+        this();
+        setBizModel(param);
+    }
+
+    public MdmStudentApiStudentChangeClassRequest() {
+        setServerUrl("https://openapi.seewo.com");
+        setPath("/mdm-basis/mdm-student-api/student-change-class");
+        setHttpMethod("POST");
+        // replace with your permissionId
+        setPermissionId("");
+    }
+
+    public Class<MdmStudentApiStudentChangeClassResult> getResponseClass() {
+        return MdmStudentApiStudentChangeClassResult.class;
+    }
+
+    public Class<MdmStudentApiStudentChangeClassParam> getDomainClass() {
+        return MdmStudentApiStudentChangeClassParam.class;
+    }
+}
+

+ 82 - 0
src/main/java/com/template/model/seewo/MdmStudentApiStudentChangeClassResult.java

@@ -0,0 +1,82 @@
+package com.template.model.seewo;
+
+
+import com.seewo.open.sdk.OpenApiResult;
+import com.seewo.open.sdk.HttpResponse;
+
+/**
+ * seewo-open API: 学生转班
+ * 学生转班
+ *
+ * @author auto create
+ * @since 2.0.1 2024-9-3
+ */
+public class MdmStudentApiStudentChangeClassResult extends OpenApiResult {
+
+    public MdmStudentApiStudentChangeClassResult(HttpResponse response) {
+        super(response);
+    }
+
+
+    /**
+     * 响应体,MimeType为 application/json
+     */
+
+    private JSONResponseBody responseBody;
+
+
+    public JSONResponseBody getResponseBody() {
+        return this.responseBody;
+    }
+
+    public void setResponseBody(JSONResponseBody responseBody) {
+        this.responseBody = responseBody;
+    }
+
+    public static class JSONResponseBody {
+        /**
+         * 响应码
+         */
+        private String code;
+        /**
+         * 异常信息
+         */
+        private String message;
+        /**
+         * 业务内容
+         */
+        private T data;
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getMessage() {
+            return this.message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
+        public T getData() {
+            return this.data;
+        }
+
+        public void setData(T data) {
+            this.data = data;
+        }
+
+    }
+
+    public static class T {
+
+    }
+
+
+}
+

+ 2 - 0
src/main/java/com/template/services/SmartUserService.java

@@ -52,6 +52,8 @@ public interface SmartUserService extends IService<SmartUser> {
 
     List<SmartUser> querySmartUsers(List<Integer> departmentIds, String name);
 
+    List<SmartUser> queryStudentDatas(Integer identityId,List<Integer> gradeIds);
+
     List<SmartUser> queryStudentDatas();
 
 	List<SmartUser> queryStudentBySchoolClass(Integer schoolClass);

+ 44 - 32
src/main/java/com/template/services/impl/SmartUserServiceImpl.java

@@ -207,6 +207,16 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
     }
 
     @Override
+    public List<SmartUser> queryStudentDatas(Integer identityId, List<Integer> gradeIds) {
+        QueryWrapper<SmartUser> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("is_cancel", 0);
+        queryWrapper.eq("identity_id", eIdentityStatu.Student.getValue());
+        queryWrapper.in(gradeIds != null && gradeIds.size() > 0 ,"grade",gradeIds);
+        List<SmartUser> result = smartUserMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
     public PageUtils<WarningUserDto> warningUserList(int currentPage, int pageCount, String name) {
         Page<UserVo> page = new Page<>();
         page.setCurrent(currentPage);
@@ -300,6 +310,7 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         List<SmartUser> users = smartUserMapper.selectList(queryWrapper);
         return users;
     }
+
     @Override
     public List<SmartUser> getListUser() {
 
@@ -313,9 +324,9 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public SmartUser getPhoneUser(String phone) {
-        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SmartUser::getPhone,phone)
-                .eq(SmartUser::getIdentityId,1);
+        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getPhone, phone)
+                .eq(SmartUser::getIdentityId, 1);
         SmartUser smartUser = this.getOne(wrapper);
         return smartUser;
     }
@@ -335,10 +346,10 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public SmartUser getCard(String certificateNumber) {
-        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
         wrapper/*.eq(SmartUser::getIdCard,certificateNumber)
                 .or()*/
-                .eq(SmartUser::getCardNo,certificateNumber);
+                .eq(SmartUser::getCardNo, certificateNumber);
         SmartUser one = this.getOne(wrapper);
 
         return one;
@@ -346,21 +357,21 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public SmartUser getBsStudentNo(String idNum) {
-        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SmartUser::getBsStudentNo,idNum)
+        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getBsStudentNo, idNum)
                 .or()
-                .eq(SmartUser::getBsStaffCode,idNum)
+                .eq(SmartUser::getBsStaffCode, idNum)
                 .or()
-                .eq(SmartUser::getIdCard,idNum);
+                .eq(SmartUser::getIdCard, idNum);
         SmartUser one = this.getOne(wrapper);
         return one;
     }
 
     @Override
     public List<SmartUser> getChargeTeacher(Integer schoolClass) {
-        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SmartUser::getSchoolClass,schoolClass)
-                .eq(SmartUser::getDepartmentId,137);
+        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getSchoolClass, schoolClass)
+                .eq(SmartUser::getDepartmentId, 137);
         List<SmartUser> list = this.list(wrapper);
 
         return list;
@@ -387,28 +398,29 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public List<StatisticsCampusVo> getAccessStatisticsCampus(Integer classId, LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getAccessStatisticsCampus(classId,startTime,endTime);
+        return smartUserMapper.getAccessStatisticsCampus(classId, startTime, endTime);
     }
 
     @Override
     public List<StatisticsCampusVo> getAttendanceStatisticsCampus(Integer classId, LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getAttendanceStatisticsCampus(classId,startTime,endTime);
+        return smartUserMapper.getAttendanceStatisticsCampus(classId, startTime, endTime);
     }
 
     @Override
     public List<StatisticsCampusVo> getFaceDiscernStatisticsCampus(Integer classId, LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getFaceDiscernStatisticsCampus(classId,startTime,endTime);
+        return smartUserMapper.getFaceDiscernStatisticsCampus(classId, startTime, endTime);
     }
 
     @Override
     public List<StatisticsCampusVo> getAckStatisticsCampus(Integer classId, LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getAckStatisticsCampus(classId,startTime,endTime);
+        return smartUserMapper.getAckStatisticsCampus(classId, startTime, endTime);
     }
 
     @Override
     public List<StatisticsCampusVo> getClassStudent(Integer classId) {
         return smartUserMapper.getClassStudent(classId);
     }
+
     @Override
     public List<SmartUser> queryTeachers() {
         QueryWrapper<SmartUser> queryWrapper = new QueryWrapper();
@@ -419,36 +431,36 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public List<SmartUser> getAddressBook(Integer userId) {
-        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SmartUser::getAffiliate,userId);
-        wrapper.eq(SmartUser::getIsCancel,0);
+        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getAffiliate, userId);
+        wrapper.eq(SmartUser::getIsCancel, 0);
         List<SmartUser> list = this.list(wrapper);
         return list;
     }
 
     @Override
-    public List<StatisticsCampusManageVo> getAccessStatisticsCampusManage(Integer gradeId,Integer classId, LocalDateTime startTime, LocalDateTime endTime,String keyWord) {
-        return smartUserMapper.getAccessStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+    public List<StatisticsCampusManageVo> getAccessStatisticsCampusManage(Integer gradeId, Integer classId, LocalDateTime startTime, LocalDateTime endTime, String keyWord) {
+        return smartUserMapper.getAccessStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
     }
 
     @Override
-    public List<StatisticsCampusManageVo> getAttendanceStatisticsCampusManage(Integer gradeId,Integer classId, LocalDateTime startTime, LocalDateTime endTime,String keyWord) {
-        return smartUserMapper.getAttendanceStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+    public List<StatisticsCampusManageVo> getAttendanceStatisticsCampusManage(Integer gradeId, Integer classId, LocalDateTime startTime, LocalDateTime endTime, String keyWord) {
+        return smartUserMapper.getAttendanceStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
     }
 
     @Override
-    public List<StatisticsCampusManageVo> getFaceDiscernStatisticsCampusManage(Integer gradeId,Integer classId, LocalDateTime startTime, LocalDateTime endTime,String keyWord) {
-        return smartUserMapper.getFaceDiscernStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+    public List<StatisticsCampusManageVo> getFaceDiscernStatisticsCampusManage(Integer gradeId, Integer classId, LocalDateTime startTime, LocalDateTime endTime, String keyWord) {
+        return smartUserMapper.getFaceDiscernStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
     }
 
     @Override
-    public List<StatisticsCampusManageVo> getAckStatisticsCampusManage(Integer gradeId,Integer classId, LocalDateTime startTime, LocalDateTime endTime, String keyWord) {
-        return smartUserMapper.getAckStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+    public List<StatisticsCampusManageVo> getAckStatisticsCampusManage(Integer gradeId, Integer classId, LocalDateTime startTime, LocalDateTime endTime, String keyWord) {
+        return smartUserMapper.getAckStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
     }
 
     @Override
-    public List<StatisticsCampusManageVo> getClassStudentManage(Integer gradeId,Integer classId,String keyWord) {
-        return smartUserMapper.getClassStudentManage(gradeId,classId,keyWord);
+    public List<StatisticsCampusManageVo> getClassStudentManage(Integer gradeId, Integer classId, String keyWord) {
+        return smartUserMapper.getClassStudentManage(gradeId, classId, keyWord);
     }
 
     @Override
@@ -474,7 +486,7 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         Page<SmartUserPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<SmartUserPageVo> result = smartUserMapper.getPage(page,keyWord,schoolClass);
+        IPage<SmartUserPageVo> result = smartUserMapper.getPage(page, keyWord, schoolClass);
         return new PageUtils(result);
     }
 
@@ -485,12 +497,12 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
     @Override
     public List<StatisticsStatement> getUserAckTotal(LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getUserAckTotal(startTime,endTime);
+        return smartUserMapper.getUserAckTotal(startTime, endTime);
     }
 
     @Override
     public List<StatisticsStatement> getUserNormalTotal(LocalDateTime startTime, LocalDateTime endTime) {
-        return smartUserMapper.getUserNormalTotal(startTime,endTime);
+        return smartUserMapper.getUserNormalTotal(startTime, endTime);
     }