Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
volunteer_service
Commits
1c036f4c
Commit
1c036f4c
authored
Feb 24, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改专业获取
parent
0ec5d3f3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
22 deletions
+22
-22
ProfessionServiceImpl.java
.../cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
+9
-9
ShiroConfig.java
...min/src/main/java/cn/wisenergy/web/shiro/ShiroConfig.java
+13
-13
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
View file @
1c036f4c
...
@@ -113,8 +113,8 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
...
@@ -113,8 +113,8 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
}
}
//本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
//本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
double
firstC
ulture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
double
c
ulture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
if
(
scoreInfo
.
getCultureGrade
()
>=
firstCulture
)
{
if
(
culture
>=
firstRule
.
getCultureMin
()
)
{
return
SchemeTypeEnums
.
UNDERGRADUATE_CULTURE
.
getCode
();
return
SchemeTypeEnums
.
UNDERGRADUATE_CULTURE
.
getCode
();
}
}
...
@@ -130,10 +130,10 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
...
@@ -130,10 +130,10 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
}
}
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
double
first
Culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
double
true
Culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
double
first
Major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
();
double
true
Major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
();
if
(
scoreInfo
.
getCultureGrade
()
>=
firstCulture
&&
if
(
trueCulture
>=
firstRule
.
getCultureMin
()
&&
scoreInfo
.
getMajorGrade
()
>=
firstMajor
)
{
trueMajor
>=
firstRule
.
getProfessionMin
()
)
{
return
SchemeTypeEnums
.
UNDERGRADUATE_ARTS
.
getCode
();
return
SchemeTypeEnums
.
UNDERGRADUATE_ARTS
.
getCode
();
}
}
...
@@ -167,9 +167,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
...
@@ -167,9 +167,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
}
}
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
double
first
Culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
double
true
Culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
();
double
first
Major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
();
double
true
Major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
();
if
(
scoreInfo
.
getCultureGrade
()
>=
firstCulture
&&
scoreInfo
.
getMajorGrade
()
>=
firstMajor
)
{
if
(
trueCulture
>=
firstRule
.
getCultureMin
()
&&
trueMajor
>=
firstRule
.
getProfessionMin
()
)
{
return
SchemeTypeEnums
.
UNDERGRADUATE_LITERATURE
.
getCode
();
return
SchemeTypeEnums
.
UNDERGRADUATE_LITERATURE
.
getCode
();
}
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/ShiroConfig.java
View file @
1c036f4c
...
@@ -53,19 +53,19 @@ public class ShiroConfig {
...
@@ -53,19 +53,19 @@ public class ShiroConfig {
// 设置拦截器集合
// 设置拦截器集合
Map
<
String
,
String
>
filterChainDefinitionMap
=
new
LinkedHashMap
<
String
,
String
>();
Map
<
String
,
String
>
filterChainDefinitionMap
=
new
LinkedHashMap
<
String
,
String
>();
//
filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号
filterChainDefinitionMap
.
put
(
"/authInformation/save"
,
"anon"
);
//存储设备IMEI号和手机SIM卡ID号
//
filterChainDefinitionMap.put("/sys/login", "anon"); // 登录页面-身份认证
filterChainDefinitionMap
.
put
(
"/sys/login"
,
"anon"
);
// 登录页面-身份认证
//
filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面
filterChainDefinitionMap
.
put
(
"/sys/registered"
,
"anon"
);
// 注册页面
//
filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问
filterChainDefinitionMap
.
put
(
"/swagger-ui.html"
,
"anon"
);
// swagger接口-匿名访问
//
filterChainDefinitionMap.put("/swagger/**", "anon");
filterChainDefinitionMap
.
put
(
"/swagger/**"
,
"anon"
);
//
filterChainDefinitionMap.put("/admin/anon/**", "anon");
filterChainDefinitionMap
.
put
(
"/admin/anon/**"
,
"anon"
);
//
filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
filterChainDefinitionMap
.
put
(
"/webjars/springfox-swagger-ui/**"
,
"anon"
);
//
filterChainDefinitionMap.put("/swagger-resources/**", "anon");
filterChainDefinitionMap
.
put
(
"/swagger-resources/**"
,
"anon"
);
//
filterChainDefinitionMap.put("/v2/api-docs", "anon");
filterChainDefinitionMap
.
put
(
"/v2/api-docs"
,
"anon"
);
//
filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
filterChainDefinitionMap
.
put
(
"/upload_flowChart/**"
,
"anon"
);
//图片地址
//
filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
filterChainDefinitionMap
.
put
(
"/webSocket/**"
,
"anon"
);
//socket
//
filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
filterChainDefinitionMap
.
put
(
"/message/**"
,
"anon"
);
//消息推送接口
//
filterChainDefinitionMap.put("/**", "oauth2"); // 其他路径均需要身份认证,一般位于最下面,优先级最低
filterChainDefinitionMap
.
put
(
"/**"
,
"oauth2"
);
// 其他路径均需要身份认证,一般位于最下面,优先级最低
// 设置拦截器
// 设置拦截器
shiroFilterFactoryBean
.
setFilterChainDefinitionMap
(
filterChainDefinitionMap
);
shiroFilterFactoryBean
.
setFilterChainDefinitionMap
(
filterChainDefinitionMap
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment