diff --git a/pom.xml b/pom.xml index 04f6a07..8b9c0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,17 +69,7 @@ ink.wgink - service-group - 1.0-SNAPSHOT - - - ink.wgink - service-position - 1.0-SNAPSHOT - - - ink.wgink - service-role + service-core 1.0-SNAPSHOT diff --git a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java index 1a7d318..492fcf8 100644 --- a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java @@ -245,7 +245,7 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp @Override public List list(Map params) { ClassPlanDTO searchClassPlanDto = null; - if(!com.alibaba.excel.util.StringUtils.isEmpty(params.get("planNumber"))) { + if(!StringUtils.isEmpty(params.get("planNumber").toString())) { searchClassPlanDto = classPlanService.get(params); } if(null != searchClassPlanDto) { diff --git a/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java index 40cc411..bb15732 100644 --- a/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java @@ -5,12 +5,9 @@ import cn.com.tenlion.dao.classplan.IClassPlanDao; import cn.com.tenlion.dao.examcheck.IExamCheckDao; import cn.com.tenlion.pojo.bos.applystudentsnew.ApplyStudentsNewBO; import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; import cn.com.tenlion.pojo.dtos.applystudentsnew.ApplyStudentsNewDTO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.dtos.examplan.ExamPlanDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.pos.applystudentsnew.ApplyStudentsNewPO; import cn.com.tenlion.pojo.vos.applystudentsnew.ApplyStudentsNewVO; @@ -24,7 +21,6 @@ import cn.com.tenlion.service.worktype.IWorkTypeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; @@ -254,7 +250,7 @@ public class ApplyStudentsNewServiceImpl extends DefaultBaseService implements I @Override public List list(Map params) { ClassPlanDTO searchClassPlanDto = null; - if(!com.alibaba.excel.util.StringUtils.isEmpty(params.get("planNumber"))) { + if(!StringUtils.isEmpty(params.get("planNumber").toString())) { searchClassPlanDto = classPlanService.get(params); } if(null != searchClassPlanDto) { diff --git a/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java b/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java index 9c97b8e..d3635f8 100644 --- a/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java @@ -186,7 +186,7 @@ public class ExaminationServiceImpl extends DefaultBaseService implements IExami @Override public ExaminationDTO saveExamUser(Map params) throws Exception { - if(com.alibaba.excel.util.StringUtils.isEmpty(params.get("examId"))) { + if(StringUtils.isEmpty(params.get("examId").toString())) { throw new SearchException("请传入考试ID"); } // 获取考场分配信息 @@ -233,7 +233,7 @@ public class ExaminationServiceImpl extends DefaultBaseService implements IExami public SuccessResultList> resultExamUser(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); Map params = page.getParams(); - if(com.alibaba.excel.util.StringUtils.isEmpty(params.get("startTime"))) { + if(StringUtils.isEmpty(params.get("startTime").toString())) { throw new SearchException("请传入考试开始时间"); } // 先获取所有考务人员 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index afe9511..c4049c6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: port: 8089 - url: http://192.168.0.111:8089/signup + url: http://127.0.0.1:8089/signup system-title: 考试报名系统 system-sub-title: 考试报名系统 default-home-page: indexweb @@ -26,7 +26,7 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://192.168.0.151:3306/db_baotou_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/db_examination_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver username: root @@ -95,7 +95,7 @@ file: # 日志 logging: file: - name: /projects/logs/e/systemstudy-logs.log + name: /Users/wanggeng/Desktop/UploadFiles/logs/e/systemstudy-logs.log level: root: error ink.wgink: debug