update

edu-user/edu-user-biz/java/com/keao/edu/user/UserServerApplication.java

@@ -1,50 +0,0 @@
-package com.keao.edu.user;
-
-import com.huifu.adapay.Adapay;
-import com.huifu.adapay.model.MerConfig;
-import com.keao.edu.thirdparty.adapay.ConfigInit;
-import com.keao.edu.user.service.NotifyCallback;
-import com.spring4all.swagger.EnableSwagger2Doc;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.client.RestTemplate;
-
-@SpringBootApplication
-@EnableDiscoveryClient
-@EnableFeignClients({"com.keao.edu"})
-@MapperScan({"com.keao.edu.user.dao", "com.keao.edu.common.dao"})
-@ComponentScan(basePackages="com.keao.edu")
-@Configuration
-@EnableSwagger2Doc
-@EnableAsync
-public class UserServerApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(UserServerApplication.class, args);
-	}
-
-	@Bean
-	@LoadBalanced
-	public RestTemplate restTemplate() {
-		return new RestTemplate();
-	}
-
-	@Bean
-	public static void startMqtt() {
-		MerConfig merConfig = ConfigInit.merConfig;
-		NotifyCallback notifyCallback = new NotifyCallback();
-		try {
-			Adapay.startMqttListener(merConfig, notifyCallback);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/config/PermissionCheckService.java

@@ -1,49 +0,0 @@
-package com.keao.edu.user.config;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.api.util.SecurityUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-
-@Component("pcs")
-public class PermissionCheckService {
-
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
-	public boolean hasPermissions(String... permissions) {
-		Authentication authentication = SecurityUtils.getAuthentication();
-		if (authentication == null) {
-			return false;
-		}
-
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (user.getIsSuperAdmin()) {
-			return true;
-		}
-
-		Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
-
-		for (String perm : permissions) {
-			for (GrantedAuthority authority : authorities) {
-				if (StringUtils.equalsIgnoreCase(perm, authority.getAuthority())) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public boolean hasRoles(String... roles) {
-
-		return hasPermissions(roles);
-	}
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -1,40 +0,0 @@
-package com.keao.edu.user.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-
-import com.keao.edu.common.security.BaseAccessDeniedHandler;
-import com.keao.edu.common.security.BaseAuthenticationEntryPoint;
-
-@Configuration
-@EnableResourceServer
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
-
-    @Autowired
-    private BaseAccessDeniedHandler baseAccessDeniedHandler;
-
-    @Autowired
-    private BaseAuthenticationEntryPoint baseAuthenticationEntryPoint;
-
-    @Override
-    public void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests()
-                .antMatchers("/task/*","/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList","/studentExamResult/recordSync")
-                .permitAll()
-                .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
-                .authenticationEntryPoint(baseAuthenticationEntryPoint).and();
-    }
-
-    @Override
-    public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
-        resources.authenticationEntryPoint(baseAuthenticationEntryPoint).accessDeniedHandler(baseAccessDeniedHandler);
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/config/WebMvcConfig.java

@@ -1,56 +0,0 @@
-package com.keao.edu.user.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.http.MediaType;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import com.keao.edu.common.config.EnumConverterFactory;
-import com.keao.edu.common.config.LocalFastJsonHttpMessageConverter;
-import com.keao.edu.common.tenant.TenantInterceptor;
-import com.keao.edu.datasource.interceptor.DataSourceInterceptor;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-	/**
-	 * 枚举类的转换器 addConverterFactory
-	 */
-	@Override
-	public void addFormatters(FormatterRegistry registry) {
-		registry.addConverterFactory(new EnumConverterFactory());
-	}
-
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-
-		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns("/**");
-		registry.addInterceptor(getTenantInterceptor()).addPathPatterns("/**");
-	}
-
-	@Bean
-	public DataSourceInterceptor getDataSrouceInterceptor() {
-		return new DataSourceInterceptor();
-	}
-
-	@Bean
-	public TenantInterceptor getTenantInterceptor() {
-		return new TenantInterceptor();
-	}
-	
-	@Bean
-    public HttpMessageConverters fastJsonHttpMessageConverters(){
-		LocalFastJsonHttpMessageConverter converter = new LocalFastJsonHttpMessageConverter();
-        List<MediaType> fastMediaTypes =  new ArrayList<MediaType>();
-        fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
-        converter.setSupportedMediaTypes(fastMediaTypes);
-        return new HttpMessageConverters(converter);
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/config/WebSocketConfig.java

@@ -1,14 +0,0 @@
-package com.keao.edu.user.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-@Configuration
-public class WebSocketConfig {
-
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter () {
-        return new ServerEndpointExporter();
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/AppVersionInfoController.java

@@ -1,72 +0,0 @@
-package com.keao.edu.user.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.user.entity.AppVersionInfo;
-import com.keao.edu.user.service.AppVersionInfoService;
-
-@RequestMapping("appVersionInfo")
-@Api(tags = "APP版本信息服务")
-@RestController
-public class AppVersionInfoController extends BaseController {
-
-	@Autowired
-	private AppVersionInfoService appVersionInfoService;
-
-	@ApiOperation("分页查询")
-	@GetMapping(value = "/list")
-	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/list')")
-	public Object getList(QueryInfo queryInfo) {
-		return succeed(appVersionInfoService.queryPage(queryInfo));
-	}
-
-	@ApiOperation("根据app客户端查询对象")
-	@ApiImplicitParam(name = "platform", value = "平台名称", required = true, dataType = "String", paramType = "path")
-	@GetMapping(value = "/queryByPlatform")
-	public Object queryByPlatform(String platform) {
-		List<AppVersionInfo> list = appVersionInfoService.queryNewestByPlatform(platform);
-		if (list.size() > 0) {
-			return succeed(list.get(0));
-		}
-		return failed();
-	}
-
-	@ApiOperation("单查询")
-	@ApiImplicitParam(name = "id", value = "ID编号", required = true, dataType = "Integer", paramType = "path")
-	@GetMapping(value = "/query")
-	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/query')")
-	public Object query(Integer id) {
-		return succeed(appVersionInfoService.get(id));
-	}
-
-	@ApiOperation("新增")
-	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/add')")
-	public Object add(AppVersionInfo appVersionInfo) {
-		appVersionInfoService.add(appVersionInfo);
-		return succeed();
-	}
-
-	@ApiOperation("更新")
-	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/update')")
-	public Object update(AppVersionInfo appVersionInfo) {
-		appVersionInfoService.updateVersion(appVersionInfo);
-		return succeed();
-	}
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/EmployeeController.java

@@ -1,85 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.page.EmployeeQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("employee")
-@Api(tags = "员工服务")
-public class EmployeeController extends BaseController {
-
-	@Autowired
-	private EmployeeService employeeService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	
-	@ApiOperation("员工服务分页查询")
-	@GetMapping(value = "/list")
-	public HttpResponseResult<PageInfo<Employee>> getList(EmployeeQueryInfo queryInfo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		queryInfo.setUserId(sysUser.getId());
-		/*if(queryInfo.getOrganId() != null){
-			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),true));
-		}*/
-		return succeed(employeeService.queryPage(queryInfo));
-	}
-
-	@ApiOperation("查询员工详情")
-	@ApiImplicitParam(name = "id", value = "员工ID", required = true, dataType = "Integer", paramType = "path")
-	@GetMapping(value = "/query")
-	public HttpResponseResult<Employee> query(Integer id) {
-		return succeed(employeeService.getEmployee(id));
-	}
-
-	@ApiOperation("新增员工")
-	@PostMapping(value = "/add")
-	public HttpResponseResult add(@RequestBody Employee employee) {
-//        SysUser sysUser = sysUserFeignService.queryUserInfo();
-//        employee.setOrganId(sysUser.getId());
-		employee.setTenantId(TenantContextHolder.getTenantId());
-	    employeeService.add(employee);
-		return succeed();
-	}
-
-	@ApiOperation("更新员工")
-	@PostMapping(value = "/update")
-	public HttpResponseResult update(@RequestBody Employee employee) {
-		employeeService.updateEmployee(employee);
-		return succeed();
-	}
-
-	@ApiOperation(value = "获取用户信息")
-	@GetMapping("/queryUserInfo")
-	public Object apiQueryUserInfo() {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser != null && sysUser.getId() != null){
-//			Employee employee = employeeService.get(sysUser.getId());
-//			sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
-//			sysUser.setContactAddress(employee.getContactAddress());
-//			sysUser.setPostalCode(employee.getPostalCode());
-			return succeed(sysUser);
-		}
-		return failed("获取用户信息失败");
-	}
-
-	@ApiOperation("删除")
-	@PostMapping(value = "/del/{id}")
-	public HttpResponseResult add(@PathVariable("id") Integer id) {
-		employeeService.del(id);
-		return succeed();
-	}
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamCertificationController.java

@@ -1,42 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.user.dto.ExamCertificationDto;
-import com.keao.edu.user.dto.NeedCheckingDetailDto;
-import com.keao.edu.user.service.ExamCertificationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("examCertification")
-@Api(tags = "准考证服务")
-public class ExamCertificationController extends BaseController {
-
-    @Autowired
-    private ExamCertificationService examCertificationService;
-
-    @ApiOperation("后台获取学员准考证详情")
-    @GetMapping(value = "findDetailByStudentId")
-    public HttpResponseResult<ExamCertificationDto> findDetailByStudentId(Long examRegistrationId) {
-        return succeed(examCertificationService.findDetailByStudentId(examRegistrationId));
-    }
-
-    @ApiOperation("学生端获取学员准考证列表")
-    @GetMapping(value = "queryCertificationPage")
-    public HttpResponseResult<List<ExamCertificationDto>> queryCertification(Long examRegistrationId) {
-        return succeed(examCertificationService.queryCertificationPage(examRegistrationId));
-    }
-
-    @ApiOperation("学生端待考详情")
-    @GetMapping(value = "needCheckingDetail")
-    public HttpResponseResult<NeedCheckingDetailDto> needCheckingDetail(Long examRegistrationId) {
-        return succeed(examCertificationService.needCheckingDetail(examRegistrationId));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamLocationController.java

@@ -1,77 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.ExamLocation;
-import com.keao.edu.user.page.ExamLocationQueryInfo;
-import com.keao.edu.user.service.ExamLocationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.16
- */
-@RestController
-@RequestMapping("examLocation")
-@Api(tags = "线下考点服务")
-public class ExamLocationController extends BaseController {
-
-    @Autowired
-    private ExamLocationService examLocationService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamLocation>> getList(ExamLocationQueryInfo queryInfo) {
-        if(StringUtils.isBlank(queryInfo.getSearch())){
-            queryInfo.setSearch(null);
-        }
-        return succeed(examLocationService.queryPage(queryInfo));
-    }
-
-    @ApiOperation("获取所在机构所有考点")
-    @GetMapping(value = "/getTenantAllLocations")
-    public HttpResponseResult<List<ExamLocation>> getTenantAllLocations(){
-        return succeed(examLocationService.getTenantAllLocations(TenantContextHolder.getTenantId()));
-    }
-
-    @ApiOperation("查询考点详情")
-    @ApiImplicitParam(name = "id", value = "机构ID", required = true, dataType = "Integer", paramType = "path")
-    @GetMapping(value = "/query")
-    public HttpResponseResult<ExamLocation> query(Integer id) {
-        return succeed(examLocationService.get(id));
-    }
-
-    @ApiOperation("新增考点")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(@RequestBody ExamLocation examLocation) {
-        examLocation.setTenantId(TenantContextHolder.getTenantId());
-        examLocation.setIsAvailable(true);
-        examLocationService.insert(examLocation);
-        return succeed();
-    }
-
-    @ApiOperation("更新考点")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExamLocation examLocation) {
-        examLocation.setUpdateTime(new Date());
-        examLocationService.update(examLocation);
-        return succeed();
-    }
-
-    @ApiOperation("删除考点")
-    @PostMapping(value = "/del")
-    public HttpResponseResult add(Integer id) {
-        return succeed(examLocationService.delete(id));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamManualLedgerController.java

@@ -1,73 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.OrganContextHolder;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
-import com.keao.edu.user.entity.ExamManualLedger;
-import com.keao.edu.user.enums.TransDirectionEnum;
-import com.keao.edu.user.page.ExamManualLedgerQueryInfo;
-import com.keao.edu.user.service.ExamManualLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.07
- */
-@RestController
-@RequestMapping("examManualLedger")
-@Api(tags = "支出记录服务")
-public class ExamManualLedgerController extends BaseController {
-
-    @Autowired
-    private ExamManualLedgerService examManualLedgerService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamManualLedger>> getList(ExamManualLedgerQueryInfo queryInfo) {
-        return succeed(examManualLedgerService.queryExamManualLedgers(queryInfo));
-    }
-
-    @ApiOperation("新增支出记录")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(@RequestBody ExamManualLedger examManualLedger) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examManualLedger.setTransDirection(TransDirectionEnum.EXPENDITURE);
-        examManualLedger.setTenantId(TenantContextHolder.getTenantId());
-        examManualLedger.setOperatorUserId(sysUser.getId());
-        examManualLedger.setOrganId(OrganContextHolder.getOrganId());
-        examManualLedgerService.addExamManualLedger(examManualLedger);
-        return succeed();
-    }
-
-    @ApiOperation("更新支出记录")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExamManualLedger examManualLedger) {
-        examManualLedgerService.update(examManualLedger);
-        return succeed();
-    }
-
-    @ApiOperation("删除支出记录")
-    @PostMapping(value = "/del")
-    public HttpResponseResult del(Long id) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examManualLedgerService.deleteExamManualLedger(sysUser.getId(),id);
-        return succeed();
-    }
-
-    @ApiOperation("获取考级项目支出统计信息")
-    @GetMapping(value = "/getExamManualLedgerStatistics")
-    public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId, Integer targetOrganId){
-        return succeed(examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),examId,targetOrganId));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamMusicTheoryController.java

@@ -1,65 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.ExamMusicTheory;
-import com.keao.edu.user.page.ExamMusicTheoryQueryInfo;
-import com.keao.edu.user.service.ExamMusicTheoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.01
- */
-@RestController
-@RequestMapping("examMusicTheory")
-@Api(tags = "考级乐理")
-public class ExamMusicTheoryController extends BaseController {
-
-    @Autowired
-    private ExamMusicTheoryService examMusicTheoryService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamMusicTheory>> getList(ExamMusicTheoryQueryInfo queryInfo) {
-        return succeed(examMusicTheoryService.queryPage(queryInfo));
-    }
-
-    @ApiOperation("新增")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(ExamMusicTheory examMusicTheory) {
-        examMusicTheory.setTenantId(TenantContextHolder.getTenantId());
-        examMusicTheoryService.insert(examMusicTheory);
-        return succeed();
-    }
-
-    @ApiOperation("更新")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(ExamMusicTheory examMusicTheory) {
-        examMusicTheory.setUpdateTime(new Date());
-        examMusicTheoryService.update(examMusicTheory);
-        return succeed();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping(value = "/del/{id}")
-    public HttpResponseResult add(@PathVariable("id") Integer id) {
-        return succeed(examMusicTheoryService.delete(id));
-    }
-
-
-    @ApiOperation("获取项目乐理级别列表")
-    @GetMapping(value = "/getTheoryLevelList")
-    public HttpResponseResult<List<ExamMusicTheory>> getTheoryLevelList(Integer examId) {
-        return succeed(examMusicTheoryService.getTheoryLevelList(examId));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -1,211 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.thirdparty.adapay.ConfigInit;
-import com.keao.edu.thirdparty.adapay.Payment;
-import com.keao.edu.thirdparty.yqpay.Msg;
-import com.keao.edu.user.dto.ExamPaymentInfo;
-import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamRegistrationPayment;
-import com.keao.edu.user.enums.TransStatusEnum;
-import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamRegistrationPaymentService;
-import com.keao.edu.util.date.DateUtil;
-import com.keao.edu.util.http.HttpUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-@RestController
-@Api(tags = "报名订单服务")
-@RequestMapping(value = "examOrder")
-public class ExamOrderController extends BaseController {
-
-    @Autowired
-    private ExamRegistrationPaymentService examRegistrationPaymentService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @ApiOperation(value = "缴费列表")
-    @GetMapping(value = "pageList")
-    @PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
-    public HttpResponseResult<PageInfo<ExamRegistrationPaymentDto>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
-            Employee employee = employeeService.get(sysUser.getId());
-            if (Objects.nonNull(employee)) {
-                queryInfo.setOrganId(employee.getOrganId());
-            }
-        }
-        return succeed(examRegistrationPaymentService.pageList(queryInfo));
-    }
-
-    @ApiOperation("获取用户项目未支付的订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "examinationBasicId", value = "项目id", required = true, dataType = "Integer")})
-    @GetMapping(value = "/getExamIngOrder")
-    public HttpResponseResult<ExamRegistrationPayment> getExamIngOrder(Long examinationBasicId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        return succeed(examRegistrationPaymentService.getExamIngOrder(examinationBasicId, sysUser.getId()));
-    }
-
-    @ApiOperation(value = "台牌支付")
-    @PostMapping("/executePayment")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amount", value = "支付金额", required = true, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "orderNo", value = "订单号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "payChannel", value = "支付方式", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "returnUrl", value = "返回页面", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "orderSubject", value = "订单标题", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "orderBody", value = "订单内容", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "sign", value = "sign", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "code", value = "code", required = true, dataType = "String")
-    })
-    public Object executePayment(BigDecimal amount, String orderNo, String payChannel, String returnUrl, String orderSubject, String orderBody, String sign, String code, String platform) throws Exception {
-        String openId = "";
-        if (payChannel.equals("wx_pub")) {
-            if (code == null || code.isEmpty()) {
-                return failed("微信支付请先授权");
-            }
-            String wxMpOAuth2AccessTokenUrl = String.format(ConfigInit.wxMpOAuth2AccessTokenUrl, ConfigInit.wxAppId, ConfigInit.wxAppSecret, code);
-            Map<String, String> weChatRes = JSON.parseObject(HttpUtil.get(wxMpOAuth2AccessTokenUrl, new HashMap<>()), Map.class);
-            if (!weChatRes.containsKey("openid")) {
-                return failed("授权失败,请重新授权");
-            }
-            openId = weChatRes.get("openid");
-        }
-
-        ExamRegistrationPayment examRegistrationPayment = examRegistrationPaymentService.getByOrderNo(orderNo);
-
-        if (examRegistrationPayment == null) {
-            return failed("订单不存在,请勿非法请求");
-        }
-        String merNos = examRegistrationPayment.getMerNo();
-        Date createTime = examRegistrationPayment.getCreateTime();
-        Calendar beforeTime = Calendar.getInstance();
-        beforeTime.add(Calendar.MINUTE, -28);// 28 分钟之前的时间
-        Date beforeDate = beforeTime.getTime();
-        if (createTime.before(beforeDate)) {
-            return failed("订单已超时,请重新下单");
-        }
-        amount = examRegistrationPayment.getTransAmount();
-
-        Date expireDate = DateUtil.addMinutes(createTime, 30);
-        String timeExpire = new SimpleDateFormat("yyyyMMddHHmmss").format(expireDate);
-
-        Map<String, Object> paymentParams = new HashMap<>();
-        paymentParams.put("app_id", ConfigInit.appId);
-        paymentParams.put("order_no", orderNo);
-        paymentParams.put("pay_channel", payChannel);
-        paymentParams.put("pay_amt", amount);
-        paymentParams.put("goods_title", orderSubject);
-        paymentParams.put("goods_desc", orderBody);
-        paymentParams.put("time_expire", timeExpire);
-
-        if (!merNos.equals(ConfigInit.merNo)) {
-            List<Map<String, Object>> divMembers = new ArrayList<>();
-            Map<String, Object> divMember = new HashMap<>();
-            divMember.put("member_id", merNos);//分佣账户
-            divMember.put("amount", amount);//分佣金额
-            divMember.put("fee_flag", "Y"); //承担手续费
-            divMembers.add(divMember);
-            paymentParams.put("div_members", JSON.toJSONString(divMembers));
-        }
-
-        Map<String, Object> expendParams = new HashMap<>(5);
-        expendParams.put("open_id", openId);
-        expendParams.put("is_raw", "1");
-        expendParams.put("callback_url", returnUrl);
-        expendParams.put("limit_pay", "1");
-        paymentParams.put("expend", expendParams);
-
-        Map<String, Object> payment = Payment.executePayment(paymentParams);
-
-        examRegistrationPayment.setTransNo((String) payment.get("id"));
-        examRegistrationPaymentService.update(examRegistrationPayment);
-        return succeed(payment);
-    }
-
-
-    @ApiOperation(value = "获取订单状态及订单信息")
-    @GetMapping(value = "/paymentResult")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
-    public HttpResponseResult<ExamPaymentInfo> getExamOrderInfo(String orderNo) {
-        return succeed(examRegistrationPaymentService.getExamOrderInfo(orderNo));
-    }
-
-    @PostMapping("/notify")
-    public Msg notify(@ModelAttribute Msg msg) throws Exception {
-        Map<String, Object> rqMap = new LinkedHashMap<String, Object>();
-        rqMap.put("code", msg.getCode());
-        rqMap.put("msg", msg.getMsg());
-        rqMap.put("responseType", msg.getResponseType());
-        rqMap.put("responseParameters", msg.getResponseParameters());
-        rqMap.put("sign", msg.getSign());
-        //boolean rs = YqPayUtil.verify(rqMap);
-        msg.setMsg("fail");
-        Map<String, String> notifyMap = new HashMap<>();
-        //if (rs) {
-        notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
-        //}
-        //支付中订单存在，更新状态
-        if (msg.getResponseType().equals("1") && notifyMap.size() > 0) {
-            TransStatusEnum status = msg.getCode().equals("88") ? TransStatusEnum.SUCCESS : TransStatusEnum.FAILED;
-            String channelType = notifyMap.get("channelType").equals("1") ? "WXPay" : (notifyMap.get("channelType").equals("2") ? "Alipay" : "quickPay");
-
-            String memo = notifyMap.get("remarks");
-            String orderNo = notifyMap.get("merMerOrderNo");
-            String transNo = notifyMap.get("orderNo");
-
-            notifyMap.put("channelType", channelType);
-            notifyMap.put("memo", memo);
-            notifyMap.put("transStatus", status.getCode());
-            notifyMap.put("orderNo", orderNo);
-            notifyMap.put("transNo", transNo);
-
-            examRegistrationPaymentService.updateOrder(notifyMap);
-            msg.setCode("000000");
-            msg.setMsg("success");
-        }
-        return msg;
-    }
-
-    @PostMapping(value = "orderSuccess")
-    public HttpResponseResult orderSuccess(String orderNo){
-        Map<String, String> notifyMap = new HashMap<>();
-        notifyMap.put("channelType", "Alipay");
-        notifyMap.put("memo", "手动回调");
-        notifyMap.put("transStatus", "SUCCESS");
-        notifyMap.put("orderNo", orderNo);
-        notifyMap.put("transNo", UUID.randomUUID().toString());
-        examRegistrationPaymentService.updateOrder(notifyMap);
-        return succeed();
-    }
-
-    @ApiOperation(value = "关闭订单")
-    @PostMapping("/closeOrder")
-    public HttpResponseResult closeOrder(String orderNo){
-        return succeed(examRegistrationPaymentService.closeOrder(orderNo));
-    }
-
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamOrganizationRelationController.java

@@ -1,157 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamOrganizationRelation;
-import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamOrganizationRelationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-@RestController
-@RequestMapping("examOrganizationRelation")
-@Api(tags = "考级项目合作单位服务")
-public class ExamOrganizationRelationController extends BaseController {
-
-    @Autowired
-    private ExamOrganizationRelationService examOrganizationRelationService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamOrganizationRelationExtraDto>> getList(ExamOrganizationRelationQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
-            }
-        }
-
-        return succeed(examOrganizationRelationService.queryExamOrgans(queryInfo));
-    }
-
-    @ApiOperation("获取子合作单位")
-    @GetMapping(value = "/getChildOrgans")
-    public HttpResponseResult<List<ExamOrganizationRelationExtraDto>> getChildOrgans(Long examId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        Integer organId=null;
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.nonNull(employee)){
-            organId=employee.getOrganId();
-        }
-
-        return succeed(examOrganizationRelationService.getChildOrgans(examId,organId));
-    }
-
-    @ApiOperation("添加合作单位")
-    @PostMapping(value = "/addExamOrganizations")
-    public HttpResponseResult addExamOrganizations(@RequestBody List<ExamOrganizationRelation> organizationRelations){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户异常");
-        }
-        examOrganizationRelationService.addExamOrganizations(organizationRelations,employee.getOrganId());
-        return succeed();
-    }
-
-    @ApiOperation("更新考级项目与合作单位关联信息")
-    @PostMapping(value = "/updateExamOrganizationRelation")
-    public HttpResponseResult updateExamOrganizationRelation(@RequestBody ExamOrganizationRelation examOrganizationRelation){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户异常");
-        }
-        examOrganizationRelationService.updateExamOrganizationRelation(examOrganizationRelation,employee.getOrganId());
-        return succeed();
-    }
-
-    @ApiOperation("发送考级报名链接")
-    @PostMapping(value = "/sendUrl")
-    public HttpResponseResult sendUrl(Integer examId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户异常");
-        }
-        examOrganizationRelationService.sendUrl(examId,employee.getOrganId());
-        return succeed();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping(value = "/del")
-    public HttpResponseResult del(Long id){
-        examOrganizationRelationService.deleteExamOrgan(id);
-        return succeed();
-    }
-
-    @ApiOperation("获取本单位项目信息")
-    @GetMapping(value = "/getExamOrganStatistics")
-    public HttpResponseResult getExamOrganStatistics(Long examId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                organId = employee.getOrganId();
-            }
-        }
-        return succeed(examOrganizationRelationService.getExamOrganStatistics(organId, examId));
-    }
-
-    @ApiOperation("获取未关联到考级项目的合作单位")
-    @GetMapping(value = "/queryUnRelatedOrgans")
-    public HttpResponseResult<Map<String, Object>> queryUnRelatedOrgans(ExamOrganizationRelationQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("请重新登录");
-        }
-        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
-            }
-        }
-        return succeed(examOrganizationRelationService.queryUnRelatedOrgans(queryInfo));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -1,156 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.thirdparty.ocr.Ocr;
-import com.keao.edu.user.dto.*;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
-import com.keao.edu.user.page.ApplyListQueryInfo;
-import com.keao.edu.user.page.ExamRecordQueryInfo;
-import com.keao.edu.user.page.ExamRegistrationQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamRegistrationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.23
- */
-@RestController
-@Api(tags = "学员报名服务")
-@RequestMapping(value = "examRegistration")
-public class ExamRegistrationController extends BaseController {
-
-    @Autowired
-    private ExamRegistrationService examRegistrationService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @ApiOperation(value = "学员报名记录查询")
-    @GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('examRegistration/list')")
-    public HttpResponseResult<PageInfo<ExamRegistrationRoomDto>> list(ExamRegistrationQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            queryInfo.setOrganId(employee.getOrganId());
-        }else if(sysUser.getIsSuperAdmin()){
-            queryInfo.setOrganId(null);
-        }
-        if(Objects.nonNull(queryInfo.getOrganizationId())){
-            queryInfo.setOrganId(queryInfo.getOrganizationId());
-        }
-        return succeed(examRegistrationService.queryExamRegistrationStudents(queryInfo));
-    }
-
-    @ApiOperation(value = "学生端学员报名记录查询")
-    @GetMapping(value = "applyList")
-    public HttpResponseResult<PageInfo<ExamRegistrationDto>> applyList(ApplyListQueryInfo queryInfo) {
-        return succeed(examRegistrationService.applyList(queryInfo));
-    }
-
-    @ApiOperation(value = "学生端考级曲库考试列表")
-    @GetMapping(value = "studentBaseExams")
-    public HttpResponseResult<PageInfo<StudentBaseExamsDto>> studentBaseExams(QueryInfo queryInfo) {
-        return succeed(examRegistrationService.studentBaseExams(queryInfo));
-    }
-
-    @ApiOperation(value = "学生端获取学员考试记录")
-    @GetMapping(value = "examList")
-    public HttpResponseResult<PageInfo<StudentExamListDto>> examList(ExamRecordQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        queryInfo.setStudentId(sysUser.getId());
-        return succeed(examRegistrationService.examList(queryInfo));
-    }
-
-    @ApiOperation(value = "更新学员报名状态")
-    @PostMapping(value = "updateExamRegistrationStatus")
-    @PreAuthorize("@pcs.hasPermissions('examRegistration/updateExamREgistrationStatus')")
-    public HttpResponseResult updateExamRegistrationStatus(Long registId, StudentRegistrationStatusEnum status, String memo){
-        examRegistrationService.updateExamRegistrationStatus(registId, status, memo);
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改学员报名信息")
-    @PostMapping(value = "update")
-    public HttpResponseResult update(@RequestBody ExamRegistration examRegistration) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed("用户信息异常");
-        }
-        examRegistration.setStudentId(sysUser.getId());
-        examRegistrationService.updateExamRegistration(examRegistration);
-        return succeed();
-    }
-
-
-    @ApiOperation(value = "报名")
-    @PostMapping(value = "add")
-    public HttpResponseResult add(@RequestBody ExamRegistration examRegistration) throws Exception {
-        SysUser student = sysUserFeignService.queryUserInfo();
-        examRegistration.setStudentId(student.getId());
-        return succeed(examRegistrationService.addRegistration(examRegistration));
-    }
-
-    @ApiOperation(value = "获取招生统计信息")
-    @GetMapping(value = "getExamRegistrationStaticsInfo")
-    @PreAuthorize("@pcs.hasPermissions('examRegistration/getExamRegistrationStaticsInfo')")
-    public HttpResponseResult<ExamRegistrationStatisticsDto> getExamRegistrationStaticsInfo(Integer examId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        return succeed(examRegistrationService.getExamRegistrationStaticsInfo(organId, examId));
-    }
-
-
-    @ApiOperation(value = "ocr")
-    @PostMapping(value = "ocr")
-    @ApiImplicitParams({@ApiImplicitParam(name = "file", value = "身份证图片", required = true, dataType = "file"),
-            @ApiImplicitParam(name = "idCardSide", value = "身份证（front-人像面 back-国徽面）", required = true, dataType = "String")})
-    public HttpResponseResult ocr(@RequestParam("file") MultipartFile file, String idCardSide) throws IOException {
-        return succeed(Ocr.idcard(file, idCardSide));
-    }
-
-
-    @ApiOperation(value = "获取报名信息(报名)")
-    @GetMapping(value = "getExamRegistration")
-    @ApiImplicitParams({@ApiImplicitParam(name = "examRegistrationId", value = "报名id", required = true, dataType = "int")})
-    public HttpResponseResult<ExamRegistrationDto> getExamRegistration(Long examRegistrationId) {
-        return succeed(examRegistrationService.getExamRegistration(examRegistrationId));
-    }
-
-    @ApiOperation(value = "重新支付(报名用)")
-    @PostMapping(value = "repay")
-    public HttpResponseResult repay(@RequestParam String orderNo) throws Exception {
-        SysUser student = sysUserFeignService.queryUserInfo();
-        return succeed(examRegistrationService.repay(student.getId(), orderNo));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamReviewController.java

@@ -1,71 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.user.dto.ExamReviewDto;
-import com.keao.edu.user.dto.ExamReviewRecordDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamReview;
-import com.keao.edu.user.page.ExamReviewQueryInfo;
-import com.keao.edu.user.page.ExamReviewRecordQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamReviewService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-@RestController
-@RequestMapping("examReview")
-@Api(tags = "评审服务")
-public class ExamReviewController extends BaseController {
-
-    @Autowired
-    private ExamReviewService examReviewService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @ApiOperation("分页查询评审结果")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamReviewDto>> getList(ExamReviewQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
-            }
-        }
-        return succeed(examReviewService.findExamResult(queryInfo));
-    }
-
-    @ApiOperation("监考页面分页查询评审结果")
-    @GetMapping(value = "/queryExamReviewRecordList")
-    public HttpResponseResult<PageInfo<ExamReviewRecordDto>> queryExamReviewRecordList(ExamReviewRecordQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        queryInfo.setTeacherId(sysUser.getId());
-        return succeed(examReviewService.queryExamReviewRecordList(queryInfo));
-    }
-
-    @ApiOperation("修改评审结果")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(ExamReview examReview){
-        examReviewService.update(examReview);
-        return succeed();
-    }
-
-    @ApiOperation("老师评审")
-    @PostMapping(value = "/createExamReview")
-    public HttpResponseResult createExamReview(ExamReview examReview){
-        examReviewService.add(examReview);
-        return succeed();
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -1,174 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.api.entity.ExamRoom;
-import com.keao.edu.user.dto.ExamRoomDto;
-import com.keao.edu.user.dto.ExamRoomListDto;
-import com.keao.edu.user.dto.ExamRoomStatisticsDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.Teacher;
-import com.keao.edu.user.page.ExamRoomListQueryInfo;
-import com.keao.edu.user.page.ExamRoomQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamRoomService;
-import com.keao.edu.user.service.TeacherService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-@RestController
-@RequestMapping("examRoom")
-@Api(tags = "考场服务")
-public class ExamRoomController extends BaseController {
-
-    @Autowired
-    private ExamRoomService examRoomService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-    @Autowired
-    private TeacherService teacherService;
-
-    @ApiOperation("分页查询监考列表")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamRoomListDto>> getList(ExamRoomListQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())){
-            Teacher teacher = teacherService.get(sysUser.getId());
-            if(Objects.isNull(teacher)){
-                return failed("用户信息异常");
-            }
-            queryInfo.setOrganId(teacher.getOrganId());
-        }
-        return succeed(examRoomService.queryExamRoomPage(queryInfo));
-    }
-
-    @ApiOperation("发送考试安排")
-    @GetMapping(value = "/sendExamPlan")
-    public HttpResponseResult sendExamPlan(Integer examId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户信息异常");
-        }
-        examRoomService.sendExamPlan(employee.getOrganId(), examId, sysUser.getId());
-        return succeed();
-    }
-
-    @ApiOperation("获取考级项目教室列表")
-    @GetMapping(value = "/queryExamRooms")
-    public HttpResponseResult<PageInfo<ExamRoomDto>> queryExamRooms(ExamRoomQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            queryInfo.setOrganId(employee.getOrganId());
-        }
-        return succeed(examRoomService.queryExamRooms(queryInfo));
-    }
-
-    @ApiOperation("更新考场")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExamRoom examRoom){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户信息异常");
-        }
-        examRoom.setOrganId(employee.getOrganId());
-        examRoomService.update(examRoom);
-        return succeed();
-    }
-
-    @ApiOperation("创建教室")
-    @PostMapping(value = "/createExamRoom")
-    public HttpResponseResult createExamRoom(@RequestBody ExamRoom examRoom){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户信息异常");
-        }
-        examRoom.setOrganId(employee.getOrganId());
-        examRoomService.createExamRoom(examRoom);
-        return succeed();
-    }
-
-    @ApiOperation("更新教室信息")
-    @PostMapping(value = "/updateExamRoom")
-    public HttpResponseResult<ExamRoom> updateExamRoom(@RequestBody ExamRoom examRoom){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户信息异常");
-        }
-        examRoom.setOrganId(employee.getOrganId());
-        return succeed(examRoomService.updateExamRoom(examRoom));
-    }
-
-    @ApiOperation("教室状态变更（关闭教室，开启教室）")
-    @PostMapping(value = "/changeExamRoom")
-    public HttpResponseResult changeExamRoom(Long examRoomId,Integer openFlag){
-        examRoomService.changeExamRoom(examRoomId,openFlag);
-        return succeed();
-    }
-
-    @ApiOperation("删除教室")
-    @PostMapping(value = "/deleteExamRooms")
-    public HttpResponseResult deleteExamRooms(String examRoomIds){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        examRoomService.deleteExamRooms(organId,examRoomIds);
-        return succeed();
-    }
-
-    @ApiOperation("获取教室")
-    @GetMapping(value = "/get")
-    public HttpResponseResult<ExamRoom> getExamRoom(Long id){
-        return succeed(examRoomService.get(id));
-    }
-
-    @ApiOperation("获取教室")
-    @PostMapping(value = "/api/get")
-    public ExamRoom getApiExamRoom(Long id){
-        return examRoomService.get(id);
-    }
-
-    @ApiOperation("获取考场统计信息")
-    @GetMapping(value = "/getExamRoomStatisticsInfo")
-    public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Long examId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        return succeed(examRoomService.getExamRoomStatisticsInfo(organId, examId));
-    }
-
-    @ApiOperation("获取报名学员可加入教室列表")
-    @GetMapping(value = "/getStudentEnableJoinRoom")
-    public HttpResponseResult<List<ExamRoom>> getStudentEnableJoinRoom(Long registId){
-        return succeed(examRoomService.getStudentEnableJoinRoom(registId));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamRoomStudentRelationController.java

@@ -1,176 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.im.api.entity.PublishMessageDto;
-import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
-import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
-import com.keao.edu.user.dto.StuRecordDetailDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExamRoomStudentRelationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Objects;
-
-@RestController
-@RequestMapping("examRoomStudentRelation")
-@Api(tags = "考场与学生关联服务")
-public class ExamRoomStudentRelationController extends BaseController {
-
-    @Autowired
-    private ExamRoomStudentRelationService examRoomStudentRelationService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    /*@ApiOperation("开启/关闭教室")
-    @GetMapping(value = "/switchClassRoom")
-    public HttpResponseResult switchClassRoom(Integer openFlag,Integer examinationBasicId,Integer studentId) {
-        examRoomStudentRelationService.switchClassRoom(openFlag,examinationBasicId,studentId);
-        return succeed();
-    }*/
-
-    @ApiOperation("签到")
-    @PostMapping(value = "/signIn")
-    public HttpResponseResult signIn(Long examRegistrationId) {
-        examRoomStudentRelationService.signIn(examRegistrationId);
-        return succeed();
-    }
-
-    @ApiOperation("下一位")
-    @PostMapping(value = "/nextBit")
-    public HttpResponseResult nextBit(Integer examStatus,Long roomId) {
-        examRoomStudentRelationService.nextBit(examStatus,roomId);
-        return succeed();
-    }
-
-    @ApiOperation("开始考试")
-    @PostMapping(value = "/actionExam")
-    public HttpResponseResult actionExam(Long roomId) {
-        examRoomStudentRelationService.actionExam(roomId);
-        return succeed();
-    }
-
-    @ApiOperation("监考端选择去录播")
-    @PostMapping(value = "/webRecorded")
-    public HttpResponseResult webRecorded(Long roomId) {
-        examRoomStudentRelationService.recorded(roomId);
-        return succeed();
-    }
-
-    /*@ApiOperation("学生选择去录播")
-    @PostMapping(value = "/stuRecorded")
-    public HttpResponseResult<NeedCheckingDetailDto> stuRecorded(Long examRegistrationId) {
-        return succeed(examRoomStudentRelationService.stuRecorded(examRegistrationId));
-    }*/
-
-    @ApiOperation("学生端录播详情页面")
-    @GetMapping(value = "/stuRecordDetail")
-    public HttpResponseResult<StuRecordDetailDto> stuRecordDetail(Long examRegistrationId) {
-        return succeed(examRoomStudentRelationService.stuRecordDetail(examRegistrationId));
-    }
-
-    @ApiOperation("学生端完成录播")
-    @PostMapping(value = "/stuEndRecord")
-    public HttpResponseResult stuEndRecord(Long examRegistrationId,String videoUrl) {
-        examRoomStudentRelationService.stuEndRecord(examRegistrationId,videoUrl);
-        return succeed();
-    }
-
-    /*@ApiOperation("学生选择重新排队")
-    @PostMapping(value = "/againQueue")
-    public HttpResponseResult<NeedCheckingDetailDto> againQueue(Long examRegistrationId) {
-        return succeed(examRoomStudentRelationService.againQueue(examRegistrationId));
-    }*/
-
-    @ApiOperation("获取后台考场待考队列")
-    @PostMapping(value = "/queryNeedCheckingList")
-    public HttpResponseResult queryNeedCheckingList(Long roomId) {
-        return succeed(examRoomStudentRelationService.queryNeedCheckingList(roomId));
-    }
-
-    @ApiOperation("获取推送消息内容")
-    @PostMapping(value = "api/getPublishMessage")
-    public PublishMessageDto getPublishMessage(Long examRegistrationId) {
-        return examRoomStudentRelationService.getPublishMessage(examRegistrationId);
-    }
-
-    @ApiOperation("获取教室学员关联")
-    @PostMapping(value = "api/getExamRoomStudentRelation")
-    public ExamRoomStudentRelation getExamRoomStudentRelation(Long registrationId) {
-        return examRoomStudentRelationService.getExamRoomStudentRelation(registrationId);
-    }
-
-    @ApiOperation("给教室分配学员")
-    @PostMapping(value = "/addStudentForRoom")
-    public HttpResponseResult addStudentForRoom(Long examRoomId, String registIds){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        examRoomStudentRelationService.addStudentForRoom(examRoomId, registIds, organId);
-        return succeed();
-    }
-
-    @ApiOperation("更换学员考场")
-    @PostMapping(value = "/changeStudentExamRoom")
-    public HttpResponseResult changeStudentExamRoom(Long registId, Long examRoomId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        examRoomStudentRelationService.changeStudentExamRoom(registId, examRoomId, organId);
-        return succeed();
-    }
-
-    @ApiOperation("获取教室学员")
-    @GetMapping(value = "/findExamRoomStudents")
-    public HttpResponseResult<PageInfo<ExamRoomStudentRelationDto>> findExamRoomStudents(ExamRoomStudentRelationQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
-            }
-        }
-        return succeed(examRoomStudentRelationService.findExamRoomStudents(queryInfo));
-    }
-
-    @ApiOperation("删除指定教室学员")
-    @PostMapping(value = "/deleteStudentFromRoom")
-    public HttpResponseResult deleteStudentFromRoom(Long examRoomId, String registIds){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        examRoomStudentRelationService.deleteStudentFromRoom(examRoomId, registIds, organId);
-        return succeed();
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamSongController.java

@@ -1,77 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.ExamSong;
-import com.keao.edu.user.page.ExamSongQueryInfo;
-import com.keao.edu.user.service.ExamSongService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.16
- */
-@RestController
-@RequestMapping("examSong")
-@Api(tags = "曲库服务")
-public class ExamSongController extends BaseController {
-
-    @Autowired
-    private ExamSongService examSongService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamSong>> getList(ExamSongQueryInfo queryInfo) {
-        return succeed(examSongService.queryPage(queryInfo));
-    }
-
-    @ApiOperation("学生端分页查询考级曲库")
-    @GetMapping(value = "/queryPage")
-    public HttpResponseResult<PageInfo<ExamSong>> queryPage(ExamSongQueryInfo queryInfo) {
-        return succeed(examSongService.querySongPage(queryInfo));
-    }
-
-    @ApiOperation("查询曲库详情")
-    @ApiImplicitParam(name = "id", value = "机构ID", required = true, dataType = "Integer", paramType = "path")
-    @GetMapping(value = "/query")
-    public HttpResponseResult<ExamSong> query(Integer id) {
-        return succeed(examSongService.get(id));
-    }
-
-    @ApiOperation("新增曲库")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(@RequestBody ExamSong examSong) {
-        examSong.setTenantId(TenantContextHolder.getTenantId());
-        examSongService.insert(examSong);
-        return succeed();
-    }
-
-    @ApiOperation("更新曲库")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExamSong examSong) {
-        examSong.setUpdateTime(new Date());
-        examSongService.update(examSong);
-        return succeed();
-    }
-
-    @ApiOperation("删除曲库")
-    @PostMapping(value = "/del")
-    public HttpResponseResult add(Integer id) {
-        return succeed(examSongService.delete(id));
-    }
-
-    @ApiOperation("根据专业获取曲目")
-    @GetMapping(value = "/getWithSubject")
-    public HttpResponseResult<List<ExamSong>> getWithSubject(Integer subjectId){
-        return succeed(examSongService.getWithSubject(subjectId));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamSubjectController.java

@@ -1,39 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.dto.ExamSubjectDto;
-import com.keao.edu.user.entity.ExamSong;
-import com.keao.edu.user.entity.Subject;
-import com.keao.edu.user.service.ExamSubjectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("examSubject")
-@Api(tags = "考级内容服务")
-public class ExamSubjectController extends BaseController {
-
-    @Autowired
-    private ExamSubjectService examSubjectService;
-
-    @ApiOperation("获取考试项目专业")
-    @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
-    @GetMapping(value = "/getExamSubjects")
-    public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
-        return succeed(examSubjectService.getExamSubjects(examId));
-    }
-
-    @ApiOperation("获取与考级项目相关的专业")
-    @GetMapping(value = "/getUnRelatedWithExamSubjects")
-    public HttpResponseResult<List<Subject>> getUnRelatedWithExamSubjects(Integer examId){
-        return succeed(examSubjectService.getUnRelatedWithExamSubjects(Integer.valueOf(TenantContextHolder.getTenantId()), examId));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamSubjectSongController.java

@@ -1,78 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.dto.ExamSubjectSongDto;
-import com.keao.edu.user.entity.ExamSong;
-import com.keao.edu.user.entity.ExamSubjectSong;
-import com.keao.edu.user.page.ExamSubjectSongQueryInfo;
-import com.keao.edu.user.service.ExamSubjectSongService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-@RestController
-@RequestMapping("examSubjectSong")
-@Api(tags = "考级内容服务")
-public class ExamSubjectSongController extends BaseController {
-
-    @Autowired
-    private ExamSubjectSongService examSubjectSongService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamSubjectSongDto>> getList(ExamSubjectSongQueryInfo queryInfo) {
-        return succeed(examSubjectSongService.queryExamSubjectSongs(queryInfo));
-    }
-
-    @ApiOperation("添加考试内容")
-    @PostMapping(value = "/addExamSubjects")
-    public HttpResponseResult addExamSubjects(@RequestBody List<ExamSubjectSong> examSubjectSongs) {
-        examSubjectSongService.addExamSubjects(examSubjectSongs);
-        return succeed();
-    }
-
-    @ApiOperation("更新考试内容")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExamSubjectSong examSubjectSong) {
-        examSubjectSongService.update(examSubjectSong);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除考试内容")
-    @PostMapping(value = "del")
-    public HttpResponseResult del(Long id) {
-        examSubjectSongService.deleteExamSubjectSong(id);
-        return succeed();
-    }
-
-    @ApiOperation("获取考级专业相应级别列表-报名")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "examinationBasicId", value = "项目id", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "examSubjectId", value = "考试项目专业id", required = true, dataType = "Integer")})
-    @GetMapping(value = "/getExamSubjectLevel")
-    public HttpResponseResult<List<ExamSubjectSong>> getExamSubjectLevel(Integer examinationBasicId, Long examSubjectId) {
-        return succeed(examSubjectSongService.getExamSubjectLevels(examinationBasicId, examSubjectId));
-    }
-
-    @ApiOperation("获取考级专业相应级别的曲目-报名")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "examinationBasicId", value = "项目id", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "examSubjectId", value = "考试项目专业id", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "level", value = "级别", required = true, dataType = "Integer")})
-    @GetMapping(value = "/getExamSubjectSong")
-    public HttpResponseResult<List<ExamSong>> getExamSubjectSong(Integer examinationBasicId, Long examSubjectId, Integer level) {
-        return succeed(examSubjectSongService.getExamSubjectSong(examinationBasicId, examSubjectId, level));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExamTeacherSalaryController.java

@@ -1,93 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.dto.BaseUserInfoDto;
-import com.keao.edu.user.dto.ExamTeacherSalaryDto;
-import com.keao.edu.user.dto.ExamTeacherSalaryStaticsInfo;
-import com.keao.edu.user.dto.TeacherDto;
-import com.keao.edu.user.entity.ExamTeacherSalary;
-import com.keao.edu.user.page.ExamTeacherSalaryQueryInfo;
-import com.keao.edu.user.service.ExamTeacherSalaryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.01
- */
-@RestController
-@RequestMapping("examTeacherSalary")
-@Api(tags = "考级项目教师服务")
-public class ExamTeacherSalaryController extends BaseController {
-
-    @Autowired
-    private ExamTeacherSalaryService examTeacherSalaryService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamTeacherSalaryDto>> getList(ExamTeacherSalaryQueryInfo queryInfo) {
-        return succeed(examTeacherSalaryService.queryExamTeacherSalary(queryInfo));
-    }
-
-    @ApiOperation("新增")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(ExamTeacherSalary examTeacherSalary) {
-        examTeacherSalary.setTotalInvigilationNum(0);
-        examTeacherSalary.setTotalInvigilationStudentNum(0);
-        examTeacherSalary.setTotalSettlementCost(BigDecimal.ZERO);
-        examTeacherSalaryService.insert(examTeacherSalary);
-        return succeed();
-    }
-
-    @ApiOperation("新增考级教师")
-    @PostMapping(value = "/addExamTeacherSalary")
-    public HttpResponseResult addExamTeacherSalary(Long examId, String teacherIdsStr) {
-        examTeacherSalaryService.addExamTeacherSalary(examId, teacherIdsStr);
-        return succeed();
-    }
-
-    @ApiOperation("获取指定考级项目可排考教师")
-    @GetMapping(value = "/getExamTeachers")
-    public HttpResponseResult<List<BaseUserInfoDto>> getExamTeachers(Integer examId){
-        return succeed(examTeacherSalaryService.getExamTeachers(examId));
-    }
-
-    @ApiOperation("更新")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(ExamTeacherSalary examTeacherSalary) {
-        examTeacherSalary.setUpdateTime(new Date());
-        examTeacherSalaryService.updateExamTeacherSalary(examTeacherSalary);
-        return succeed();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping(value = "/del")
-    public HttpResponseResult add(Long id) {
-        examTeacherSalaryService.deleteExamTeacherSalary(id);
-        return succeed();
-    }
-
-    @ApiOperation("获取与考级项目无关的教师")
-    @GetMapping(value = "/getUnRelatedWithExamTeachers")
-    public HttpResponseResult<PageInfo<TeacherDto>> getUnRelatedWithExamTeachers(ExamTeacherSalaryQueryInfo queryInfo){
-        return succeed(examTeacherSalaryService.getUnRelatedWithExamTeachers(queryInfo));
-    }
-
-    @ApiOperation("获取考级项目关联教师统计信息")
-    @GetMapping(value = "/getExamTeacherSalaryStaticsInfo")
-    public HttpResponseResult<ExamTeacherSalaryStaticsInfo> getExamTeacherSalaryStaticsInfo(Integer examId){
-        return succeed(examTeacherSalaryService.getExamTeacherSalaryStaticsInfo(examId));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -1,108 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.dto.ExaminationBasicDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExaminationBasic;
-import com.keao.edu.user.enums.ExamStatusEnum;
-import com.keao.edu.user.page.ExaminationQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.ExaminationBasicService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-@RestController
-@RequestMapping("examinationBasic")
-@Api(tags = "考级项目服务")
-public class ExaminationBasicController extends BaseController {
-
-    @Autowired
-    private ExaminationBasicService examinationBasicService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @ApiOperation("查询指定考级项目")
-    @GetMapping(value = "/getExaminationBasic")
-    public HttpResponseResult<ExaminationBasicDto> getExaminationBasic(Integer examId) {
-        return succeed(examinationBasicService.getExaminationBasic(examId));
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExaminationBasicDto>> getList(ExaminationQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            queryInfo.setOrganId(employee.getOrganId());
-        }
-        return succeed(examinationBasicService.findExaminationBasics(queryInfo));
-    }
-
-    @ApiOperation("创建考级项目")
-    @PostMapping(value = "/addExaminationBasic")
-    public HttpResponseResult<ExaminationBasic> addExaminationBasic(@RequestBody ExaminationBasic examinationBasic){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Employee employee = employeeService.get(sysUser.getId());
-        if(Objects.isNull(employee)){
-            return failed("用户信息异常");
-        }
-        examinationBasic.setCreatorId(sysUser.getId());
-        examinationBasic.setOrganId(employee.getOrganId());
-        return succeed(examinationBasicService.addExaminationBasic(examinationBasic));
-    }
-
-    @ApiOperation("更新考级项目")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(@RequestBody ExaminationBasic examinationBasic){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examinationBasicService.updateExam(examinationBasic,sysUser.getId());
-        return succeed();
-    }
-
-    @ApiOperation("更新考级项目状态")
-    @PostMapping(value = "/updateExamBasicStatus")
-    public HttpResponseResult updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examinationBasicService.updateExamBasicStatus(examId, statusEnum, sysUser.getId());
-        return succeed();
-    }
-
-    @ApiOperation("关闭考级项目")
-    @PostMapping(value = "/closeExam")
-    public HttpResponseResult closeExam(Integer examId, String reason){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId = null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId = employee.getOrganId();
-        }
-        examinationBasicService.closeExam(organId, examId, reason);
-        return succeed();
-    }
-
-    @ApiOperation("获取考级项目信息")
-    @PostMapping(value = "/getInfo")
-    public HttpResponseResult<ExaminationBasic> getInfo(Integer examId){
-        return succeed(examinationBasicService.getInfo(examId));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/MusicTheoryController.java

@@ -1,64 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.MusicTheory;
-import com.keao.edu.user.service.MusicTheoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author wangyp
- * @Date 2020/6/27 9:17
- * @Description TODO
- */
-@RestController
-@RequestMapping("musicTheory")
-@Api(tags = "乐理信息")
-public class MusicTheoryController extends BaseController {
-
-    @Autowired
-    private MusicTheoryService musicTheoryService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<MusicTheory>> getList(QueryInfo queryInfo) {
-        return succeed(musicTheoryService.queryPage(queryInfo));
-    }
-
-    @ApiOperation("查询乐理详情")
-    @ApiImplicitParam(name = "id", value = "机构ID", required = true, dataType = "Integer", paramType = "path")
-    @GetMapping(value = "/query")
-    public HttpResponseResult<MusicTheory> query(Integer id) {
-        return succeed(musicTheoryService.get(id));
-    }
-
-    @ApiOperation("新增乐理")
-    @PostMapping(value = "/add")
-    public HttpResponseResult add(MusicTheory musicTheory) {
-        musicTheory.setTenantId(TenantContextHolder.getTenantId());
-        musicTheoryService.addMusicTheory(musicTheory);
-        return succeed();
-    }
-
-    @ApiOperation("更新乐理")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(MusicTheory musicTheory) {
-        musicTheoryService.update(musicTheory);
-        return succeed();
-    }
-
-    @ApiOperation("删除乐理")
-    @PostMapping(value = "/del/{id}")
-    public HttpResponseResult add(@PathVariable("id") Integer id) {
-        return succeed(musicTheoryService.delete(id));
-    }
-
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/OrganizationController.java

@@ -1,86 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.Organization;
-import com.keao.edu.user.page.OrganizationQueryInfo;
-import com.keao.edu.user.service.OrganizationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 合作单位服务
- */
-@RestController
-@Api(tags = "合作单位服务")
-@RequestMapping(value = "organization")
-public class OrganizationController extends BaseController {
-
-	@Autowired
-	private OrganizationService organizationService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
-	@ApiOperation(value = "合作单位列表")
-	@GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('organization/list')")
-	public HttpResponseResult<PageInfo<Organization>> configList(OrganizationQueryInfo queryInfo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		queryInfo.setParentId(sysUser.getId());
-		if(queryInfo.getOrganId() != null){
-			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),false));
-		}
-		return succeed(organizationService.queryPage(queryInfo));
-	}
-
-	@ApiOperation(value = "修改合作单位")
-	@PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('organization/update')")
-	public HttpResponseResult updateOrganization(@RequestBody Organization organization) {
-		organizationService.updateOrganization(organization);
-		return succeed();
-	}
-
-	@ApiOperation(value = "新增合作单位")
-	@PostMapping(value = "add")
-    @PreAuthorize("@pcs.hasPermissions('organization/add')")
-	public HttpResponseResult addConfig(@RequestBody Organization organization) {
-		organization.setTenantId(TenantContextHolder.getTenantId());
-		organizationService.add(organization);
-		return succeed();
-	}
-
-	@ApiOperation(value = "查询合作单位")
-	@GetMapping(value = "get")
-    @PreAuthorize("@pcs.hasPermissions('organization/get')")
-	public HttpResponseResult<Organization> getConfig(Integer id) {
-		return succeed(organizationService.getOrganization(id));
-	}
-
-	@ApiOperation(value = "删除合作单位")
-	@PostMapping(value = "del")
-    @PreAuthorize("@pcs.hasPermissions('organization/del')")
-	public HttpResponseResult del(Integer id) {
-		organizationService.del(id);
-		return succeed();
-	}
-
-	@ApiOperation(value = "获取当前分部及其所有子合作单位")
-	@GetMapping(value = "getChildOrgans")
-	@PreAuthorize("@pcs.hasPermissions('organization/getChildOrgans')")
-	public HttpResponseResult<List<Organization>> getChildOrgans(Integer includeSelf){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		Organization organization = organizationService.findByUserId(sysUser.getId());
-		return succeed(organizationService.getChildOrgans(organization.getId(), includeSelf==1));
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/ShortUrlController.java

@@ -1,38 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.user.entity.ShortUrl;
-import com.keao.edu.user.service.ShortUrlService;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.22
- */
-@Controller
-@RequestMapping("/")
-@Api(tags = "短链接服务")
-public class ShortUrlController extends BaseController {
-
-    @Autowired
-    private ShortUrlService shortUrlService;
-
-    @GetMapping(value = "/su/{id}")
-    public void redirectUrl(@PathVariable("id") Long id, HttpServletResponse response) throws IOException {
-        ShortUrl shortUrl = shortUrlService.get(id);
-        if(Objects.isNull(shortUrl)|| StringUtils.isBlank(shortUrl.getUrl())){
-            return;
-        }
-        response.sendRedirect(shortUrl.getUrl());
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/StudentController.java

@@ -1,81 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.user.api.entity.Student;
-import com.keao.edu.user.dto.StudentExamPaymentDto;
-import com.keao.edu.user.page.StudentApplyQueryInfo;
-import com.keao.edu.user.service.StudentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 系统配置控制层
- */
-@RestController
-@Api(tags = "学员服务")
-@RequestMapping(value = "student")
-public class StudentController extends BaseController {
-
-    @Autowired
-    private StudentService studentService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @ApiOperation(value = "学员列表")
-    @GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('student/list')")
-    public HttpResponseResult<PageInfo<Student>> list(QueryInfo queryInfo) {
-        return succeed(studentService.queryStudentPage(queryInfo));
-    }
-
-    @ApiOperation(value = "学生端学员报考记录列表（包括详情）")
-    @PostMapping(value = "applyList")
-    @PreAuthorize("@pcs.hasPermissions('student/applyList')")
-    public HttpResponseResult<PageInfo<StudentExamPaymentDto>> applyList(StudentApplyQueryInfo queryInfo) {
-        return succeed(studentService.queryApplyList(queryInfo));
-    }
-
-    @ApiOperation(value = "查询学员")
-    @GetMapping(value = "get")
-    @PreAuthorize("@pcs.hasPermissions('student/get')")
-    public HttpResponseResult<Student> get(Integer id) {
-        return succeed(studentService.get(id));
-    }
-
-    @ApiOperation(value = "学员报名")
-    @PostMapping(value = "apply")
-    public HttpResponseResult apply(Integer organId, String phone) {
-        Student student = new Student(organId, phone);
-        studentService.addStudent(student);
-        return succeed();
-    }
-
-    @ApiOperation(value = "获取学生信息")
-    @GetMapping(value = "getStudent")
-    public HttpResponseResult<Student> getStudent() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        return succeed(studentService.getStudent(user.getId()));
-    }
-
-    @ApiOperation(value = "更新学员基本信息")
-    @PostMapping(value = "updateInfo")
-    public HttpResponseResult<Student> updateInfo(Student student) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        student.setUserId(user.getId());
-        return succeed(studentService.updateInfo(student));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -1,118 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.api.enums.StudentExamResultApiDto;
-import com.keao.edu.user.dto.RecordNotify;
-import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
-import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.StudentExamResult;
-import com.keao.edu.user.page.StudentExamResultQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
-import com.keao.edu.user.service.StudentExamResultService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.30
- */
-@RestController
-@RequestMapping("studentExamResult")
-@Api(tags = "考试结果服务")
-public class StudentExamResultController extends BaseController {
-
-    @Autowired
-    private StudentExamResultService studentExamResultService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
-
-    @RequestMapping(value = "/recordSync")
-    public void recordSync(@RequestBody String body) throws Exception {
-        RecordNotify recordNotify = JSONObject.parseObject(body, RecordNotify.class);
-        studentExamResultService.recordSync(recordNotify);
-    }
-
-    @ApiOperation("查询考试结果")
-    @GetMapping(value = "/queryStudentExamResult")
-    public HttpResponseResult<PageInfo<StudentExamResult>> queryStudentExamResult(StudentExamResultQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            queryInfo.setOrganId(employee.getOrganId());
-        }
-        return succeed(studentExamResultService.queryStudentExamResult(queryInfo));
-    }
-
-    @ApiOperation("修改考试结果")
-    @PostMapping(value = "/update")
-    public HttpResponseResult update(StudentExamResult examResult){
-        studentExamResultService.updateStudentExamResult(examResult);
-        return succeed();
-    }
-
-    @ApiOperation("修改考试状态")
-    @PostMapping(value = "/api/updateFinishedExam")
-    public void updateFinishedExam(Long examRegistrationId,Integer finishedExam){
-        studentExamResultService.updateFinishedExam(examRegistrationId,finishedExam);
-    }
-
-    @ApiOperation("修改SessionId")
-    @PostMapping(value = "/api/updateSessionId")
-    public void updateSessionId(Long examRegistrationId,String sessionId){
-        studentExamResultService.updateSessionId(examRegistrationId,sessionId);
-    }
-
-    @ApiOperation("获取考试结果")
-    @PostMapping(value = "/api/get")
-    public StudentExamResultApiDto get(Long id){
-        return studentExamResultService.getStudentExamResultApiDto(id);
-    }
-
-    @ApiOperation("考试结果统计信息")
-    @GetMapping(value = "/getStudentExamResultStatisticsInfo")
-    public HttpResponseResult<StudentExamResultStatisticsDto> getStudentExamResultStatisticsInfo(Integer examId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId=null;
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee)){
-                return failed("用户信息异常");
-            }
-            organId=employee.getOrganId();
-        }
-        return succeed(studentExamResultService.getStudentExamResultStatisticsInfo(organId, examId));
-    }
-
-    @ApiOperation("确认考生")
-    @PostMapping(value = "/confirmStudent")
-    public HttpResponseResult confirmStudent(Long examRegistrationId) {
-        studentExamResultService.confirmStudent(examRegistrationId);
-        return succeed();
-    }
-
-    /**
-     * 屏蔽指定用户
-     * @param roomId
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/shieldUserId", method = RequestMethod.POST)
-    public Object shieldUserId(Long roomId,Integer shieldFlag)throws Exception {
-        studentExamResultService.shieldUserId(roomId,shieldFlag);
-        return succeed();
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/SubjectController.java

@@ -1,80 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.Subject;
-import com.keao.edu.user.page.SubjectQueryInfo;
-import com.keao.edu.user.service.SubjectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RequestMapping("subject")
-@Api(tags = "科目服务")
-@RestController
-public class SubjectController extends BaseController {
-
-    @Autowired
-    private SubjectService subjectService;
-
-    @ApiOperation(value = "修改、新增科目")
-    @PostMapping("/upset")
-    @PreAuthorize("@pcs.hasPermissions('subject/upset')")
-    public HttpResponseResult update(@RequestBody Subject subject){
-        subject.setTenantId(TenantContextHolder.getTenantId());
-        subjectService.upSetSubject(subject);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除科目")
-    @PostMapping("/del")
-    @PreAuthorize("@pcs.hasPermissions('subject/del')")
-    public HttpResponseResult del(@RequestBody Subject subject){
-        subject.setTenantId(TenantContextHolder.getTenantId());
-        subject.setDelFlag(true);
-        subjectService.upSetSubject(subject);
-        return succeed();
-    }
-
-    @ApiOperation(value = "根据科目编号查询科目")
-    @GetMapping("/get/{id}")
-    @PreAuthorize("@pcs.hasPermissions('subject/get')")
-    public HttpResponseResult<Subject> get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
-        return succeed(subjectService.get(id));
-    }
-
-    @ApiOperation(value = "分页查询科目列表")
-    @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
-    public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo){
-        return succeed(subjectService.queryPage(queryInfo));
-    }
-
-    @ApiOperation(value = "学生端分页查询科目列表")
-    @GetMapping("/studentQueryPage")
-    public HttpResponseResult<PageInfo<Subject>> studentQueryPage(SubjectQueryInfo queryInfo){
-        return succeed(subjectService.queryPage(queryInfo));
-    }
-
-    @ApiOperation(value = "分页查询科目树状列表")
-    @GetMapping("/queryPageTree")
-    @PreAuthorize("@pcs.hasPermissions('subject/queryPageTree')")
-    public HttpResponseResult<PageInfo<Subject>> queryPageTree(SubjectQueryInfo queryInfo){
-        return succeed(subjectService.queryPageTree(queryInfo));
-    }
-
-    @ApiOperation(value = "获取子集科目列表")
-    @GetMapping("/findSubSubjects")
-    @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
-    public HttpResponseResult<List<Subject>> findSubSubjects(){
-        return succeed(subjectService.findSubSubjects(Integer.parseInt(TenantContextHolder.getTenantId())));
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/SysConfigController.java

@@ -1,93 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.SysConfig;
-import com.keao.edu.user.service.SysConfigService;
-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.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 系统配置控制层
- */
-@RestController
-@Api(tags = "系统参数设置")
-@RequestMapping(value = "sysConfig")
-public class SysConfigController extends BaseController {
-
-	@Autowired
-	private SysConfigService sysConfigService;
-
-	@ApiOperation(value = "参数列表")
-	@GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/list')")
-	public Object configList(String group) {
-//		String tenantId = TenantContextHolder.getTenantId();
-		Map<String,Object> params = new HashMap<String, Object>();
-		params.put("group", group);
-//		params.put("tenantId", tenantId);
-		return succeed(sysConfigService.findAll(params));
-	}
-
-	@ApiOperation(value = "修改参数")
-	@PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/update')")
-	public Object update(SysConfig config) {
-		config.setModifyOn(new Date());
-		sysConfigService.update(config);
-		return succeed();
-	}
-
-	@ApiOperation(value = "新增参数")
-	@PostMapping(value = "add")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/add')")
-	public Object addConfig(SysConfig config) {
-		if (config == null)
-			return failed("参数无效");
-		if (StringUtils.isBlank(config.getParamName())) {
-			return failed("参数名称不能为空");
-		}
-		if (StringUtils.isBlank(config.getParanValue())) {
-			return failed("参数值不能为空");
-		}
-		config.setCreateOn(new Date());
-		config.setModifyOn(new Date());
-		return sysConfigService.insert(config) > 0 ? succeed() : failed("添加失败");
-	}
-
-	@ApiOperation(value = "查询参数")
-	@GetMapping(value = "get")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/get')")
-	public Object getConfig(Long id) {
-		if (id == null || id <= 0)
-			return failed("请检查输入的ID");
-		return succeed(sysConfigService.get(id));
-	}
-
-	@ApiOperation(value = "查询参数")
-	@GetMapping(value = "queryByParamName")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/queryByParamName')")
-	public Object queryByParamName(String paramName) {
-		if(StringUtils.isBlank(paramName)){
-			return failed("参数不能为空");
-		}
-		return succeed(sysConfigService.findByParamName(paramName));
-	}
-
-	@ApiOperation(value = "查询参数")
-	@PostMapping(value = "api/get")
-	public String apiGet(String paramName) {
-		return sysConfigService.findByParamName(paramName).getParanValue();
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/SysSuggestionController.java

@@ -1,46 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.user.entity.SysSuggestion;
-import com.keao.edu.user.service.SysSuggestionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RequestMapping("sysSuggestion")
-@Api(tags = "意见反馈")
-@RestController
-public class SysSuggestionController extends BaseController {
-
-    @Autowired
-    private SysSuggestionService sysSuggestionService;
-
-    @ApiOperation(value = "新增")
-    @RequestMapping("/add")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/add')")
-    public Object add(SysSuggestion sysSuggestion) {
-        sysSuggestionService.insert(sysSuggestion);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除")
-    @RequestMapping("/del")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/del')")
-    public Object del(Long id) {
-        sysSuggestionService.delete(id);
-        return succeed();
-    }
-
-    @ApiOperation(value = "分页查询")
-    @RequestMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
-        return succeed(sysSuggestionService.queryPage(queryInfo));
-    }
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/TaskController.java

@@ -1,50 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.user.service.ExamRegistrationPaymentService;
-import com.keao.edu.user.service.ExamRoomService;
-import com.keao.edu.user.service.ExaminationBasicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RequestMapping("task")
-@RestController
-public class TaskController extends BaseController {
-
-    @Autowired
-    private ExamRegistrationPaymentService examRegistrationPaymentService;
-    @Autowired
-    private ExaminationBasicService examinationBasicService;
-    @Autowired
-    private ExamRoomService examRoomService;
-
-    // 查询订单状态
-    @GetMapping("/queryPaymentStatus")
-    public void queryOrderStatus() throws Exception {
-        try {
-            examRegistrationPaymentService.queryPaymentStatus();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    //更新考级项目状态
-    @GetMapping("/updateExamStatus")
-    public void updateExamStatus(){
-        examinationBasicService.updateExamStatus();
-    }
-
-    //明日考试安排推送
-    @GetMapping("/tomorrowExamPlanRemind")
-    public void tomorrowExamPlanRemind(String day){
-        examRoomService.tomorrowExamPlanRemind(day);
-    }
-
-    //考级项目结束提醒，提醒确认结果
-    @GetMapping("/examEndRemind")
-    public void examEndRemind(){
-        examinationBasicService.examEndRemind();
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/TeacherController.java

@@ -1,70 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.tenant.OrganContextHolder;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.entity.Teacher;
-import com.keao.edu.user.page.TeacherQueryInfo;
-import com.keao.edu.user.service.TeacherService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 系统配置控制层
- */
-@RestController
-@Api(tags = "教师服务")
-@RequestMapping(value = "teacher")
-public class TeacherController extends BaseController {
-
-	@Autowired
-	private TeacherService teacherService;
-
-	@ApiOperation(value = "教师列表")
-	@GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('teacher/list')")
-	public HttpResponseResult<PageInfo<Teacher>> list(TeacherQueryInfo queryInfo) {
-		/*if(queryInfo.getOrganId() != null){
-			queryInfo.setOrganIds(organizationService.getChildOrganIds(queryInfo.getOrganId(),true));
-		}*/
-		return succeed(teacherService.queryTeacherPage(queryInfo));
-	}
-
-	@ApiOperation(value = "修改教师")
-	@PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('teacher/update')")
-	public HttpResponseResult update(@RequestBody Teacher teacher) {
-		teacherService.updateTeacher(teacher);
-		return succeed();
-	}
-
-	@ApiOperation(value = "新增教师")
-	@PostMapping(value = "add")
-    @PreAuthorize("@pcs.hasPermissions('teacher/add')")
-	public HttpResponseResult add(@RequestBody Teacher teacher) {
-		teacher.setTenantId(TenantContextHolder.getTenantId());
-		teacher.setOrganId(OrganContextHolder.getOrganId());
-		return succeed(teacherService.add(teacher));
-	}
-
-	@ApiOperation(value = "查询教师")
-	@GetMapping(value = "get")
-    @PreAuthorize("@pcs.hasPermissions('teacher/get')")
-	public HttpResponseResult<Teacher> get(Integer id) {
-		return succeed(teacherService.get(id));
-	}
-
-	@ApiOperation(value = "删除教师")
-	@PostMapping(value = "del")
-    @PreAuthorize("@pcs.hasPermissions('teacher/del')")
-	public HttpResponseResult del(Integer id) {
-		teacherService.del(id);
-		return succeed();
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/TenantInfoController.java

@@ -1,78 +0,0 @@
-package com.keao.edu.user.controller;
-
-
-import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.dto.TenantInfoDto;
-import com.keao.edu.user.entity.TenantInfo;
-import com.keao.edu.user.service.TenantInfoService;
-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.*;
-
-import java.util.Date;
-
-@RestController
-@RequestMapping("tenantInfo")
-@Api(tags = "机构服务")
-public class TenantInfoController extends BaseController {
-
-	@Autowired
-	private TenantInfoService tenantInfoService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	
-	@ApiOperation("机构服务分页查询")
-	@GetMapping(value = "/list")
-	public HttpResponseResult<PageInfo<TenantInfoDto>> getList(QueryInfo queryInfo) {
-		return succeed(tenantInfoService.queryTenants(queryInfo));
-	}
-
-	@ApiOperation("查询机构详情")
-	@GetMapping(value = "/query")
-	public HttpResponseResult<TenantInfo> query() {
-		String tenantId = TenantContextHolder.getTenantId();
-		if(StringUtils.isNotEmpty(tenantId)){
-			return succeed(tenantInfoService.get(Integer.parseInt(tenantId)));
-		}else {
-			return succeed(new TenantInfo());
-		}
-	}
-
-	@ApiOperation("新增机构")
-	@PostMapping(value = "/add")
-	public HttpResponseResult add(@RequestBody TenantInfoDto tenantInfo) {
-		tenantInfoService.addTenant(tenantInfo);
-		return succeed();
-	}
-
-	@ApiOperation("更新机构")
-	@PostMapping(value = "/update")
-	public HttpResponseResult update(@RequestBody TenantInfoDto tenantInfo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(!sysUser.getIsSuperAdmin()){
-			String tenantId = TenantContextHolder.getTenantId();
-			if(StringUtils.isNotEmpty(tenantId)){
-				tenantInfo.setId(Integer.parseInt(tenantId));
-			}
-		}
-
-		tenantInfo.setUpdateTime(new Date());
-		tenantInfoService.updateTenant(tenantInfo);
-		return succeed();
-	}
-
-	@ApiOperation("删除")
-	@PostMapping(value = "/del")
-	public HttpResponseResult add(Integer id) {
-		return succeed(tenantInfoService.delete(id));
-	}
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/UploadFileController.java

@@ -1,46 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.UploadReturnBean;
-import com.keao.edu.user.service.UploadFileService;
-import com.keao.edu.util.upload.UploadUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 上传控制层
- */
-@RestController
-@Api(tags = "文件上传服务")
-public class UploadFileController extends BaseController {
-
-	private final static Logger LOGGER = LoggerFactory.getLogger(UploadFileController.class);
-
-	@Autowired
-	private UploadFileService uploadFileService;
-
-	@PostMapping(value = "uploadFile")
-	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) {
-		try {
-			if (file != null && StringUtils.isNotBlank(file.getOriginalFilename())) {
-				UploadReturnBean bean = uploadFileService.uploadFile(file.getInputStream(), UploadUtil.getExtension(file.getOriginalFilename()));
-				if (bean.isStatus()) {
-					return succeed(bean);
-				}
-				return failed(bean.getMessage());
-			}
-		} catch (Exception e) {
-			LOGGER.error("上传失败", e);
-		}
-		return failed("上传失败");
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/controller/WebSocketServer.java

@@ -1,139 +0,0 @@
-package com.keao.edu.user.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-
-@ServerEndpoint(value = "/ws/{userId}")
-@Component
-public class WebSocketServer {
-
-    private static Logger log = LoggerFactory.getLogger(WebSocketServer.class);
-    /**静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。*/
-    private static int onlineCount = 0;
-    /**concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。*/
-    private static ConcurrentHashMap<String,WebSocketServer> webSocketMap = new ConcurrentHashMap<>();
-    /**与某个客户端的连接会话，需要通过它来给客户端发送数据*/
-    private Session session;
-    /**接收userId*/
-    private String userId="";
-
-    /**
-     * 连接建立成功调用的方法*/
-    @OnOpen
-    public void onOpen(Session session,@PathParam("userId") String userId) {
-        this.session = session;
-        this.userId=userId;
-        if(webSocketMap.containsKey(userId)){
-            webSocketMap.remove(userId);
-            webSocketMap.put(userId,this);
-            //加入set中
-        }else{
-            webSocketMap.put(userId,this);
-            //加入set中
-            addOnlineCount();
-            //在线数加1
-        }
-
-        log.info("用户连接:"+userId+",当前在线人数为:" + getOnlineCount());
-
-        try {
-            sendMessage("连接成功");
-        } catch (IOException e) {
-            log.error("用户:"+userId+",网络异常!!!!!!");
-        }
-    }
-
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    public void onClose() {
-        if(webSocketMap.containsKey(userId)){
-            webSocketMap.remove(userId);
-            //从set中删除
-            subOnlineCount();
-        }
-        log.info("用户退出:"+userId+",当前在线人数为:" + getOnlineCount());
-    }
-
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息*/
-    @OnMessage
-    public void onMessage(String message, Session session) {
-        log.info("用户消息:"+userId+",报文:"+message);
-        //可以群发消息
-        //消息保存到数据库、redis
-        if(StringUtils.isNotBlank(message)){
-            try {
-                //解析发送的报文
-                JSONObject jsonObject = JSON.parseObject(message);
-                //追加发送人(防止串改)
-                jsonObject.put("fromUserId",this.userId);
-                String toUserId=jsonObject.getString("toUserId");
-                //传送给对应toUserId用户的websocket
-                if(StringUtils.isNotBlank(toUserId)&&webSocketMap.containsKey(toUserId)){
-                    webSocketMap.get(toUserId).sendMessage(jsonObject.toJSONString());
-                }else{
-                    log.error("请求的userId:"+toUserId+"不在该服务器上");
-                    //否则不在这个服务器上，发送到mysql或者redis
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     *
-     * @param session
-     * @param error
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("用户错误:"+this.userId+",原因:"+error.getMessage());
-        error.printStackTrace();
-    }
-    /**
-     * 实现服务器主动推送
-     */
-    public void sendMessage(String message) throws IOException {
-        this.session.getBasicRemote().sendText(message);
-    }
-
-
-    /**
-     * 发送自定义消息
-     * */
-    public static void sendInfo(String message,@PathParam("userId") String userId) throws IOException {
-        log.info("发送消息到:"+userId+"，报文:"+message);
-        if(StringUtils.isNotBlank(userId)&&webSocketMap.containsKey(userId)){
-            webSocketMap.get(userId).sendMessage(message);
-        }else{
-            log.error("用户"+userId+",不在线！");
-        }
-    }
-
-    public static synchronized int getOnlineCount() {
-        return onlineCount;
-    }
-
-    public static synchronized void addOnlineCount() {
-        WebSocketServer.onlineCount++;
-    }
-
-    public static synchronized void subOnlineCount() {
-        WebSocketServer.onlineCount--;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/AppVersionInfoDao.java

@@ -1,17 +0,0 @@
-package com.keao.edu.user.dao;
-
-import java.util.List;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.AppVersionInfo;
-
-public interface AppVersionInfoDao extends BaseDAO<Integer, AppVersionInfo> {
-
-	List<AppVersionInfo> queryNewestByPlatform(String platform);
-
-	/**
-	 * 修改所有的为历史
-	 * @param platform
-	 */
-	void batchUpdateStatus(String platform);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/EmployeeDao.java

@@ -1,7 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.Employee;
-
-public interface EmployeeDao extends BaseDAO<Integer, Employee> {
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamCertificationDao.java

@@ -1,55 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamCertificationDto;
-import com.keao.edu.user.dto.NeedCheckingDetailDto;
-import com.keao.edu.user.entity.ExamCertification;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamCertificationDao extends BaseDAO<Long, ExamCertification> {
-
-    int batchInsert(@Param("ecs")List<ExamCertification> ecs);
-
-    /**
-     * 获取学员准考证
-     * @param studentId
-     * @param examRegistrationId
-     * @return
-     */
-    ExamCertification findByStuAndBasicId(@Param("studentId") Integer studentId, @Param("examRegistrationId") Long examRegistrationId);
-
-    int updateExamAddress(@Param("address") String address,
-                          @Param("registIds") List<Long> registIds);
-
-    int deleteWithRegist(@Param("registIds") List<Long> registIds);
-
-    /**
-     * 获取学员准考证列表
-     * @param studentId
-     * @return
-     */
-    List<ExamCertificationDto> queryExamCertificationDtoPage(@Param("studentId") Integer studentId, @Param("examRegistrationId") Long examRegistrationId);
-    /**
-     * COUNT学员准考证列表
-     * @param params
-     * @return
-     */
-    Integer countExamCertificationDtoPage(Map<String, Object> params);
-
-    /**
-     * 学生端待考详情
-     * @param examRegistrationId
-     * @return
-     */
-    NeedCheckingDetailDto needCheckingDetail(Long examRegistrationId);
-
-    /**
-     * 获取监考端准考证详情
-     * @param examRegistrationId
-     * @return
-     */
-    ExamCertificationDto getExamCertificationDto(@Param("examRegistrationId") Long examRegistrationId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamLifecycleLogDao.java

@@ -1,14 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamLifecycleLogDto;
-import com.keao.edu.user.entity.ExamLifecycleLog;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ExamLifecycleLogDao extends BaseDAO<Long, ExamLifecycleLog> {
-
-    List<ExamLifecycleLogDto> findWithExam(@Param("examId") Long examId);
-	
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamLocationDao.java

@@ -1,20 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.ExamLocation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ExamLocationDao extends BaseDAO<Integer, ExamLocation> {
-
-    /**
-     * 根据ids获取考点
-     * @param ids
-     * @return
-     */
-    List<ExamLocation> getExamLocationByIds(@Param("ids") String ids);
-
-    List<ExamLocation> getTenantAllLocations(@Param("tenantId") String tenantId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamManualLedgerDao.java

@@ -1,43 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
-import com.keao.edu.user.entity.ExamManualLedger;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
-
-    List<ExamManualLedger> queryExamManualLedgers(Map<String, Object> params);
-    int countExamManualLedgers(Map<String, Object> params);
-
-    /**
-     * @describe 获取考级项目支出统计信息
-     * @author Joburgess
-     * @date 2020.07.09
-     * @param examId:
-     * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
-     */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(@Param("organId") Integer organId,
-                                                                @Param("examId") Long examId,
-                                                                @Param("targetOrganId") Integer targetOrganId);
-
-
-    List<ExamManualLedger> getExamOrganManualLedgers(@Param("organId") Integer organId,
-                                                     @Param("examId") Long examId,
-                                                     @Param("days") List<String> days);
-
-    /**
-     * @describe 统计合作单位在指定项目中的累计支出
-     * @author Joburgess
-     * @date 2020.07.21
-     * @param examId:
-     * @param organId:
-     * @return java.math.BigDecimal
-     */
-    BigDecimal countOrganLedgerWithExam(@Param("examId") Long examId,
-                                        @Param("organId") Integer organId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamMusicTheoryDao.java

@@ -1,19 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.ExamMusicTheory;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ExamMusicTheoryDao extends BaseDAO<Integer, ExamMusicTheory> {
-
-    int batchInsert(@Param("emts") List<ExamMusicTheory> examMusicTheories);
-
-    /**
-     * 获取项目乐理级别列表
-     * @param examinationBasicId
-     * @return
-     */
-    List<ExamMusicTheory> getTheoryLevelList(@Param("examinationBasicId") Integer examinationBasicId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamOrganizationRelationDao.java

@@ -1,139 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamOrganStatisticsDto;
-import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
-import com.keao.edu.user.entity.ExamOrganizationRelation;
-import com.keao.edu.user.entity.Organization;
-import com.keao.edu.user.enums.YesOrNoEnum;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizationRelation> {
-
-    List<ExamOrganizationRelationExtraDto> queryExamOrgans(Map<String, Object> params);
-    int countExamOrgans(Map<String, Object> params);
-
-    List<ExamOrganizationRelationExtraDto> getExamChildOrgans(@Param("examId") Long examId, @Param("organIds") List<Integer> organIds);
-
-    /**
-     * @param examOrganizationRelations:
-     * @return int
-     * @describe 批量插入考级项目与合作单位关联
-     * @author Joburgess
-     * @date 2020.06.18
-     */
-    int batchInsert(@Param("examOrganizationRelations") List<ExamOrganizationRelation> examOrganizationRelations);
-
-    /**
-     * @param examOrganizationRelations:
-     * @return int
-     * @describe 批量更新
-     * @author Joburgess
-     * @date 2020.06.29
-     */
-    int batchUpdate(@Param("examOrganizationRelations") List<ExamOrganizationRelation> examOrganizationRelations);
-
-    /**
-     * @describe 更新考级项目下指定合作单位的可排考状态
-     * @author Joburgess
-     * @date 2020.07.17
-     * @param examId:
-     * @param organIds:
-     * @return int
-     */
-    int updateOrganAllowArrangeExamStatus(@Param("examId") Long examId,
-                                          @Param("isAllowArrangeExam") Integer isAllowArrangeExam,
-                                          @Param("organIds") List<Integer> organIds);
-
-    /**
-     * @param examId:      考级项目编号
-     * @param organIds:    合作单位编号列表
-     * @param sendUrlFlag: 链接发送状态
-     * @return int
-     * @describe 批量更新合作单位的链接发送状态
-     * @author Joburgess
-     * @date 2020.06.18
-     */
-    int batchUpdateSendUrlFlag(@Param("examId") Integer examId,
-                               @Param("organIds") List<Integer> organIds,
-                               @Param("sendUrlFlag") YesOrNoEnum sendUrlFlag);
-
-    /**
-     * @param examId:
-     * @return com.keao.edu.user.entity.ExamOrganizationRelation
-     * @describe 获取考级项目关联的合作单位
-     * @author Joburgess
-     * @date 2020.06.18
-     */
-    List<ExamOrganizationRelation> getWithExam(@Param("examId") Integer examId);
-
-    List<ExamOrganizationRelation> getOrganInfoWithExam(@Param("examId") Integer examId);
-
-    List<ExamOrganizationRelation> getWithExams(@Param("examIds") List<Long> examIds);
-
-    List<ExamOrganizationRelation> getWithExamsAndOrgans(@Param("examIds") List<Long> examIds,
-                                                         @Param("organIds") List<Integer> organs);
-
-    /**
-     * @param examId:
-     * @return java.util.Set<java.lang.Integer>
-     * @describe 获取考级项目关联的合作单位编号
-     * @author Joburgess
-     * @date 2020.06.18
-     */
-    Set<Integer> getOrganIdsWithExam(@Param("examId") Integer examId);
-
-    /**
-     * @param examId:
-     * @param organIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamOrganizationRelation>
-     * @describe 统计指定考级项目与指定分布下的报名人数与累计收款
-     * @author Joburgess
-     * @date 2020.06.28
-     */
-    List<ExamOrganizationRelation> countExamOrganStudentAndPayment(@Param("examId") Integer examId,
-                                                                   @Param("organIds") List<Integer> organIds);
-
-    /**
-     * 是否有考试项目
-     *
-     * @param organId
-     * @return
-     */
-    Integer findByOrganId(@Param("organId") Integer organId);
-
-    /**
-     * @param params:
-     * @return java.util.List<com.keao.edu.user.entity.Organization>
-     * @describe 获取未关联到考级项目的合作单位
-     * @author Joburgess
-     * @date 2020.07.03
-     */
-    List<Organization> queryUnRelatedOrgans(Map<String, Object> params);
-
-    int countUnRelatedOrgans(Map<String, Object> params);
-
-    /**
-     * 获取考级项目关联合作单位信息
-     *
-     * @param examId
-     * @param OrganId
-     * @return
-     */
-    ExamOrganStatisticsDto getExamOrganizationRelation(@Param("examId") Long examId, @Param("OrganId") Integer OrganId);
-
-    int deleteExamOrgans(@Param("examId") Long examId, @Param("organIds") List<Integer> organIds);
-
-    /**
-     * 获取考级项目关联合作单位信息
-     * @param examId
-     * @param organIds
-     * @return
-     */
-    List<ExamOrganizationRelation> getExamOrganizationRelations(@Param("examId") Long examId, @Param("organIds") List<Integer> organIds);
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -1,171 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.*;
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
-
-    List<ExamRegistrationRoomDto> queryExamRegist(Map<String, Object> params);
-
-    int countExamRegist(Map<String, Object> params);
-
-    int batchUpdate(@Param("regists") List<ExamRegistration> regists);
-
-    /**
-     * @param organIds:
-     * @return int
-     * @describe 统计无教室学员
-     * @author Joburgess
-     * @date 2020.06.29
-     */
-    int countWithoutExamRoomStudentNum(@Param("organIds") List<Integer> organIds,
-                                       @Param("examId") Integer examId);
-
-    /**
-     * @param organIds:
-     * @param examId:
-     * @return int
-     * @describe 统计已分配教室学员数量
-     * @author Joburgess
-     * @date 2020.06.30
-     */
-    int countInExamRoomStudentNum(@Param("organIds") List<Integer> organIds,
-                                  @Param("examId") Long examId);
-
-    /**
-     * @param organIds:
-     * @param examId:
-     * @return int
-     * @describe 统计总报名人数
-     * @author Joburgess
-     * @date 2020.06.30
-     */
-    int countTotalRegistrationStudentNumWithExam(@Param("organIds") List<Integer> organIds,
-                                                 @Param("examId") Long examId);
-
-    /**
-     * @param selfOrganId: 本级合作单位编号
-     * @param organIds:    本级及子级合作单位编号
-     * @param examId:      考级项目编号
-     * @return com.keao.edu.user.dto.ExamRegistrationStatisticsDto
-     * @describe 统计招生信息
-     * @author Joburgess
-     * @date 2020.06.30
-     */
-    ExamRegistrationStatisticsDto getExamRegistrationStaticsInfo(@Param("selfOrganId") Integer selfOrganId,
-                                                                 @Param("organIds") List<Integer> organIds,
-                                                                 @Param("examId") Integer examId);
-
-    /**
-     * @param examId:
-     * @param studentIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
-     * @describe 获取指定考级项目下指定学员的报名记录
-     * @author Joburgess
-     * @date 2020.07.02
-     */
-    List<ExamRegistration> getWithExamAndStudents(@Param("examId") Long examId,
-                                                  @Param("studentIds") List<Integer> studentIds);
-
-    /**
-     * @param registIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
-     * @describe 获取指定报名记录
-     * @author Joburgess
-     * @date 2020.07.12
-     */
-    List<ExamRegistration> getRegists(@Param("registIds") List<Long> registIds);
-
-    /**
-     * COUNT学员报考记录
-     *
-     * @param params
-     * @return
-     */
-    int countStudentList(Map<String, Object> params);
-
-    /**
-     * 获取学员报考列表
-     *
-     * @param params
-     * @return
-     */
-    List<ExamRegistrationDto> queryStudentList(Map<String, Object> params);
-
-    /**
-     * 学员考试记录
-     *
-     * @param params
-     * @return
-     */
-    List<StudentExamListDto> queryExamList(Map<String, Object> params);
-
-    /**
-     * @param params
-     * @return
-     */
-    int countExamList(Map<String, Object> params);
-
-
-    /**
-     * 获取报名信息
-     *
-     * @return
-     */
-    ExamRegistrationDto getExamRegistration(@Param("examRegistrationId") Long examRegistrationId);
-
-    /**
-     * 获取单条报名信息
-     *
-     * @param id
-     * @return
-     */
-    ExamRegistration getExamRegistrationInfo(@Param("id") Integer id);
-
-    /**
-     * 根据考试项目id专业id和等级获取已报名的信息
-     *
-     * @param examId
-     * @param subjectId
-     * @param level
-     * @return
-     */
-    ExamRegistration getRegistration(@Param("examId") Long examId, @Param("studentId") Integer studentId,
-                                     @Param("subjectId") Integer subjectId, @Param("level") Integer level,
-                                     @Param("statusEnumList") List<StudentRegistrationStatusEnum> statusEnumList);
-
-    /**
-     * 获取学员机构列表
-     * @param userId
-     * @return
-     */
-    List<Integer> queryStudentTenantId(Integer userId);
-
-    /**
-     * 学生端考级曲库考试列表
-     * @param params
-     * @return
-     */
-    int countStudentBaseExams(Map<String, Object> params);
-
-    /**
-     * 学生端考级曲库考试列表
-     * @param params
-     * @return
-     */
-    List<StudentBaseExamsDto> queryStudentBaseExams(Map<String, Object> params);
-
-    /**
-     * 学生端录播详情页面
-     * @param examRegistrationId
-     * @return
-     */
-    StuRecordDetailDto getStuRecordDetail(Long examRegistrationId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -1,78 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
-import com.keao.edu.user.entity.ExamRegistrationPayment;
-import com.keao.edu.user.enums.TransStatusEnum;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrationPayment> {
-
-    /**
-     * 获取用户项目未支付的订单
-     *
-     * @param examinationBasicId
-     * @param userId
-     * @return
-     */
-    ExamRegistrationPayment getExamIngOrder(@Param("examinationBasicId") Long examinationBasicId, @Param("userId") Integer userId);
-
-    /**
-     * 根据订单号获取订单
-     *
-     * @param orderNo
-     * @return
-     */
-    ExamRegistrationPayment getByOrderNo(@Param("orderNo") String orderNo);
-
-    /**
-     * 根据状态获取订单
-     *
-     * @param status
-     * @param payType
-     * @return
-     */
-    List<ExamRegistrationPayment> getOrdersByStatus(@Param("status") String status, @Param("payType") String payType);
-
-
-    /**
-     * 获取过期未支付的订单列表
-     *
-     * @param orderNoList
-     * @param transStatus
-     * @param beforeTime
-     * @return
-     */
-    List<ExamRegistrationPayment> findOrdersOverTime(@Param("orderNoList") List<String> orderNoList, @Param("transStatus") TransStatusEnum transStatus, @Param("beforeTime") Date beforeTime);
-
-    /**
-     * 获取支付列表
-     *
-     * @return
-     */
-    List<ExamRegistrationPaymentDto> getOrderPageList(Map<String, Object> params);
-
-    /**
-     * 获取订单总条数
-     * @param params
-     * @return
-     */
-    Integer getOrderListCount(Map<String, Object> params);
-
-    /**
-     * @describe 获取指定日期中分部考级项目的报名费用
-     * @author Joburgess
-     * @date 2020.07.16
-     * @param examId:
-     * @param organId:
-     * @param days:
-     * @return java.util.List<com.keao.edu.user.entity.ExamRegistrationPayment>
-     */
-    List<ExamRegistrationPayment> getWithExamOrganAndDay(@Param("examId") Long examId,
-                                                         @Param("organId") Integer organId,
-                                                         @Param("days") List<String> days);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamReviewDao.java

@@ -1,40 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamReviewDto;
-import com.keao.edu.user.dto.ExamReviewRecordDto;
-import com.keao.edu.user.entity.ExamReview;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamReviewDao extends BaseDAO<Long, ExamReview> {
-
-    /**
-     * @describe 获取考试结果
-     * @author Joburgess
-     * @date 2020.06.24
-     * @param params:
-     * @return java.util.List<com.keao.edu.user.dto.ExamReviewDto>
-     */
-    List<ExamReviewDto> findExamResult(Map<String, Object> params);
-    int countExamResult(Map<String, Object> params);
-
-    /**
-     * 监考页面评审列表查询
-     * @param params
-     * @return
-     */
-    int countExamReviewRecordList(Map<String, Object> params);
-
-    /**
-     * 监考页面评审列表查询
-     * @param params
-     * @return
-     */
-    List<ExamReviewRecordDto> queryExamReviewRecordList(Map<String, Object> params);
-
-    ExamReview findByRegistrationId(@Param("examRegistrationId") Long examRegistrationId, @Param("teacherId") Integer teacherId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamRoomDao.java

@@ -1,95 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.api.entity.ExamRoom;
-import com.keao.edu.user.dto.ExamRoomDto;
-import com.keao.edu.user.dto.ExamRoomExamTimeDto;
-import com.keao.edu.user.dto.ExamRoomListDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamRoomDao extends BaseDAO<Long, ExamRoom> {
-
-    int batchInsert(@Param("examRooms") List<ExamRoom> examRooms);
-
-    int batchUpdate(@Param("examRooms") List<ExamRoom> examRooms);
-
-    /**
-     * COUNT教师考试列表
-     * @param params
-     * @return
-     */
-    int countExamRoomPage(Map<String, Object> params);
-
-    /**
-     * 获取教师考试列表（未完待续）
-     * @param params
-     * @return
-     */
-    List<ExamRoomListDto> queryExamRoomPage(Map<String, Object> params);
-
-    /**
-     * @describe 获取考级教师列表
-     * @author Joburgess
-     * @date 2020.07.12
-     * @param params:
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
-     */
-    List<ExamRoomDto> queryExamRoom(Map<String, Object> params);
-    int countExamRoom(Map<String, Object> params);
-
-    /**
-     * @describe 获取考场首尾考试时间
-     * @author Joburgess
-     * @date 2020.07.24
-     * @param examId:
-     * @return com.keao.edu.user.dto.ExamRoomExamTimeDto
-     */
-    ExamRoomExamTimeDto getExamRoomExamTime(@Param("examId") Long examId);
-
-    /**
-     * @describe 删除指定教室
-     * @author Joburgess
-     * @date 2020.06.24
-     * @param examRoomIds:
-     * @return int
-     */
-    int batchDeleteExamRooms(@Param("examRoomIds") List<Long> examRoomIds);
-    
-    /**
-     * @describe 获取指定考级项目下的考场
-     * @author Joburgess
-     * @date 2020.06.30
-     * @param examId: 
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
-     */
-    List<ExamRoom> getWithExam(@Param("organIds") List<Integer> organIds,
-                                @Param("examId") Long examId);
-
-    int updateSL(ExamRoom examRoom);
-
-    ExamRoom lockRoom(@Param("examRoomId") Long examRoomId);
-
-    /**
-     * @describe 根据日期获取教室
-     * @author Joburgess
-     * @date 2020.07.07
-     * @param days:
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
-     */
-    List<ExamRoom> getWithDays(@Param("days") List<String> days);
-
-    /**
-     * @describe 根据专业获取指定考级项目下可选择教室
-     * @author Joburgess
-     * @date 2020.07.08
-     * @param examId:
-     * @param subjectId:
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
-     */
-    List<ExamRoom> getWithExamAndSubject(@Param("examId") Long examId,
-                                         @Param("subjectId") Integer subjectId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamRoomStudentRelationDao.java

@@ -1,183 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
-import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
-import com.keao.edu.user.dto.RoomStudentListDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface ExamRoomStudentRelationDao extends BaseDAO<Long, ExamRoomStudentRelation> {
-
-    int batchInsert(@Param("roomStudents") List<ExamRoomStudentRelation> examRoomStudentRelations);
-
-    /**
-     * 开启/关闭教室
-     * @param openFlag
-     * @param examinationBasicId
-     * @param studentId
-     */
-    void switchClassRoom(@Param("openFlag") Integer openFlag, @Param("examinationBasicId") Integer examinationBasicId, @Param("studentId") Integer studentId);
-
-    List<ExamRoomStudentRelationDto> findExamRoomStudents(Map<String, Object> params);
-    int countExamRoomStudents(Map<String, Object> params);
-
-    /**
-     * @describe 获取指定教室的学员
-     * @author Joburgess
-     * @date 2020.06.24
-     * @param examRoomId:
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoomStudentRelation>
-     */
-    List<ExamRoomStudentRelation> findStudentsWithExamRoom(@Param("examRoomId") Long examRoomId);
-
-
-    List<ExamRoomStudentRelation> findStudentsWithExamRooms(@Param("examRoomIds") List<Long> examRoomIds);
-
-    /**
-     * @describe 删除指定教室的学员
-     * @author Joburgess
-     * @date 2020.06.24
-     * @param examRoomId:
-     * @param registIds:
-     * @return int
-     */
-    int deleteStudentsFromExamRoom(@Param("examRoomId") Long examRoomId,
-                                    @Param("registIds") List<Long> registIds);
-
-    /**
-     * @describe 根据班级删除记录
-     * @author Joburgess
-     * @date 2020.06.24
-     * @param examRoomIds:
-     * @return int
-     */
-    int deleteWithExamRooms(@Param("examRoomIds") List<Long> examRoomIds);
-
-    /**
-     * @describe 获取考级项目下指定分部未发送考试安排的学员
-     * @author Joburgess
-     * @date 2020.07.22
-     * @param examId:
-     * @param organIds:
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoomStudentRelation>
-     */
-    List<ExamRoomStudentRelation> getNoSendExamPlanRooms(@Param("examId") Long examId,
-                                                               @Param("organIds") List<Integer> organIds);
-
-    /**
-     * @describe 获取考试时间在指定日期的考场学生记录
-     * @author Joburgess
-     * @date 2020.07.22
-     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoomStudentRelation>
-     */
-    List<ExamRoomStudentRelation> getTomorrowExamStudents(@Param("day") String day);
-
-    /**
-     * 获取教室学员关联
-     * @param basicId
-     * @param roomId
-     * @param studentId
-     * @return
-     */
-    List<ExamRoomStudentRelation> getExamRoomStudentRelations(@Param("basicId") Long basicId, @Param("roomId") String roomId, @Param("studentId") Integer studentId);
-
-    /**
-     * @describe 获取报名学员所在教室
-     * @author Joburgess
-     * @date 2020.07.08
-     * @param registId:
-     * @return com.keao.edu.user.api.entity.ExamRoomStudentRelation
-     */
-    ExamRoomStudentRelation getStudentExamRoom(@Param("registId") Long registId);
-
-    /**
-     * 获取教室
-     * @param roomId
-     * @param currentUserId
-     * @return
-     */
-    ExamRoomStudentRelation findByStudentIdAndRoomId(@Param("roomId") Long roomId, @Param("currentUserId") Integer currentUserId);
-
-    /**
-     * 清除签到时间
-     * @param examRegistrationId
-     */
-    void cleanSignInTime(Long examRegistrationId);
-
-    /**
-     * 获取房间学员队列
-     * @param roomId
-     * @return
-     */
-    List<RoomStudentListDto> queryStudentList(Long roomId);
-
-    /**
-     * 获取签到总人数
-     * @param roomId
-     * @return
-     */
-    Integer querySignTotalNum(Long roomId);
-
-    /**
-     * 获取未签到总人数
-     * @param roomId
-     * @return
-     */
-    Integer queryNoSignTotalNum(Long roomId);
-
-    /**
-     * 获取未考试学院数
-     * @param roomId
-     * @return
-     */
-    Integer querySurplusNum(Long roomId);
-
-    /**
-     * 获取当前学员需要等待人数
-     * @param examRoomId
-     * @param signInTime
-     * @return
-     */
-    Integer sumWaitNum(@Param("examRoomId") Long examRoomId, @Param("signInTime") String signInTime, @Param("studentId") Integer studentId);
-
-    /**
-     * 获取所有参考学员编号
-     * @param examRoomId
-     * @return
-     */
-    String getStudentIds(Long examRoomId);
-
-    /**
-     * 获取学员编号注册编号map
-     * @param examRoomId
-     * @return
-     */
-    List<Map<Integer, String>> getStuRegistrationMap(Long examRoomId);
-
-    /**
-     * 获取房间学员数
-     * @param roomIds
-     * @return
-     */
-    List<Map<Long,Integer>> getStudentNumMap(@Param("roomIds") Set<Long> roomIds);
-
-    /**
-     * 获取已签到学员数
-     * @param examRoomId
-     * @return
-     */
-    Integer countSignInNum(Long examRoomId);
-
-    /**
-     * @describe 统计指定教师学员数量
-     * @author Joburgess
-     * @date 2020.07.28
-     * @param examRoomId:
-     * @return int
-     */
-    int countStudentsWithRoom(Long examRoomId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamSongDao.java

@@ -1,67 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.ExamSong;
-import com.keao.edu.user.enums.SongTypeEnum;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map;
-
-public interface ExamSongDao extends BaseDAO<Integer, ExamSong> {
-
-    /**
-     * 获取考试曲目
-     *
-     * @param ids
-     * @return
-     */
-    List<ExamSong> getExamSongs(@Param("ids") String ids);
-
-    /**
-     * @describe 根据专业获取曲目
-     * @author Joburgess
-     * @date 2020.07.03
-     * @param subjectId:
-     * @return java.util.List<com.keao.edu.user.entity.ExamSong>
-     */
-    List<ExamSong> getWithSubject(@Param("subjectId") Integer subjectId);
-
-    /**
-     * @describe 根据级别和类型获取曲库
-     * @author Joburgess
-     * @date 2020.07.03
-     * @param level:
-     * @param songType:
-     * @return java.util.List<com.keao.edu.user.entity.ExamSong>
-     */
-    List<ExamSong> getWithLevelAndType(@Param("tenantId") String tenantId,
-                                       @Param("level") String level,
-                                       @Param("songType")SongTypeEnum songType);
-
-    /**
-     * COUNT学生端考级曲库
-     * @param params
-     * @return
-     */
-    int countSongPage(Map<String, Object> params);
-
-    /**
-     * 学生端考级曲库
-     * @param params
-     * @return
-     */
-    List<ExamSong> querySongPage(Map<String, Object> params);
-
-    /**
-     * @describe 获取指定的曲目
-     * @author Joburgess
-     * @date 2020.07.03
-     * @param ids:
-     * @return java.util.List<com.keao.edu.user.entity.ExamSong>
-     */
-    List<ExamSong> getWithIds(@Param("ids") List<Integer> ids);
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamSubjectDao.java

@@ -1,45 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamSubjectDto;
-import com.keao.edu.user.entity.ExamSubject;
-import com.keao.edu.user.entity.Subject;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ExamSubjectDao extends BaseDAO<Long, ExamSubject> {
-
-    int batchInsert(@Param("examSubjects") List<ExamSubject> examSubjects);
-
-    int deleteWithExamSubject(@Param("examId") Long examId, @Param("subjectId") Integer subjectId);
-
-    /**
-     * @param examId: 考级项目编号
-     * @return java.util.List<com.keao.edu.user.entity.ExamSubject>
-     * @describe 获取考级项目关联的声部
-     * @author Joburgess
-     * @date 2020.06.19
-     */
-    List<ExamSubject> getWithTenant(@Param("examId") Integer examId);
-
-    /**
-     * 根据考级项目编号获取相关专业
-     *
-     * @param examId 考级项目编号
-     * @return
-     */
-    List<ExamSubjectDto> getSubjectWithExamId(@Param("examId") Integer examId);
-
-    /**
-     * @describe 获取与考级项目无关的专业
-     * @author Joburgess
-     * @date 2020.07.03
-     * @param tenantId:
-     * @param examId:
-     * @return java.util.List<com.keao.edu.user.entity.Subject>
-     */
-    List<Subject> getUnRelatedWithExamSubjects(@Param("tenantId") Integer tenantId,
-                                               @Param("examId") Integer examId);
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamSubjectSongDao.java

@@ -1,47 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamSubjectSongDto;
-import com.keao.edu.user.entity.ExamSubjectSong;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamSubjectSongDao extends BaseDAO<Long, ExamSubjectSong> {
-
-    int batchInsert(@Param("examSubjectSongs") List<ExamSubjectSong> examSubjectSongs);
-
-    /**
-     * @param examId:
-     * @return java.util.List<com.keao.edu.user.entity.ExamSubjectSong>
-     * @describe 获取考级项目下的专业设置
-     * @author Joburgess
-     * @date 2020.06.22
-     */
-    List<ExamSubjectSong> findByExam(@Param("examId") Integer examId);
-
-
-    /**
-     * 获取考试对应科目对应级别的曲目
-     *
-     * @param examSubjectId
-     * @param level
-     * @return
-     */
-    ExamSubjectSong getExamSubjectSong(@Param("examinationBasicId") Integer examinationBasicId, @Param("examSubjectId") Long examSubjectId, @Param("level") Integer level);
-
-    /**
-     * 获取项目对应专业的级别
-     * @param examinationBasicId
-     * @param examSubjectId
-     * @return
-     */
-    List<ExamSubjectSong> getExamSubjectLevels(@Param("examinationBasicId") Integer examinationBasicId, @Param("examSubjectId") Long examSubjectId);
-
-    List<ExamSubjectSongDto> queryExamSubjectSongs(Map<String, Object> params);
-    int countExamSubjectSongs(Map<String, Object> params);
-
-    int countExamSongsWithSubject(@Param("examId") Long examId,@Param("subjectId") Integer subjectId);
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExamTeacherSalaryDao.java

@@ -1,80 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.BaseUserInfoDto;
-import com.keao.edu.user.dto.ExamTeacherSalaryDto;
-import com.keao.edu.user.dto.ExamTeacherSalaryStaticsInfo;
-import com.keao.edu.user.dto.TeacherDto;
-import com.keao.edu.user.entity.ExamTeacherSalary;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExamTeacherSalaryDao extends BaseDAO<Long, ExamTeacherSalary> {
-
-    int batchInsert(@Param("examTeacherSalaries") List<ExamTeacherSalary> examTeacherSalaries);
-
-    int batchUpdate(@Param("teacherSalaries") List<ExamTeacherSalary> teacherSalaries);
-
-    List<ExamTeacherSalaryDto> queryExamTeacherSalary(Map<String, Object> params);
-    int countExamTeacherSalary(Map<String, Object> params);
-
-    /**
-     * @describe 获取指定考级项目下的老师分润设置
-     * @author Joburgess
-     * @date 2020.07.02
-     * @param examId:
-     * @return java.util.List<com.keao.edu.user.entity.ExamTeacherSalary>
-     */
-    List<ExamTeacherSalary> queryWithExam(@Param("examId") Long examId);
-
-    /**
-     * @describe 获取指定考级项目下教师的基本信息
-     * @author Joburgess
-     * @date 2020.07.02
-     * @param examId:
-     * @return java.util.List<com.keao.edu.user.dto.BaseUserInfoDto>
-     */
-    List<BaseUserInfoDto> getTeachersWithExam(@Param("examId") Integer examId);
-
-    /**
-     * @describe 获取指定老师的分润设置
-     * @author Joburgess
-     * @date 2020.07.20
-     * @param teacherIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamTeacherSalary>
-     */
-    List<ExamTeacherSalary> getWithTeachers(@Param("teacherIds") List<Integer> teacherIds);
-
-    /**
-     * @describe 获取指定考级项目下指定老师的分润设置
-     * @author Joburgess
-     * @date 2020.07.02
-     * @param examId:
-     * @param teacherIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamTeacherSalary>
-     */
-    List<ExamTeacherSalary> getWithExamAndTeacher(@Param("examId") Long examId,
-                                                  @Param("teacherIds") List<Integer> teacherIds);
-
-    /**
-     * @describe 获取与考级项目无关的教师
-     * @author Joburgess
-     * @date 2020.07.02
-     * @param params:
-     * @return java.util.List<com.keao.edu.user.entity.Teacher>
-     */
-    List<TeacherDto> queryUnRelatedWithExamTeachers(Map<String, Object> params);
-    int countUnRelatedWithExamTeachers(Map<String, Object> params);
-
-    /**
-     * @describe 统计考级项目教师信息
-     * @author Joburgess
-     * @date 2020.07.08
-     * @param examId:
-     * @return com.keao.edu.user.dto.ExamTeacherSalaryStaticsInfo
-     */
-    ExamTeacherSalaryStaticsInfo getExamTeacherSalaryStaticsInfo(@Param("examId") Integer examId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -1,41 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExaminationBasicDto;
-import com.keao.edu.user.entity.ExaminationBasic;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
-
-    int batchUpdate(@Param("exams") List<ExaminationBasic> exams);
-
-    ExaminationBasic lockExam(@Param("examId") Long examId);
-
-    ExaminationBasicDto getExaminationBasic(Integer examId);
-
-    /**
-     * @describe 获取指定日期结束的考级项目
-     * @author Joburgess
-     * @date 2020.07.27
-     * @param day:
-     * @return java.util.List<com.keao.edu.user.entity.ExaminationBasic>
-     */
-    List<ExaminationBasic> getEndExamsWithDayAndStatus(@Param("day") String day);
-
-    List<ExaminationBasicDto> findExaminationBasics(Map<String, Object> params);
-    int countExaminationBasics(Map<String, Object> params);
-
-    /**
-     * @describe 获取需要更新状态的考级项目
-     * @author Joburgess
-     * @date 2020.06.19
-     * @return java.util.List<com.keao.edu.user.entity.ExaminationBasic>
-     */
-    List<ExaminationBasic> getNeedUpdateStatusExams();
-
-    List<ExaminationBasicDto> getExams(@Param("examIds") List<Long> examIds);
-	
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/MusicTheoryDao.java

@@ -1,21 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.MusicTheory;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author: wangyp
- * @Date: 2020/6/27 11:26
- * @desc 乐理Dao
- */
-public interface MusicTheoryDao extends BaseDAO<Integer, MusicTheory> {
-
-    List<MusicTheory> getWithTenant(@Param("tenantId") Integer tenantId);
-
-    MusicTheory getWithTenantAndLevel(@Param("tenantId") String tenantId,
-                                      @Param("level") Integer level);
-
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/OrganizationDao.java

@@ -1,58 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.Organization;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface OrganizationDao extends BaseDAO<Integer, Organization> {
-
-    /**
-     * @describe 获取指定机构下的所有合作单位
-     * @author Joburgess
-     * @date 2020.06.18
-     * @param tenantId:
-     * @return
-     */
-    List<Organization> getByTenant(@Param("tenantId") String tenantId);
-
-    /**
-     * @describe 获取指定单位所有下级单位的编号
-     * @author Joburgess
-     * @date 2020.06.28
-     * @param parentOrganIdTag:
-     * @return java.util.List<java.lang.Integer>
-     */
-    List<Integer> getChildOrganIds(@Param("parentOrganIdTag") String parentOrganIdTag);
-
-    /**
-     * @describe 获取指定单位所有下级单位
-     * @author Joburgess
-     * @date 2020.06.28
-     * @param parentOrganIdTag:
-     * @return java.util.List<java.lang.Integer>
-     */
-    List<Organization> getChildOrgans(@Param("parentOrganIdTag") String parentOrganIdTag);
-
-    /**
-     * @describe 获取下一级所有合作单位编号
-     * @author Joburgess
-     * @date 2020.06.28
-     * @param organId: 当前合作单位
-     * @return java.util.List<java.lang.Integer>
-     */
-    List<Integer> getNextLevelOrganIds(@Param("organId") Integer organId);
-
-    /**
-     * @describe 获取指定的合作单位
-     * @author Joburgess
-     * @date 2020.07.07
-     * @param organIds:
-     * @return java.util.List<com.keao.edu.user.entity.Organization>
-     */
-    List<Organization> getOrgans(@Param("organIds") List<Integer> organIds);
-
-    Organization findByUserId(Integer userId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/ShortUrlDao.java

@@ -1,9 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.ShortUrl;
-
-public interface ShortUrlDao extends BaseDAO<Long, ShortUrl> {
-
-	
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/StudentDao.java

@@ -1,37 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.api.entity.Student;
-import com.keao.edu.user.dto.StudentExamPaymentDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface StudentDao extends BaseDAO<Integer, Student> {
-
-
-    /**
-     * COUNT学员报名详情列表
-     *
-     * @param params
-     * @return
-     */
-    int countApplyList(Map<String, Object> params);
-
-    /**
-     * 获取学员报名详情列表
-     *
-     * @param params
-     * @return
-     */
-    List<StudentExamPaymentDto> queryApplyList(Map<String, Object> params);
-
-    /**
-     * 获取学生信息
-     *
-     * @param userId
-     * @return
-     */
-    Student getStudent(@Param("userId") Integer userId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/StudentExamResultDao.java

@@ -1,104 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.api.enums.StudentExamResultApiDto;
-import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
-import com.keao.edu.user.entity.StudentExamResult;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
-
-    int batchInsert(@Param("results") List<StudentExamResult> results);
-
-    int deleteWithRegists(@Param("registIds") List<Long> registIds);
-
-    /**
-     * @describe 获取指定考级项目的考级结果
-     * @author Joburgess
-     * @date 2020.07.24
-     * @param examId:
-     * @return java.util.List<com.keao.edu.user.entity.StudentExamResult>
-     */
-    List<StudentExamResult> getWithExam(@Param("examId") Long examId);
-
-    /**
-     * @describe 查询考试结果
-     * @author Joburgess
-     * @date 2020.06.30
-     * @param params:
-     * @return java.util.List<com.keao.edu.user.entity.StudentExamResult>
-     */
-    List<StudentExamResult> queryStudentExamResult(Map<String, Object> params);
-
-    int countStudentExamResult(Map<String, Object> params);
-
-    /**
-     * @describe 考试结果统计信息
-     * @author Joburgess
-     * @date 2020.06.30
-     * @param organIds:
-     * @param examId:
-     * @return com.keao.edu.user.dto.StudentExamResultStatisticsDto
-     */
-    StudentExamResultStatisticsDto getStudentExamResultStatisticsInfo(@Param("organIds") List<Integer> organIds,
-                                                                      @Param("examId") Integer examId);
-
-    /**
-     * 获取考试次数
-     * @param studentIds
-     * @param tenantId
-     * @return
-     */
-    List<Map<Integer, Integer>> countExamNum(@Param("studentIds") List<Integer> studentIds, @Param("tenantId") String tenantId);
-
-    /**
-     * 获取考试结果
-     * @param examRegistrationId
-     * @return
-     */
-    StudentExamResult findByRegistrationId(Long examRegistrationId);
-
-    /**
-     * 获取考试结果
-     * @param examRegistrationId
-     * @return
-     */
-    StudentExamResultApiDto getStudentExamResultApiDto(Long examRegistrationId);
-
-    /**
-     * 确认考生
-     * @param examRegistrationId
-     */
-    void confirmStudent(Long examRegistrationId);
-
-    /**
-     * 修改学员考试状态
-     * @param examRegistrationId
-     * @param finishedExam
-     */
-    void updateFinishedExam(@Param("examRegistrationId") Long examRegistrationId, @Param("finishedExam") Integer finishedExam);
-
-    /**
-     * 获取学员房间关联
-     * @param roomId
-     * @param userId
-     */
-    StudentExamResult findByRoomIdAndUserId(@Param("roomId") String roomId, @Param("userId") String userId);
-
-    /**
-     * 修改学员SessionId
-     * @param examRegistrationId
-     * @param sessionId
-     */
-    void updateSessionId(@Param("examRegistrationId") Long examRegistrationId, @Param("sessionId") String sessionId);
-
-    /**
-     * 修改屏蔽用户
-     * @param examRegistrationId
-     * @param shieldUserId
-     */
-    void updateShield(@Param("examRegistrationId") Long examRegistrationId, @Param("shieldUserId") String shieldUserId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/SubjectDao.java

@@ -1,61 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.Subject;
-import com.keao.edu.user.enums.YesOrNoEnum;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface SubjectDao extends BaseDAO<Integer, Subject> {
-
-    /**
-     * 根据父级id查询子级列表
-     *
-     * @param parentId
-     * @return
-     */
-    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag, @Param("tenantId") String tenantId);
-
-    /**
-     * 根据声部id字符串查询
-     *
-     * @param subIds
-     * @return
-     */
-    List<String> findBySubIds(String subIds);
-
-    /**
-     * 根据声部编号列表获取声部名称map
-     *
-     * @param subjectIds
-     * @return
-     */
-    List<Map<Integer, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
-
-    /**
-     * 获取子级列表
-     *
-     * @return
-     */
-    List<Subject> findSubSubjects(@Param("tenantId") Integer tenantId);
-
-    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
-
-    List<Subject> findBySubjectIds(@Param("subjectIds") List<Integer> subjectIds);
-
-    /**
-     * 获取声部名称
-     * @param subjectIdList
-     * @return
-     */
-    String findNames(String subjectIdList);
-
-    /**
-     * 是否有使用中的专业
-     * @param id
-     * @return
-     */
-    int countExamSubject(Integer id);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/SysConfigDao.java

@@ -1,25 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.common.entity.SysConfig;
-
-public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/9
-     * @params [paramName]
-     * @return com.keao.edu.biz.dal.entity.SysConfig
-     * @describe 根据配置名称获取配置信息
-     */
-    SysConfig findByParamName(String paramName);
-
-    /**
-     * 获取value
-     * @param paramName
-     * @return
-     */
-    String findConfigValue(String paramName);
-	
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/SysSuggestionDao.java

@@ -1,10 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.SysSuggestion;
-
-public interface SysSuggestionDao extends BaseDAO<Long, SysSuggestion> {
-
-	
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/SysUserDao.java

@@ -1,92 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.api.enums.UserLockFlag;
-import com.keao.edu.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Set;
-
-public interface SysUserDao extends BaseDAO<Integer, SysUser> {
-
-	/**
-	 * 根据手机号查询对象
-	 * @param phone
-	 * @return
-	 */
-	SysUser queryByPhone(String phone);
-
-	Integer lockUser(@Param("userId") Integer userId);
-
-	/**
-	 * 根据手机号查询对象
-	 * @param phone
-	 * @return
-	 */
-	SysUser queryByPhoneAndClient(@Param("phone") String phone, @Param("client") String client);
-
-	/**
-	 * 根据状态查询
-	 * @param status
-	 * @return
-	 */
-	List<SysUser> queryByStatus(UserLockFlag status);
-
-	/**
-	 * 删除用户角色
-	 * @param userId
-	 */
-	void delEmployeeRole(Integer userId);
-
-	/**
-	 * 删除用户角色
-	 * @param userIds
-	 */
-	void batchDelEmployeeRole(@Param("userIds") Set<Integer> userIds);
-
-	/**
-	 * 批量新增用户角色
-	 * @param id
-	 * @param roles
-	 */
-	void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roles") Integer roles);
-	/**
-	 * 批量新增用户角色
-	 * @param userIds
-	 * @param roles
-	 */
-	void batchAddEmployeeRoles(@Param("userIds") Set<Integer> userIds, @Param("roles") Integer roles);
-
-	/**
-	 * 获取用户角色
-	 * @param userId
-	 * @return
-	 */
-	Integer queryRoleIds(Integer userId);
-
-	/**
-	 * 修改userType
-	 * @param userId
-	 * @param userType
-	 */
-	void updateUserType(@Param("userId") Integer userId, @Param("userType") String userType);
-
-	/**
-	 * @describe 根据部门获取用户
-	 * @author Joburgess
-	 * @date 2020.07.16
-	 * @param organId:
-	 * @return com.keao.edu.auth.api.entity.SysUser
-	 */
-	SysUser getWithOrgan(@Param("organId") Integer organId);
-
-	/**
-	 * @describe 获取手机号对应的用户
-	 * @author Joburgess
-	 * @date 2020.07.27
-	 * @param phones:
-	 * @return java.util.List<com.keao.edu.auth.api.entity.SysUser>
-	 */
-	List<SysUser> getWithPones(@Param("phones") List<String> phones);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/TeacherDao.java

@@ -1,24 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.Teacher;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface TeacherDao extends BaseDAO<Integer, Teacher> {
-
-    List<Teacher> getWithTeachers(@Param("teacherIds") List<Integer> teacherIds);
-
-    int batchUpdate(@Param("teachers") List<Teacher> teachers);
-
-    /**
-     * 获取教师声部名
-     * @param teacherIds
-     * @return
-     */
-    List<Map<Integer, String>> queryTeacherSubjectNames(@Param("teacherIds") Set<Integer> teacherIds);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dao/TenantInfoDao.java

@@ -1,27 +0,0 @@
-package com.keao.edu.user.dao;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.TenantInfoDto;
-import com.keao.edu.user.entity.TenantInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface TenantInfoDao extends BaseDAO<Integer, TenantInfo> {
-
-    List<TenantInfoDto> queryTenants(Map<String, Object> params);
-
-    List<TenantInfo> getTenants(@Param("ids") List<Integer> ids);
-
-    int countTenants(Map<String, Object> params);
-
-    /**
-     * @describe 获取指定分部的机构信息
-     * @author Joburgess
-     * @date 2020.07.13
-     * @param organId:
-     * @return com.keao.edu.user.entity.TenantInfo
-     */
-    TenantInfo getWithOrgan(@Param("organId") Integer organId);
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/BaseUserInfoDto.java

@@ -1,63 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.02
- */
-public class BaseUserInfoDto {
-
-    /** 主键ID */
-    private Integer id;
-
-    @ApiModelProperty(value = "手机号",required = false)
-    private String phone;
-
-    /** 头像 */
-    @ApiModelProperty(value = "头像",required = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "真实姓名",required = false)
-    private String realName;
-
-    public BaseUserInfoDto() {
-    }
-
-    public BaseUserInfoDto(Integer id, String realName) {
-        this.id = id;
-        this.realName = realName;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamCertificationDto.java

@@ -1,149 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class ExamCertificationDto{
-
-    @ApiModelProperty(value = "报名编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "准考证号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "性别")
-    private Integer gender;
-
-    @ApiModelProperty(value = "科目")
-    private String subjectName;
-
-    @ApiModelProperty(value = "科目")
-    private Integer subjectId;
-
-    @ApiModelProperty(value = "学员编号")
-    private Integer studentId;
-
-    @ApiModelProperty(value = "学员确认状态")
-    private Integer confirmStatus;
-
-    @ApiModelProperty(value = "级别")
-    private Integer level;
-
-    @ApiModelProperty(value = "考试时间")
-    private String examTime;
-
-    @ApiModelProperty(value = "考试地点")
-    private String examAddress;
-
-    @ApiModelProperty(value = "证件照")
-    private String certificatePhoto;
-
-    @ApiModelProperty(value = "考试内容")
-    private String songJson;
-
-    public Integer getConfirmStatus() {
-        return confirmStatus;
-    }
-
-    public void setConfirmStatus(Integer confirmStatus) {
-        this.confirmStatus = confirmStatus;
-    }
-
-    public Integer getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Integer studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getSongJson() {
-        return songJson;
-    }
-
-    public void setSongJson(String songJson) {
-        this.songJson = songJson;
-    }
-
-    public String getCertificatePhoto() {
-        return certificatePhoto;
-    }
-
-    public void setCertificatePhoto(String certificatePhoto) {
-        this.certificatePhoto = certificatePhoto;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public String getCardNo() {
-        return cardNo;
-    }
-
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Integer getGender() {
-        return gender;
-    }
-
-    public void setGender(Integer gender) {
-        this.gender = gender;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getExamTime() {
-        return examTime;
-    }
-
-    public void setExamTime(String examTime) {
-        this.examTime = examTime;
-    }
-
-    public String getExamAddress() {
-        return examAddress;
-    }
-
-    public void setExamAddress(String examAddress) {
-        this.examAddress = examAddress;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamLifecycleLogDto.java

@@ -1,20 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamLifecycleLog;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.17
- */
-public class ExamLifecycleLogDto extends ExamLifecycleLog {
-
-    private String operatorName;
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamManualLedgerStatisticsDto.java

@@ -1,34 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.09
- */
-public class ExamManualLedgerStatisticsDto {
-
-    @ApiModelProperty(value = "支出笔数")
-    private Integer expenditureNum;
-
-    @ApiModelProperty(value = "支出费用")
-    private BigDecimal expenditureFee;
-
-    public Integer getExpenditureNum() {
-        return expenditureNum;
-    }
-
-    public void setExpenditureNum(Integer expenditureNum) {
-        this.expenditureNum = expenditureNum;
-    }
-
-    public BigDecimal getExpenditureFee() {
-        return expenditureFee;
-    }
-
-    public void setExpenditureFee(BigDecimal expenditureFee) {
-        this.expenditureFee = expenditureFee;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamOrganRegistDto.java

@@ -1,44 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.27
- */
-public class ExamOrganRegistDto {
-
-    private Integer examId;
-
-    @ApiModelProperty(value = "总报名人数")
-    private Integer totalRegistrationStudentNum;
-
-    @ApiModelProperty(value = "总缴费金额")
-    private BigDecimal totalPaymentAmount;
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public Integer getTotalRegistrationStudentNum() {
-        return totalRegistrationStudentNum;
-    }
-
-    public void setTotalRegistrationStudentNum(Integer totalRegistrationStudentNum) {
-        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
-    }
-
-    public BigDecimal getTotalPaymentAmount() {
-        return totalPaymentAmount;
-    }
-
-    public void setTotalPaymentAmount(BigDecimal totalPaymentAmount) {
-        this.totalPaymentAmount = totalPaymentAmount;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamOrganStatisticsDto.java

@@ -1,44 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamOrganizationRelation;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.16
- */
-public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
-
-    private List<ExamLifecycleLogDto> examLifecycleLogs;
-
-    private Map<String, BigDecimal> dayTransAmount;
-
-    private Map<String, BigDecimal> dayPaymentAmount;
-
-    public List<ExamLifecycleLogDto> getExamLifecycleLogs() {
-        return examLifecycleLogs;
-    }
-
-    public void setExamLifecycleLogs(List<ExamLifecycleLogDto> examLifecycleLogs) {
-        this.examLifecycleLogs = examLifecycleLogs;
-    }
-
-    public Map<String, BigDecimal> getDayTransAmount() {
-        return dayTransAmount;
-    }
-
-    public void setDayTransAmount(Map<String, BigDecimal> dayTransAmount) {
-        this.dayTransAmount = dayTransAmount;
-    }
-
-    public Map<String, BigDecimal> getDayPaymentAmount() {
-        return dayPaymentAmount;
-    }
-
-    public void setDayPaymentAmount(Map<String, BigDecimal> dayPaymentAmount) {
-        this.dayPaymentAmount = dayPaymentAmount;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamOrganizationRelationExtraDto.java

@@ -1,30 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamOrganizationRelation;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-public class ExamOrganizationRelationExtraDto extends ExamOrganizationRelation {
-
-    private String organizationName;
-
-    private int selfOrgan;
-
-    public int getSelfOrgan() {
-        return selfOrgan;
-    }
-
-    public void setSelfOrgan(int selfOrgan) {
-        this.selfOrgan = selfOrgan;
-    }
-
-    public String getOrganizationName() {
-        return organizationName;
-    }
-
-    public void setOrganizationName(String organizationName) {
-        this.organizationName = organizationName;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamPaymentInfo.java

@@ -1,30 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.entity.ExamRegistrationPayment;
-import io.swagger.annotations.ApiModelProperty;
-
-public class ExamPaymentInfo{
-
-    @ApiModelProperty(value = "订单信息")
-    private ExamRegistrationPayment examRegistrationPayment;
-
-    @ApiModelProperty(value = "报名信息")
-    private ExamRegistrationDto examRegistrationDto;
-
-    public ExamRegistrationDto getExamRegistrationDto() {
-        return examRegistrationDto;
-    }
-
-    public void setExamRegistrationDto(ExamRegistrationDto examRegistrationDto) {
-        this.examRegistrationDto = examRegistrationDto;
-    }
-
-    public ExamRegistrationPayment getExamRegistrationPayment() {
-        return examRegistrationPayment;
-    }
-
-    public void setExamRegistrationPayment(ExamRegistrationPayment examRegistrationPayment) {
-        this.examRegistrationPayment = examRegistrationPayment;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRecordDto.java

@@ -1,52 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.entity.StudentExamResult;
-import io.swagger.annotations.ApiModelProperty;
-
-public class ExamRecordDto extends ExamRegistration {
-
-    @ApiModelProperty(value = "考试项目")
-    private String examBaseName;
-
-    @ApiModelProperty(value = "考试项目")
-    private String subjectName;
-
-    @ApiModelProperty(value = "准考证")
-    private String examCertificationId;
-
-    @ApiModelProperty(value = "考试结果")
-    private StudentExamResult studentExamResult;
-
-    public String getExamBaseName() {
-        return examBaseName;
-    }
-
-    public void setExamBaseName(String examBaseName) {
-        this.examBaseName = examBaseName;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getExamCertificationId() {
-        return examCertificationId;
-    }
-
-    public void setExamCertificationId(String examCertificationId) {
-        this.examCertificationId = examCertificationId;
-    }
-
-    public StudentExamResult getStudentExamResult() {
-        return studentExamResult;
-    }
-
-    public void setStudentExamResult(StudentExamResult studentExamResult) {
-        this.studentExamResult = studentExamResult;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRegistrationDto.java

@@ -1,283 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-public class ExamRegistrationDto{
-
-    @ApiModelProperty(value = "报名编号")
-    private Long id;
-
-    @ApiModelProperty(value = "考级项目编号")
-    private Long examinationBasicId;
-
-    @ApiModelProperty(value = "专业编号")
-    private Integer subjectId;
-
-    @ApiModelProperty(value = "报考级别")
-    private Integer level;
-
-    @ApiModelProperty(value = "考级费用")
-    private BigDecimal levelFee;
-
-    @ApiModelProperty(value = "乐理级别")
-    private Integer examMusicTheoryLevel;
-
-    @ApiModelProperty(value = "乐理考级费用")
-    private BigDecimal theoryLevelFee;
-
-    @ApiModelProperty(value = "考试内容")
-    private String songJson;
-
-    @ApiModelProperty(value = "上次报考级别")
-    private Integer lastExamLevel;
-
-    @ApiModelProperty(value = "上次报考证书")
-    private String lastExamCertificateUrl;
-
-    @ApiModelProperty(value = "上次乐理级别")
-    private Integer lastMusicTheoryLevel;
-
-    @ApiModelProperty(value = "上次乐理证书")
-    private String lastMusicTheoryCertificateUrl;
-
-    @ApiModelProperty(value = "证件号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "报名状态（缴费状态）")
-    private StudentRegistrationStatusEnum status;
-
-    @ApiModelProperty(value = "备注")
-    private String memo;
-
-    @ApiModelProperty(value = "订单编号")
-    private String paymentOrderNo;
-
-    @ApiModelProperty(value = "考试项目名称")
-    private String examBaseName;
-
-    @ApiModelProperty(value = "考试专业")
-    private String subjectName;
-
-    @ApiModelProperty(value = "报名开始时间")
-    private String enrollStartTime;
-
-    @ApiModelProperty(value = "演奏曲列表（用逗号分隔）")
-    private String performSongIdList;
-
-    @ApiModelProperty(value = "练习曲列表（用逗号分隔）")
-    private String practiceSongIdList;
-
-    @ApiModelProperty(value = "报名结束时间")
-    private String enrollEndTime;
-
-    @ApiModelProperty(value = "预计考试开始时间")
-    private String examStartTime;
-
-    @ApiModelProperty(value = "预计考试结束时间")
-    private String examEndTime;
-
-    private String studentName;
-
-    public String getPerformSongIdList() {
-        return performSongIdList;
-    }
-
-    public void setPerformSongIdList(String performSongIdList) {
-        this.performSongIdList = performSongIdList;
-    }
-
-    public String getPracticeSongIdList() {
-        return practiceSongIdList;
-    }
-
-    public void setPracticeSongIdList(String practiceSongIdList) {
-        this.practiceSongIdList = practiceSongIdList;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getExaminationBasicId() {
-        return examinationBasicId;
-    }
-
-    public void setExaminationBasicId(Long examinationBasicId) {
-        this.examinationBasicId = examinationBasicId;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public BigDecimal getLevelFee() {
-        return levelFee;
-    }
-
-    public void setLevelFee(BigDecimal levelFee) {
-        this.levelFee = levelFee;
-    }
-
-    public Integer getExamMusicTheoryLevel() {
-        return examMusicTheoryLevel;
-    }
-
-    public void setExamMusicTheoryLevel(Integer examMusicTheoryLevel) {
-        this.examMusicTheoryLevel = examMusicTheoryLevel;
-    }
-
-    public BigDecimal getTheoryLevelFee() {
-        return theoryLevelFee;
-    }
-
-    public void setTheoryLevelFee(BigDecimal theoryLevelFee) {
-        this.theoryLevelFee = theoryLevelFee;
-    }
-
-    public String getSongJson() {
-        return songJson;
-    }
-
-    public void setSongJson(String songJson) {
-        this.songJson = songJson;
-    }
-
-    public Integer getLastExamLevel() {
-        return lastExamLevel;
-    }
-
-    public void setLastExamLevel(Integer lastExamLevel) {
-        this.lastExamLevel = lastExamLevel;
-    }
-
-    public String getLastExamCertificateUrl() {
-        return lastExamCertificateUrl;
-    }
-
-    public void setLastExamCertificateUrl(String lastExamCertificateUrl) {
-        this.lastExamCertificateUrl = lastExamCertificateUrl;
-    }
-
-    public Integer getLastMusicTheoryLevel() {
-        return lastMusicTheoryLevel;
-    }
-
-    public void setLastMusicTheoryLevel(Integer lastMusicTheoryLevel) {
-        this.lastMusicTheoryLevel = lastMusicTheoryLevel;
-    }
-
-    public String getLastMusicTheoryCertificateUrl() {
-        return lastMusicTheoryCertificateUrl;
-    }
-
-    public void setLastMusicTheoryCertificateUrl(String lastMusicTheoryCertificateUrl) {
-        this.lastMusicTheoryCertificateUrl = lastMusicTheoryCertificateUrl;
-    }
-
-    public String getCardNo() {
-        return cardNo;
-    }
-
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
-    }
-
-    public StudentRegistrationStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(StudentRegistrationStatusEnum status) {
-        this.status = status;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public String getExamBaseName() {
-        return examBaseName;
-    }
-
-    public void setExamBaseName(String examBaseName) {
-        this.examBaseName = examBaseName;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getEnrollStartTime() {
-        return enrollStartTime;
-    }
-
-    public void setEnrollStartTime(String enrollStartTime) {
-        this.enrollStartTime = enrollStartTime;
-    }
-
-    public String getEnrollEndTime() {
-        return enrollEndTime;
-    }
-
-    public void setEnrollEndTime(String enrollEndTime) {
-        this.enrollEndTime = enrollEndTime;
-    }
-
-    public String getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(String examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public String getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(String examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getPaymentOrderNo() {
-        return paymentOrderNo;
-    }
-
-    public void setPaymentOrderNo(String paymentOrderNo) {
-        this.paymentOrderNo = paymentOrderNo;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRegistrationPaymentDto.java

@@ -1,32 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamLocation;
-import com.keao.edu.user.entity.ExamRegistrationPayment;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-public class ExamRegistrationPaymentDto extends ExamRegistrationPayment {
-
-    @ApiModelProperty(value = "准考证号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "考试地点")
-    private List<ExamLocation> examLocations;
-
-    public List<ExamLocation> getExamLocations() {
-        return examLocations;
-    }
-
-    public void setExamLocations(List<ExamLocation> examLocations) {
-        this.examLocations = examLocations;
-    }
-
-    public String getCardNo() {
-        return cardNo;
-    }
-
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRegistrationRoomDto.java

@@ -1,57 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamRegistration;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.08
- */
-public class ExamRegistrationRoomDto extends ExamRegistration {
-
-    @ApiModelProperty(value = "考场编号")
-    private Long examRoomId;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Date examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Date examEndTime;
-
-    @ApiModelProperty(value = "是否完成考试")
-    private Integer isFinishedExam;
-
-    public Long getExamRoomId() {
-        return examRoomId;
-    }
-
-    public void setExamRoomId(Long examRoomId) {
-        this.examRoomId = examRoomId;
-    }
-
-    public Date getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Date examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Date getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Date examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public Integer getIsFinishedExam() {
-        return isFinishedExam;
-    }
-
-    public void setIsFinishedExam(Integer isFinishedExam) {
-        this.isFinishedExam = isFinishedExam;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRegistrationStatisticsDto.java

@@ -1,54 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.30
- */
-public class ExamRegistrationStatisticsDto {
-
-    @ApiModelProperty(value = "总招生人数")
-    private int totalRegistrationStudentNum;
-
-    @ApiModelProperty(value = "子合作伙伴招生人数")
-    private int childOrganRegistrationStudentNum;
-
-    @ApiModelProperty(value = "待审核人数")
-    private int waitAuditStudentNum;
-
-    @ApiModelProperty(value = "退费人数")
-    private int refundedStudentNum;
-
-    public int getTotalRegistrationStudentNum() {
-        return totalRegistrationStudentNum;
-    }
-
-    public void setTotalRegistrationStudentNum(int totalRegistrationStudentNum) {
-        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
-    }
-
-    public int getChildOrganRegistrationStudentNum() {
-        return childOrganRegistrationStudentNum;
-    }
-
-    public void setChildOrganRegistrationStudentNum(int childOrganRegistrationStudentNum) {
-        this.childOrganRegistrationStudentNum = childOrganRegistrationStudentNum;
-    }
-
-    public int getWaitAuditStudentNum() {
-        return waitAuditStudentNum;
-    }
-
-    public void setWaitAuditStudentNum(int waitAuditStudentNum) {
-        this.waitAuditStudentNum = waitAuditStudentNum;
-    }
-
-    public int getRefundedStudentNum() {
-        return refundedStudentNum;
-    }
-
-    public void setRefundedStudentNum(int refundedStudentNum) {
-        this.refundedStudentNum = refundedStudentNum;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamReviewDto.java

@@ -1,48 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.entity.ExamReview;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.24
- */
-public class ExamReviewDto extends ExamReview {
-
-    @ApiModelProperty(value = "学员基本信息")
-    private SysUser studentInfo;
-
-    @ApiModelProperty(value = "考生报名信息")
-    private ExamRegistration examRegistration;
-
-    @ApiModelProperty(value = "考试时间")
-    private Date examStartTime;
-
-    public Date getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Date examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public SysUser getStudentInfo() {
-        return studentInfo;
-    }
-
-    public void setStudentInfo(SysUser studentInfo) {
-        this.studentInfo = studentInfo;
-    }
-
-    public ExamRegistration getExamRegistration() {
-        return examRegistration;
-    }
-
-    public void setExamRegistration(ExamRegistration examRegistration) {
-        this.examRegistration = examRegistration;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamReviewRecordDto.java

@@ -1,127 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class ExamReviewRecordDto {
-
-    @ApiModelProperty(value = "学员报名编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "学员名称")
-    private String realName;
-
-    @ApiModelProperty(value = "学员编号")
-    private Integer studentId;
-
-    @ApiModelProperty(value = "是否录制")
-    private Integer recordFlag;
-
-    @ApiModelProperty(value = "考试状态，是否完成考试")
-    private Integer finishedExam;
-
-    @ApiModelProperty(value = "考试形态，直播还是录播")
-    private Integer confirmStatus;
-
-    @ApiModelProperty(value = "开始录制时间")
-    private Integer recordStartTime;
-
-    @ApiModelProperty(value = "评价")
-    private String evaluationContent;
-
-    @ApiModelProperty(value = "视频地址")
-    private String videoUrl;
-
-    @ApiModelProperty(value = "评分")
-    private Integer evaluationResult;
-
-    @ApiModelProperty(value = "评审编号")
-    private Integer examReviewId;
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public String getVideoUrl() {
-        return videoUrl;
-    }
-
-    public void setVideoUrl(String videoUrl) {
-        this.videoUrl = videoUrl;
-    }
-
-    public Integer getRecordFlag() {
-        return recordFlag;
-    }
-
-    public void setRecordFlag(Integer recordFlag) {
-        this.recordFlag = recordFlag;
-    }
-
-    public Integer getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Integer studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Integer getFinishedExam() {
-        return finishedExam;
-    }
-
-    public void setFinishedExam(Integer finishedExam) {
-        this.finishedExam = finishedExam;
-    }
-
-    public Integer getConfirmStatus() {
-        return confirmStatus;
-    }
-
-    public void setConfirmStatus(Integer confirmStatus) {
-        this.confirmStatus = confirmStatus;
-    }
-
-    public Integer getRecordStartTime() {
-        return recordStartTime;
-    }
-
-    public void setRecordStartTime(Integer recordStartTime) {
-        this.recordStartTime = recordStartTime;
-    }
-
-    public String getEvaluationContent() {
-        return evaluationContent;
-    }
-
-    public void setEvaluationContent(String evaluationContent) {
-        this.evaluationContent = evaluationContent;
-    }
-
-    public Integer getEvaluationResult() {
-        return evaluationResult;
-    }
-
-    public void setEvaluationResult(Integer evaluationResult) {
-        this.evaluationResult = evaluationResult;
-    }
-
-    public Integer getExamReviewId() {
-        return examReviewId;
-    }
-
-    public void setExamReviewId(Integer examReviewId) {
-        this.examReviewId = examReviewId;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRoomDto.java

@@ -1,28 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.api.entity.ExamRoom;
-import com.keao.edu.user.entity.ExamLocation;
-import com.keao.edu.user.entity.ExaminationBasic;
-
-public class ExamRoomDto extends ExamRoom {
-
-    private ExamLocation examLocation;
-
-    private ExaminationBasic examinationBasic;
-
-    public ExamLocation getExamLocation() {
-        return examLocation;
-    }
-
-    public void setExamLocation(ExamLocation examLocation) {
-        this.examLocation = examLocation;
-    }
-
-    public ExaminationBasic getExaminationBasic() {
-        return examinationBasic;
-    }
-
-    public void setExaminationBasic(ExaminationBasic examinationBasic) {
-        this.examinationBasic = examinationBasic;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRoomExamTimeDto.java

@@ -1,30 +0,0 @@
-package com.keao.edu.user.dto;
-
-import java.util.Date;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.24
- */
-public class ExamRoomExamTimeDto {
-
-    private Date examStartTime;
-
-    private Date examEndTime;
-
-    public Date getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Date examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Date getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Date examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRoomListDto.java

@@ -1,138 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class ExamRoomListDto{
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    @ApiModelProperty(value = "结束时间")
-    private String examEndTime;
-
-    @ApiModelProperty(value = "开始时间")
-    private String examStartTime;
-
-    @ApiModelProperty(value = "教室编号")
-    private Long examRoomId;
-
-    @ApiModelProperty(value = "专业")
-    private String subjectNameList;
-
-    @ApiModelProperty(value = "考生人数")
-    private Integer studentNum;
-
-    @ApiModelProperty(value = "主考老师")
-    private  String mainTeacherUserName;
-
-    @ApiModelProperty(value = "主考老师编号")
-    private String getMainTeacherUserId;
-
-    @ApiModelProperty(value = "助教老师")
-    private String assistantTeacherUserIdList;
-
-    @ApiModelProperty(value = "助教老师编号")
-    private String assistantTeacherUserNameList;
-
-    @ApiModelProperty(value = "考试状态")
-    private String examBaseStatus;
-
-    @ApiModelProperty(value = "考场状态")
-    private Integer openFlag;
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(String examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(String examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamRoomId() {
-        return examRoomId;
-    }
-
-    public void setExamRoomId(Long examRoomId) {
-        this.examRoomId = examRoomId;
-    }
-
-    public String getSubjectNameList() {
-        return subjectNameList;
-    }
-
-    public void setSubjectNameList(String subjectNameList) {
-        this.subjectNameList = subjectNameList;
-    }
-
-    public Integer getStudentNum() {
-        return studentNum;
-    }
-
-    public void setStudentNum(Integer studentNum) {
-        this.studentNum = studentNum;
-    }
-
-    public String getMainTeacherUserName() {
-        return mainTeacherUserName;
-    }
-
-    public void setMainTeacherUserName(String mainTeacherUserName) {
-        this.mainTeacherUserName = mainTeacherUserName;
-    }
-
-    public String getGetMainTeacherUserId() {
-        return getMainTeacherUserId;
-    }
-
-    public void setGetMainTeacherUserId(String getMainTeacherUserId) {
-        this.getMainTeacherUserId = getMainTeacherUserId;
-    }
-
-    public String getAssistantTeacherUserIdList() {
-        return assistantTeacherUserIdList;
-    }
-
-    public void setAssistantTeacherUserIdList(String assistantTeacherUserIdList) {
-        this.assistantTeacherUserIdList = assistantTeacherUserIdList;
-    }
-
-    public String getAssistantTeacherUserNameList() {
-        return assistantTeacherUserNameList;
-    }
-
-    public void setAssistantTeacherUserNameList(String assistantTeacherUserNameList) {
-        this.assistantTeacherUserNameList = assistantTeacherUserNameList;
-    }
-
-    public String getExamBaseStatus() {
-        return examBaseStatus;
-    }
-
-    public void setExamBaseStatus(String examBaseStatus) {
-        this.examBaseStatus = examBaseStatus;
-    }
-
-    public Integer getOpenFlag() {
-        return openFlag;
-    }
-
-    public void setOpenFlag(Integer openFlag) {
-        this.openFlag = openFlag;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRoomStatisticsDto.java

@@ -1,78 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.30
- */
-public class ExamRoomStatisticsDto {
-
-    @ApiModelProperty(value = "考场数量")
-    private int examRoomNum;
-
-    @ApiModelProperty(value = "考场分派老师数量")
-    private int examRoomTeacherNum;
-
-    @ApiModelProperty(value = "已安排考试学生数量")
-    private int inRoomStudentNum;
-
-    @ApiModelProperty(value = "总报名学生数量")
-    private int totalRegistrationStudentNum;
-
-    @ApiModelProperty(value = "第一次考试时间")
-    private Date firstExamTime;
-
-    @ApiModelProperty(value = "最后一次考试时间")
-    private Date lastExamTime;
-
-    public int getExamRoomNum() {
-        return examRoomNum;
-    }
-
-    public void setExamRoomNum(int examRoomNum) {
-        this.examRoomNum = examRoomNum;
-    }
-
-    public int getExamRoomTeacherNum() {
-        return examRoomTeacherNum;
-    }
-
-    public void setExamRoomTeacherNum(int examRoomTeacherNum) {
-        this.examRoomTeacherNum = examRoomTeacherNum;
-    }
-
-    public int getInRoomStudentNum() {
-        return inRoomStudentNum;
-    }
-
-    public void setInRoomStudentNum(int inRoomStudentNum) {
-        this.inRoomStudentNum = inRoomStudentNum;
-    }
-
-    public int getTotalRegistrationStudentNum() {
-        return totalRegistrationStudentNum;
-    }
-
-    public void setTotalRegistrationStudentNum(int totalRegistrationStudentNum) {
-        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
-    }
-
-    public Date getFirstExamTime() {
-        return firstExamTime;
-    }
-
-    public void setFirstExamTime(Date firstExamTime) {
-        this.firstExamTime = firstExamTime;
-    }
-
-    public Date getLastExamTime() {
-        return lastExamTime;
-    }
-
-    public void setLastExamTime(Date lastExamTime) {
-        this.lastExamTime = lastExamTime;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamRoomStudentRelationDto.java

@@ -1,47 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
-import com.keao.edu.user.entity.Subject;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.24
- */
-public class ExamRoomStudentRelationDto extends ExamRoomStudentRelation {
-
-    @ApiModelProperty(value = "学员详情")
-    private SysUser studentInfo;
-
-    @ApiModelProperty(value = "专业信息")
-    private Subject subject;
-
-    @ApiModelProperty(value = "报名信息")
-    private ExamRegistration examRegistration;
-
-    public SysUser getStudentInfo() {
-        return studentInfo;
-    }
-
-    public void setStudentInfo(SysUser studentInfo) {
-        this.studentInfo = studentInfo;
-    }
-
-    public Subject getSubject() {
-        return subject;
-    }
-
-    public void setSubject(Subject subject) {
-        this.subject = subject;
-    }
-
-    public ExamRegistration getExamRegistration() {
-        return examRegistration;
-    }
-
-    public void setExamRegistration(ExamRegistration examRegistration) {
-        this.examRegistration = examRegistration;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamSubjectDto.java

@@ -1,16 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.Subject;
-
-public class ExamSubjectDto extends Subject {
-
-    private Long examSubjectId;
-
-    public Long getExamSubjectId() {
-        return examSubjectId;
-    }
-
-    public void setExamSubjectId(Long examSubjectId) {
-        this.examSubjectId = examSubjectId;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamSubjectSongDto.java

@@ -1,33 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamSubjectSong;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.03
- */
-public class ExamSubjectSongDto extends ExamSubjectSong {
-
-    @ApiModelProperty(value = "练习曲名称")
-    private String practiceSongNames;
-
-    @ApiModelProperty(value = "演奏曲名称")
-    private String performSongNames;
-
-    public String getPracticeSongNames() {
-        return practiceSongNames;
-    }
-
-    public void setPracticeSongNames(String practiceSongNames) {
-        this.practiceSongNames = practiceSongNames;
-    }
-
-    public String getPerformSongNames() {
-        return performSongNames;
-    }
-
-    public void setPerformSongNames(String performSongNames) {
-        this.performSongNames = performSongNames;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamTeacherSalaryDto.java

@@ -1,20 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamTeacherSalary;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.08
- */
-public class ExamTeacherSalaryDto extends ExamTeacherSalary {
-
-    private ExaminationBasicDto examinationBasic;
-
-    public ExaminationBasicDto getExaminationBasic() {
-        return examinationBasic;
-    }
-
-    public void setExaminationBasic(ExaminationBasicDto examinationBasic) {
-        this.examinationBasic = examinationBasic;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExamTeacherSalaryStaticsInfo.java

@@ -1,34 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.08
- */
-public class ExamTeacherSalaryStaticsInfo {
-
-    @ApiModelProperty(value = "教师数量")
-    private Integer teacherNum;
-
-    @ApiModelProperty(value = "预计支出金额")
-    private BigDecimal expectExpenseAmount;
-
-    public Integer getTeacherNum() {
-        return teacherNum;
-    }
-
-    public void setTeacherNum(Integer teacherNum) {
-        this.teacherNum = teacherNum;
-    }
-
-    public BigDecimal getExpectExpenseAmount() {
-        return expectExpenseAmount;
-    }
-
-    public void setExpectExpenseAmount(BigDecimal expectExpenseAmount) {
-        this.expectExpenseAmount = expectExpenseAmount;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/ExaminationBasicDto.java

@@ -1,57 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExaminationBasic;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.27
- */
-public class ExaminationBasicDto extends ExaminationBasic {
-
-    @ApiModelProperty(value = "创建人名称")
-    private String creatorName;
-
-    @ApiModelProperty(value = "合作单位数量")
-    private Integer organNum;
-
-    @ApiModelProperty(value = "总报名人数")
-    private Integer totalRegistrationStudentNum;
-
-    @ApiModelProperty(value = "总缴费金额")
-    private BigDecimal totalPaymentAmount;
-
-    public String getCreatorName() {
-        return creatorName;
-    }
-
-    public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
-    }
-
-    public Integer getOrganNum() {
-        return organNum;
-    }
-
-    public void setOrganNum(Integer organNum) {
-        this.organNum = organNum;
-    }
-
-    public Integer getTotalRegistrationStudentNum() {
-        return totalRegistrationStudentNum;
-    }
-
-    public void setTotalRegistrationStudentNum(Integer totalRegistrationStudentNum) {
-        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
-    }
-
-    public BigDecimal getTotalPaymentAmount() {
-        return totalPaymentAmount;
-    }
-
-    public void setTotalPaymentAmount(BigDecimal totalPaymentAmount) {
-        this.totalPaymentAmount = totalPaymentAmount;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/NeedCheckingDetailDto.java

@@ -1,149 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class NeedCheckingDetailDto {
-
-    @ApiModelProperty(value = "报名编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "考场与学员关联编号")
-    private Long examRoomStudentRelationId;
-
-    @ApiModelProperty(value = "开始时间")
-    private String examStartTime;
-
-    @ApiModelProperty(value = "结束时间")
-    private String examEndTime;
-
-    @ApiModelProperty(value = "签到时间")
-    private String signInTime;
-
-    @ApiModelProperty(value = "房间入口开启状态")
-    private Integer classroomSwitch;
-
-    @ApiModelProperty(value = "考试是否开始")
-    private Integer openFlag;
-
-    @ApiModelProperty(value = "是否录制")
-    private Integer recordFlag;
-
-    @ApiModelProperty(value = "学员是否考试")
-    private Integer finishedExam;
-
-    @ApiModelProperty(value = "等待人数")
-    private Integer waitNum;
-
-    @ApiModelProperty(value = "考试名称")
-    private String baseExamName;
-
-    @ApiModelProperty(value = "房间编号")
-    private Long examRoomId;
-
-    @ApiModelProperty(value = "注意事项")
-    private String desc;
-
-    public Integer getRecordFlag() {
-        return recordFlag;
-    }
-
-    public void setRecordFlag(Integer recordFlag) {
-        this.recordFlag = recordFlag;
-    }
-
-    public Long getExamRoomStudentRelationId() {
-        return examRoomStudentRelationId;
-    }
-
-    public void setExamRoomStudentRelationId(Long examRoomStudentRelationId) {
-        this.examRoomStudentRelationId = examRoomStudentRelationId;
-    }
-
-    public Integer getFinishedExam() {
-        return finishedExam;
-    }
-
-    public void setFinishedExam(Integer finishedExam) {
-        this.finishedExam = finishedExam;
-    }
-
-    public Integer getOpenFlag() {
-        return openFlag;
-    }
-
-    public void setOpenFlag(Integer openFlag) {
-        this.openFlag = openFlag;
-    }
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public String getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(String examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public String getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(String examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getSignInTime() {
-        return signInTime;
-    }
-
-    public void setSignInTime(String signInTime) {
-        this.signInTime = signInTime;
-    }
-
-    public Integer getClassroomSwitch() {
-        return classroomSwitch;
-    }
-
-    public void setClassroomSwitch(Integer classroomSwitch) {
-        this.classroomSwitch = classroomSwitch;
-    }
-
-    public Integer getWaitNum() {
-        return waitNum;
-    }
-
-    public void setWaitNum(Integer waitNum) {
-        this.waitNum = waitNum;
-    }
-
-    public String getBaseExamName() {
-        return baseExamName;
-    }
-
-    public void setBaseExamName(String baseExamName) {
-        this.baseExamName = baseExamName;
-    }
-
-    public Long getExamRoomId() {
-        return examRoomId;
-    }
-
-    public void setExamRoomId(Long examRoomId) {
-        this.examRoomId = examRoomId;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/RecordNotify.java

@@ -1,97 +0,0 @@
-package com.keao.edu.user.dto;
-
-public class RecordNotify {
-	private Long timestamp;
-
-	private Integer type;
-
-	private String appkey;
-
-	private String recordId;
-
-	private String sessionId;
-
-	private String roomId;
-
-	private String userId;
-
-	private String output;
-
-	public Long getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public String getAppkey() {
-		return appkey;
-	}
-
-	public void setAppkey(String appkey) {
-		this.appkey = appkey;
-	}
-
-	public String getRecordId() {
-		return recordId;
-	}
-
-	public void setRecordId(String recordId) {
-		this.recordId = recordId;
-	}
-
-	public String getSessionId() {
-		return sessionId;
-	}
-
-	public void setSessionId(String sessionId) {
-		this.sessionId = sessionId;
-	}
-
-	public String getRoomId() {
-		return roomId;
-	}
-
-	public void setRoomId(String roomId) {
-		this.roomId = roomId;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getOutput() {
-		return output;
-	}
-
-	public void setOutput(String output) {
-		this.output = output;
-	}
-
-	@Override
-	public String toString() {
-		return "RecordNotify{" +
-				"timestamp=" + timestamp +
-				", type=" + type +
-				", appkey='" + appkey + '\'' +
-				", recordId='" + recordId + '\'' +
-				", sessionId='" + sessionId + '\'' +
-				", roomId='" + roomId + '\'' +
-				", userId='" + userId + '\'' +
-				", output='" + output + '\'' +
-				'}';
-	}
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/RoomStudentListDto.java

@@ -1,105 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class RoomStudentListDto {
-
-    @ApiModelProperty(value = "学员房间关联id")
-    private Long examRoomStudentRelationId;
-
-    @ApiModelProperty(value = "学员报名编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "学员名称")
-    private String realName;
-
-    @ApiModelProperty(value = "声部名")
-    private String subjectName;
-
-    @ApiModelProperty(value = "签到时间（为空代表未签到）")
-    private String signInTime;
-
-    @ApiModelProperty(value = "级别")
-    private Integer level;
-
-    @ApiModelProperty(value = "学员考试状态 0考试中,1呼叫中,2已签到,3未签到,4录播中,5已完成")
-    private Integer finishedExam;
-
-    @ApiModelProperty(value = "房间编号")
-    private Long examRoomId;
-
-    @ApiModelProperty(value = "学员编号")
-    private Integer studentId;
-
-    public Integer getFinishedExam() {
-        return finishedExam;
-    }
-
-    public void setFinishedExam(Integer finishedExam) {
-        this.finishedExam = finishedExam;
-    }
-
-    public String getSignInTime() {
-        return signInTime;
-    }
-
-    public void setSignInTime(String signInTime) {
-        this.signInTime = signInTime;
-    }
-
-    public Long getExamRoomStudentRelationId() {
-        return examRoomStudentRelationId;
-    }
-
-    public void setExamRoomStudentRelationId(Long examRoomStudentRelationId) {
-        this.examRoomStudentRelationId = examRoomStudentRelationId;
-    }
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public Long getExamRoomId() {
-        return examRoomId;
-    }
-
-    public void setExamRoomId(Long examRoomId) {
-        this.examRoomId = examRoomId;
-    }
-
-    public Integer getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Integer studentId) {
-        this.studentId = studentId;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/StuRecordDetailDto.java

@@ -1,85 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-public class StuRecordDetailDto {
-
-    @ApiModelProperty(value = "报名编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "剩余时长（秒）")
-    private Integer subTime;
-
-    @ApiModelProperty(value = "录制最大时长（分）")
-    private Integer recordTime;
-
-    @ApiModelProperty(value = "单首曲目录制时长（分）")
-    private Integer singleSongRecordMinutes;
-
-    @ApiModelProperty(value = "实际考试结束时间")
-    private Date examEndTime;
-
-    @ApiModelProperty(value = "考试内容")
-    private String songJson;
-
-    @ApiModelProperty(value = "开始录制时间")
-    private Date recordStartTime;
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public Integer getRecordTime() {
-        return recordTime;
-    }
-
-    public void setRecordTime(Integer recordTime) {
-        this.recordTime = recordTime;
-    }
-
-    public Integer getSingleSongRecordMinutes() {
-        return singleSongRecordMinutes;
-    }
-
-    public void setSingleSongRecordMinutes(Integer singleSongRecordMinutes) {
-        this.singleSongRecordMinutes = singleSongRecordMinutes;
-    }
-
-    public Date getRecordStartTime() {
-        return recordStartTime;
-    }
-
-    public void setRecordStartTime(Date recordStartTime) {
-        this.recordStartTime = recordStartTime;
-    }
-
-    public Integer getSubTime() {
-        return subTime;
-    }
-
-    public void setSubTime(Integer subTime) {
-        this.subTime = subTime;
-    }
-
-    public Date getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Date examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getSongJson() {
-        return songJson;
-    }
-
-    public void setSongJson(String songJson) {
-        this.songJson = songJson;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/StudentBaseExamsDto.java

@@ -1,28 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class StudentBaseExamsDto {
-
-    @ApiModelProperty(value = "考试名")
-    private String baseExamName;
-
-    @ApiModelProperty(value = "机构编号")
-    private Integer tenantId;
-
-    public String getBaseExamName() {
-        return baseExamName;
-    }
-
-    public void setBaseExamName(String baseExamName) {
-        this.baseExamName = baseExamName;
-    }
-
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/StudentExamListDto.java

@@ -1,195 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.api.enums.ExamEvaluationResultEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-public class StudentExamListDto{
-    @ApiModelProperty(value = "实际考试开始时间")
-    private String actualExamStartTime;
-
-    @ApiModelProperty(value = "实际考试结束时间")
-    private String actualExamEndTime;
-
-    @ApiModelProperty(value = "考试项目名称")
-    private String examBaseName;
-
-    @ApiModelProperty(value = "考级项目编号")
-    private Long examinationBasicId;
-
-    @ApiModelProperty(value = "准考证号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "专业")
-    private String subjectName;
-
-    @ApiModelProperty(value = "专业")
-    private Integer subjectId;
-
-    @ApiModelProperty(value = "报考级别")
-    private Integer level;
-
-    @ApiModelProperty(value = "乐理级别")
-    private Integer examMusicTheoryLevel;
-
-    @ApiModelProperty(value = "乐理考级费用")
-    private BigDecimal theoryLevelFee;
-
-    @ApiModelProperty(value = "考试地点")
-    private String examAddress;
-
-    @ApiModelProperty(value = "准考证编号")
-    private String examCertificationId;
-
-    @ApiModelProperty(value = "学员报考编号")
-    private Long examRegistrationId;
-
-    @ApiModelProperty(value = "考试结果")
-    private ExamEvaluationResultEnum result;
-
-    @ApiModelProperty(value = "教师评审均分")
-    private Float avgScore;
-
-    @ApiModelProperty(value = "是否参与考试")
-    private Integer isFinishedExam;
-
-    @ApiModelProperty(value = "视频连接")
-    private String videoUrl;
-
-    public String getCardNo() {
-        return cardNo;
-    }
-
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getActualExamStartTime() {
-        return actualExamStartTime;
-    }
-
-    public void setActualExamStartTime(String actualExamStartTime) {
-        this.actualExamStartTime = actualExamStartTime;
-    }
-
-    public String getActualExamEndTime() {
-        return actualExamEndTime;
-    }
-
-    public void setActualExamEndTime(String actualExamEndTime) {
-        this.actualExamEndTime = actualExamEndTime;
-    }
-
-    public String getExamBaseName() {
-        return examBaseName;
-    }
-
-    public void setExamBaseName(String examBaseName) {
-        this.examBaseName = examBaseName;
-    }
-
-    public Long getExaminationBasicId() {
-        return examinationBasicId;
-    }
-
-    public void setExaminationBasicId(Long examinationBasicId) {
-        this.examinationBasicId = examinationBasicId;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public Integer getExamMusicTheoryLevel() {
-        return examMusicTheoryLevel;
-    }
-
-    public void setExamMusicTheoryLevel(Integer examMusicTheoryLevel) {
-        this.examMusicTheoryLevel = examMusicTheoryLevel;
-    }
-
-    public BigDecimal getTheoryLevelFee() {
-        return theoryLevelFee;
-    }
-
-    public void setTheoryLevelFee(BigDecimal theoryLevelFee) {
-        this.theoryLevelFee = theoryLevelFee;
-    }
-
-    public String getExamAddress() {
-        return examAddress;
-    }
-
-    public void setExamAddress(String examAddress) {
-        this.examAddress = examAddress;
-    }
-
-    public String getExamCertificationId() {
-        return examCertificationId;
-    }
-
-    public void setExamCertificationId(String examCertificationId) {
-        this.examCertificationId = examCertificationId;
-    }
-
-    public Long getExamRegistrationId() {
-        return examRegistrationId;
-    }
-
-    public void setExamRegistrationId(Long examRegistrationId) {
-        this.examRegistrationId = examRegistrationId;
-    }
-
-    public ExamEvaluationResultEnum getResult() {
-        return result;
-    }
-
-    public void setResult(ExamEvaluationResultEnum result) {
-        this.result = result;
-    }
-
-    public Float getAvgScore() {
-        return avgScore;
-    }
-
-    public void setAvgScore(Float avgScore) {
-        this.avgScore = avgScore;
-    }
-
-    public Integer getIsFinishedExam() {
-        return isFinishedExam;
-    }
-
-    public void setIsFinishedExam(Integer isFinishedExam) {
-        this.isFinishedExam = isFinishedExam;
-    }
-
-    public String getVideoUrl() {
-        return videoUrl;
-    }
-
-    public void setVideoUrl(String videoUrl) {
-        this.videoUrl = videoUrl;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/StudentExamPaymentDto.java

@@ -1,75 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.ExamRegistration;
-import com.keao.edu.user.entity.ExamRegistrationPayment;
-import com.keao.edu.user.entity.StudentExamResult;
-import io.swagger.annotations.ApiModelProperty;
-
-public class StudentExamPaymentDto {
-
-    @ApiModelProperty(value = "考试项目")
-    private String examBaseName;
-
-    @ApiModelProperty(value = "学员报名数据")
-    private ExamRegistration examRegistration;
-
-    @ApiModelProperty(value = "学员考试结果")
-    private StudentExamResult studentExamResult;
-
-    @ApiModelProperty(value = "学员报名订单数据")
-    private ExamRegistrationPayment examRegistrationPayment;
-
-    @ApiModelProperty(value = "合作单位")
-    private String organName;
-
-    @ApiModelProperty(value = "报考专业")
-    private String subjectName;
-
-    public String getExamBaseName() {
-        return examBaseName;
-    }
-
-    public void setExamBaseName(String examBaseName) {
-        this.examBaseName = examBaseName;
-    }
-
-    public ExamRegistration getExamRegistration() {
-        return examRegistration;
-    }
-
-    public void setExamRegistration(ExamRegistration examRegistration) {
-        this.examRegistration = examRegistration;
-    }
-
-    public StudentExamResult getStudentExamResult() {
-        return studentExamResult;
-    }
-
-    public void setStudentExamResult(StudentExamResult studentExamResult) {
-        this.studentExamResult = studentExamResult;
-    }
-
-    public ExamRegistrationPayment getExamRegistrationPayment() {
-        return examRegistrationPayment;
-    }
-
-    public void setExamRegistrationPayment(ExamRegistrationPayment examRegistrationPayment) {
-        this.examRegistrationPayment = examRegistrationPayment;
-    }
-
-    public String getOrganName() {
-        return organName;
-    }
-
-    public void setOrganName(String organName) {
-        this.organName = organName;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/StudentExamResultStatisticsDto.java

@@ -1,54 +0,0 @@
-package com.keao.edu.user.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.30
- */
-public class StudentExamResultStatisticsDto {
-
-    @ApiModelProperty(value = "总招生人数")
-    private int totalRegistrationStudentNum;
-
-    @ApiModelProperty(value = "参考人数")
-    private int examStudentNum;
-
-    @ApiModelProperty(value = "缺考人数")
-    private int notExamStudentNum;
-
-    @ApiModelProperty(value = "不及格人数")
-    private int examFailStudentNum;
-
-    public int getTotalRegistrationStudentNum() {
-        return totalRegistrationStudentNum;
-    }
-
-    public void setTotalRegistrationStudentNum(int totalRegistrationStudentNum) {
-        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
-    }
-
-    public int getExamStudentNum() {
-        return examStudentNum;
-    }
-
-    public void setExamStudentNum(int examStudentNum) {
-        this.examStudentNum = examStudentNum;
-    }
-
-    public int getNotExamStudentNum() {
-        return notExamStudentNum;
-    }
-
-    public void setNotExamStudentNum(int notExamStudentNum) {
-        this.notExamStudentNum = notExamStudentNum;
-    }
-
-    public int getExamFailStudentNum() {
-        return examFailStudentNum;
-    }
-
-    public void setExamFailStudentNum(int examFailStudentNum) {
-        this.examFailStudentNum = examFailStudentNum;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/TeacherDto.java

@@ -1,20 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.Teacher;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.02
- */
-public class TeacherDto extends Teacher {
-
-    private String subjectNames;
-
-    public String getSubjectNames() {
-        return subjectNames;
-    }
-
-    public void setSubjectNames(String subjectNames) {
-        this.subjectNames = subjectNames;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/dto/TenantInfoDto.java

@@ -1,30 +0,0 @@
-package com.keao.edu.user.dto;
-
-import com.keao.edu.user.entity.TenantInfo;
-
-/**
- * @Author Joburgess
- * @Date 2020.07.07
- */
-public class TenantInfoDto extends TenantInfo {
-
-    private Integer roleIds;
-
-    private String roleNames;
-
-    public Integer getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Integer roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public String getRoleNames() {
-        return roleNames;
-    }
-
-    public void setRoleNames(String roleNames) {
-        this.roleNames = roleNames;
-    }
-}

edu-user/edu-user-biz/java/com/keao/edu/user/entity/AppVersionInfo.java

@@ -1,133 +0,0 @@
-package com.keao.edu.user.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(app_version_info):
- */
-public class AppVersionInfo {
-
-	/**  */
-	private Integer id;
-	
-	/** 平台（andorid/ios） */
-	private String platform;
-	
-	/** 版本号（以V开头） */
-	private String version;
-	
-	/** 状态（newest/history） */
-	private String status;
-	
-	/** 是否强制更新 */
-	private boolean isForceUpdate;
-	
-	/** 更新描述 */
-	private String description;
-	
-	/** 下载地址 */
-	private byte[] downloadUrl;
-	
-	/** 创建人 */
-	private Integer operatorId;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/**  */
-	private java.util.Date createTime;
-
-	public boolean isForceUpdate() {
-		return isForceUpdate;
-	}
-
-	public void setForceUpdate(boolean forceUpdate) {
-		isForceUpdate = forceUpdate;
-	}
-
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setPlatform(String platform){
-		this.platform = platform;
-	}
-	
-	public String getPlatform(){
-		return this.platform;
-	}
-			
-	public void setVersion(String version){
-		this.version = version;
-	}
-	
-	public String getVersion(){
-		return this.version;
-	}
-			
-	public void setStatus(String status){
-		this.status = status;
-	}
-	
-	public String getStatus(){
-		return this.status;
-	}
-			
-	public void setIsForceUpdate(boolean isForceUpdate){
-		this.isForceUpdate = isForceUpdate;
-	}
-	
-	public boolean getIsForceUpdate(){
-		return this.isForceUpdate;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setDownloadUrl(byte[] downloadUrl){
-		this.downloadUrl = downloadUrl;
-	}
-	
-	public byte[] getDownloadUrl(){
-		return this.downloadUrl;
-	}
-			
-	public void setOperatorId(Integer operatorId){
-		this.operatorId = operatorId;
-	}
-	
-	public Integer getOperatorId(){
-		return this.operatorId;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}