a = new LinkedList<>();
- a.add("012121");
- send("1008072673404706816",a,"18201963812");
- }
/**
* 短信发送
diff --git a/src/main/java/com/zhongzhi/common/utils/SmsUtils.java b/src/main/java/com/zhongzhi/common/utils/SmsUtils.java
deleted file mode 100644
index 61e7f7d..0000000
--- a/src/main/java/com/zhongzhi/common/utils/SmsUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.zhongzhi.common.utils;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-
-public class SmsUtils {
-
-// API接口信息
-// 账号:SHP10016-N2
-// apiKey:01b0312e7d016d2af41a47e5ba2c2748
-// AccessKey:bd985a3772ca3b362f8b049a3017b6edac604815e34be96631513e29afbcac47
-
- public static void main(String[] args) {
- String info = null;
- try{
- HttpClient httpclient = new HttpClient();
- PostMethod post = new PostMethod("https://opassapi.infocloud.cc/sms/Api/SendGBK.do");//
- post.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET,"gb2312");
- post.addParameter("SpCode", "333665");//替换企业真实数据
- post.addParameter("LoginName", "tangyining");//替换企业真实数据
- post.addParameter("Password", "Vq9542055#");//替换企业真实数据
- post.addParameter("MessageContent", "1008072673404706816");//替换企业真实数据
- post.addParameter("UserNumber", "18201963812");//替换企业真实数据
- // post.addParameter("SerialNumber", "");
- post.addParameter("f", "111111");
- httpclient.executeMethod(post);
- info = new String(post.getResponseBody(),"gbk");
- System.out.println(info);
- }catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
-
- public static String getByteString( byte[] buff_out )
- {
- StringBuffer strBuf = new StringBuffer(buff_out.length * 3);
- strBuf.append("Length[");
- strBuf.append(buff_out.length);
- strBuf.append("];Content[");
- for ( int i = 0 ; i < buff_out.length ; ++i ) {
- int l = buff_out[i] & 0x0F;
- int h = (buff_out[i] & 0xF0) >> 4;
-
- char ll = (char) (l > 9 ? 'a' + l - 10 : '0' + l);
- char hh = (char) (h > 9 ? 'a' + h - 10 : '0' + h);
-
- strBuf.append(hh);
- strBuf.append(ll);
- strBuf.append(" ");
- }
- strBuf.append("]");
- return strBuf.toString().toUpperCase();
- }
-}
diff --git a/src/main/java/com/zhongzhi/controller/AdministerController.java b/src/main/java/com/zhongzhi/controller/AdministerController.java
index ca6a439..59cac6f 100644
--- a/src/main/java/com/zhongzhi/controller/AdministerController.java
+++ b/src/main/java/com/zhongzhi/controller/AdministerController.java
@@ -1,12 +1,18 @@
package com.zhongzhi.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.utils.LoginRequired;
import com.zhongzhi.common.utils.ResponseData;
import com.zhongzhi.dto.administer.AdministerPageDTO;
+import com.zhongzhi.dto.administer.CreateAdministerDTO;
import com.zhongzhi.dto.administer.LoginDTO;
import com.zhongzhi.model.AdministerDO;
+import com.zhongzhi.model.AdministerPermissionDO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.zhongzhi.service.AdministerPermissionService;
import com.zhongzhi.service.AdministerService;
+import com.zhongzhi.service.AdministerTrackMappingService;
import com.zhongzhi.vo.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
*
* 中心管理账户表 前端控制器
@@ -32,6 +40,12 @@ public class AdministerController {
@Autowired
private AdministerService administerService;
+ @Autowired
+ private AdministerTrackMappingService administerTrackMappingService;
+
+ @Autowired
+ private AdministerPermissionService administerPermissionService;
+
@PostMapping(value = "/login")
@ApiOperation("中心端 --- 登录：手机号/telephone， code/验证码")
public ResponseVO login(@RequestBody LoginDTO loginDTO) {
@@ -39,33 +53,80 @@ public class AdministerController {
}
@PostMapping(value = "/getAdministerPage")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
+ @ApiOperation("[立信]中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getAdministerPage(@RequestBody AdministerPageDTO administerPageDTO) {
return ResponseData.generateCreatedResponse(0, administerService.getAdministerPage(administerPageDTO));
}
@PostMapping(value = "/createAdminister")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色")
- public ResponseVO createAdminister(@RequestBody AdministerDO administerDO) {
- administerService.save(administerDO);
+ @ApiOperation("[立信]中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色 trackIds[] 赛道ids permissionIds[] 权限ids")
+ public ResponseVO createAdminister(@RequestBody CreateAdministerDTO createAdministerDTO) {
+ administerService.save(createAdministerDTO);
+ List trackIds = createAdministerDTO.getTrackIds();
+
+ if (null != trackIds){
+ for (Long id : trackIds){
+ AdministerTrackMappingDO administerTrackMappingDO = new AdministerTrackMappingDO();
+ administerTrackMappingDO.setAdministerId(createAdministerDTO.getId());
+ administerTrackMappingDO.setTrackId(id);
+ administerTrackMappingService.save(administerTrackMappingDO);
+ }
+ }
+
+ List permissionIds = createAdministerDTO.getPermissionIds();
+ if (null != permissionIds){
+ for (Long id : permissionIds){
+ AdministerPermissionDO administerPermissionDO = new AdministerPermissionDO();
+ administerPermissionDO.setAdministerId(createAdministerDTO.getId());
+ administerPermissionDO.setPermissionId(id);
+ administerPermissionService.save(administerPermissionDO);
+ }
+ }
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/updateAdminister")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色")
- public ResponseVO updateAdminister(@RequestBody AdministerDO administerDO) {
- administerService.updateById(administerDO);
+ @ApiOperation("[立信]中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色 trackIds[] 赛道ids permissionIds[] 权限ids")
+ public ResponseVO updateAdminister(@RequestBody CreateAdministerDTO createAdministerDTO) {
+
+ administerService.updateAdminister(createAdministerDTO);
+
+ List trackIds = createAdministerDTO.getTrackIds();
+ if (null != trackIds){
+ administerTrackMappingService.remove(new QueryWrapper()
+ .lambda()
+ .eq(AdministerTrackMappingDO::getAdministerId,createAdministerDTO.getId()));
+ for (Long id : trackIds){
+ AdministerTrackMappingDO administerTrackMappingDO = new AdministerTrackMappingDO();
+ administerTrackMappingDO.setAdministerId(createAdministerDTO.getId());
+ administerTrackMappingDO.setTrackId(id);
+ administerTrackMappingService.save(administerTrackMappingDO);
+ }
+ }
+
+ List permissionIds = createAdministerDTO.getPermissionIds();
+ if (null != permissionIds) {
+ administerPermissionService.remove(new QueryWrapper()
+ .lambda()
+ .eq(AdministerPermissionDO::getAdministerId,createAdministerDTO.getId()));
+ for (Long id : permissionIds){
+ AdministerPermissionDO administerPermissionDO = new AdministerPermissionDO();
+ administerPermissionDO.setAdministerId(createAdministerDTO.getId());
+ administerPermissionDO.setPermissionId(id);
+ administerPermissionService.save(administerPermissionDO);
+ }
+ }
+
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/deleteById")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 删除成员：id/成员ID")
+ @ApiOperation("[立信]中心端 --- 删除成员：id/成员ID")
public ResponseVO delete(@RequestBody AdministerDO administerDO) {
administerService.removeById(administerDO.getId());
+ administerTrackMappingService.remove(new QueryWrapper()
+ .lambda()
+ .eq(AdministerTrackMappingDO::getAdministerId,administerDO.getId()));
return ResponseData.generateCreatedResponse(0);
}
}
diff --git a/src/main/java/com/zhongzhi/controller/AdministerPermissionController.java b/src/main/java/com/zhongzhi/controller/AdministerPermissionController.java
index 36ce519..cd66663 100644
--- a/src/main/java/com/zhongzhi/controller/AdministerPermissionController.java
+++ b/src/main/java/com/zhongzhi/controller/AdministerPermissionController.java
@@ -1,6 +1,7 @@
package com.zhongzhi.controller;
import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/com/zhongzhi/controller/AdministerTrackMappingController.java b/src/main/java/com/zhongzhi/controller/AdministerTrackMappingController.java
new file mode 100644
index 0000000..0423cb5
--- /dev/null
+++ b/src/main/java/com/zhongzhi/controller/AdministerTrackMappingController.java
@@ -0,0 +1,42 @@
+package com.zhongzhi.controller;
+
+
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.service.AdministerTrackMappingService;
+import com.zhongzhi.vo.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+ import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+*
+ * 赛道管理员映射表 前端控制器
+ *
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@RestController
+@RequestMapping("/administerTrackMapping")
+@Api("管理员赛道")
+public class AdministerTrackMappingController {
+
+ @Autowired
+ private AdministerTrackMappingService administerTrackMappingService;
+
+ @PostMapping("administerTracks")
+ @ApiOperation("[立信]管理员的赛道 userId")
+ public ResponseVO administerTracks(@RequestBody AdministerTracksDTO administerTracksDTO){
+ return ResponseData.generateCreatedResponse(0,administerTrackMappingService.administerTracks(administerTracksDTO));
+ }
+
+
+}
diff --git a/src/main/java/com/zhongzhi/controller/CollegesDictController.java b/src/main/java/com/zhongzhi/controller/CollegesDictController.java
index 6186f34..df7f0ad 100644
--- a/src/main/java/com/zhongzhi/controller/CollegesDictController.java
+++ b/src/main/java/com/zhongzhi/controller/CollegesDictController.java
@@ -3,8 +3,6 @@ package com.zhongzhi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhongzhi.common.configure.DbContextHolder;
-import com.zhongzhi.common.constant.DBTypeEnum;
import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.utils.LoginRequired;
import com.zhongzhi.common.utils.ResponseData;
@@ -42,9 +40,8 @@ public class CollegesDictController {
public CollegesDictService collegesDictService;
@PostMapping(value = "/getCollegesListNew")
- @ApiOperation("查询所有就读院校: name/院校名称, education/学历")
+ @ApiOperation("####查询所有就读院校: name/院校名称, education/学历")
public ResponseVO getCollegesList(@RequestBody CollegesDictDTO collegesDictDTO) {
- DbContextHolder.setDbType(DBTypeEnum.db2);
QueryWrapper queryWrapper = new QueryWrapper();
if (StringUtils.isNotBlank(collegesDictDTO.getEducation())) {
if ("中职".equals(collegesDictDTO.getEducation())){
@@ -62,17 +59,11 @@ public class CollegesDictController {
}
@PostMapping("getCollegeInfo")
- @ApiOperation("返回院校基本信息 sceneId name")
+ @ApiOperation("[立信]返回院校基本信息 name")
public ResponseVO getCollegeInfo(@RequestBody GetCollegesListDTO getCollegesListDTO){
return ResponseData.generateCreatedResponse(0,collegesDictService.getCollegeInfo(getCollegesListDTO));
}
- @PostMapping("getSceneCollegeInfo")
- @ApiOperation("返回院校基本信息 sceneId name")
- public ResponseVO getSceneCollegeInfo(@RequestBody GetCollegesListDTO getCollegesListDTO){
- return ResponseData.generateCreatedResponse(0,collegesDictService.getSceneCollegeInfo(getCollegesListDTO));
- }
-
@PostMapping(value = "/login")
@ApiOperation("院校端 --- 登录: account/账户, password/密码")
public ResponseVO login(@RequestBody LoginDTO loginDTO) {
@@ -80,8 +71,8 @@ public class CollegesDictController {
}
@PostMapping(value = "updateCollegeById")
- @LoginRequired({Platform.center})
- @ApiOperation("院校端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码")
+ @LoginRequired({Platform.center,Platform.school})
+ @ApiOperation("####院校端，中心端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码")
public ResponseVO updateCollegeById(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.updateById(collegesDictDO);
return ResponseData.generateCreatedResponse(0);
@@ -209,14 +200,14 @@ public class CollegesDictController {
@PostMapping(value = "/getCollegesPage")
@LoginRequired(Platform.center)
- @ApiOperation("中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数")
+ @ApiOperation("####中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getCollegesPage(@RequestBody CollegesPageDTO collegesPageDTO) {
return ResponseData.generateCreatedResponse(0, collegesDictService.getCollegesPage(collegesPageDTO));
}
@PostMapping(value = "/createColleges")
@LoginRequired(Platform.center)
- @ApiOperation("中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号")
+ @ApiOperation("####中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号")
public ResponseVO createColleges(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.createColleges(collegesDictDO);
return ResponseData.generateCreatedResponse(0);
@@ -224,7 +215,7 @@ public class CollegesDictController {
@PostMapping(value = "/delete")
@LoginRequired(Platform.center)
- @ApiOperation("中心端 --- 删除院校: id/院校ID")
+ @ApiOperation("####中心端 --- 删除院校: id/院校ID")
public ResponseVO delete(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.removeById(collegesDictDO.getId());
return ResponseData.generateCreatedResponse(0);
@@ -261,7 +252,7 @@ public class CollegesDictController {
@PostMapping(value = "/exportCollege")
@LoginRequired(Platform.center)
- @ApiOperation("导出院校名录")
+ @ApiOperation("####导出院校名录")
public ResponseVO exportCollege() {
collegesDictService.exportCollege();
return ResponseData.generateCreatedResponse(0);
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotGroupDictController.java b/src/main/java/com/zhongzhi/controller/DrawLotGroupDictController.java
deleted file mode 100644
index 35f6470..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotGroupDictController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import com.zhongzhi.common.utils.ResponseData;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.zhongzhi.service.DrawLotGroupDictService;
-import com.zhongzhi.service.DrawLotsGroupJudgesService;
-import com.zhongzhi.vo.ResponseVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@RestController
-@RequestMapping("/drawLotGroupDict")
-@Api("小组字典表")
-public class DrawLotGroupDictController {
-
- @Autowired
- private DrawLotGroupDictService drawLotGroupDictService;
-
- @PostMapping("allGroups")
- @ApiOperation("所有组别 sceneId ")
- public ResponseVO allGroups(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO) {
- return ResponseData.generateCreatedResponse(0,drawLotGroupDictService.allGroups(drawLotGroupDictDO));
- }
-
- @PostMapping("addGroup")
- @ApiOperation("新建组别 sceneId projectCnt fieldCnt teachCnt")
- public ResponseVO addGroup(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotGroupDictService.addGroup(drawLotGroupDictDO));
- }
-
- @PostMapping("updateGroup")
- @ApiOperation("修改组别 id sceneId projectCnt fieldCnt teachCnt")
- public ResponseVO updateGroup(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotGroupDictService.updateGroup(drawLotGroupDictDO));
- }
-
- @PostMapping("deleteGroup")
- @ApiOperation("移除组别 id")
- public ResponseVO deleteGroup(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotGroupDictService.deleteGroup(drawLotGroupDictDO));
- }
-
- @PostMapping("sceneGroups")
- @ApiOperation("查看某现场的组别 sceneId")
- public ResponseVO sceneGroups(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotGroupDictService.sceneGroups(drawLotGroupDictDO));
- }
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotsGroupItemsController.java b/src/main/java/com/zhongzhi/controller/DrawLotsGroupItemsController.java
deleted file mode 100644
index f175ff5..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotsGroupItemsController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import com.zhongzhi.common.utils.ResponseData;
-import com.zhongzhi.dto.drawlots.AddProjectToSceneDTO;
-import com.zhongzhi.dto.drawlots.AllGroupItemsDTO;
-import com.zhongzhi.dto.drawlots.CollegeProjectsDTO;
-import com.zhongzhi.dto.drawlots.MatchProjectsDTO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.service.DrawLotsGroupItemsService;
-import com.zhongzhi.vo.ResponseVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@RestController
-@RequestMapping("/drawLotsGroupItems")
-@Api("小组项目")
-public class DrawLotsGroupItemsController {
-
- @Autowired
- private DrawLotsGroupItemsService drawLotsGroupItemsService;
-
- @PostMapping("allGroupItems")
- @ApiOperation("查看所有小组项目 pageSize pageNum sceneId projectName college")
- public ResponseVO allGroupItems(@RequestBody AllGroupItemsDTO allGroupItemsDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.allGroupItems(allGroupItemsDTO));
- }
-
- @PostMapping("deleteGroupItem")
- @ApiOperation("删除小组项目 id")
- public ResponseVO deleteGroupItem(@RequestBody DrawLotsGroupItemsDO drawLotsGroupItemsDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.deleteGroupItem(drawLotsGroupItemsDO));
- }
-
- @PostMapping("matchProjects")
- @ApiOperation("项目名单含赛段筛选（除去这一届已经选中的） matchId projectSchedule")
- public ResponseVO matchProjects(@RequestBody MatchProjectsDTO matchProjectsDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.matchProjects(matchProjectsDTO));
- }
-
- @PostMapping("collegeProjects")
- @ApiOperation("选择院校下这一届的项目（除去已经分配的） college matchId sceneId")
- public ResponseVO collegeProjects(@RequestBody CollegeProjectsDTO collegeProjectsDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.collegeProjects(collegeProjectsDTO));
- }
-
- @PostMapping("addProjectToScene")
- @ApiOperation("添加项目到现场 sceneId projectIds")
- public ResponseVO addProjectToScene(@RequestBody AddProjectToSceneDTO addProjectToSceneDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.addProjectToScene(addProjectToSceneDTO));
- }
-
- @PostMapping("drawlots")
- @ApiOperation("学生--项目抽签 返回组别+编号 sceneId projectId (映射id)")
- public ResponseVO drawlots(@RequestBody DrawLotsGroupItemsDO drawLotsGroupItemsDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.drawlots(drawLotsGroupItemsDO));
- }
-
- @PostMapping("groupProjectScreen")
- @ApiOperation("项目抽签大屏 sceneId")
- public ResponseVO groupProjectScreen(@RequestBody DrawLotsGroupItemsDO drawLotsGroupItemsDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupItemsService.groupProjectScreen(drawLotsGroupItemsDO));
- }
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotsGroupJudgesController.java b/src/main/java/com/zhongzhi/controller/DrawLotsGroupJudgesController.java
deleted file mode 100644
index e31ea30..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotsGroupJudgesController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import com.zhongzhi.common.utils.ResponseData;
-import com.zhongzhi.dto.drawlots.AddJudgeDTO;
-import com.zhongzhi.dto.drawlots.AddProjectToSceneDTO;
-import com.zhongzhi.dto.drawlots.DrawLoginDTO;
-import com.zhongzhi.dto.drawlots.JudgeScoreScreenDTO;
-import com.zhongzhi.dto.judge.MatchJudgesDTO;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.zhongzhi.model.DrawLotsJudgeNumDO;
-import com.zhongzhi.service.DrawLotsGroupJudgesService;
-import com.zhongzhi.vo.ResponseVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 赛组评委表 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@RestController
-@RequestMapping("/drawLotsGroupJudges")
-@Api("评委表")
-public class DrawLotsGroupJudgesController {
-
- @Autowired
- private DrawLotsGroupJudgesService drawLotsGroupJudgesService;
-
- @PostMapping("matchJudges")
- @ApiOperation("某赛道的所有评委 pageSize pageNum sceneId userName expectorType roleType ")
- public ResponseVO matchJudges(@RequestBody MatchJudgesDTO matchJudgesDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.matchJudges(matchJudgesDTO));
- }
-
- @PostMapping("selectJudges")
- @ApiOperation("选择没有被选择过的评委 pageSize pageNum sceneId userName ")
- public ResponseVO selectJudges(@RequestBody MatchJudgesDTO matchJudgesDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.selectJudges(matchJudgesDTO));
- }
-
- @PostMapping("removeJudge")
- @ApiOperation("移除评委 matchJudges返回的id")
- public ResponseVO removeJudge(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.removeJudge(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("updateJudge")
- @ApiOperation("编辑评委 id expectorType roleType groupId")
- public ResponseVO updateJudge(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.updateJudge(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("addJudge")
- @ApiOperation("新加评委 judgeIds sceneId")
- public ResponseVO addJudge(@RequestBody AddJudgeDTO addJudgeDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.addJudge(addJudgeDTO));
- }
-
- @PostMapping("assignJudge")
- @ApiOperation("批量分配评委 ids expectorType roleType")
- public ResponseVO assignJudge(@RequestBody AddJudgeDTO addJudgeDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.assignJudge(addJudgeDTO));
- }
-
- @PostMapping("selectNoDrawLotsJudge")
- @ApiOperation("选择现场还没有抽过签的评委 roleType 组长/组员 sceneId")
- public ResponseVO selectNoDrawLotsJudge(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.selectNoDrawLotsJudge(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("drawlots")
- @ApiOperation("评审-项目抽签 返回组别+评委编号 sceneId judgeId roleType")
- public ResponseVO drawlots(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.drawlots(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("judgeScreen")
- @ApiOperation("评委抽签大屏 sceneId")
- public ResponseVO judgeScreen(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.judgeScreen(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("login")
- @ApiOperation("评委登录 name 评委编号")
- public ResponseVO login(@RequestBody DrawLoginDTO drawLoginDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.login(drawLoginDTO));
- }
-
- @PostMapping("judgeScoreScreen")
- @ApiOperation("评委分数大屏 groupId groupNums[] ")
- public ResponseVO judgeScoreScreen(@RequestBody JudgeScoreScreenDTO judgeScoreScreenDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.judgeScoreScreen(judgeScoreScreenDTO));
- }
-
- @PostMapping("leaderFull")
- @ApiOperation("组长是否已满 sceneId")
- public ResponseVO leaderFull(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.leaderFull(drawLotGroupDictDO));
- }
-
- @PostMapping("judgeInfo")
- @ApiOperation("评委信息 groupId groupNum")
- public ResponseVO judgeFullInfo(@RequestBody DrawLotsJudgeNumDO drawLotsJudgeNumDO){
- return ResponseData.generateCreatedResponse(0,drawLotsGroupJudgesService.judgeInfo(drawLotsJudgeNumDO));
- }
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotsJudgeNumController.java b/src/main/java/com/zhongzhi/controller/DrawLotsJudgeNumController.java
deleted file mode 100644
index de61be8..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotsJudgeNumController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-07-10
- */
-@RestController
-@RequestMapping("/draw-lots-judge-num-do")
-public class DrawLotsJudgeNumController {
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotsScenesController.java b/src/main/java/com/zhongzhi/controller/DrawLotsScenesController.java
deleted file mode 100644
index edc224e..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotsScenesController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import com.zhongzhi.common.utils.ResponseData;
-import com.zhongzhi.model.DrawLotsScenesDO;
-import com.zhongzhi.service.DrawLotsScenesService;
-import com.zhongzhi.vo.ResponseVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@RestController
-@RequestMapping("/drawLotsScenes")
-@Api("现场赛事")
-public class DrawLotsScenesController {
-
- @Autowired
- private DrawLotsScenesService drawLotsScenesService;
-
- @PostMapping("allMatchScenes")
- @ApiOperation("查看某一赛道的所有现场 matchId")
- public ResponseVO allMatchScenes(@RequestBody DrawLotsScenesDO drawLotsScenesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScenesService.allMatchScenes(drawLotsScenesDO));
- }
-
- @PostMapping("addMatchScene")
- @ApiOperation("添加某一赛道的所有现场 matchId sceneName openStatus ")
- public ResponseVO addMatchScene(@RequestBody DrawLotsScenesDO drawLotsScenesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScenesService.addMatchScene(drawLotsScenesDO));
- }
-
- @PostMapping("updateMatchScene")
- @ApiOperation("修改某一个赛道现场 id matchId sceneName openStatus ")
- public ResponseVO updateMatchScene(@RequestBody DrawLotsScenesDO drawLotsScenesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScenesService.updateMatchScene(drawLotsScenesDO));
- }
-
- @PostMapping("deleteMatchScene")
- @ApiOperation("删除某一个赛道现场 id matchId sceneName projectCnt groupCnt judgeCnt rankCnt openStatus ")
- public ResponseVO deleteMatchScene(@RequestBody DrawLotsScenesDO drawLotsScenesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScenesService.deleteMatchScene(drawLotsScenesDO));
- }
-}
diff --git a/src/main/java/com/zhongzhi/controller/DrawLotsScoresController.java b/src/main/java/com/zhongzhi/controller/DrawLotsScoresController.java
deleted file mode 100644
index 6877fa6..0000000
--- a/src/main/java/com/zhongzhi/controller/DrawLotsScoresController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import com.zhongzhi.common.utils.ResponseData;
-import com.zhongzhi.dto.drawlots.GroupScoresDTO;
-import com.zhongzhi.model.*;
-import com.zhongzhi.service.DrawLotsScenesService;
-import com.zhongzhi.service.DrawLotsScoresService;
-import com.zhongzhi.vo.ResponseVO;
-import com.zhongzhi.vo.drawlots.RankListVO;
-import com.zhongzhi.vo.drawlots.RankVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author DengMin
- * @since 2025-07-04
- */
-@RestController
-@RequestMapping("/drawLotsScores")
-@Api(tags = "评分")
-public class DrawLotsScoresController {
-
- @Autowired
- private DrawLotsScoresService drawLotsScoresService;
-
- @PostMapping("groupScores")
- @ApiOperation("小组评分 sceneId ")
- public ResponseVO groupScores(@RequestBody GroupScoresDTO groupScoresDTO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.groupScores(groupScoresDTO));
- }
-
- @PostMapping("queryItems")
- @ApiOperation("查询某评委可以看到的项目 judgeId")
- public ResponseVO queryItems(@RequestBody DrawLotsGroupJudgesDO drawLotsGroupJudgesDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.queryItems(drawLotsGroupJudgesDO));
- }
-
- @PostMapping("submit")
- @ApiOperation("暂存/提交 sceneId groupId judgeId projectId submitStatus ：暂存/已提交 score")
- public ResponseVO submit(@RequestBody DrawLotsScoresDO drawLotsScoresDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.submit(drawLotsScoresDO));
- }
-
- @PostMapping("groupRank")
- @ApiOperation("某个组别的排行 groupId")
- public ResponseVO groupRank(@RequestBody DrawLotsGroupItemsDO drawLotsGroupItemsDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.groupRank(drawLotsGroupItemsDO));
- }
-
- @PostMapping("rankList")
- @ApiOperation("排位赛抽签(前四名展示) 查询 sceneId ")
- public ResponseVO rankList(@RequestBody DrawLotGroupDictDO drawLotGroupDictDO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.rankList(drawLotGroupDictDO));
- }
-
- @PostMapping("rank")
- @ApiOperation("排位赛抽签(随机排序，每个现场只能查一次） sceneId groupId projectName ")
- public ResponseVO rank(@RequestBody RankVO rankVO){
- return ResponseData.generateCreatedResponse(0,drawLotsScoresService.rank(rankVO));
- }
-
-// @PostMapping("rankItems")
-// @ApiOperation("排位项目查询 sceneId groupId projectName ")
-// public ResponseVO rankItems(@RequestBody RankVO rankVO){
-// return ResponseData.generateCreatedResponse(0,drawLotsScoresService.rankItems(rankVO));
-// }
-
-
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/MajorDictController.java b/src/main/java/com/zhongzhi/controller/MajorDictController.java
index 0934eea..1c9a275 100644
--- a/src/main/java/com/zhongzhi/controller/MajorDictController.java
+++ b/src/main/java/com/zhongzhi/controller/MajorDictController.java
@@ -1,11 +1,15 @@
package com.zhongzhi.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhongzhi.common.utils.ResponseData;
import com.zhongzhi.model.MajorDictDO;
import com.zhongzhi.service.MajorDictService;
import com.zhongzhi.vo.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -29,9 +33,13 @@ public class MajorDictController {
private MajorDictService majorDictService;
@PostMapping(value = "/getMajorList")
- @ApiOperation("查询全部就读专业: major/专业名称、education/学历、code/院校代码")
+ @ApiOperation("[立信]####查询全部就读专业: major/专业名称、education/学历、code/院校代码")
public ResponseVO getMajorList(@RequestBody MajorDictDO majorDictDO) {
- return ResponseData.generateCreatedResponse(0, majorDictService.getMajorList(majorDictDO));
+ return ResponseData.generateCreatedResponse(0, majorDictService.list(new QueryWrapper()
+ .lambda()
+ .eq(StringUtils.isNotBlank(majorDictDO.getEducation()), MajorDictDO::getEducation, majorDictDO.getEducation())
+ .eq(StringUtils.isNotBlank(majorDictDO.getCode()), MajorDictDO::getCode, majorDictDO.getCode())
+ .like(StringUtils.isNotBlank(majorDictDO.getMajor()), MajorDictDO::getMajor, majorDictDO.getMajor())));
}
}
diff --git a/src/main/java/com/zhongzhi/controller/MatchCollegeCountController.java b/src/main/java/com/zhongzhi/controller/MatchCollegeCountController.java
deleted file mode 100644
index 4ae4ea2..0000000
--- a/src/main/java/com/zhongzhi/controller/MatchCollegeCountController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zhongzhi.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
- import org.springframework.web.bind.annotation.RestController;
-
-/**
-*
- * 前端控制器
- *
-*
-* @author DengMin
-* @since 2025-06-10
-*/
-@RestController
-@RequestMapping("/match-college-count-do")
-public class MatchCollegeCountController {
-
-}
diff --git a/src/main/java/com/zhongzhi/controller/MatchDictController.java b/src/main/java/com/zhongzhi/controller/MatchDictController.java
index 5d6189a..d7831bf 100644
--- a/src/main/java/com/zhongzhi/controller/MatchDictController.java
+++ b/src/main/java/com/zhongzhi/controller/MatchDictController.java
@@ -2,15 +2,12 @@ package com.zhongzhi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhongzhi.common.configure.DbContextHolder;
-import com.zhongzhi.common.constant.DBTypeEnum;
import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.constant.ProjectType;
import com.zhongzhi.common.utils.LoginRequired;
import com.zhongzhi.common.utils.ResponseData;
import com.zhongzhi.dto.match.MatchDictDTO;
import com.zhongzhi.dto.match.SelectListPageDTO;
-import com.zhongzhi.dto.project.ProjectListPageDTO;
import com.zhongzhi.model.MatchDictDO;
import com.zhongzhi.service.MatchDictService;
import com.zhongzhi.vo.ResponseVO;
@@ -38,14 +35,6 @@ public class MatchDictController {
@Autowired
private MatchDictService matchDictService;
- @PostMapping(value = "/getMainMatch")
- @LoginRequired({Platform.school, Platform.center, Platform.student})
- @ApiOperation("查询主赛道启用赛事年份")
- public ResponseVO getAllMatch() {
- return ResponseData.generateCreatedResponse(0, matchDictService.getAllMatch());
- }
-
-
@PostMapping(value = "/getMainTrackMatch")
@LoginRequired({Platform.school, Platform.center, Platform.student})
@ApiOperation("查询主赛道启用赛事年份")
@@ -97,17 +86,12 @@ public class MatchDictController {
}
@PostMapping(value = "/getSeedTrackMatchPage")
+ @LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询种子赛道赛事年份：pageNo、pageSize")
public ResponseVO getSeedTrackMatchPage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getSeedTrackMatchPage(selectListPageDTO));
}
- @PostMapping(value = "/getSeedTrackMatchPageCity")
- @ApiOperation("院校端 ---分页查询种子赛道赛事年份：pageNo、pageSize")
- public ResponseVO getSeedTrackMatchPageCity(@RequestBody SelectListPageDTO selectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, matchDictService.getSeedTrackMatchPageCity(selectListPageDTO));
- }
-
@PostMapping(value = "/createMainTrackMatch")
@LoginRequired({Platform.center})
@ApiOperation("中心端 ---创建主赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
@@ -119,6 +103,7 @@ public class MatchDictController {
}
@PostMapping(value = "/createSeedTrackMatch")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 ---创建种子赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
"schedule:[{ scheduleTime/时间安排、explains/说明 }]")
public ResponseVO createSeedTrackMatch(@RequestBody MatchDictDTO matchDictDTO) {
@@ -128,36 +113,16 @@ public class MatchDictController {
}
@PostMapping(value = "/createVocationalMatch")
- @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
+ @ApiOperation("####中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
"schedule:[{ scheduleTime/时间安排、explains/说明 }]")
public ResponseVO createVocationalMatch(@RequestBody MatchDictDTO matchDictDTO) {
- matchDictDTO.setMatchType(ProjectType.VOCATIONAL);
- matchDictService.createMatch(matchDictDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
- @PostMapping(value = "/createHonglvMatch")
- @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
- "schedule:[{ scheduleTime/时间安排、explains/说明 }]")
- public ResponseVO createHonglvMatch(@RequestBody MatchDictDTO matchDictDTO) {
- matchDictDTO.setMatchType(ProjectType.HONGLV);
matchDictService.createMatch(matchDictDTO);
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/createInternationalMatch")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
- "schedule:[{ scheduleTime/时间安排、explains/说明 }]")
- public ResponseVO createInternationalMatch(@RequestBody MatchDictDTO matchDictDTO) {
- matchDictDTO.setMatchType(ProjectType.INTERNATIONAL);
- matchDictService.createMatch(matchDictDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
-
@PostMapping(value = "/updateMatch")
- @ApiOperation("中心端 ---编辑赛事年份：id/ID、matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、status/状态（1：启动，0：暂停）" +
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---编辑赛事年份：id/ID、matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、status/状态（1：启动，0：暂停）" +
"schedule:[{ id/时间安排ID、scheduleTime/时间安排、explains/说明 }]")
public ResponseVO updateMatch(@RequestBody MatchDictDTO matchDictDTO) {
matchDictService.updateMatch(matchDictDTO);
@@ -166,7 +131,7 @@ public class MatchDictController {
@PostMapping(value = "/delete")
@LoginRequired({Platform.center})
- @ApiOperation("中心端 ---删除赛事年份：id/ID")
+ @ApiOperation("[立信]中心端 ---删除赛事年份：id/ID")
public ResponseVO delete(@RequestBody MatchDictDO matchDictDO) {
matchDictService.removeById(matchDictDO.getId());
return ResponseData.generateCreatedResponse(0);
@@ -185,62 +150,25 @@ public class MatchDictController {
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
@ApiOperation("中心端/学生端/院校端/审批端 ---查询全部种子赛道赛事年份")
public ResponseVO getSeedTrackMatchAll() {
- return ResponseData.generateCreatedResponse(0, matchDictService.getSeedTrackMatchAll());
+ return ResponseData.generateCreatedResponse(0, matchDictService.list(new QueryWrapper()
+ .lambda()
+ .eq(MatchDictDO::getMatchType, ProjectType.SEED_TRACK)));
}
@PostMapping(value = "/getVocationalMatchAll")
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
- @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
+ @ApiOperation("[立信]中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
public ResponseVO getVocationalMatchAll() {
- return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalMatchAll());
- }
-
- @PostMapping(value = "/getHonglvMatchAll")
- @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
- @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
- public ResponseVO getHonglvMatchAll() {
- return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvMatchAll());
- }
-
- @PostMapping(value = "/getInternationalMatchAll")
- @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
- @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
- public ResponseVO getInternationalMatchAll() {
- return ResponseData.generateCreatedResponse(0, matchDictService.list(new QueryWrapper()
- .lambda()
- .eq(MatchDictDO::getMatchType, ProjectType.INTERNATIONAL)));
+ return ResponseData.generateCreatedResponse(0, matchDictService.list(null));
}
/* 职教管理端 */
@PostMapping(value = "/getVocationalPage")
@LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
+ @ApiOperation("[立信]中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
public ResponseVO getVocationalPage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalPage(selectListPageDTO));
}
- /* 职教管理端 */
- @PostMapping(value = "/getHonglvPage")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
- public ResponseVO getHonglvPage(@RequestBody SelectListPageDTO selectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvPage(selectListPageDTO));
- }
-
- /* 职教管理端 */
- @PostMapping(value = "/getVocationalPageCity")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
- public ResponseVO getVocationalPageCity(@RequestBody SelectListPageDTO selectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalPageCity(selectListPageDTO));
- }
-
- /* 职教管理端 */
- @PostMapping(value = "/getInternationalPage")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
- public ResponseVO getInternationalPage(@RequestBody SelectListPageDTO selectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, matchDictService.getInternationalPage(selectListPageDTO));
- }
}
\ No newline at end of file
diff --git a/src/main/java/com/zhongzhi/controller/MatchScheduleController.java b/src/main/java/com/zhongzhi/controller/MatchScheduleController.java
index 7b30017..f460a47 100644
--- a/src/main/java/com/zhongzhi/controller/MatchScheduleController.java
+++ b/src/main/java/com/zhongzhi/controller/MatchScheduleController.java
@@ -45,31 +45,27 @@ public class MatchScheduleController {
@LoginRequired({Platform.student})
@ApiOperation("学生端 ---种子赛道查看时间安排：matchId/赛事年份ID")
public ResponseVO getMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
- return ResponseData.generateCreatedResponse(0, matchScheduleService.getMatchSchedule(matchScheduleDO));
+ MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper()
+ .lambda()
+ .eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
+ .eq(MatchDictDO::getMatchType, ProjectType.SEED_TRACK)
+ .eq(MatchDictDO::getStatus, 1));
+ List list = new ArrayList<>();
+ if (matchDictDO != null) {
+ list = matchScheduleService.list(new QueryWrapper()
+ .lambda()
+ .eq(MatchScheduleDO::getMatchId, matchDictDO.getId()));
+ }
+ return ResponseData.generateCreatedResponse(0, list);
}
@PostMapping(value = "getVocationalMatchSchedule")
@LoginRequired({Platform.student})
@ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
public ResponseVO getVocationalMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
- return ResponseData.generateCreatedResponse(0, matchScheduleService.getVocationalMatchSchedule(matchScheduleDO));
- }
-
- @PostMapping(value = "getHonglvMatchSchedule")
- @LoginRequired({Platform.student})
- @ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
- public ResponseVO getHonglvMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
- return ResponseData.generateCreatedResponse(0, matchScheduleService.getHonglvMatchSchedule(matchScheduleDO));
- }
-
- @PostMapping(value = "getInternationalMatchSchedule")
- @LoginRequired({Platform.student})
- @ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
- public ResponseVO getInternationalMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper()
.lambda()
.eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
- .eq(MatchDictDO::getMatchType, ProjectType.INTERNATIONAL)
.eq(MatchDictDO::getStatus, 1));
List list = new ArrayList<>();
if (matchDictDO != null) {
diff --git a/src/main/java/com/zhongzhi/controller/MessageController.java b/src/main/java/com/zhongzhi/controller/MessageController.java
index c43b688..3efe619 100644
--- a/src/main/java/com/zhongzhi/controller/MessageController.java
+++ b/src/main/java/com/zhongzhi/controller/MessageController.java
@@ -1,8 +1,6 @@
package com.zhongzhi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zhongzhi.common.configure.DbContextHolder;
-import com.zhongzhi.common.constant.DBTypeEnum;
import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.utils.DateFormatUtil;
import com.zhongzhi.common.utils.Localstorage;
@@ -45,11 +43,8 @@ public class MessageController {
private MessageService messageService;
@PostMapping(value = "/getMessage")
- @ApiOperation("查询通知")
+ @ApiOperation("[立信]查询通知")
public ResponseVO getMessage() {
-
- DbContextHolder.setDbType(DBTypeEnum.db2);
-
List messages = new ArrayList();
List list = messageService.list(new QueryWrapper()
@@ -66,38 +61,37 @@ public class MessageController {
@PostMapping(value = "/getMessageById")
@LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 根据ID查询详情：id/ID")
+ @ApiOperation("[立信]中心端 --- 根据ID查询详情：id/ID")
public ResponseVO getMessageById(@RequestBody MessageDO messageDO) {
- DbContextHolder.setDbType(DBTypeEnum.db2);
return ResponseData.generateCreatedResponse(0, messageService.getById(messageDO.getId()));
}
@PostMapping(value = "/getMessagePage")
- @ApiOperation("中心端 ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getMessagePage(@RequestBody MessagePageDTO messagePageDTO) {
return ResponseData.generateCreatedResponse(0, messageService.getMessagePage(messagePageDTO));
}
@PostMapping(value = "/createMessage")
- @LoginRequired({Platform.center,Platform.school})
- @ApiOperation("中心端 ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型")
public ResponseVO createMessage(@RequestBody MessageDO messageDO) {
messageService.createMessage(messageDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/updateMessage")
- @LoginRequired({Platform.center,Platform.school})
- @ApiOperation("中心端 ---编辑通知: id/ID, title/标题, content/内容, attachmentUrl/附件地址, attachmentName/附件名称, attachmentType/附件类型")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---编辑通知: id/ID, title/标题, content/内容, attachmentUrl/附件地址, attachmentName/附件名称, attachmentType/附件类型")
public ResponseVO updateMessage(@RequestBody MessageDO messageDO) {
- DbContextHolder.setDbType(DBTypeEnum.db2);
messageService.updateById(messageDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/delete")
- @LoginRequired({Platform.center,Platform.school})
- @ApiOperation("中心端 ---删除通知: id/ID, ")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---删除通知: id/ID, ")
public ResponseVO delete(@RequestBody MessageDO messageDO) {
messageService.removeById(messageDO.getId());
return ResponseData.generateCreatedResponse(0);
diff --git a/src/main/java/com/zhongzhi/controller/OssController.java b/src/main/java/com/zhongzhi/controller/OssController.java
index faa90ab..543983c 100644
--- a/src/main/java/com/zhongzhi/controller/OssController.java
+++ b/src/main/java/com/zhongzhi/controller/OssController.java
@@ -181,6 +181,7 @@ public class OssController {
// 完成分片上传。
CompleteMultipartUploadResult completeMultipartUploadResult = ossClient.completeMultipartUpload(completeMultipartUploadRequest);
uploadFileVO.setUrl(completeMultipartUploadResult.getLocation().replace("http","https"));
+ uploadFileVO.setRequestId(completeMultipartUploadResult.getRequestId());
System.out.println(completeMultipartUploadResult.getLocation());
} catch (OSSException oe) {
System.out.println("Caught an OSSException, which means your request made it to OSS, "
@@ -189,11 +190,13 @@ public class OssController {
System.out.println("Error Code:" + oe.getErrorCode());
System.out.println("Request ID:" + oe.getRequestId());
System.out.println("Host ID:" + oe.getHostId());
+ oe.printStackTrace();
} catch (ClientException ce) {
System.out.println("Caught an ClientException, which means the client encountered "
+ "a serious internal problem while trying to communicate with OSS, "
+ "such as not being able to access the network.");
System.out.println("Error Message:" + ce.getMessage());
+ ce.printStackTrace();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
diff --git a/src/main/java/com/zhongzhi/controller/PermissionsController.java b/src/main/java/com/zhongzhi/controller/PermissionsController.java
index 59b2ec4..3247357 100644
--- a/src/main/java/com/zhongzhi/controller/PermissionsController.java
+++ b/src/main/java/com/zhongzhi/controller/PermissionsController.java
@@ -1,6 +1,12 @@
package com.zhongzhi.controller;
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.service.PermissionsService;
+import com.zhongzhi.vo.ResponseVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,4 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/permissions")
public class PermissionsController {
+ @Autowired
+ private PermissionsService permissionsService;
+
+ @PostMapping("allPermissions")
+ @ApiOperation("[立信]所有权限")
+ public ResponseVO allPermissions(){
+ return ResponseData.generateCreatedResponse(0,permissionsService.allPermissions());
+ }
+
+
}
diff --git a/src/main/java/com/zhongzhi/controller/ProjectController.java b/src/main/java/com/zhongzhi/controller/ProjectController.java
index 185c3cc..00f5f83 100644
--- a/src/main/java/com/zhongzhi/controller/ProjectController.java
+++ b/src/main/java/com/zhongzhi/controller/ProjectController.java
@@ -36,17 +36,17 @@ public class ProjectController {
private ProjectService projectService;
@PostMapping(value = "/getProjectDetail")
- @ApiOperation("学生端（高职赛道、种子赛道、国际合作通用） ---项目详情: id/项目ID")
+ @ApiOperation("####学生端（高职赛道、种子赛道通用） ---项目详情: id/项目ID")
public ResponseVO getProjectDetail(@RequestBody ProjectDO projectDO) {
return ResponseData.generateCreatedResponse(0, projectService.getProjectById(projectDO.getId()));
}
- @PostMapping(value = "/getMainTrackProject")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---主赛道项目分页查询: matchId/赛事年份ID, pageNo/当前页数, pageSize/每页显示条数")
- public ResponseVO getMainTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getMainTrackProject(projectListPageDTO));
- }
+// @PostMapping(value = "/getMainTrackProject")
+// @LoginRequired(Platform.student)
+// @ApiOperation("学生端 ---主赛道项目分页查询: matchId/赛事年份ID, pageNo/当前页数, pageSize/每页显示条数")
+// public ResponseVO getMainTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
+// return ResponseData.generateCreatedResponse(0, projectService.getMainTrackProject(projectListPageDTO));
+// }
@PostMapping(value = "/getMainTrackProjectById")
@LoginRequired(Platform.student)
@@ -84,7 +84,7 @@ public class ProjectController {
public ResponseVO createProjectMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
createProjectMemberDTO.setProjectGroup(ProjectType.MAIN_TRACK);
createProjectMemberDTO.setProjectType(ProjectType.MAIN_TRACK);
- projectService.createProjectMember(createProjectMemberDTO,null);
+ projectService.createProjectMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
@@ -104,12 +104,12 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/getSeedTrackProject")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---种子赛道项目分页查询: matchId/年份ID, pageNo/当前页数, pageSize/每页显示条数")
- public ResponseVO getSeedTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProject(projectListPageDTO));
- }
+// @PostMapping(value = "/getSeedTrackProject")
+// @LoginRequired(Platform.student)
+// @ApiOperation("学生端 ---种子赛道项目分页查询: matchId/年份ID, pageNo/当前页数, pageSize/每页显示条数")
+// public ResponseVO getSeedTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
+// return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProject(projectListPageDTO));
+// }
@PostMapping(value = "/createSeedTrackProject")
@LoginRequired(Platform.student)
@@ -117,14 +117,8 @@ public class ProjectController {
"scientificPrinciple/科学设计、applicationProspect/应用前景、roadShowForm/路演形式、restriction/创意实施或实验所受条件的限制" +
"、materials/项目材料：[{ materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址 }]")
public ResponseVO createSeedTrackProject(@RequestBody CreateSeedTrackProjectDTO createSeedTrackProjectDTO) {
- return ResponseData.generateCreatedResponse(0,projectService.createSeedTrackProject(createSeedTrackProjectDTO));
- }
-
- @PostMapping("judgeThemeDone")
- @LoginRequired((Platform.student))
- @ApiOperation("学生端 学生报过了哪些主题")
- public ResponseVO judgeThemeDone(@RequestBody CreateSeedTrackProjectDTO createSeedTrackProjectDTO){
- return ResponseData.generateCreatedResponse(0,projectService.judgeThemeDone(createSeedTrackProjectDTO));
+ projectService.createSeedTrackProject(createSeedTrackProjectDTO);
+ return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/getTechnologyProjectById")
@@ -137,8 +131,8 @@ public class ProjectController {
@PostMapping(value = "/getCulturalProjectById")
@LoginRequired(Platform.student)
@ApiOperation("学生端 ---根据ID查询红色文创项目")
- public ResponseVO getCulturalProjectById(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getCulturalProjectById(projectDO));
+ public ResponseVO getCulturalProjectById() {
+ return ResponseData.generateCreatedResponse(0, projectService.getCulturalProjectById());
}
@PostMapping(value = "/uploadTechnologyProjectAttachment")
@@ -146,7 +140,7 @@ public class ProjectController {
@ApiOperation("学生端 --- 上传科技创新项目加盖公章的附件: printAttachment/附件地址, printAttachmentType/附件类型, printAttachmentName/附件名称")
public ResponseVO uploadTechnologyProjectAttachment(@RequestBody PrintAttachmentDTO printAttachmentDTO) {
printAttachmentDTO.setProjectGroup(ProjectType.TECHNOLOGY_INNOVATION_GROUP);
- projectService.uploadPrintAttachment(printAttachmentDTO,ProjectType.TECHNOLOGY_INNOVATION_GROUP);
+ projectService.uploadPrintAttachment(printAttachmentDTO);
return ResponseData.generateCreatedResponse(0);
}
@@ -158,23 +152,23 @@ public class ProjectController {
public ResponseVO createTechnologyProjectMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
createProjectMemberDTO.setProjectGroup(ProjectType.TECHNOLOGY_INNOVATION_GROUP);
createProjectMemberDTO.setProjectType(ProjectType.SEED_TRACK);
- projectService.createProjectMember(createProjectMemberDTO,ProjectType.TECHNOLOGY_INNOVATION_GROUP);
+ projectService.createProjectMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/getTechnologyProjectMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---查询科技创新项目团队信息")
- public ResponseVO getTechnologyProjectMember() {
- return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.TECHNOLOGY_INNOVATION_GROUP,null,ProjectType.TECHNOLOGY_INNOVATION_GROUP));
- }
+// @PostMapping(value = "/getTechnologyProjectMember")
+// @LoginRequired(Platform.student)
+// @ApiOperation("学生端 ---查询科技创新项目团队信息")
+// public ResponseVO getTechnologyProjectMember() {
+// return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.TECHNOLOGY_INNOVATION_GROUP));
+// }
@PostMapping(value = "/uploadCulturalProjectAttachment")
@LoginRequired(Platform.student)
@ApiOperation("学生端 --- 上传红色文创项目加盖公章的附件: printAttachment/附件地址, printAttachmentType/附件类型, printAttachmentName/附件名称")
public ResponseVO uploadCulturalProjectAttachment(@RequestBody PrintAttachmentDTO printAttachmentDTO) {
printAttachmentDTO.setProjectGroup(ProjectType.CULTURAL_CREATIVE_GROUP);
- projectService.uploadPrintAttachment(printAttachmentDTO,ProjectType.CULTURAL_CREATIVE_GROUP);
+ projectService.uploadPrintAttachment(printAttachmentDTO);
return ResponseData.generateCreatedResponse(0);
}
@@ -186,16 +180,16 @@ public class ProjectController {
public ResponseVO createCulturalProjectMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
createProjectMemberDTO.setProjectGroup(ProjectType.CULTURAL_CREATIVE_GROUP);
createProjectMemberDTO.setProjectType(ProjectType.SEED_TRACK);
- projectService.createProjectMember(createProjectMemberDTO,ProjectType.CULTURAL_CREATIVE_GROUP);
+ projectService.createProjectMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/getCulturalProjectMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---查询红色文创项目团队信息")
- public ResponseVO getCulturalProjectMember(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.CULTURAL_CREATIVE_GROUP,projectDO.getThemeName(),"文化创意"));
- }
+// @PostMapping(value = "/getCulturalProjectMember")
+// @LoginRequired(Platform.student)
+// @ApiOperation("学生端 ---查询红色文创项目团队信息")
+// public ResponseVO getCulturalProjectMember() {
+// return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.CULTURAL_CREATIVE_GROUP));
+// }
@PostMapping(value = "/getMainTrackProjectPage")
@LoginRequired(Platform.school)
@@ -220,41 +214,34 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/getSeedTrackProjectList")
- @LoginRequired(Platform.school)
- @ApiOperation("院校端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
- }
-
- @PostMapping(value = "/getSeedTrackProjectListCity")
- @LoginRequired(Platform.school)
- @ApiOperation("院校端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getSeedTrackProjectListCity(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectListCity(projectListPageDTO));
- }
+// @PostMapping(value = "/getSeedTrackProjectList")
+// @LoginRequired(Platform.school)
+// @ApiOperation("院校端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
+// "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
+// public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
+// return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
+// }
- @PostMapping(value = "/getSeedTrackProjectPage")
- @ApiOperation("中心端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数 projectProgress")
- public ResponseVO getSeedTrackProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectPage(projectListPageDTO));
- }
+// @PostMapping(value = "/getSeedTrackProjectPage")
+// @LoginRequired(Platform.center)
+// @ApiOperation("中心端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
+// "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数 projectProgress")
+// public ResponseVO getSeedTrackProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
+// return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectPage(projectListPageDTO));
+// }
@PostMapping(value = "/downloadTechnologyPDF")
@LoginRequired({Platform.student})
@ApiOperation("学生端 --- 种子赛道科技创新申请表下载")
public void downloadTechnologyPDF() {
- projectService.downloadPDF(ProjectType.TECHNOLOGY_INNOVATION_GROUP,null,ProjectType.TECHNOLOGY_INNOVATION_GROUP);
+ projectService.downloadPDF(ProjectType.TECHNOLOGY_INNOVATION_GROUP);
}
@PostMapping(value = "/downloadCulturalPDF")
@LoginRequired({Platform.student})
- @ApiOperation("学生端 --- 种子赛道红色文创申请表下载 themeName")
- public void downloadCulturalPDF(@RequestBody DownloadCulturalPDFDTO downloadCulturalPDFDTO) {
- projectService.downloadPDF(ProjectType.CULTURAL_CREATIVE_GROUP,downloadCulturalPDFDTO.getThemeName(),ProjectType.CULTURAL_CREATIVE_GROUP);
+ @ApiOperation("学生端 --- 种子赛道红色文创申请表下载")
+ public void downloadCulturalPDF() {
+ projectService.downloadPDF(ProjectType.CULTURAL_CREATIVE_GROUP);
}
@PostMapping(value = "/getSeedTrackProjectDetail")
@@ -264,13 +251,6 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectDetail(projectDO.getId()));
}
- @PostMapping(value = "/getSeedTrackProjectDetailCity")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- 种子赛道项目详情：id/项目ID")
- public ResponseVO getSeedTrackProjectDetailCity(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectDetailCity(projectDO.getId()));
- }
-
@PostMapping(value = "/weedOut")
@LoginRequired({Platform.center, Platform.school})
@ApiOperation("院校端 --- 不予提交：id/项目ID")
@@ -289,8 +269,8 @@ public class ProjectController {
@PostMapping(value = "/pass")
@LoginRequired({Platform.center, Platform.school})
- @ApiOperation("中心端/院校端 --- （校内赛/初赛/复赛/决赛）通过：id/项目ID、" +
- "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖")
+ @ApiOperation("[立信]中心端/院校端 --- （校内赛/初赛/复赛/决赛）通过：id/项目ID、" +
+ "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖 7 未通过")
public ResponseVO pass(@RequestBody ApproveDTO approveDTO) {
projectService.pass(approveDTO);
return ResponseData.generateCreatedResponse(0);
@@ -298,15 +278,15 @@ public class ProjectController {
@PostMapping(value = "/batchPass")
@LoginRequired({Platform.center, Platform.school})
- @ApiOperation("中心端/院校端 --- 批量（校内赛/初赛/复赛/决赛）通过：ids/项目ID、" +
- "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖")
+ @ApiOperation("[立信]中心端/院校端 --- 批量（校内赛/初赛/复赛/决赛）通过：ids/项目ID、" +
+ "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖 7 未通过")
public ResponseVO batchPass(@RequestBody ApproveDTO approveDTO) {
projectService.batchPass(approveDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/getReviewList")
-// @LoginRequired({Platform.center})
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审列表：projectGroup/组别（科技创新、红色文创、主赛道）、projectName/搜索项目或院校、 projectStatus/项目状态（市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
"pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getReviewList(@RequestBody ReviewListDTO reviewListDTO) {
@@ -314,13 +294,14 @@ public class ProjectController {
}
@PostMapping(value = "/getProjectReviewNum")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审列表项目数量统计：matchId/赛事年份ID、projectProgress/组别（科技创新、文化创意）, projectStatus/项目进度（市级复赛、市级决赛）")
public ResponseVO getProjectReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getProjectReviewNum(reviewListDTO));
}
@PostMapping(value = "/getProjectReviewAssignNum")
- @LoginRequired({Platform.school})
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审分配项目数量统计：matchId/赛事年份ID、projectGroup/组别（科技创新、红色文创）, projectStatus/项目进度（市级复赛、市级决赛）")
public ResponseVO getProjectReviewAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getProjectReviewAssignNum(reviewListDTO));
@@ -333,13 +314,6 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getReviewProjectNum(reviewListDTO));
}
- @PostMapping(value = "/getReviewProjectNumCity")
- @LoginRequired({Platform.review})
- @ApiOperation("评审端 --- 评审项目数量统计：matchId/赛事年份ID、projectGroup/组别（科技创新、红色文创）, projectStatus/项目状态（市级复赛、市级决赛）")
- public ResponseVO getReviewProjectNumCity(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getReviewProjectNumCity(reviewListDTO));
- }
-
@PostMapping(value = "/getExportProjectListField")
@LoginRequired({Platform.center, Platform.school})
@ApiOperation("中心端 --- 种子赛道项目字段")
@@ -355,13 +329,15 @@ public class ProjectController {
}
@PostMapping(value = "/exportProjectList")
- @ApiOperation("中心端 --- 批量导出种子赛道项目：matchId/赛事ID")
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 --- 批量导出种子赛道项目：matchId/赛事ID")
public void exportProjectList(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
projectService.exportProjectList(projectCollegeListDTO);
}
@PostMapping(value = "/exportProjectAll")
- @ApiOperation("中心端 --- 导出全部种子赛道项目：matchId/赛事ID, projectSchedule/项目进度,projectGroup/项目组别")
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 --- 导出全部种子赛道项目：matchId/赛事ID, projectSchedule/项目进度,projectGroup/项目组别")
public void exportProjectAll(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
projectService.exportProjectAll(projectCollegeListDTO);
}
@@ -373,7 +349,6 @@ public class ProjectController {
projectService.exportProjectAllProgress(projectCollegeListDTO);
}
-
@PostMapping(value = "/getExportProjectField")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审项目字段")
@@ -383,14 +358,14 @@ public class ProjectController {
@PostMapping(value = "/exportProject")
@LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 评审项目导出：matchId/赛事ID")
+ @ApiOperation("####中心端 --- 评审项目导出：matchId/赛事ID userId")
public ResponseVO exportProject(@RequestBody ReviewListDTO reviewListDTO) {
projectService.exportProjectReview(reviewListDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/exportProjectNew")
-// @LoginRequired({Platform.school})
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审项目导出：matchId/赛事ID")
public ResponseVO exportProjectNew(@RequestBody ReviewListDTO reviewListDTO) {
projectService.exportProjectNew(reviewListDTO);
@@ -398,8 +373,8 @@ public class ProjectController {
}
@PostMapping(value = "/exportProjectById")
- @LoginRequired({Platform.school})
- @ApiOperation("中心端 --- 评审项目根据ID导出：id/ID")
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 --- 评审项目根据ID导出：id/ID")
public ResponseVO exportProjectById(@RequestBody ReviewListDTO reviewListDTO) {
projectService.exportProjectById(reviewListDTO);
return ResponseData.generateCreatedResponse(0);
@@ -412,13 +387,6 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getProjectReviewPage(projectReviewPageDTO));
}
- @PostMapping(value = "/getProjectReviewPageCity")
- @LoginRequired({Platform.review})
- @ApiOperation("评审端 ---评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
- public ResponseVO getProjectReviewPageCity(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getProjectReviewPageCity(projectReviewPageDTO));
- }
-
@PostMapping(value = "/setScore")
@LoginRequired({Platform.review})
@ApiOperation("评审端 ---批量预评分：reviewScore[{ id/项目ID、score/分数 }] +" +
@@ -428,15 +396,6 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/setScoreCity")
- @LoginRequired({Platform.review})
- @ApiOperation("评审端 ---批量预评分：reviewScore[{ id/项目ID、score/分数 }] +" +
- " --- 单个预评分：id/项目ID、score/分数")
- public ResponseVO setScoreCity(@RequestBody ProjectReviewScoreDTO projectReviewScoreDTO) {
- projectService.setScoreCity(projectReviewScoreDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
@PostMapping(value = "/submitted")
@LoginRequired({Platform.review})
@ApiOperation("评审端 ---批量提交：ids：[项目ID]" +
@@ -446,15 +405,6 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "/submittedCity")
- @LoginRequired({Platform.review})
- @ApiOperation("评审端 ---批量提交：ids：[项目ID]" +
- " --- 提交评分：id/项目ID ")
- public ResponseVO submittedCity(@RequestBody ProjectReviewScoreDTO projectReviewScoreDTO) {
- projectService.submittedCity(projectReviewScoreDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
@PostMapping(value = "getCollegeDataOverview")
@LoginRequired({Platform.school})
@ApiOperation("院校端 --- 种子赛道数据概览")
@@ -470,12 +420,19 @@ public class ProjectController {
// }
@PostMapping(value = "getDataOverview")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 数据概览")
+// @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 --- 数据概览 matchId")
public ResponseVO getDataOverview(@RequestBody DataOverviewDTO dataOverviewDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalDataOverview(dataOverviewDTO));
}
+ @PostMapping("getDateList")
+ @ApiOperation("中心端---概览列表 matchId")
+ public ResponseVO getDateList(@RequestBody DataOverviewDTO dataOverviewDTO){
+ return ResponseData.generateCreatedResponse(0,projectService.getDateList(dataOverviewDTO));
+ }
+
+
// @PostMapping(value = "getSeedTrackDataOverview")
// @LoginRequired({Platform.center})
// @ApiOperation("中心端 --- 种子赛道数据概览")
@@ -513,174 +470,62 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectNum(seedTrackProjectNumDTO));
}
- @PostMapping(value = "getSeedTrackProjectNumCity")
- @LoginRequired({Platform.center, Platform.school})
- @ApiOperation("中心端/院校端 --- 项目数量: matchId/赛事ID、projectGroup/项目组别")
- public ResponseVO getSeedTrackProjectNumCity(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectNumCity(seedTrackProjectNumDTO));
- }
-
/* -- 职教接口（学生端） -- */
@PostMapping(value = "createVocationalProject")
@LoginRequired({ Platform.student })
- @ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
- "学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
- "公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
- "ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
- "隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
- "patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
- "paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
- "award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
- "copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
- "works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
- "trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
- "vodUrl")
+ @ApiOperation("####学生端--创建项目：项目名称/projectName、项目概述/projectIntro、参赛赛道/projectTrack、单元赛道/unitTrack、组别/projectGroup" +
+ "公司名称/companyName、注册资金/registerFund、注册时间/registerDate、注册地址/registerAddress、营业执照/businessLicense" +
+ "项目计划书 projectAttachment projectAttachmentName projectAttachmentType" +
+ "答辩PPT projectPptUrl projectPptType projectPptName"+
+ "身份证明书/identityCertificate 承诺书 commitmentLetter participationCertificate 参赛证明书")
public ResponseVO createVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.createVocationalProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
- /* -- 职教接口（学生端） -- */
- @PostMapping(value = "createHonglvProject")
- @LoginRequired({ Platform.student })
- @ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
- "学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
- "公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
- "ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
- "隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
- "patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
- "paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
- "award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
- "copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
- "works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
- "trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
- "vodUrl")
- public ResponseVO createHonglvProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
- projectService.createHonglvProject(createVocationalProjectDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
- /* -- 国际合作（学生端） -- */
- @PostMapping(value = "createInternationalProject")
- @LoginRequired({ Platform.student })
- @ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
- "学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
- "公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
- "ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
- "隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
- "patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
- "paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
- "award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
- "copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
- "works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
- "trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
- "vodUrl")
- public ResponseVO createInternationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
- projectService.createInternationalProject(createVocationalProjectDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
@PostMapping(value = "updateVocationalProject")
@LoginRequired({ Platform.student })
- @ApiOperation("学生端(职教)--修改职教项目：id/项目ID、项目logo/logoUri、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
- "学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
- "公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
- "ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
- "隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
- "patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
- "paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
- "award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
- "copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
- "works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
- "trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]")
+ @ApiOperation("学生端(职教)--修改职教项目：id/项目ID、 createVocationalProject的字段， projectSchedule 项目阶段 ")
public ResponseVO updateVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.updateVocationalProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "updateInternationalProject")
- @LoginRequired({ Platform.student })
- @ApiOperation("学生端(职教)--修改职教项目：id/项目ID、项目logo/logoUri、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
- "学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
- "公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
- "ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
- "隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
- "patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
- "paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
- "award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
- "copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
- "works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
- "trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]")
- public ResponseVO updateInternationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
- projectService.updateInternationalProject(createVocationalProjectDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
@PostMapping(value = "getVocationalProject")
@LoginRequired(Platform.student)
- @ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
+ @ApiOperation("[立信]学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getVocationalProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProject(projectListPageDTO));
}
- @PostMapping(value = "getHonglvProject")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
- public ResponseVO getHonglvProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvProject(projectListPageDTO));
- }
-
- @PostMapping(value = "getInternationalProject")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
- public ResponseVO getInternationalProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProject(projectListPageDTO));
- }
-
@PostMapping(value = "getVocationalProjectById")
@LoginRequired(Platform.student)
- @ApiOperation("学生端(职教)--根据ID查询高职赛道项目信息")
+ @ApiOperation("[立信]学生端(职教)--根据ID查询高职赛道项目信息")
public ResponseVO getVocationalProjectById() {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectById());
}
- @PostMapping(value = "getHonglvProjectById")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(职教)--根据ID查询高职赛道项目信息")
- public ResponseVO getHonglvProjectById() {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectById());
- }
-
- @PostMapping(value = "getInternationalProjectById")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(国际合作)--根据ID查询高职赛道项目信息")
- public ResponseVO getInternationalProjectById() {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectById());
- }
-
@PostMapping(value = "createVocationalMember")
@LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 fiveYears" +
- "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 teamTelephone 手机号 }]" +
+ @ApiOperation("####学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 " +
+ "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号}]" +
"mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号 idCard}]")
public ResponseVO createVocationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
projectService.createVocationalMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "createHonglvMember")
+ @PostMapping("confirm")
@LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 fiveYears" +
- "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 teamTelephone 手机号 }]" +
- "mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号 idCard}]")
- public ResponseVO createHonglvMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
- projectService.createHonglvMember(createProjectMemberDTO);
+ @ApiOperation("id 项目id")
+ public ResponseVO confirm(@RequestBody ProjectDO projectDO){
+ projectService.confirm(projectDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "updateVocationalMember")
@LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
+ @ApiOperation("####学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
"teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 }]" +
"mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号}]")
public ResponseVO updateVocationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
@@ -688,73 +533,23 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
- @PostMapping(value = "createInternationalMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 fiveYears" +
- "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 teamTelephone 手机号 }]" +
- "mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号 idCard}]")
- public ResponseVO createInternationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
- projectService.createInternationalMember(createProjectMemberDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
- @PostMapping(value = "updateInternationalMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
- "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 }]" +
- "mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号}]")
- public ResponseVO updateInternationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
- projectService.updateInternationalMember(createProjectMemberDTO);
- return ResponseData.generateCreatedResponse(0);
- }
-
@PostMapping(value = "getVocationalProjectMember")
@LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---查询职教项目团队信息")
+ @ApiOperation("####学生端(职教) ---查询职教项目团队信息")
public ResponseVO getVocationalProjectMember() {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.VOCATIONAL,null));
- }
-
- @PostMapping(value = "getHonglvProjectMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(职教) ---查询职教项目团队信息")
- public ResponseVO getHonglvProjectMember() {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.HONGLV,null));
- }
-
- @PostMapping(value = "getInternationalProjectMember")
- @LoginRequired(Platform.student)
- @ApiOperation("学生端(国际合作) ---查询国际合作项目团队信息")
- public ResponseVO getInternationalProjectMember() {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.INTERNATIONAL,null));
+ return ResponseData.generateCreatedResponse(0, projectService.getProjectMember());
}
/* -- 管理端 -- */
@PostMapping(value = "/getVocationalProjectPage")
- @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
+ @ApiOperation("[立信]中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别、赛道 projectTrack、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
"projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
+ @LoginRequired({Platform.center,Platform.school,Platform.review})
public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectPage(projectListPageDTO));
}
- /* -- 管理端 -- */
- @PostMapping(value = "/getVocationalProjectPageCity")
- @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getVocationalProjectPageCity(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectPageCity(projectListPageDTO));
- }
-
- /* -- 管理端 -- */
- @PostMapping(value = "/getInternationalProjectPage")
- @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getInternationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectPage(projectListPageDTO));
- }
-
@PostMapping(value = "updateAllEditStatus")
- @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 更新所有编辑状态：matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、editStatus/状态（0:关闭，1：开启）")
public ResponseVO updateAllEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
projectService.updateAllEditStatus(editStatusDTO);
@@ -762,7 +557,6 @@ public class ProjectController {
}
@PostMapping(value = "batchUpdateEditStatus")
- @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 批量更新编辑状态：ids/项目ID（数组）、editStatus/状态（0:关闭，1：开启）")
public ResponseVO batchUpdateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
projectService.batchUpdateEditStatus(editStatusDTO);
@@ -770,7 +564,6 @@ public class ProjectController {
}
@PostMapping(value = "updateEditStatus")
- @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 更新编辑状态：id/项目ID、editStatus/状态（0:关闭，1：开启）")
public ResponseVO updateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
projectService.updateEditStatus(editStatusDTO);
@@ -778,208 +571,82 @@ public class ProjectController {
}
@PostMapping(value = "/getVocationalReviewList")
- @ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
+ @ApiOperation("[立信]中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectSchedule/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
"pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getVocationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
}
- @PostMapping(value = "/getHonglvReviewList")
- @ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
- "pageNo/当前页数、pageSize/每页显示条数")
- public ResponseVO getHonglvReviewList(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvReviewList(reviewListDTO));
- }
-
- @PostMapping(value = "/getInternationalReviewList")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
- "pageNo/当前页数、pageSize/每页显示条数")
- public ResponseVO getInternationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
- }
-
@PostMapping(value = "/getVocationalProjectDetail")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
+ @ApiOperation("####中心端/院校端 --- 职教赛道项目详情：id/项目ID")
+ @LoginRequired({Platform.center,Platform.school,Platform.review})
public ResponseVO getVocationalProjectDetail(@RequestBody ProjectDO projectDO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectDetail(projectDO.getId()));
}
- @PostMapping(value = "/getVocationalProjectDetailCity")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
- public ResponseVO getVocationalProjectDetailCity(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectDetailCity(projectDO.getId()));
- }
-
- @PostMapping(value = "/getInternationalProjectDetail")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
- public ResponseVO getInternationalProjectDetail(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectDetail(projectDO.getId()));
- }
-
/* -- 院校端 -- */
@PostMapping(value = "/getVocationalProjectList")
- @LoginRequired(Platform.school)
@ApiOperation("院校端 --- 分页查询职教赛道项目：matchId/赛事ID,projectGroup/项目组别、projectSchedule/项目进度（全部项目传空字符串、校内赛、初赛、复赛、决赛）, " +
"projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
+ @LoginRequired({Platform.center,Platform.school})
public ResponseVO getVocationalProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectList(projectListPageDTO));
}
- /* -- 院校端 -- */
- @PostMapping(value = "/getInternationalProjectList")
- @LoginRequired(Platform.school)
- @ApiOperation("院校端 --- 分页查询职教赛道项目：matchId/赛事ID,projectGroup/项目组别、projectSchedule/项目进度（全部项目传空字符串、校内赛、初赛、复赛、决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getInternationalProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectList(projectListPageDTO));
- }
-
@PostMapping(value = "getReviewVocationalNum")
- @LoginRequired(Platform.review)
@ApiOperation("评审端 --- （职教）项目数量： matchId/赛事ID、projectGroup/项目组别、 projectSchedule/赛事状态 projectJudgeId")
public ResponseVO getReviewVocationalNum(@RequestBody ReviewVocationalNumDTO reviewVocationalNumDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getReviewVocationalNum(reviewVocationalNumDTO));
}
- @PostMapping(value = "getReviewInternationalNum")
- @LoginRequired(Platform.review)
- @ApiOperation("评审端 --- （职教）项目数量： matchId/赛事ID、projectGroup/项目组别、 projectSchedule/赛事状态 projectJudgeId")
- public ResponseVO getReviewInternationalNum(@RequestBody ReviewVocationalNumDTO reviewVocationalNumDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getReviewInternationalNum(reviewVocationalNumDTO));
- }
-
/* -- 评审端 -- */
@PostMapping(value = "/getVocationalProjectReviewPage")
- @LoginRequired({Platform.review})
@ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
+ @LoginRequired({Platform.center,Platform.school,Platform.review})
public ResponseVO getVocationalProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectReviewPage(projectReviewPageDTO));
}
- /* -- 评审端 -- */
- @PostMapping(value = "/getInternationalProjectReviewPage")
- @LoginRequired({Platform.review})
- @ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
- public ResponseVO getInternationalProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectReviewPage(projectReviewPageDTO));
- }
-
@PostMapping(value = "getVocationalProjectNum")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
+ @LoginRequired({Platform.school, Platform.center, Platform.student})
+ @ApiOperation("[立信]中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
}
- @PostMapping(value = "getVocationalProjectNumCity")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
- public ResponseVO getVocationalProjectNumCity(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNumCity(seedTrackProjectNumDTO));
- }
-
- @PostMapping(value = "getInternationalProjectNum")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
- public ResponseVO getInternationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalProjectNum(seedTrackProjectNumDTO));
- }
-
@PostMapping(value = "/getVocationalReviewNum")
- @ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
+ @ApiOperation("[立信]中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getVocationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewNum(reviewListDTO));
}
- @PostMapping(value = "/getHonglvReviewNum")
- @ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
- public ResponseVO getHonglvReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvReviewNum(reviewListDTO));
- }
-
- @PostMapping(value = "/getInternationalReviewNum")
- @ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
- public ResponseVO getInternationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalReviewNum(reviewListDTO));
- }
-
@PostMapping(value = "/getVocationalAssignNum")
@ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getVocationalAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalAssignNum(reviewListDTO));
}
- @PostMapping(value = "/getHonglvAssignNum")
- @ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
- public ResponseVO getHonglvAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvAssignNum(reviewListDTO));
- }
-
- @PostMapping(value = "/getInternationalAssignNum")
- @LoginRequired({Platform.center})
- @ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
- public ResponseVO getInternationalAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getInternationalAssignNum(reviewListDTO));
- }
-
- @PostMapping(value = "importVocationalProject")
- @ApiOperation("中心端/院校端 --- 导出高职项目赛事： projectGroup/项目组别")
- @LoginRequired({ Platform.center, Platform.school })
- public void importVocationalProject(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
- projectService.importVocationalProject(importVocationalProjectDTO);
- }
+// @PostMapping(value = "importVocationalProject")
+// @ApiOperation("中心端/院校端 --- 导出高职项目赛事： projectGroup/项目组别")
+// @LoginRequired({ Platform.center, Platform.school })
+// public void importVocationalProject(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
+// projectService.importVocationalProject(importVocationalProjectDTO);
+// }
@PostMapping(value = "importProjectByGroup")
@ApiOperation("中心端/院校端 ---excel 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别")
- @LoginRequired({ Platform.center, Platform.school })
public void importProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
projectService.importProjectByGroup(importVocationalProjectDTO);
}
@PostMapping("exportProjectByGroup")
@ApiOperation("中心端/院校端 ---pdf 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别 matchId")
-// @LoginRequired({ Platform.center, Platform.school })
public void exportProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
projectService.exportProjectByGroup(importVocationalProjectDTO);
}
- @PostMapping("exportInternationalByGroup")
- @ApiOperation("中心端/院校端 ---pdf 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别 matchId")
-// @LoginRequired({ Platform.center, Platform.school })
- public void exportInternationalByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
- projectService.exportInternationalByGroup(importVocationalProjectDTO);
- }
- @PostMapping("attendCount")
- @ApiOperation("这一届参加的个数 matchId ")
- @LoginRequired({ Platform.student})
- public ResponseVO attendCount(@RequestBody AttendCountDTO attendCountDTO){
- return ResponseData.generateCreatedResponse(0, projectService.attendCount(attendCountDTO));
- }
- /* -- 管理端 -- */
- @PostMapping(value = "/getHonglvProjectPage")
- @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
- "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
- public ResponseVO getHonglvProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectPage(projectListPageDTO));
- }
- @PostMapping(value = "getHonglvProjectNum")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
- public ResponseVO getHonglvProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectNum(seedTrackProjectNumDTO));
- }
- @PostMapping(value = "/getHonglvProjectDetail")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
- public ResponseVO getHonglvProjectDetail(@RequestBody ProjectDO projectDO) {
- return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectDetail(projectDO.getId()));
- }
}
\ No newline at end of file
diff --git a/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java b/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java
index 9e532b6..1498bcb 100644
--- a/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java
+++ b/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java
@@ -34,63 +34,67 @@ public class ProjectJudgeController {
private ProjectJudgeService projectJudgeService;
@PostMapping(value = "/login")
- @ApiOperation("评审端 --- 登录：telephone/手机号、code/验证码")
+ @ApiOperation("评审端 --- 登录：accountName password")
public ResponseVO login(@RequestBody LoginDTO loginDTO) {
return ResponseData.generateCreatedResponse(0, projectJudgeService.login(loginDTO));
}
@PostMapping(value = "/getProjectJudgePage")
- @ApiOperation("中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数")
public ResponseVO getProjectJudgePage(@RequestBody ProjectJudgePageDTO projectJudgePageDTO) {
return ResponseData.generateCreatedResponse(0, projectJudgeService.getProjectJudgePage(projectJudgePageDTO));
}
@PostMapping(value = "/createProjectJudge")
- @LoginRequired({Platform.school})
- @ApiOperation("中心端 ---添加评委：username/姓名、telephone/手机号、 position/职位、unit/单位")
+ @LoginRequired({Platform.center})
public ResponseVO createProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
projectJudgeService.createProjectJudge(projectJudgeDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/updateProjectJudge")
- @ApiOperation("中心端 ---编辑评委：id/ID、username/姓名、telephone/手机号、 position/职位、unit/单位, status/状态（1：启用，0：禁用）")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---编辑评委：id/ID、username/姓名、telephone/手机号、 position/职位、unit/单位, status/状态（1：启用，0：禁用）")
public ResponseVO updateProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
projectJudgeService.updateProjectJudge(projectJudgeDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/delete")
- @ApiOperation("中心端 ---删除评委：id/ID")
+ @LoginRequired({Platform.center})
+ @ApiOperation("[立信]中心端 ---删除评委：id/ID")
public ResponseVO delete(@RequestBody ProjectJudgeDO projectJudgeDO) {
- projectJudgeService.removeJudge(projectJudgeDO);
+ projectJudgeService.removeById(projectJudgeDO.getId());
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/projectJudgesAssigned")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 ---已分配项目评委列表： matchId/赛事ID、projectGroup/组别、projectSchedule/进度")
public ResponseVO projectJudgesAssigned(@RequestBody ProjectJudgePageDTO projectJudgePageDTO) {
return ResponseData.generateCreatedResponse(0, projectJudgeService.projectJudgesAssigned(projectJudgePageDTO));
}
@PostMapping(value = "/downloadJudgeTemplate")
- @ApiOperation("中心端 ---下载导入评委模板")
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 ---下载导入评委模板")
public ResponseVO downloadJudgeTemplate() {
projectJudgeService.downloadTemplate();
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/importJudge")
- @LoginRequired({Platform.school})
- @ApiOperation("中心端 ---导入评委：file/文件（数据格式：Form-Data）")
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 ---导入评委：file/文件（数据格式：Form-Data）")
public ResponseVO importJudge(MultipartFile file) {
projectJudgeService.importJudge(file);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/exportProjectJudge")
- @ApiOperation("中心端 ---导出评委")
- @LoginRequired({Platform.school})
+ @LoginRequired({Platform.center})
+ @ApiOperation("####中心端 ---导出评委")
public void exportProjectJudge() {
projectJudgeService.exportProjectJudge();
}
diff --git a/src/main/java/com/zhongzhi/controller/ProjectReviewController.java b/src/main/java/com/zhongzhi/controller/ProjectReviewController.java
index b9cf952..8bbaafd 100644
--- a/src/main/java/com/zhongzhi/controller/ProjectReviewController.java
+++ b/src/main/java/com/zhongzhi/controller/ProjectReviewController.java
@@ -35,6 +35,7 @@ public class ProjectReviewController {
private ProjectReviewService projectReviewService;
@PostMapping(value = "/setReview")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 ---分配评审：[{projectId}]/项目ID、[{judgeId}]/评委ID、smsMessage/是否发送短信通知（0：不发送，1：发送）")
public ResponseVO setReview(@RequestBody SetReviewDTO setReviewDTO) {
projectReviewService.setReview(setReviewDTO);
@@ -42,6 +43,7 @@ public class ProjectReviewController {
}
@PostMapping(value = "/sendNotice")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 发送通知评审：id/评委ID, matchId/赛事ID")
public ResponseVO sendNotice(@RequestBody SendNoticeVO sendNoticeVO) {
projectReviewService.sendNotice(sendNoticeVO);
@@ -49,6 +51,7 @@ public class ProjectReviewController {
}
@PostMapping(value = "/cancelReview")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 撤销分配：projectId/项目ID、[{judgeId}]/评委ID、smsMessage/是否发送短信通知（0：不发送，1：发送）")
public ResponseVO cancelReview(@RequestBody CancelReviewDTO cancelReviewVO) {
projectReviewService.cancelReview(cancelReviewVO);
@@ -56,6 +59,7 @@ public class ProjectReviewController {
}
@PostMapping(value = "/getProjectReview")
+ @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 已分配项目评审员：projectId/项目ID")
public ResponseVO getProjectReview(@RequestBody ProjectReviewDTO projectReviewDTO) {
return ResponseData.generateCreatedResponse(0, projectReviewService.getProjectReview(projectReviewDTO));
diff --git a/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java b/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java
index 7eac7fd..ef5989e 100644
--- a/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java
+++ b/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java
@@ -32,21 +32,12 @@ public class ProjectReviewPeriodController {
private ProjectReviewPeriodService projectReviewPeriodService;
@PostMapping(value = "/getProjectReviewPeriod")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
+ @ApiOperation("[立信]中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
public ResponseVO getProjectReviewPeriod(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) {
return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO));
}
- @PostMapping(value = "/getProjectReviewPeriodCity")
- @LoginRequired({Platform.center, Platform.school, Platform.review})
- @ApiOperation("中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
- public ResponseVO getProjectReviewPeriodCity(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) {
- return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriodCity(projectReviewPeriodDTO));
- }
-
@PostMapping(value = "/updateProjectReviewPeriod")
- @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 修改评审时间：id/ID、matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、startTime/开始时间、endTime/结束时间")
public ResponseVO updateProjectReviewPeriod(@RequestBody ProjectReviewPeriodDO projectReviewPeriodDO) {
projectReviewPeriodService.updateProjectReviewPeriod(projectReviewPeriodDO);
diff --git a/src/main/java/com/zhongzhi/controller/ProjectTrackController.java b/src/main/java/com/zhongzhi/controller/ProjectTrackController.java
new file mode 100644
index 0000000..c6b9630
--- /dev/null
+++ b/src/main/java/com/zhongzhi/controller/ProjectTrackController.java
@@ -0,0 +1,36 @@
+package com.zhongzhi.controller;
+
+
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.service.ProjectTrackService;
+import com.zhongzhi.vo.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+ import org.springframework.web.bind.annotation.RestController;
+
+/**
+*
+ * 赛道字典表 前端控制器
+ *
+* @author DengMin
+* @since 2025-03-28
+*/
+@RestController
+@RequestMapping("/projectTrack")
+@Api(tags = "赛道")
+public class ProjectTrackController {
+
+ @Autowired
+ private ProjectTrackService projectTrackService;
+
+ @PostMapping("allTracks")
+ @ApiOperation("[立信]查询所有赛道 ")
+ public ResponseVO allTracks(){
+ return ResponseData.generateCreatedResponse(0,projectTrackService.list());
+ }
+
+}
diff --git a/src/main/java/com/zhongzhi/controller/SmsCodeController.java b/src/main/java/com/zhongzhi/controller/SmsCodeController.java
index ba53d12..9556d7d 100644
--- a/src/main/java/com/zhongzhi/controller/SmsCodeController.java
+++ b/src/main/java/com/zhongzhi/controller/SmsCodeController.java
@@ -32,29 +32,29 @@ public class SmsCodeController {
private SmsCodeService smsCodeService;
@PostMapping(value = "/sendRegisterCode")
- @ApiOperation("学生端 ---注册验证码：telephone/手机号")
- public ResponseVO sendRegisterCode(@RequestBody SmsCodeDO smsCodeDO)throws Exception {
+ @ApiOperation("[立信]学生端 ---注册验证码：telephone/手机号")
+ public ResponseVO sendRegisterCode(@RequestBody SmsCodeDO smsCodeDO) {
smsCodeService.sendRegisterCode(smsCodeDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/sendStudentLoginCode")
- @ApiOperation("学生端 ---登陆验证码：telephone/手机号")
- public ResponseVO sendStudentLoginCode(@RequestBody SmsCodeDO smsCodeDO)throws Exception {
+ @ApiOperation("[立信]学生端 ---登陆验证码：telephone/手机号")
+ public ResponseVO sendStudentLoginCode(@RequestBody SmsCodeDO smsCodeDO) {
smsCodeService.sendStudentLoginCode(smsCodeDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/sendAdministerLoginCode")
@ApiOperation("中心端 --- 中心端登陆验证码：telephone/手机号")
- public ResponseVO sendAdministerLoginCode(@RequestBody AdministerDO administerDO) throws Exception{
+ public ResponseVO sendAdministerLoginCode(@RequestBody AdministerDO administerDO) {
smsCodeService.sendAdministerLoginCode(administerDO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/sendJudgeLoginCode")
@ApiOperation("评审端 ---登陆验证码：telephone/手机号")
- public ResponseVO sendJudgeLoginCode(@RequestBody SmsCodeDO smsCodeDO) throws Exception{
+ public ResponseVO sendJudgeLoginCode(@RequestBody SmsCodeDO smsCodeDO) {
smsCodeService.sendJudgeLoginCode(smsCodeDO);
return ResponseData.generateCreatedResponse(0);
}
diff --git a/src/main/java/com/zhongzhi/controller/SmsNoticeController.java b/src/main/java/com/zhongzhi/controller/SmsNoticeController.java
index f143fda..0135843 100644
--- a/src/main/java/com/zhongzhi/controller/SmsNoticeController.java
+++ b/src/main/java/com/zhongzhi/controller/SmsNoticeController.java
@@ -35,7 +35,7 @@ public class SmsNoticeController {
@PostMapping(value = "batchSend")
@LoginRequired({Platform.center})
- @ApiOperation("管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称")
+ @ApiOperation("####管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称")
public ResponseVO batchSend(@RequestBody SmsNoticeDTO smsNoticeDTO) {
smsNoticeService.batchSend(smsNoticeDTO);
return ResponseData.generateCreatedResponse(0);
@@ -43,7 +43,7 @@ public class SmsNoticeController {
@PostMapping(value = "send")
@LoginRequired({Platform.center})
- @ApiOperation("管理端 -- 发送短信：ids/项目ID（数组）")
+ @ApiOperation("####管理端 -- 发送短信：ids/项目ID（数组）")
public ResponseVO send(@RequestBody SmsNoticeDTO smsNoticeDTO) {
smsNoticeService.send(smsNoticeDTO);
return ResponseData.generateCreatedResponse(0);
@@ -51,7 +51,7 @@ public class SmsNoticeController {
@PostMapping(value = "getListByPage")
@LoginRequired({Platform.center})
- @ApiOperation("管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize")
+ @ApiOperation("####管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize")
public ResponseVO getListByPage(@RequestBody SmsNoticePageDTO smsNoticePageDTO) {
return ResponseData.generateCreatedResponse(0, smsNoticeService.getListByPage(smsNoticePageDTO));
}
diff --git a/src/main/java/com/zhongzhi/controller/StudentController.java b/src/main/java/com/zhongzhi/controller/StudentController.java
index ce699a9..15116fa 100644
--- a/src/main/java/com/zhongzhi/controller/StudentController.java
+++ b/src/main/java/com/zhongzhi/controller/StudentController.java
@@ -33,14 +33,14 @@ public class StudentController {
private StudentService studentService;
@PostMapping(value = "/register")
- @ApiOperation("注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " +
- "education/学历层次, school/就读院校, major/就读专业, enrollmentDate/入学年份, graduateDate/毕业年份 sex")
+ @ApiOperation("[立信]注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " +
+ "education/学历层次, school/就读院校, major/就读专业, enrollmentDate/入学年份, graduateDate/毕业年份")
public ResponseVO register(@RequestBody RegisterDTO registerDTO) {
return ResponseData.generateCreatedResponse(0, studentService.register(registerDTO));
}
@PostMapping(value = "/login")
- @ApiOperation("登陆：telephone/手机号, code/验证码")
+ @ApiOperation("####登陆：telephone/手机号, code/验证码")
public ResponseVO login(@RequestBody LoginDTO loginDTO) {
return ResponseData.generateCreatedResponse(0, studentService.login(loginDTO));
}
@@ -52,5 +52,4 @@ public class StudentController {
studentService.updateStudentInfo(studentDO);
return ResponseData.generateCreatedResponse(0);
}
-
}
diff --git a/src/main/java/com/zhongzhi/controller/YearDictController.java b/src/main/java/com/zhongzhi/controller/YearDictController.java
index ac1c090..ce4b79f 100644
--- a/src/main/java/com/zhongzhi/controller/YearDictController.java
+++ b/src/main/java/com/zhongzhi/controller/YearDictController.java
@@ -31,7 +31,7 @@ public class YearDictController {
private YearDictService yearDictService;
@PostMapping("queryYears")
- @ApiOperation("查询年份")
+ @ApiOperation("####查询年份")
public ResponseVO queryYears(){
return ResponseData.generateCreatedResponse(0,yearDictService.queryYears());
}
diff --git a/src/main/java/com/zhongzhi/dao/AdministerDAO.java b/src/main/java/com/zhongzhi/dao/AdministerDAO.java
index 0d51a5f..f07974f 100644
--- a/src/main/java/com/zhongzhi/dao/AdministerDAO.java
+++ b/src/main/java/com/zhongzhi/dao/AdministerDAO.java
@@ -1,7 +1,9 @@
package com.zhongzhi.dao;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhongzhi.model.AdministerDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzhi.vo.administer.GetAdministerPageVO;
import org.springframework.stereotype.Repository;
/**
@@ -15,4 +17,8 @@ import org.springframework.stereotype.Repository;
@Repository
public interface AdministerDAO extends BaseMapper {
+ IPage getAdministerPage(IPage iPage, String listItem, String username);
+
+ void updateAdminister(AdministerDO administerDO);
+
}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotsJudgeNumMapper.java b/src/main/java/com/zhongzhi/dao/AdministerTrackMappingDAO.java
similarity index 64%
rename from src/main/java/com/zhongzhi/dao/DrawLotsJudgeNumMapper.java
rename to src/main/java/com/zhongzhi/dao/AdministerTrackMappingDAO.java
index 7e671ed..088a8bc 100644
--- a/src/main/java/com/zhongzhi/dao/DrawLotsJudgeNumMapper.java
+++ b/src/main/java/com/zhongzhi/dao/AdministerTrackMappingDAO.java
@@ -1,18 +1,23 @@
package com.zhongzhi.dao;
-import com.zhongzhi.model.DrawLotsJudgeNumDO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzhi.model.ProjectTrackDO;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-07-10
- */
+*
+ * 赛道管理员映射表 Mapper 接口
+ *
+*
+* @author DengMin
+* @since 2025-03-28
+*/
@Repository
-public interface DrawLotsJudgeNumMapper extends BaseMapper {
+ public interface AdministerTrackMappingDAO extends BaseMapper {
+
+ List administerTracks(Long userId);
-}
+ }
diff --git a/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java b/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java
index c8b391a..99ff21a 100644
--- a/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java
+++ b/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java
@@ -2,6 +2,7 @@ package com.zhongzhi.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhongzhi.dto.college.ExportCollegeDTO;
import com.zhongzhi.model.CollegesDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhongzhi.vo.college.AwardedListVO;
@@ -28,8 +29,6 @@ public interface CollegesDictDAO extends BaseMapper {
List getAwardedListAll();
- List getCollegeInfo(String name,String education,Long sceneId);
-
- List getSceneCollegeInfo(String name,String education,Long sceneId);
+ List getCollegeInfo(String name);
}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotGroupDictMapper.java b/src/main/java/com/zhongzhi/dao/DrawLotGroupDictMapper.java
deleted file mode 100644
index 7eae753..0000000
--- a/src/main/java/com/zhongzhi/dao/DrawLotGroupDictMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zhongzhi.dao;
-
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzhi.vo.drawlots.GroupJudgesVO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Repository
-public interface DrawLotGroupDictMapper extends BaseMapper {
-
- /**
- * 组别下的成员
- */
- List groupJudges(Long groupId, String roleType);
-
- /**
- * 查看组别下的编号
- */
- List groupNums(Long groupId);
-
-}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotsGroupItemsMapper.java b/src/main/java/com/zhongzhi/dao/DrawLotsGroupItemsMapper.java
deleted file mode 100644
index 450836c..0000000
--- a/src/main/java/com/zhongzhi/dao/DrawLotsGroupItemsMapper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.zhongzhi.dao;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzhi.vo.drawlots.AllGroupItemsVO;
-import com.zhongzhi.vo.drawlots.CollegeProjectsVO;
-import com.zhongzhi.vo.drawlots.GroupProjectInfoVO;
-import com.zhongzhi.vo.drawlots.MatchProjectsVO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Repository
-public interface DrawLotsGroupItemsMapper extends BaseMapper {
-
- IPage allGroupItems(IPage page,Long sceneId, String projectName,String college);
-
- /**
- * 某赛道 没有被选的项目
- */
- List matchProjects(Long matchId, String projectSchedule);
-
- /**
- * 还没有坑位的项目
- */
- IPage collegeProjects(IPage iPage,Long sceneId, String college, String projectSchedule, String projectProgress);
-
- /**
- * 还没有满的坑位
- */
- List noFullGroup(Long sceneId,String college,Integer count);
-
- /**
- * 查看该组别下的项目
- */
- List groupProjectInfo(Long groupId);
-
- /**
- * 某组别已经存在的编码
- */
- List existNum(Long groupId);
-
- /**
- * 某现场某院校组别最小的数量
- */
- Integer sceneCollege(Long sceneId,String college);
-}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.java b/src/main/java/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.java
deleted file mode 100644
index b33354f..0000000
--- a/src/main/java/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.zhongzhi.dao;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzhi.vo.drawlots.*;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *
- * 赛组评委表 Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Repository
-public interface DrawLotsGroupJudgesMapper extends BaseMapper {
-
- IPage matchJudges(IPage page,Long sceneId, String userName, String expectorType, String roleType);
-
- /**
- * 选择评委
- */
- IPage selectJudges(IPage page,Long sceneId,String userName);
-
- /**
- * 某组别已经存在的编码
- */
- List allNum(Long groupId);
-
- /**
- * 某组别已经随机到的编码
- */
- List existNum(Long groupId);
-
- /**
- * 当前组的组长
- */
- Integer currentGroupLeaderCnt(Long groupId);
-
- /**
- * 评委信息
- */
- List drawJudgeInfo(Long groupId);
-
- /**
- * 没有组长的组
- */
- List noLeaderGroup(Long sceneId);
-
- /**
- * 某个类别（行业专家，教育专家）没有满的组员
- */
- List noMemberGroup(Long sceneId,String teachType);
-
- LoginVO login(String name);
-
- List judgeScoreScreen(Long groupId, Integer groupNum);
-
- JudgeFullInfoVO judgeInfo(Long groupId,Integer groupNum);
-}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotsScenesMapper.java b/src/main/java/com/zhongzhi/dao/DrawLotsScenesMapper.java
deleted file mode 100644
index a0f97a9..0000000
--- a/src/main/java/com/zhongzhi/dao/DrawLotsScenesMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zhongzhi.dao;
-
-import com.zhongzhi.model.DrawLotsScenesDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzhi.vo.project.AllMatchScenesVO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Repository
-public interface DrawLotsScenesMapper extends BaseMapper {
-
- /**
- * 某赛道所有现场
- */
- List allMatchScenes(Long matchId, String openStatus);
-
-}
diff --git a/src/main/java/com/zhongzhi/dao/DrawLotsScoresMapper.java b/src/main/java/com/zhongzhi/dao/DrawLotsScoresMapper.java
deleted file mode 100644
index 0b680b2..0000000
--- a/src/main/java/com/zhongzhi/dao/DrawLotsScoresMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.zhongzhi.dao;
-
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.model.DrawLotsScoresDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzhi.vo.drawlots.*;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-07-04
- */
-@Repository
-public interface DrawLotsScoresMapper extends BaseMapper {
-
- /**
- * 评分--项目列表
- */
- List groupScores(Long sceneId,String projectName,Long groupId);
-
- /**
- * 评分--列表里每个角色的评分详情
- */
- List groupJudgeScores(Long groupId, Long projectId);
-
- /**
- * 某评委的评分列表
- */
- List queryItems(Long judgeId);
-
- /**
- * 排序
- */
- List groupRank(Long groupId);
-
- /**
- * 最初前4
- */
- List beforeHand4Project(Long groupId);
-
- /**
- * 前4
- */
- List hand4Project(Long groupId);
-
- /**
- * 负责人
- */
- String groupLeader(Long groupId);
-
- /**
- * 最终排位结果
- */
- List rank(Long sceneId,Long groupId,String projectName);
-
-}
diff --git a/src/main/java/com/zhongzhi/dao/MatchDictDAO.java b/src/main/java/com/zhongzhi/dao/MatchDictDAO.java
index 087cd87..174293d 100644
--- a/src/main/java/com/zhongzhi/dao/MatchDictDAO.java
+++ b/src/main/java/com/zhongzhi/dao/MatchDictDAO.java
@@ -21,19 +21,7 @@ import java.util.List;
@Repository
public interface MatchDictDAO extends BaseMapper {
- IPage getSeedTrackMatchPage(Page page, String matchType);
+ IPage getSeedTrackMatchPage(Page page);
List getList(@Param("projectType") String projectType, @Param("projectGroup") String projectGroup);
-
- /**
- * 职教
- */
- MatchDictDO getVocationalCurrentMatch(Long memberId,String progress);
-
- /**
- * 种子
- * @return
- */
- MatchDictDO getSeedCurrentMatch(Long memberId,String progress);
-
}
diff --git a/src/main/java/com/zhongzhi/dao/ProjectDAO.java b/src/main/java/com/zhongzhi/dao/ProjectDAO.java
index 742189e..282ea25 100644
--- a/src/main/java/com/zhongzhi/dao/ProjectDAO.java
+++ b/src/main/java/com/zhongzhi/dao/ProjectDAO.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhongzhi.model.ProjectDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhongzhi.vo.project.*;
-import com.zhongzhi.vo.student.JudgeThemeDoneVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -22,21 +21,19 @@ import java.util.List;
@Repository
public interface ProjectDAO extends BaseMapper {
- IPage getListPage(Page page, Long matchId, Long proposerId, String projectType);
+ IPage getListPage(Page page, Long matchId, Long proposerId);
IPage getMainTrackProjectPage(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
String projectSchedule,
String projectStatus, String itemField, @Param("name") String name);
- IPage getSeedTrackProjectPage(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
+ IPage getSeedTrackProjectPage(Page page, Long matchId, String projectGroup,String projectTrack, @Param("type") String type,
@Param("school") String school, String projectSchedule,
- String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress,@Param("themeName")String themeName);
+ String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress,Long userId,String college,String projectType,String xueyuan);
- IPage getSeedTrackProjectPageCity(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
- @Param("school") String school, String projectSchedule,
- String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress,@Param("themeName")String themeName);
-
- IPage getReviewList(Page page, String projectName, String projectGroup, String schoolReview, Long matchId, String projectStatus, String schoolAssigned,String projectProgress);
+ IPage getReviewList(Page page, String projectName, String projectGroup, String projectReview, Long matchId, String projectSchedule,
+ String projectAssigned,String projectProgress,String projectTrack,Long userId,String college,
+ String xueyuan,String projectType);
IPage getProjectReviewPage(Page page, Long judgeId, Long matchId, String projectName, String projectSchedule, String projectReview, String projectGroup,String projectProgress);
@@ -44,7 +41,7 @@ public interface ProjectDAO extends BaseMapper {
List getProjectByCollege(Long matchId, @Param("name") String name, String projectProgress);
- List getSeedTrackProjectList(Long matchId, String projectGroup, @Param("name") String name,@Param("projectProgress")String projectProgress);
+ List getSeedTrackProjectList(Long matchId, String projectGroup, @Param("name") String name,@Param("projectProgress")String projectProgress,Long userId,String college);
List selectListByCollege(String projectType, String projectGroup, @Param("name") String name);
@@ -58,11 +55,19 @@ public interface ProjectDAO extends BaseMapper {
List projects(Long matchId,Long collegeId,String college);
- Integer attendCount(Long userId,String matchDate);
+ Integer collegeNum();
+
+ List getVocationalReviewNum(Long userId,Long matchId,String college);
+
+ List getVocationalAssignNum(Long userId,Long matchId,String college);
+
+ List exportProjectReview(Long userId,Long matchId,String projectSchedule,String college);
+
+ List getDateList(Long matchId);
- List judgeThemeDone(Long studentId, Long matchId);
+ List collegeProjects(String xueyuan,String major,Long matchId);
- ProjectDO existProject(Long studentId,Long matchId,String projectGroup,String themeName,String projectStatus,String progress);
+ Integer projectMembers(Long project,String type);
- ProjectDO existVocationalProject(Long studentId,Long matchId,String projectGroup,String themeName,String projectStatus);
+ ProjectProgressCntVO projectProgressCnt(List projectIds);
}
diff --git a/src/main/java/com/zhongzhi/dao/ProjectJudgeDAO.java b/src/main/java/com/zhongzhi/dao/ProjectJudgeDAO.java
index 79dd8b7..1789d95 100644
--- a/src/main/java/com/zhongzhi/dao/ProjectJudgeDAO.java
+++ b/src/main/java/com/zhongzhi/dao/ProjectJudgeDAO.java
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
@Repository
public interface ProjectJudgeDAO extends BaseMapper {
- IPage getProjectJudgePage(Page page, String username, Integer status);
+ IPage getProjectJudgePage(Page page, String username, Integer status,String projectTrack);
IPage projectJudgesAssigned(Page page, @Param("matchId") Long matchId, @Param("projectGroup") String projectGroup, @Param("projectSchedule") String projectSchedule);
}
diff --git a/src/main/java/com/zhongzhi/dao/MatchCollegeCountDAO.java b/src/main/java/com/zhongzhi/dao/ProjectTrackDAO.java
similarity index 64%
rename from src/main/java/com/zhongzhi/dao/MatchCollegeCountDAO.java
rename to src/main/java/com/zhongzhi/dao/ProjectTrackDAO.java
index d13a8c0..031ad16 100644
--- a/src/main/java/com/zhongzhi/dao/MatchCollegeCountDAO.java
+++ b/src/main/java/com/zhongzhi/dao/ProjectTrackDAO.java
@@ -1,18 +1,16 @@
package com.zhongzhi.dao;
-import com.zhongzhi.model.MatchCollegeCountDO;
+import com.zhongzhi.model.ProjectTrackDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
/**
- *
- * Mapper 接口
- *
- *
- * @author DengMin
- * @since 2025-06-10
- */
-@Repository
-public interface MatchCollegeCountDAO extends BaseMapper {
+*
+ * 赛道字典表 Mapper 接口
+ *
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+ public interface ProjectTrackDAO extends BaseMapper {
-}
+ }
diff --git a/src/main/java/com/zhongzhi/dto/project/AttendCountDTO.java b/src/main/java/com/zhongzhi/dto/administer/AdministerTracksDTO.java
similarity index 57%
rename from src/main/java/com/zhongzhi/dto/project/AttendCountDTO.java
rename to src/main/java/com/zhongzhi/dto/administer/AdministerTracksDTO.java
index 94f22bb..9d3421b 100644
--- a/src/main/java/com/zhongzhi/dto/project/AttendCountDTO.java
+++ b/src/main/java/com/zhongzhi/dto/administer/AdministerTracksDTO.java
@@ -1,14 +1,10 @@
-package com.zhongzhi.dto.project;
+package com.zhongzhi.dto.administer;
import lombok.Data;
@Data
-public class AttendCountDTO {
+public class AdministerTracksDTO {
private Long userId;
- private String matchDate;
-
- private Long matchId;
-
}
diff --git a/src/main/java/com/zhongzhi/dto/administer/CreateAdministerDTO.java b/src/main/java/com/zhongzhi/dto/administer/CreateAdministerDTO.java
new file mode 100644
index 0000000..49ffad0
--- /dev/null
+++ b/src/main/java/com/zhongzhi/dto/administer/CreateAdministerDTO.java
@@ -0,0 +1,15 @@
+package com.zhongzhi.dto.administer;
+
+import com.zhongzhi.model.AdministerDO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CreateAdministerDTO extends AdministerDO {
+
+ private List trackIds;
+
+ private List permissionIds;
+
+}
diff --git a/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java b/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java
index 042a0cf..16c1c51 100644
--- a/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java
+++ b/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java
@@ -8,4 +8,9 @@ public class LoginDTO {
private String telephone;
private String code;
+
+
+ private String accountName;
+
+ private String password;
}
diff --git a/src/main/java/com/zhongzhi/dto/college/GetCollegesListDTO.java b/src/main/java/com/zhongzhi/dto/college/GetCollegesListDTO.java
index 25db159..f03300f 100644
--- a/src/main/java/com/zhongzhi/dto/college/GetCollegesListDTO.java
+++ b/src/main/java/com/zhongzhi/dto/college/GetCollegesListDTO.java
@@ -11,7 +11,4 @@ public class GetCollegesListDTO {
private String name;
- private String education;
-
- private Long sceneId;
}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/AddJudgeDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/AddJudgeDTO.java
deleted file mode 100644
index b943718..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/AddJudgeDTO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AddJudgeDTO {
-
- private List judgeIds;
-
- private Long sceneId;
-
- /**
- * 专家类型
- */
- private String expectorType;
-
- /**
- * 角色类型
- */
- private String roleType;
-
- private List ids;
-
- private Long groupId;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/AddProjectToSceneDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/AddProjectToSceneDTO.java
deleted file mode 100644
index 949798e..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/AddProjectToSceneDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AddProjectToSceneDTO {
-
- private List projectIds;
-
- private Long sceneId;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/AllGroupItemsDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/AllGroupItemsDTO.java
deleted file mode 100644
index 26e9764..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/AllGroupItemsDTO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-@Data
-public class AllGroupItemsDTO {
-
- private Long sceneId;
-
- private String projectName;
-
- private String college;
-
- private Integer pageSize;
-
- private Integer pageNum;
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/CollegeProjectsDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/CollegeProjectsDTO.java
deleted file mode 100644
index 90fc95e..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/CollegeProjectsDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-@Data
-public class CollegeProjectsDTO {
-
- private Long matchId;
-
- private Long sceneId;
-
- private String college;
-
- private Integer pageSize;
-
- private Integer pageNum;
-
- private String projectProgress;
-
- private String projectSchedule;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/DrawLoginDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/DrawLoginDTO.java
deleted file mode 100644
index 9cdc137..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/DrawLoginDTO.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-@Data
-public class DrawLoginDTO {
-
- private String name;
-
-}
-
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/GroupScoresDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/GroupScoresDTO.java
deleted file mode 100644
index 5ab998e..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/GroupScoresDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-@Data
-public class GroupScoresDTO {
-
- private Long sceneId;
-
- private String projectName;
-
- private Long groupId;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/JudgeScoreScreenDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/JudgeScoreScreenDTO.java
deleted file mode 100644
index 3ec4909..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/JudgeScoreScreenDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class JudgeScoreScreenDTO {
-
- private Long groupId;
-
- private List groupNums;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/drawlots/MatchProjectsDTO.java b/src/main/java/com/zhongzhi/dto/drawlots/MatchProjectsDTO.java
deleted file mode 100644
index 7cc6ded..0000000
--- a/src/main/java/com/zhongzhi/dto/drawlots/MatchProjectsDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zhongzhi.dto.drawlots;
-
-import lombok.Data;
-
-@Data
-public class MatchProjectsDTO {
-
- private Long matchId;
-
- private Long sceneId;
-
- private String projectSchedule;
-}
diff --git a/src/main/java/com/zhongzhi/dto/judge/MatchJudgesDTO.java b/src/main/java/com/zhongzhi/dto/judge/MatchJudgesDTO.java
deleted file mode 100644
index 4db5b42..0000000
--- a/src/main/java/com/zhongzhi/dto/judge/MatchJudgesDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zhongzhi.dto.judge;
-
-import lombok.Data;
-
-@Data
-public class MatchJudgesDTO {
-
- private Long sceneId;
-
- private Long matchId;
-
- private String userName;
-
- private String expectorType;
-
- private String roleType;
-
- private Integer pageSize;
-
- private Integer pageNum;
-}
diff --git a/src/main/java/com/zhongzhi/dto/judge/ProjectJudgePageDTO.java b/src/main/java/com/zhongzhi/dto/judge/ProjectJudgePageDTO.java
index b2927fc..bb283e4 100644
--- a/src/main/java/com/zhongzhi/dto/judge/ProjectJudgePageDTO.java
+++ b/src/main/java/com/zhongzhi/dto/judge/ProjectJudgePageDTO.java
@@ -9,6 +9,8 @@ public class ProjectJudgePageDTO {
private String projectGroup;
+ private String projectTrack;
+
private String projectSchedule;
private String username;
diff --git a/src/main/java/com/zhongzhi/dto/match/MatchDictDTO.java b/src/main/java/com/zhongzhi/dto/match/MatchDictDTO.java
index a271842..b1e0993 100644
--- a/src/main/java/com/zhongzhi/dto/match/MatchDictDTO.java
+++ b/src/main/java/com/zhongzhi/dto/match/MatchDictDTO.java
@@ -1,7 +1,9 @@
package com.zhongzhi.dto.match;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhongzhi.model.MatchScheduleDO;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@@ -24,11 +26,13 @@ public class MatchDictDTO {
/**
* 报名开始时间
*/
+ @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 报名结束时间
*/
+ @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
diff --git a/src/main/java/com/zhongzhi/dto/member/CreateProjectMemberDTO.java b/src/main/java/com/zhongzhi/dto/member/CreateProjectMemberDTO.java
index b6a1334..e8a911e 100644
--- a/src/main/java/com/zhongzhi/dto/member/CreateProjectMemberDTO.java
+++ b/src/main/java/com/zhongzhi/dto/member/CreateProjectMemberDTO.java
@@ -9,8 +9,6 @@ public class CreateProjectMemberDTO {
private Long id;
- private String themeName;
-
/**
* 姓名
*/
@@ -31,10 +29,6 @@ public class CreateProjectMemberDTO {
*/
private String idCard;
- /**
- * 证件类型
- */
- private String idCardType;
/**
* 就读专业
@@ -61,8 +55,6 @@ public class CreateProjectMemberDTO {
*/
private String email;
- private String studyCountry;
-
/**
* 团队成员
*/
@@ -85,6 +77,4 @@ public class CreateProjectMemberDTO {
private String fiveYears;
- private String nation;
-
}
diff --git a/src/main/java/com/zhongzhi/dto/member/MentorDTO.java b/src/main/java/com/zhongzhi/dto/member/MentorDTO.java
index 6605e55..6457eff 100644
--- a/src/main/java/com/zhongzhi/dto/member/MentorDTO.java
+++ b/src/main/java/com/zhongzhi/dto/member/MentorDTO.java
@@ -36,6 +36,4 @@ public class MentorDTO {
* 身份证号
*/
private String idCard;
-
- private String nation;
}
diff --git a/src/main/java/com/zhongzhi/dto/member/TeamMemberDTO.java b/src/main/java/com/zhongzhi/dto/member/TeamMemberDTO.java
index 7668a70..85a1b21 100644
--- a/src/main/java/com/zhongzhi/dto/member/TeamMemberDTO.java
+++ b/src/main/java/com/zhongzhi/dto/member/TeamMemberDTO.java
@@ -38,11 +38,6 @@ public class TeamMemberDTO {
private String idCard;
/**
- * 证件类型
- */
- private String idCardType;
-
- /**
* 学籍号
*/
private String studentNo;
@@ -51,12 +46,4 @@ public class TeamMemberDTO {
* 手机号
*/
private String teamTelephone;
-
- private String email;
-
- private String contractMethod;
-
- private String nation;
-
- private String studyCountry;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/CreateMainTrackProjectDTO.java b/src/main/java/com/zhongzhi/dto/project/CreateMainTrackProjectDTO.java
index 7438733..2a593e6 100644
--- a/src/main/java/com/zhongzhi/dto/project/CreateMainTrackProjectDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/CreateMainTrackProjectDTO.java
@@ -133,11 +133,8 @@ public class CreateMainTrackProjectDTO {
*/
private String materialsName;
-
/**
* 地址
*/
private String materialsUrl;
-
- private String languageType;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/CreateSeedTrackProjectDTO.java b/src/main/java/com/zhongzhi/dto/project/CreateSeedTrackProjectDTO.java
index 70541f5..00dd254 100644
--- a/src/main/java/com/zhongzhi/dto/project/CreateSeedTrackProjectDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/CreateSeedTrackProjectDTO.java
@@ -8,8 +8,6 @@ import java.util.List;
@Data
public class CreateSeedTrackProjectDTO {
- private String themeName;
-
private String projectName;
/**
diff --git a/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java b/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java
index bcb78f2..d3a2870 100644
--- a/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java
@@ -6,156 +6,11 @@ import lombok.Data;
import java.util.List;
@Data
-public class CreateVocationalProjectDTO {
+public class CreateVocationalProjectDTO extends ProjectDO {
private Long id;
/**
- * 所属领域
- */
- private String itemField;
-
- /**
- * 项目LOGO
- */
- private String logoUri;
-
- /**
- * 项目名称
- */
- private String projectName;
-
- /**
- * 项目概述
- */
- private String projectIntro;
-
- /**
- * 国家级重大、重点科研项目的科研成果转化项目
- */
- private String projectTransform;
-
- /**
- * 学校科技成果转化
- */
- private String resultTransfer;
-
- /**
- * 参赛申报人为科技成果的完成人或所有人
- */
- private String competitionOwner;
-
- /**
- * 参赛申报人为科技成果的第一完成人或所有人
- */
- private String competitionFirst;
-
- /**
- * 师生共创
- */
- private String bothInvention;
-
- /**
- * 项目进展
- */
- private String projectProgress;
-
- /**
- * 隐私设置
- */
- private String privacySetting;
-
- /**
- * 类型
- */
- private String materialsType;
-
- /**
- * 大小
- */
- private String materialsSize;
-
- /**
- * 名称
- */
- private String materialsName;
-
- private String languageType;
-
- /**
- * 地址
- */
- private String materialsUrl;
-
-
-
- /**
- * 项目PPT地址
- */
- private String projectPptUrl;
-
- /**
- * 项目PPT类型
- */
- private String projectPptType;
- private String projectPptTypeEn;
-
- private String projectStage;
-
- // 公司信息
- /**
- * 公司名称
- */
- private String companyName;
-
- /**
- * 法人姓名
- */
- private String legalPersonName;
-
- /**
- * 职务
- */
- private String position;
-
- /**
- * 注册资金
- */
- private String registerFund;
-
- /**
- * 注册时间
- */
- private String registerDate;
-
- /**
- * 注册省份
- */
- private String registerProvince;
-
- /**
- * 注册地址
- */
- private String registerAddress;
-
- /**
- * 统一社会信用代码
- */
- private String unifyCode;
-
- /**
- * 财务报表
- */
- private String financialStatement;
-
- /**
- * 项目是否获得投资
- */
- private String investment;
-
- private String vodUrl;
-
- /**
* 股权结构
*/
private List ownership;
@@ -189,20 +44,4 @@ public class CreateVocationalProjectDTO {
* 商标
*/
private List trademark;
-
- private String projectPptUrlEn;
-
- private String projectPptNameEn;
-
- private String projectNameEn;
-
- /**
- * 项目PPT名称
- */
- private String projectPptName;
-
- private List projectMaterialsEn;
-
- private List projectMaterialsCn;
-
}
diff --git a/src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java b/src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java
index f372fdd..926af09 100644
--- a/src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java
@@ -8,4 +8,6 @@ public class DataOverviewDTO {
private String projectGroup;
private String projectType;
+
+ private Long matchId;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/DownloadCulturalPDFDTO.java b/src/main/java/com/zhongzhi/dto/project/DownloadCulturalPDFDTO.java
deleted file mode 100644
index 0a485ad..0000000
--- a/src/main/java/com/zhongzhi/dto/project/DownloadCulturalPDFDTO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zhongzhi.dto.project;
-
-import lombok.Data;
-
-@Data
-public class DownloadCulturalPDFDTO {
-
- private String themeName;
-
-}
diff --git a/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java b/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java
index e818e8b..5e7d23e 100644
--- a/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java
@@ -6,44 +6,48 @@ import lombok.Data;
@Data
public class ExportProjectDTO {
-
-
- @ExcelColumn(col = 1, value = "序号")
- private String id;
-
- @ExcelColumn(col = 2, value = "届数")
+ @ExcelColumn(col = 1, value = "届数")
private String matchName;
- @ExcelColumn(col = 3, value = "项目名称")
+ @ExcelColumn(col = 2, value = "项目名称")
private String projectName;
+ @ExcelColumn(col = 3, value = "项目简介")
+ private String projectIntro;
+
@ExcelColumn(col = 4, value = "组别")
- private String projectProgress;
+ private String projectGroup;
+
+ @ExcelColumn(col = 5, value = "项目类型")
+ private String projectType;
+
+ @ExcelColumn(col = 6, value = "所属行业")
+ private String classification;
- @ExcelColumn(col = 5, value = "负责人")
+ @ExcelColumn(col = 7, value = "负责人")
private String name;
- @ExcelColumn(col = 6, value = "院校")
+// @ExcelColumn(col = 8, value = "院校")
private String college;
- @ExcelColumn(col = 7, value = "学籍号")
- private String studentNo;
+ @ExcelColumn(col = 8, value = "学院")
+ private String xueyuan;
- @ExcelColumn(col = 8, value = "专业")
+ @ExcelColumn(col = 9, value = "专业")
private String major;
- @ExcelColumn(col = 9, value = "手机号")
+ @ExcelColumn(col = 10, value = "手机号")
private String telephone;
- @ExcelColumn(col = 10, value = "团队成员")
+ @ExcelColumn(col = 11, value = "团队成员")
private String teamMembers;
- @ExcelColumn(col = 11, value = "指导老师")
+ @ExcelColumn(col = 12, value = "指导老师")
private String teachers;
- @ExcelColumn(col = 12, value = "项目阶段")
+ @ExcelColumn(col = 13, value = "项目阶段")
private String projectSchedule;
- @ExcelColumn(col = 13, value = "项目状态")
+ @ExcelColumn(col = 14, value = "项目状态")
private String projectStatus;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/PrintAttachmentDTO.java b/src/main/java/com/zhongzhi/dto/project/PrintAttachmentDTO.java
index be0597f..ece80bd 100644
--- a/src/main/java/com/zhongzhi/dto/project/PrintAttachmentDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/PrintAttachmentDTO.java
@@ -12,6 +12,4 @@ public class PrintAttachmentDTO {
private String printAttachmentName;
private String projectGroup;
-
- private String themeName;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/ProjectCollegeListDTO.java b/src/main/java/com/zhongzhi/dto/project/ProjectCollegeListDTO.java
index 1e757d8..70f3fc7 100644
--- a/src/main/java/com/zhongzhi/dto/project/ProjectCollegeListDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/ProjectCollegeListDTO.java
@@ -15,5 +15,7 @@ public class ProjectCollegeListDTO {
private Long matchId;
+ private Long userId;
+
private String projectProgress;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java b/src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java
index bbd2d52..3560145 100644
--- a/src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java
@@ -11,9 +11,13 @@ public class ProjectListPageDTO {
private String projectGroup;
+ private String projectType;
+
+ private String projectTrack;
+
private String itemField;
- private String name;
+ private String projectName;
private Long matchId;
@@ -23,5 +27,7 @@ public class ProjectListPageDTO {
private Integer pageSize;
- private String themeName;
+ private Long userId;
+
+ private String xueyuan;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/ReviewListDTO.java b/src/main/java/com/zhongzhi/dto/project/ReviewListDTO.java
index ef350a8..f9b3aea 100644
--- a/src/main/java/com/zhongzhi/dto/project/ReviewListDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/ReviewListDTO.java
@@ -30,7 +30,16 @@ public class ReviewListDTO {
private String projectAssigned;
+ private String projectTrack;
+
private String projectSchedule;
private String projectProgress;
+
+ private Long userId;
+
+ private String xueyuan;
+
+ private String projectType;
+
}
diff --git a/src/main/java/com/zhongzhi/dto/project/ReviewVocationalNumDTO.java b/src/main/java/com/zhongzhi/dto/project/ReviewVocationalNumDTO.java
index 9f8714c..5b17dc9 100644
--- a/src/main/java/com/zhongzhi/dto/project/ReviewVocationalNumDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/ReviewVocationalNumDTO.java
@@ -12,4 +12,6 @@ public class ReviewVocationalNumDTO {
private String projectStatus;
private Long projectJudgeId;
+
+ private String projectSchedule;
}
diff --git a/src/main/java/com/zhongzhi/dto/project/SeedTrackProjectNumDTO.java b/src/main/java/com/zhongzhi/dto/project/SeedTrackProjectNumDTO.java
index 088eb0c..c569ee8 100644
--- a/src/main/java/com/zhongzhi/dto/project/SeedTrackProjectNumDTO.java
+++ b/src/main/java/com/zhongzhi/dto/project/SeedTrackProjectNumDTO.java
@@ -10,4 +10,6 @@ public class SeedTrackProjectNumDTO {
private String projectGroup;
private String projectProgress;
+
+ private Long userId;
}
diff --git a/src/main/java/com/zhongzhi/dto/student/LoginDTO.java b/src/main/java/com/zhongzhi/dto/student/LoginDTO.java
index fbc71c6..22a8c5f 100644
--- a/src/main/java/com/zhongzhi/dto/student/LoginDTO.java
+++ b/src/main/java/com/zhongzhi/dto/student/LoginDTO.java
@@ -7,5 +7,5 @@ public class LoginDTO {
private String telephone;
- private String code;
+ private String verifyCode;
}
diff --git a/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java b/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java
index 30528de..647c5e9 100644
--- a/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java
+++ b/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java
@@ -9,8 +9,6 @@ public class RegisterDTO {
private String idCard;
- private String idCardType;
-
private String telephone;
private String education;
@@ -25,7 +23,5 @@ public class RegisterDTO {
private String code;
- private String sex;
-
- private String className;
+ private String xueyuan;
}
diff --git a/src/main/java/com/zhongzhi/model/AdministerDO.java b/src/main/java/com/zhongzhi/model/AdministerDO.java
index b36b0e4..f1bd03a 100644
--- a/src/main/java/com/zhongzhi/model/AdministerDO.java
+++ b/src/main/java/com/zhongzhi/model/AdministerDO.java
@@ -50,4 +50,6 @@ public class AdministerDO extends BaseModel {
* 角色
*/
private String role;
+
+ private String college;
}
diff --git a/src/main/java/com/zhongzhi/model/MatchCollegeCountDO.java b/src/main/java/com/zhongzhi/model/AdministerTrackMappingDO.java
similarity index 71%
rename from src/main/java/com/zhongzhi/model/MatchCollegeCountDO.java
rename to src/main/java/com/zhongzhi/model/AdministerTrackMappingDO.java
index 26704eb..ce29712 100644
--- a/src/main/java/com/zhongzhi/model/MatchCollegeCountDO.java
+++ b/src/main/java/com/zhongzhi/model/AdministerTrackMappingDO.java
@@ -1,38 +1,33 @@
package com.zhongzhi.model;
- import com.zhongzhi.model.base.BaseModel;
- import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+ import com.zhongzhi.model.base.BaseModel;
+ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
- *
+ * 赛道管理员映射表
*
*
* @author DengMin
-* @since 2025-06-10
+* @since 2025-03-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
- @TableName("match_college_count")
- public class MatchCollegeCountDO extends BaseModel {
+ @TableName("administer_track_mapping")
+ public class AdministerTrackMappingDO extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- private Long matchId;
-
- private String collegeName;
-
- private Integer applyCnt;
+ private Long administerId;
- private String themeName;
+ private Long trackId;
- private String projectProgress;
}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotGroupDictDO.java b/src/main/java/com/zhongzhi/model/DrawLotGroupDictDO.java
deleted file mode 100644
index 533b990..0000000
--- a/src/main/java/com/zhongzhi/model/DrawLotGroupDictDO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zhongzhi.model;
-
-import com.zhongzhi.model.base.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("draw_lot_group_dict")
-public class DrawLotGroupDictDO extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- private Long sceneId;
-
- /**
- * 赛组名称
- */
- private String groupName;
-
- /**
- * 赛位数量
- */
- private Integer projectCnt;
-
- /**
- * 行业专家数量
- */
- private Integer fieldCnt;
-
- /**
- * 教学专家数量
- */
- private Integer teachCnt;
-
-
-
-
-}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotsGroupItemsDO.java b/src/main/java/com/zhongzhi/model/DrawLotsGroupItemsDO.java
deleted file mode 100644
index 7cd909d..0000000
--- a/src/main/java/com/zhongzhi/model/DrawLotsGroupItemsDO.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.zhongzhi.model;
-
-import com.zhongzhi.model.base.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("draw_lots_group_items")
-public class DrawLotsGroupItemsDO extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 现场id
- */
- private Long sceneId;
-
- /**
- * 项目id
- */
- private Long projectId;
-
- /**
- * 赛组id
- */
- private Long groupId;
-
- /**
- * 编号
- */
- private Integer groupNum;
-
- /**
- * 分数
- */
- private String totalScore;
-
- /**
- * 排序
- */
- private Integer orderNo;
-
-
-}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotsGroupJudgesDO.java b/src/main/java/com/zhongzhi/model/DrawLotsGroupJudgesDO.java
deleted file mode 100644
index 363d3e3..0000000
--- a/src/main/java/com/zhongzhi/model/DrawLotsGroupJudgesDO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zhongzhi.model;
-
-import com.zhongzhi.model.base.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- * 赛组评委表
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("draw_lots_group_judges")
-public class DrawLotsGroupJudgesDO extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 赛事id
- */
- private Long matchId;
-
- private Long sceneId;
-
- /**
- * 组别id
- */
- private Long groupId;
-
- /**
- * 编号
- */
- private Integer groupNum;
-
- /**
- * 专家类型
- */
- private String expectorType;
-
- /**
- * 评委id
- */
- private Long judgeId;
-
- /**
- * 角色类型
- */
- private String roleType;
-
-}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotsScenesDO.java b/src/main/java/com/zhongzhi/model/DrawLotsScenesDO.java
deleted file mode 100644
index 06d5087..0000000
--- a/src/main/java/com/zhongzhi/model/DrawLotsScenesDO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zhongzhi.model;
-
-import com.zhongzhi.model.base.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("draw_lots_scenes")
-public class DrawLotsScenesDO extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 赛事id
- */
- private Long matchId;
-
- private String sceneName;
-
- private String sceneDate;
-
- private String openStatus;
-
- /**
- * 排位赛刷新状态
- */
- private String rankStatus;
-
-}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotsScoresDO.java b/src/main/java/com/zhongzhi/model/DrawLotsScoresDO.java
deleted file mode 100644
index 1c9c684..0000000
--- a/src/main/java/com/zhongzhi/model/DrawLotsScoresDO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zhongzhi.model;
-
-import com.zhongzhi.model.base.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author DengMin
- * @since 2025-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("draw_lots_scores")
-public class DrawLotsScoresDO extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- private Long sceneId;
-
- private Long judgeId;
-
- private Long projectId;
-
- private String score;
-
- private Long groupId;
-
- private String submitStatus;
-
-
-}
diff --git a/src/main/java/com/zhongzhi/model/MatchDictDO.java b/src/main/java/com/zhongzhi/model/MatchDictDO.java
index fd31bd5..90b7394 100644
--- a/src/main/java/com/zhongzhi/model/MatchDictDO.java
+++ b/src/main/java/com/zhongzhi/model/MatchDictDO.java
@@ -1,5 +1,8 @@
package com.zhongzhi.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.std.DateDeserializers;
import com.zhongzhi.model.base.BaseModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -41,11 +44,15 @@ public class MatchDictDO extends BaseModel {
/**
* 报名开始时间
*/
+ @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
+ @JsonDeserialize(using = DateDeserializers.DateDeserializer.class)
private Date startTime;
/**
* 报名结束时间
*/
+ @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
+ @JsonDeserialize(using = DateDeserializers.DateDeserializer.class)
private Date endTime;
/**
diff --git a/src/main/java/com/zhongzhi/model/ProjectDO.java b/src/main/java/com/zhongzhi/model/ProjectDO.java
index 2c9e843..455b7c5 100644
--- a/src/main/java/com/zhongzhi/model/ProjectDO.java
+++ b/src/main/java/com/zhongzhi/model/ProjectDO.java
@@ -34,174 +34,113 @@ public class ProjectDO extends BaseModel {
private Long proposerId;
/**
- * 主题名称
- */
- private String themeName;
-
- /**
- * 所属领域
- */
- private String itemField;
-
- /**
- * 项目LOGO
- */
- private String logoUri;
-
- /**
* 项目名称
*/
private String projectName;
/**
- * 项目计划名称英文名
- */
- private String projectNameEn;
-
- /**
- * 组别
- */
- private String projectGroup;
-
- /**
- * 赛事年份
- */
- private Long matchId;
-
- /**
- * 申报项目时所在院校
- */
- private String college;
-
- /**
- * 类别
- */
- private String classification;
-
- /**
- * 所在地址
- */
- private String address;
-
- /**
* 项目概述
*/
private String projectIntro;
/**
- * 设计背景
+ * 参赛赛道
*/
- private String projectCreativity;
+ private String projectTrack;
/**
- * 科学设计
+ * 组别
*/
- private String scientificPrinciple;
+ private String projectGroup;
/**
- * 应用前景
+ * 成果转化
*/
- private String applicationProspect;
+ private String resultTransfer;
/**
- * 路演形式
+ * 赛事年份
*/
- private String roadShowForm;
+ private Long matchId;
/**
- * 创意实施或实验所受条件的限制
+ * 公司名称
*/
- private String restriction;
+ private String companyName;
/**
- * 国家级重大、重点科研项目的科研成果转化项目
+ * 注册时间
*/
- private String projectTransform;
+ private String registerDate;
/**
- * 学校科技成果转化
+ * 注册地址
*/
- private String resultTransfer;
+ private String registerAddress;
/**
- * 参赛申报人为科技成果的完成人或所有人
+ * 注册资金
*/
- private String competitionOwner;
+ private String registerFund;
/**
- * 参赛申报人为科技成果的第一完成人或所有人
+ * 营业执照
*/
- private String competitionFirst;
+ private String businessLicense;
- /**
- * 师生共创
- */
- private String bothInvention;
+ private String projectAttachment;
- /**
- * 项目进展
- */
- private String projectProgress;
+ private String projectAttachmentName;
- /**
- * 项目阶段
- */
- private String projectStage;
+ private String projectAttachmentType;
- /**
- * 公司名称
- */
- private String companyName;
+ private String competitionFirst;
- /**
- * 法人身份
- */
- private String legalPersonStatus;
+ private String vodUrl;
- /**
- * 法人姓名
- */
- private String legalPersonName;
+ private String logoUri;
/**
- * 职务
+ * 项目PPT
*/
- private String position;
+ private String projectPptUrl;
/**
- * 注册资金
+ * 项目PPT类型
*/
- private String registerFund;
+ private String projectPptType;
/**
- * 注册时间
+ * 项目PPT名称
*/
- private String registerDate;
+ private String projectPptName;
+
+ private String identityCertificate;
/**
- * 注册省份
+ * 所属行业
*/
- private String registerProvince;
+ private String classification;
/**
- * 注册地址
+ * 承诺书
*/
- private String registerAddress;
+ private String commitmentLetter;
/**
- * 统一社会信用代码
+ * 参赛证明书
*/
- private String unifyCode;
+ private String participationCertificate;
/**
- * 财务报表
+ * 项目进展
*/
- private String financialStatement;
+ private String projectProgress;
/**
- * 隐私设置
+ * 项目阶段
*/
- private String privacySetting;
+ private String projectStage;
/**
* 项目状态
@@ -219,45 +158,6 @@ public class ProjectDO extends BaseModel {
private String projectType;
/**
- * 上传加盖公章的附件
- */
- private String printAttachment;
-
- /**
- * 上传加盖公章的附件类型
- */
- private String printAttachmentType;
-
- /**
- * 上传加盖公章的附件名称
- */
- private String printAttachmentName;
-
- /**
- * 项目是否获得投资
- */
- private String investment;
-
- /**
- * 项目PPT
- */
- private String projectPptUrl;
-
- /**
- * 项目PPT类型
- */
- private String projectPptType;
-
- private String projectPptTypeEn;
-
- /**
- * 项目PPT名称
- */
- private String projectPptName;
- private String projectPptNameEn;
-
-
- /**
* 评审状态
*/
private String projectReview;
@@ -267,16 +167,10 @@ public class ProjectDO extends BaseModel {
*/
private String projectAssigned;
-// private String schoolReview;
-//
-// private String schoolAssigned;
-
private Integer editStatus;
- private String vodUrl;
-
- private Integer orderNo;
+ private String aboveProvinceReward;
- private String projectPptUrlEn;
+ private String rewardUrl;
}
diff --git a/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java b/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java
index 0444693..900c1bf 100644
--- a/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java
+++ b/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java
@@ -33,6 +33,10 @@ public class ProjectJudgeDO extends BaseModel {
*/
private String username;
+ private String accountName;
+
+ private String password;
+
/**
* 手机号
*/
@@ -70,4 +74,5 @@ public class ProjectJudgeDO extends BaseModel {
private Integer passwordFree;
+
}
diff --git a/src/main/java/com/zhongzhi/model/ProjectMaterialsDO.java b/src/main/java/com/zhongzhi/model/ProjectMaterialsDO.java
index d79ee1e..a874be0 100644
--- a/src/main/java/com/zhongzhi/model/ProjectMaterialsDO.java
+++ b/src/main/java/com/zhongzhi/model/ProjectMaterialsDO.java
@@ -30,8 +30,6 @@ public class ProjectMaterialsDO extends BaseModel {
*/
private Long projectId;
- private String languageType;
-
/**
* 类型
*/
diff --git a/src/main/java/com/zhongzhi/model/ProjectMemberDO.java b/src/main/java/com/zhongzhi/model/ProjectMemberDO.java
index 47046bf..b66ddea 100644
--- a/src/main/java/com/zhongzhi/model/ProjectMemberDO.java
+++ b/src/main/java/com/zhongzhi/model/ProjectMemberDO.java
@@ -50,11 +50,6 @@ public class ProjectMemberDO extends BaseModel {
*/
private String idCard;
- /**
- * 证件类型
- */
- private String idCardType;
-
/**
* 就读专业
@@ -86,8 +81,6 @@ public class ProjectMemberDO extends BaseModel {
*/
private String position;
- private String contractMethod;
-
/**
* 手机号
*/
@@ -105,7 +98,5 @@ public class ProjectMemberDO extends BaseModel {
private String fiveYears;
- private String nation;
- private String studyCountry;
}
diff --git a/src/main/java/com/zhongzhi/model/DrawLotsJudgeNumDO.java b/src/main/java/com/zhongzhi/model/ProjectTrackDO.java
similarity index 77%
rename from src/main/java/com/zhongzhi/model/DrawLotsJudgeNumDO.java
rename to src/main/java/com/zhongzhi/model/ProjectTrackDO.java
index ad75583..eb2cbc9 100644
--- a/src/main/java/com/zhongzhi/model/DrawLotsJudgeNumDO.java
+++ b/src/main/java/com/zhongzhi/model/ProjectTrackDO.java
@@ -9,25 +9,23 @@ package com.zhongzhi.model;
/**
*
- *
+ * 赛道字典表
*
*
* @author DengMin
-* @since 2025-07-10
+* @since 2025-03-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
- @TableName("draw_lots_judge_num")
- public class DrawLotsJudgeNumDO extends BaseModel {
+ @TableName("project_track")
+ public class ProjectTrackDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- private Long groupId;
-
- private Integer groupNum;
+ private String projectTrack;
}
diff --git a/src/main/java/com/zhongzhi/model/StudentDO.java b/src/main/java/com/zhongzhi/model/StudentDO.java
index c732071..e64f3da 100644
--- a/src/main/java/com/zhongzhi/model/StudentDO.java
+++ b/src/main/java/com/zhongzhi/model/StudentDO.java
@@ -33,26 +33,17 @@ public class StudentDO extends BaseModel {
*/
private String name;
- private String className;
-
/**
* 头像
*/
private String avatar;
- private String sex;
-
/**
* 身份证号
*/
private String idCard;
/**
- * 证件类型
- */
- private String idCardType;
-
- /**
* 手机号
*/
private String telephone;
@@ -68,6 +59,11 @@ public class StudentDO extends BaseModel {
private String college;
/**
+ * 就读学院
+ */
+ private String xueyuan;
+
+ /**
* 就读专业
*/
private String major;
@@ -82,5 +78,4 @@ public class StudentDO extends BaseModel {
*/
private String graduateDate;
-
}
diff --git a/src/main/java/com/zhongzhi/service/AdministerService.java b/src/main/java/com/zhongzhi/service/AdministerService.java
index f1b6d04..31c0200 100644
--- a/src/main/java/com/zhongzhi/service/AdministerService.java
+++ b/src/main/java/com/zhongzhi/service/AdministerService.java
@@ -20,4 +20,6 @@ public interface AdministerService extends IService {
AdministerVO login(LoginDTO loginDTO);
IPage getAdministerPage(AdministerPageDTO administerPageDTO);
+
+ void updateAdminister(AdministerDO administerDO);
}
diff --git a/src/main/java/com/zhongzhi/service/MatchCollegeCountService.java b/src/main/java/com/zhongzhi/service/AdministerTrackMappingService.java
similarity index 56%
rename from src/main/java/com/zhongzhi/service/MatchCollegeCountService.java
rename to src/main/java/com/zhongzhi/service/AdministerTrackMappingService.java
index 9edd13b..6ce83b9 100644
--- a/src/main/java/com/zhongzhi/service/MatchCollegeCountService.java
+++ b/src/main/java/com/zhongzhi/service/AdministerTrackMappingService.java
@@ -1,16 +1,23 @@
package com.zhongzhi.service;
-import com.zhongzhi.model.MatchCollegeCountDO;
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzhi.model.ProjectTrackDO;
+
+import java.util.List;
/**
*
- * 服务类
+ * 赛道管理员映射表 服务类
*
*
* @author DengMin
-* @since 2025-06-10
+* @since 2025-03-28
*/
- public interface MatchCollegeCountService extends IService {
+public interface AdministerTrackMappingService extends IService {
+
+ List administerTracks(AdministerTracksDTO administerTracksDTO);
+
- }
+}
diff --git a/src/main/java/com/zhongzhi/service/CollegesDictService.java b/src/main/java/com/zhongzhi/service/CollegesDictService.java
index 9d2ed6d..46d2937 100644
--- a/src/main/java/com/zhongzhi/service/CollegesDictService.java
+++ b/src/main/java/com/zhongzhi/service/CollegesDictService.java
@@ -22,8 +22,6 @@ public interface CollegesDictService extends IService {
List getCollegeInfo(GetCollegesListDTO getCollegesListDTO);
- List getSceneCollegeInfo(GetCollegesListDTO getCollegesListDTO);
-
CollegesVO login(LoginDTO loginDTO);
IPage getCollegesPage(CollegesPageDTO collegesPageDTO);
diff --git a/src/main/java/com/zhongzhi/service/DrawLotGroupDictService.java b/src/main/java/com/zhongzhi/service/DrawLotGroupDictService.java
deleted file mode 100644
index ea8d14d..0000000
--- a/src/main/java/com/zhongzhi/service/DrawLotGroupDictService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zhongzhi.service;
-
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.vo.drawlots.AllGroupsVO;
-import com.zhongzhi.vo.drawlots.SceneGroupsVO;
-
-import java.util.List;
-
-/**
- *
- * 服务类
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-public interface DrawLotGroupDictService extends IService {
-
- List allGroups(DrawLotGroupDictDO drawLotGroupDictDO);
-
- String addGroup(DrawLotGroupDictDO drawLotGroupDictDO);
-
- String updateGroup(DrawLotGroupDictDO drawLotGroupDictDO);
-
- String deleteGroup(DrawLotGroupDictDO drawLotGroupDictDO);
-
- List sceneGroups(DrawLotGroupDictDO drawLotGroupDictDO);
-}
diff --git a/src/main/java/com/zhongzhi/service/DrawLotsGroupItemsService.java b/src/main/java/com/zhongzhi/service/DrawLotsGroupItemsService.java
deleted file mode 100644
index dbbf2fa..0000000
--- a/src/main/java/com/zhongzhi/service/DrawLotsGroupItemsService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zhongzhi.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhongzhi.dto.drawlots.AddProjectToSceneDTO;
-import com.zhongzhi.dto.drawlots.AllGroupItemsDTO;
-import com.zhongzhi.dto.drawlots.CollegeProjectsDTO;
-import com.zhongzhi.dto.drawlots.MatchProjectsDTO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.vo.drawlots.*;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.List;
-
-/**
- *
- * 服务类
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-public interface DrawLotsGroupItemsService extends IService {
-
- IPage allGroupItems(AllGroupItemsDTO allGroupItemsDTO);
-
- String deleteGroupItem(DrawLotsGroupItemsDO drawLotsGroupItemsDO);
-
- List matchProjects(MatchProjectsDTO matchProjectsDTO);
-
- IPage collegeProjects(CollegeProjectsDTO collegeProjectsDTO);
-
- DrawlotsVO drawlots(DrawLotsGroupItemsDO drawLotsGroupItemsDO);
-
- List groupProjectScreen(DrawLotsGroupItemsDO drawLotsGroupItemsDO);
-
- String addProjectToScene(AddProjectToSceneDTO addProjectToSceneDTO);
-}
diff --git a/src/main/java/com/zhongzhi/service/DrawLotsGroupJudgesService.java b/src/main/java/com/zhongzhi/service/DrawLotsGroupJudgesService.java
deleted file mode 100644
index e41b842..0000000
--- a/src/main/java/com/zhongzhi/service/DrawLotsGroupJudgesService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zhongzhi.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhongzhi.dto.drawlots.AddJudgeDTO;
-import com.zhongzhi.dto.drawlots.DrawLoginDTO;
-import com.zhongzhi.dto.drawlots.JudgeScoreScreenDTO;
-import com.zhongzhi.dto.judge.MatchJudgesDTO;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.model.DrawLotsJudgeNumDO;
-import com.zhongzhi.vo.drawlots.*;
-import com.zhongzhi.vo.judge.JudgeInfoVO;
-
-import java.util.List;
-
-/**
- *
- * 赛组评委表 服务类
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-public interface DrawLotsGroupJudgesService extends IService {
-
- IPage matchJudges(MatchJudgesDTO matchJudgesDTO);
-
- IPage selectJudges(MatchJudgesDTO matchJudgesDTO);
-
- String removeJudge(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- String updateJudge(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- String addJudge(AddJudgeDTO addJudgeDTO);
-
- List selectNoDrawLotsJudge(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- String assignJudge(AddJudgeDTO addJudgeDTO);
-
- DrawlotsVO drawlots(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- List judgeScreen(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- LoginVO login(DrawLoginDTO drawLoginDTO);
-
- List judgeScoreScreen(JudgeScoreScreenDTO judgeScoreScreenDTO);
-
- LeaderFullVO leaderFull(DrawLotGroupDictDO drawLotGroupDictDO);
-
- JudgeFullInfoVO judgeInfo(DrawLotsJudgeNumDO drawLotsJudgeNumDO);
-}
diff --git a/src/main/java/com/zhongzhi/service/DrawLotsScenesService.java b/src/main/java/com/zhongzhi/service/DrawLotsScenesService.java
deleted file mode 100644
index 2307942..0000000
--- a/src/main/java/com/zhongzhi/service/DrawLotsScenesService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zhongzhi.service;
-
-import com.zhongzhi.model.DrawLotsScenesDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.vo.project.AllMatchScenesVO;
-
-import java.util.List;
-
-/**
- *
- * 服务类
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-public interface DrawLotsScenesService extends IService {
-
- List allMatchScenes(DrawLotsScenesDO drawLotsScenesDO);
-
- String addMatchScene(DrawLotsScenesDO drawLotsScenesDO);
-
- String updateMatchScene(DrawLotsScenesDO drawLotsScenesDO);
-
- String deleteMatchScene(DrawLotsScenesDO drawLotsScenesDO);
-}
diff --git a/src/main/java/com/zhongzhi/service/DrawLotsScoresService.java b/src/main/java/com/zhongzhi/service/DrawLotsScoresService.java
deleted file mode 100644
index 714f875..0000000
--- a/src/main/java/com/zhongzhi/service/DrawLotsScoresService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zhongzhi.service;
-
-import com.zhongzhi.dto.drawlots.GroupScoresDTO;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.zhongzhi.model.DrawLotsScoresDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.vo.drawlots.*;
-
-import java.util.List;
-
-/**
- *
- * 服务类
- *
- *
- * @author DengMin
- * @since 2025-07-04
- */
-public interface DrawLotsScoresService extends IService {
-
- List groupScores(GroupScoresDTO groupScoresDTO);
-
- String submit(DrawLotsScoresDO drawLotsScoresDO);
-
- List queryItems(DrawLotsGroupJudgesDO drawLotsGroupJudgesDO);
-
- List groupRank(DrawLotsGroupItemsDO drawLotsGroupItemsDO);
-
- List rankList(DrawLotGroupDictDO drawLotGroupDictDO);
-
- List rank(RankVO rankVO);
-
-// List rankItems(RankVO rankVO);
-}
diff --git a/src/main/java/com/zhongzhi/service/MajorDictService.java b/src/main/java/com/zhongzhi/service/MajorDictService.java
index 636db15..eefe9e6 100644
--- a/src/main/java/com/zhongzhi/service/MajorDictService.java
+++ b/src/main/java/com/zhongzhi/service/MajorDictService.java
@@ -3,8 +3,6 @@ package com.zhongzhi.service;
import com.zhongzhi.model.MajorDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
/**
*
* 专业字典表 服务类
@@ -15,6 +13,4 @@ import java.util.List;
*/
public interface MajorDictService extends IService {
- List getMajorList(MajorDictDO majorDictDO);
-
}
diff --git a/src/main/java/com/zhongzhi/service/MatchDictService.java b/src/main/java/com/zhongzhi/service/MatchDictService.java
index 9408a63..c24b22a 100644
--- a/src/main/java/com/zhongzhi/service/MatchDictService.java
+++ b/src/main/java/com/zhongzhi/service/MatchDictService.java
@@ -18,8 +18,6 @@ import java.util.List;
*/
public interface MatchDictService extends IService {
- List getAllMatch();
-
MatchDictDO getMainTrackMatch();
MatchDictDO getSeedTrackMatch();
@@ -28,33 +26,17 @@ public interface MatchDictService extends IService {
IPage getSeedTrackMatchPage(SelectListPageDTO selectListPageDTO);
- IPage getSeedTrackMatchPageCity(SelectListPageDTO selectListPageDTO);
-
void createMatch(MatchDictDTO matchDictDTO);
- void createHonglvMatch(MatchDictDTO matchDictDTO);
-
List getMatch();
List getList(String projectType, String projectGroup);
IPage getVocationalPage(SelectListPageDTO selectListPageDTO);
- IPage getHonglvPage(SelectListPageDTO selectListPageDTO);
-
- IPage getVocationalPageCity(SelectListPageDTO selectListPageDTO);
-
- IPage getInternationalPage(SelectListPageDTO selectListPageDTO);
-
MatchDictDO getVocationalMatch();
void updateMatchDate(MatchDictDO matchDictDO);
MatchDictDO getMatch(MatchDictDO matchDictDO);
-
- List getSeedTrackMatchAll();
-
- List getVocationalMatchAll();
-
- List getHonglvMatchAll();
}
diff --git a/src/main/java/com/zhongzhi/service/MatchScheduleService.java b/src/main/java/com/zhongzhi/service/MatchScheduleService.java
index 893b80e..79bc00c 100644
--- a/src/main/java/com/zhongzhi/service/MatchScheduleService.java
+++ b/src/main/java/com/zhongzhi/service/MatchScheduleService.java
@@ -3,8 +3,6 @@ package com.zhongzhi.service;
import com.zhongzhi.model.MatchScheduleDO;
import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
/**
*
* 时间安排 服务类
@@ -15,10 +13,4 @@ import java.util.List;
*/
public interface MatchScheduleService extends IService {
- List getMatchSchedule(MatchScheduleDO matchScheduleDO);
-
- List getVocationalMatchSchedule(MatchScheduleDO matchScheduleDO);
-
- List getHonglvMatchSchedule(MatchScheduleDO matchScheduleDO);
-
}
diff --git a/src/main/java/com/zhongzhi/service/PermissionsService.java b/src/main/java/com/zhongzhi/service/PermissionsService.java
index 0dc40af..2eba5c5 100644
--- a/src/main/java/com/zhongzhi/service/PermissionsService.java
+++ b/src/main/java/com/zhongzhi/service/PermissionsService.java
@@ -17,4 +17,7 @@ import java.util.List;
public interface PermissionsService extends IService {
List getPermissionById(Long id);
+
+ List allPermissions();
+
}
diff --git a/src/main/java/com/zhongzhi/service/ProjectJudgeService.java b/src/main/java/com/zhongzhi/service/ProjectJudgeService.java
index e58ad75..a089f13 100644
--- a/src/main/java/com/zhongzhi/service/ProjectJudgeService.java
+++ b/src/main/java/com/zhongzhi/service/ProjectJudgeService.java
@@ -25,8 +25,6 @@ public interface ProjectJudgeService extends IService {
void updateProjectJudge(ProjectJudgeDO projectJudgeDO);
- void removeJudge(ProjectJudgeDO projectJudgeDO);
-
JudgeInfoVO login(LoginDTO loginDTO);
IPage projectJudgesAssigned(ProjectJudgePageDTO projectJudgePageDTO);
diff --git a/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java b/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java
index f95cc6b..a32bc96 100644
--- a/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java
+++ b/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java
@@ -17,7 +17,5 @@ public interface ProjectReviewPeriodService extends IService {
void sendNotice(SendNoticeVO sendNoticeVO);
- Integer selectCountByMatchId(Long judgeId, Long matchId);
+ Integer selectCount(Long judgeId, Long matchId);
Integer selectNotReviewCount(Long judgeId, Long matchId);
}
diff --git a/src/main/java/com/zhongzhi/service/ProjectService.java b/src/main/java/com/zhongzhi/service/ProjectService.java
index a8ea0a6..d5910ce 100644
--- a/src/main/java/com/zhongzhi/service/ProjectService.java
+++ b/src/main/java/com/zhongzhi/service/ProjectService.java
@@ -1,18 +1,15 @@
package com.zhongzhi.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhongzhi.common.utils.ResponseData;
import com.zhongzhi.dto.member.CreateProjectMemberDTO;
import com.zhongzhi.dto.project.*;
import com.zhongzhi.dto.review.ProjectReviewPageDTO;
import com.zhongzhi.dto.review.ProjectReviewScoreDTO;
-import com.zhongzhi.dto.review.SubmittedDTO;
import com.zhongzhi.model.ProjectDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhongzhi.vo.ExcelFieldVO;
import com.zhongzhi.vo.member.ProjectMemberVO;
import com.zhongzhi.vo.project.*;
-import com.zhongzhi.vo.student.JudgeThemeDoneVO;
import java.util.List;
@@ -26,17 +23,17 @@ import java.util.List;
*/
public interface ProjectService extends IService {
- IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO);
+// IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO);
void createMainTrackProject(CreateMainTrackProjectDTO createMainTrackProjectDTO);
- void createProjectMember(CreateProjectMemberDTO createProjectMemberDTO,String progress);
+ void createProjectMember(CreateProjectMemberDTO createProjectMemberDTO);
void withdrawn(ProjectDO projectDO);
- IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO);
+// IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO);
- ProjectDO createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
+ void createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
ProjectInfoVO getMainTrackProjectById();
@@ -44,24 +41,20 @@ public interface ProjectService extends IService {
ProjectInfoVO getSeedTrackProjectById();
- ProjectInfoVO getCulturalProjectById(ProjectDO projectDO);
+ ProjectInfoVO getCulturalProjectById();
IPage getMainTrackProjectPage(ProjectListPageDTO projectListPageDTO);
MainTrackProjectDetailVO getMainTrackProjectDetail(Long id);
- IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO);
+// IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO);
- IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO);
+// IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO);
- IPage getSeedTrackProjectListCity(ProjectListPageDTO projectListPageDTO);
-
- void downloadPDF(String projectGroup,String themeName,String progress);
+ void downloadPDF(String projectGroup);
SeedTrackProjectDetailVO getSeedTrackProjectDetail(Long id);
- SeedTrackProjectDetailVO getSeedTrackProjectDetailCity(Long id);
-
void pass(ApproveDTO approveDTO);
void batchPass(ApproveDTO approveDTO);
@@ -72,7 +65,7 @@ public interface ProjectService extends IService {
void exportProjectList(ProjectCollegeListDTO projectCollegeListDTO);
- void uploadPrintAttachment(PrintAttachmentDTO printAttachmentDTO,String progress);
+ void uploadPrintAttachment(PrintAttachmentDTO printAttachmentDTO);
IPage getReviewList(ReviewListDTO reviewListDTO);
@@ -86,19 +79,11 @@ public interface ProjectService extends IService {
IPage getProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO);
- IPage getProjectReviewPageCity(ProjectReviewPageDTO projectReviewPageDTO);
-
void setScore(ProjectReviewScoreDTO projectReviewScoreDTO);
- void setScoreCity(ProjectReviewScoreDTO projectReviewScoreDTO);
-
void submitted(ProjectReviewScoreDTO projectReviewScoreDTO);
- void submittedCity(ProjectReviewScoreDTO projectReviewScoreDTO);
-
- ProjectMemberVO getProjectMember(String projectGroup,String themeName,String progress);
-
- ProjectMemberVO getVocationalProjectMember(String projectGroup,String themeName);
+ ProjectMemberVO getProjectMember();
ProjectDataOverview getCollegeDataOverview(DataOverviewDTO dataOverviewDTO);
@@ -112,8 +97,6 @@ public interface ProjectService extends IService {
ProjectNumVO getReviewProjectNum(ReviewListDTO reviewListDTO);
- ProjectNumVO getReviewProjectNumCity(ReviewListDTO reviewListDTO);
-
void exportCollegeProject(CollegeProjectDTO collegeProjectDTO);
void getProjectByStudentId(StudentProjectDTO studentProjectDTO);
@@ -122,8 +105,6 @@ public interface ProjectService extends IService {
SeedTrackProjectNumVO getSeedTrackProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
- SeedTrackProjectNumVO getSeedTrackProjectNumCity(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
-
void exportProjectCollegeList(ProjectCollegeListDTO projectCollegeListDTO);
List getList(Long matchId, String name, String projectGroup);
@@ -136,88 +117,42 @@ public interface ProjectService extends IService {
void createVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
- void createHonglvProject(CreateVocationalProjectDTO createVocationalProjectDTO);
-
- void createInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
-
void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
- void updateInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
-
VocationalProjectInfoVO getVocationalProjectById();
- VocationalProjectInfoVO getHonglvProjectById();
-
- VocationalProjectInfoVO getInternationalProjectById();
-
void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
- void createHonglvMember(CreateProjectMemberDTO createProjectMemberDTO);
+ void confirm(ProjectDO projectDO);
void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
- void createInternationalMember(CreateProjectMemberDTO createProjectMemberDTO);
-
- void updateInternationalMember(CreateProjectMemberDTO createProjectMemberDTO);
-
ProjectDataOverview getVocationalDataOverview(DataOverviewDTO dataOverviewDTO);
- IPage getVocationalProject(ProjectListPageDTO projectListPageDTO);
-
- IPage getHonglvProject(ProjectListPageDTO projectListPageDTO);
+ List getDateList(DataOverviewDTO dataOverviewDTO);
- IPage getInternationalProject(ProjectListPageDTO projectListPageDTO);
+ IPage getVocationalProject(ProjectListPageDTO projectListPageDTO);
IPage getVocationalReviewList(ReviewListDTO reviewListDTO);
- IPage getHonglvReviewList(ReviewListDTO reviewListDTO);
-
SeedTrackProjectDetailVO getVocationalProjectDetail(Long id);
- SeedTrackProjectDetailVO getHonglvProjectDetail(Long id);
-
- SeedTrackProjectDetailVO getVocationalProjectDetailCity(Long id);
-
- SeedTrackProjectDetailVO getInternationalProjectDetail(Long id);
-
IPage getVocationalProjectPage(ProjectListPageDTO projectListPageDTO);
- IPage getHonglvProjectPage(ProjectListPageDTO projectListPageDTO);
-
- IPage getVocationalProjectPageCity(ProjectListPageDTO projectListPageDTO);
-
- IPage getInternationalProjectPage(ProjectListPageDTO projectListPageDTO);
-
IPage getVocationalProjectList(ProjectListPageDTO projectListPageDTO);
- IPage getInternationalProjectList(ProjectListPageDTO projectListPageDTO);
-
IPage getVocationalProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO);
- IPage getInternationalProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO);
-
- void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO);
+// void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO);
VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
- VocationalNumVO getHonglvProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
-
- VocationalNumVO getVocationalProjectNumCity(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
-
- VocationalNumVO getInternationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
-
VocationalReviewNumVO getVocationalReviewNum(ReviewListDTO reviewListDTO);
- VocationalReviewNumVO getHonglvReviewNum(ReviewListDTO reviewListDTO);
-
- VocationalReviewNumVO getInternationalReviewNum(ReviewListDTO reviewListDTO);
-
void exportProjectById(ReviewListDTO reviewListDTO);
VocationalProjectNum getReviewVocationalNum(ReviewVocationalNumDTO reviewVocationalNumDTO);
- VocationalProjectNum getReviewInternationalNum(ReviewVocationalNumDTO reviewVocationalNumDTO);
-
void batchUpdateEditStatus(EditStatusDTO editStatusDTO);
void updateEditStatus(EditStatusDTO editStatusDTO);
@@ -226,19 +161,9 @@ public interface ProjectService extends IService {
ProjectAssignNumVO getVocationalAssignNum(ReviewListDTO reviewListDTO);
- ProjectAssignNumVO getHonglvAssignNum(ReviewListDTO reviewListDTO);
-
- ProjectAssignNumVO getInternationalAssignNum(ReviewListDTO reviewListDTO);
-
void importProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
void exportProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
- void exportInternationalByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
-
- String attendCount(AttendCountDTO attendCountDTO);
-
- List judgeThemeDone(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
-
// ProjectDataOverview getCollegeVocationalDataOverview();
}
diff --git a/src/main/java/com/zhongzhi/service/DrawLotsJudgeNumService.java b/src/main/java/com/zhongzhi/service/ProjectTrackService.java
similarity index 69%
rename from src/main/java/com/zhongzhi/service/DrawLotsJudgeNumService.java
rename to src/main/java/com/zhongzhi/service/ProjectTrackService.java
index 0587395..bff9a64 100644
--- a/src/main/java/com/zhongzhi/service/DrawLotsJudgeNumService.java
+++ b/src/main/java/com/zhongzhi/service/ProjectTrackService.java
@@ -1,16 +1,16 @@
package com.zhongzhi.service;
-import com.zhongzhi.model.DrawLotsJudgeNumDO;
+import com.zhongzhi.model.ProjectTrackDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
- * 服务类
+ * 赛道字典表 服务类
*
*
* @author DengMin
-* @since 2025-07-10
+* @since 2025-03-28
*/
- public interface DrawLotsJudgeNumService extends IService {
+ public interface ProjectTrackService extends IService {
}
diff --git a/src/main/java/com/zhongzhi/service/SmsCodeService.java b/src/main/java/com/zhongzhi/service/SmsCodeService.java
index a296b08..694b358 100644
--- a/src/main/java/com/zhongzhi/service/SmsCodeService.java
+++ b/src/main/java/com/zhongzhi/service/SmsCodeService.java
@@ -14,13 +14,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface SmsCodeService extends IService {
- void sendRegisterCode(SmsCodeDO smsCodeDO)throws Exception;
+ void sendRegisterCode(SmsCodeDO smsCodeDO);
- void sendStudentLoginCode(SmsCodeDO smsCodeDO) throws Exception;
+ void sendStudentLoginCode(SmsCodeDO smsCodeDO);
SmsCodeDO getOneByTelePhone(String telephone, String type, String platform);
- void sendAdministerLoginCode(AdministerDO administerDO) throws Exception;
+ void sendAdministerLoginCode(AdministerDO administerDO);
- void sendJudgeLoginCode(SmsCodeDO smsCodeDO)throws Exception ;
+ void sendJudgeLoginCode(SmsCodeDO smsCodeDO);
}
diff --git a/src/main/java/com/zhongzhi/service/impl/AdministerServiceImpl.java b/src/main/java/com/zhongzhi/service/impl/AdministerServiceImpl.java
index a72b7ce..1200e20 100644
--- a/src/main/java/com/zhongzhi/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/zhongzhi/service/impl/AdministerServiceImpl.java
@@ -7,16 +7,18 @@ import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.constant.SmsCode;
import com.zhongzhi.common.exception.HttpException;
import com.zhongzhi.common.utils.JwtUtil;
+import com.zhongzhi.dao.AdministerPermissionDAO;
+import com.zhongzhi.dao.AdministerTrackMappingDAO;
import com.zhongzhi.dto.administer.AdministerPageDTO;
import com.zhongzhi.dto.administer.LoginDTO;
-import com.zhongzhi.model.AdministerDO;
+import com.zhongzhi.model.*;
import com.zhongzhi.dao.AdministerDAO;
-import com.zhongzhi.model.SmsCodeDO;
import com.zhongzhi.service.AdministerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhongzhi.service.PermissionsService;
import com.zhongzhi.service.SmsCodeService;
import com.zhongzhi.vo.administer.AdministerVO;
+import com.zhongzhi.vo.administer.GetAdministerPageVO;
import com.zhongzhi.vo.permission.PermissionVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +44,12 @@ public class AdministerServiceImpl extends ServiceImpl list = permissionsService.getPermissionById(administerDO.getId());
List treeList = new ArrayList();
@@ -92,9 +101,41 @@ public class AdministerServiceImpl extends ServiceImpl()
- .lambda()
- .eq(AdministerDO::getRole, administerPageDTO.getListItem())
- .like(AdministerDO::getUsername, administerPageDTO.getUsername()));
+
+ IPage page1 = this.baseMapper.getAdministerPage(page,administerPageDTO.getListItem(),administerPageDTO.getUsername());
+ List records = page1.getRecords();
+ for (GetAdministerPageVO getAdministerPageVO : records){
+
+ List administerTrackMappingDOS = administerTrackMappingDAO.selectList(new QueryWrapper()
+ .lambda()
+ .eq(AdministerTrackMappingDO::getAdministerId,getAdministerPageVO.getId()));
+ getAdministerPageVO.setAdministerTrackMappingDOS(administerTrackMappingDOS);
+
+ List list = permissionsService.getPermissionById(getAdministerPageVO.getId());
+ List treeList = new ArrayList();
+ list.forEach(permissions -> {
+ if (permissions.getParentId() == null) {
+ treeList.add(permissions);
+ }
+
+ list.forEach(p -> {
+ if (p.getParentId() != null) {
+ if (p.getParentId().equals(permissions.getId())) {
+ if (permissions.getChildNodeList() == null) {
+ permissions.setChildNodeList(new ArrayList<>());
+ }
+ permissions.getChildNodeList().add(p);
+ }
+ }
+ });
+ });
+ getAdministerPageVO.setAdministerPermissionDOS(treeList);
+ }
+ return page1;
+ }
+
+ @Override
+ public void updateAdminister(AdministerDO administerDO){
+ this.baseMapper.updateAdminister(administerDO);
}
}
diff --git a/src/main/java/com/zhongzhi/service/impl/AdministerTrackMappingServiceImpl.java b/src/main/java/com/zhongzhi/service/impl/AdministerTrackMappingServiceImpl.java
new file mode 100644
index 0000000..31f341f
--- /dev/null
+++ b/src/main/java/com/zhongzhi/service/impl/AdministerTrackMappingServiceImpl.java
@@ -0,0 +1,29 @@
+package com.zhongzhi.service.impl;
+
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.zhongzhi.dao.AdministerTrackMappingDAO;
+import com.zhongzhi.model.ProjectTrackDO;
+import com.zhongzhi.service.AdministerTrackMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+*
+ * 赛道管理员映射表 服务实现类
+ *
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@Service
+public class AdministerTrackMappingServiceImpl extends ServiceImpl implements AdministerTrackMappingService {
+
+ @Override
+ public List administerTracks(AdministerTracksDTO administerTracksDTO){
+ return this.baseMapper.administerTracks(administerTracksDTO.getUserId());
+ }
+
+}
diff --git a/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java b/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java
index 8d3a7f0..391f691 100644
--- a/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java
+++ b/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java
@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhongzhi.common.configure.DbContextHolder;
-import com.zhongzhi.common.constant.DBTypeEnum;
import com.zhongzhi.common.constant.Platform;
import com.zhongzhi.common.constant.ProjectSchedule;
import com.zhongzhi.common.constant.ProjectStatus;
@@ -13,9 +11,12 @@ import com.zhongzhi.common.exception.HttpException;
import com.zhongzhi.common.utils.*;
import com.zhongzhi.dao.*;
import com.zhongzhi.dto.college.*;
+import com.zhongzhi.dto.projectJudge.ImportJudge;
import com.zhongzhi.model.*;
import com.zhongzhi.service.CollegesDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzhi.service.ProjectScheduleRecordService;
+import com.zhongzhi.service.ProjectService;
import com.zhongzhi.vo.ExcelFieldVO;
import com.zhongzhi.vo.college.*;
import org.apache.commons.lang3.StringUtils;
@@ -41,6 +42,9 @@ import java.util.*;
public class CollegesDictServiceImpl extends ServiceImpl implements CollegesDictService {
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private MatchCollegePdfMapper matchCollegePdfMapper;
@Autowired
@@ -62,25 +66,15 @@ public class CollegesDictServiceImpl extends ServiceImpl getCollegeInfo(GetCollegesListDTO getCollegesListDTO){
- DbContextHolder.setDbType(DBTypeEnum.db2);
- return this.baseMapper.getCollegeInfo(getCollegesListDTO.getName(),getCollegesListDTO.getEducation(),getCollegesListDTO.getSceneId());
- }
-
- public List getSceneCollegeInfo(GetCollegesListDTO getCollegesListDTO){
- DbContextHolder.setDbType(DBTypeEnum.db2);
- return this.baseMapper.getSceneCollegeInfo(getCollegesListDTO.getName(),getCollegesListDTO.getEducation(),getCollegesListDTO.getSceneId());
+ return this.baseMapper.getCollegeInfo(getCollegesListDTO.getName());
}
@Override
@Transactional(rollbackFor = Exception.class)
public CollegesVO login(LoginDTO loginDTO) {
-
- DbContextHolder.setDbType(DBTypeEnum.db2);
-
CollegesVO collegesVO = new CollegesVO();
CollegesDictDO collegesDict = this.baseMapper.selectOne(new QueryWrapper().lambda()
- .eq(CollegesDictDO::getAccount, loginDTO.getAccount())
- .eq(CollegesDictDO::getName,"上海电子信息职业技术学院"));
+ .eq(CollegesDictDO::getAccount, loginDTO.getAccount()));
if (collegesDict == null) {
throw new HttpException(10060);
}
@@ -107,7 +101,6 @@ public class CollegesDictServiceImpl extends ServiceImpl iPage = this.baseMapper.listPage(page, collegesPageDTO.getName());
return iPage;
@@ -115,8 +108,6 @@ public class CollegesDictServiceImpl extends ServiceImpl().lambda()
.eq(CollegesDictDO::getAccount, collegesDictDO.getAccount()));
if (collegesDict != null) {
@@ -210,7 +201,7 @@ public class CollegesDictServiceImpl extends ServiceImpl iPage = this.baseMapper.getAwardedList(new Page<>(awardedListDTO.getPageNo(), awardedListDTO.getPageSize()),
awardedListDTO.getName());
for (AwardedListVO record : iPage.getRecords()) {
- List list = projectDAO.getList(awardedListDTO.getMatchId(), record.getName(), awardedListDTO.getProjectGroup());
+ List list = projectService.getList(awardedListDTO.getMatchId(), record.getName(), awardedListDTO.getProjectGroup());
if (list != null && list.size() > 0) {
Integer schoolCompetitionNum = 0;
Integer rematchNum = 0;
@@ -272,7 +263,7 @@ public class CollegesDictServiceImpl extends ServiceImpl listAll = this.baseMapper.getAwardedListAll();
for (AwardedListVO awardedListVO : listAll) {
- List list = projectDAO.getList(awardedListDTO.getMatchId(), awardedListVO.getName(), awardedListDTO.getProjectGroup());
+ List list = projectService.getList(awardedListDTO.getMatchId(), awardedListVO.getName(), awardedListDTO.getProjectGroup());
Integer schoolCompetitionNum = 0;
Integer rematchNum = 0;
Integer finalNum = 0;
diff --git a/src/main/java/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.java b/src/main/java/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.java
deleted file mode 100644
index f56ed0b..0000000
--- a/src/main/java/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.zhongzhi.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zhongzhi.common.constant.RoleType;
-import com.zhongzhi.common.exception.HttpException;
-import com.zhongzhi.common.utils.ConstantUtils;
-import com.zhongzhi.dao.DrawLotsGroupItemsMapper;
-import com.zhongzhi.dao.DrawLotsGroupJudgesMapper;
-import com.zhongzhi.model.DrawLotGroupDictDO;
-import com.zhongzhi.dao.DrawLotGroupDictMapper;
-import com.zhongzhi.model.DrawLotsGroupItemsDO;
-import com.zhongzhi.model.DrawLotsGroupJudgesDO;
-import com.zhongzhi.service.DrawLotGroupDictService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzhi.vo.drawlots.AllGroupsVO;
-import com.zhongzhi.vo.drawlots.GroupJudgesVO;
-import com.zhongzhi.vo.drawlots.SceneGroupsVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author DengMin
- * @since 2025-06-19
- */
-@Service
-public class DrawLotGroupDictServiceImpl extends ServiceImpl implements DrawLotGroupDictService {
-
- @Autowired
- private DrawLotsGroupJudgesMapper drawLotsGroupJudgesMapper;
-
- @Autowired
- private DrawLotsGroupItemsMapper drawLotsGroupItemsMapper;
-
- @Override
- public List allGroups(DrawLotGroupDictDO drawLotGroupDictDO) {
-
- List result = new ArrayList<>();
-
- List drawLotGroupDictDOS = this.baseMapper.selectList(new QueryWrapper()
- .lambda()
- .eq(DrawLotGroupDictDO::getSceneId, drawLotGroupDictDO.getSceneId()));
-
- for (DrawLotGroupDictDO dlgd : drawLotGroupDictDOS){
- AllGroupsVO allGroupsVO = new AllGroupsVO();
- BeanUtils.copyProperties(dlgd,allGroupsVO);
- //组长
- List leader = this.baseMapper.groupJudges(dlgd.getId(), RoleType.TEAMLEADER);
- allGroupsVO.setLeader(leader);
- //成员
- List member = this.baseMapper.groupJudges(dlgd.getId(), RoleType.TEAMMEMBER);
- allGroupsVO.setMember(member);
- result.add(allGroupsVO);
- }
- return result;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public String addGroup(DrawLotGroupDictDO drawLotGroupDictDO) {
-
- int count = this.baseMapper.selectCount(new QueryWrapper()
- .lambda()
- .eq(DrawLotGroupDictDO::getSceneId, drawLotGroupDictDO.getSceneId())
- .eq(DrawLotGroupDictDO::getGroupName, drawLotGroupDictDO.getGroupName()));
-
- if (count > 0) {
- throw new HttpException(10035);
- }
-
- this.baseMapper.insert(drawLotGroupDictDO);
- return ConstantUtils.ADD_SUCCESS;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
-
- public String updateGroup(DrawLotGroupDictDO drawLotGroupDictDO) {
-
- int count = this.baseMapper.selectCount(new QueryWrapper()
- .lambda()
- .eq(DrawLotGroupDictDO::getSceneId, drawLotGroupDictDO.getSceneId())
- .eq(DrawLotGroupDictDO::getGroupName, drawLotGroupDictDO.getGroupName())
- .ne(DrawLotGroupDictDO::getId, drawLotGroupDictDO.getId()));
-
- if (count > 0) {
- throw new HttpException(10035);
- }
-
- this.baseMapper.updateById(drawLotGroupDictDO);
- return ConstantUtils.SUCCESS_UPDATE;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public String deleteGroup(DrawLotGroupDictDO drawLotGroupDictDO) {
-
- //删除专家
- drawLotsGroupJudgesMapper.delete(new QueryWrapper()
- .lambda()
- .eq(DrawLotsGroupJudgesDO::getGroupId,drawLotGroupDictDO.getId()));
-
- //删除组别
- drawLotsGroupItemsMapper.delete(new QueryWrapper()
- .lambda()
- .eq(DrawLotsGroupItemsDO::getGroupId,drawLotGroupDictDO.getId()));
-
- this.baseMapper.deleteById(drawLotGroupDictDO.getId());
- return ConstantUtils.DELETE_SUCCESS;
- }
-
- @Override
- public List sceneGroups(DrawLotGroupDictDO drawLotGroupDictDO) {
-
- List result = new ArrayList<>();
- List