修改专业获取

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java

@@ -113,8 +113,8 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             }
 
             //本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
-            double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
-            if (scoreInfo.getCultureGrade() >= firstCulture) {
+            double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+            if (culture >= firstRule.getCultureMin()) {
                 return SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode();
             }
 
@@ -130,10 +130,10 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             }
 
             //专科类比分 = 本年录取分 -去年录取分 + 考生分数
-            double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
-            double firstMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
-            if (scoreInfo.getCultureGrade() >= firstCulture &&
-                    scoreInfo.getMajorGrade() >= firstMajor) {
+            double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+            double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
+            if (trueCulture >= firstRule.getCultureMin() &&
+                    trueMajor >= firstRule.getProfessionMin()) {
                 return SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode();
             }
 
@@ -167,9 +167,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             }
 
             //专科类比分 = 本年录取分 -去年录取分 + 考生分数
-            double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
-            double firstMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
-            if (scoreInfo.getCultureGrade() >= firstCulture && scoreInfo.getMajorGrade() >= firstMajor) {
+            double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+            double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
+            if (trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin()) {
                 return SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode();
             }
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/ShiroConfig.java

@@ -53,19 +53,19 @@ public class ShiroConfig {
 
         // 设置拦截器集合
         Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
-//        filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号
-//        filterChainDefinitionMap.put("/sys/login", "anon"); // 登录页面-身份认证
-//        filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面
-//        filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问
-//        filterChainDefinitionMap.put("/swagger/**", "anon");
-//        filterChainDefinitionMap.put("/admin/anon/**", "anon");
-//        filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
-//        filterChainDefinitionMap.put("/swagger-resources/**", "anon");
-//        filterChainDefinitionMap.put("/v2/api-docs", "anon");
-//        filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
-//        filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
-//        filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
-//        filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低
+        filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号
+        filterChainDefinitionMap.put("/sys/login", "anon"); // 登录页面-身份认证
+        filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面
+        filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问
+        filterChainDefinitionMap.put("/swagger/**", "anon");
+        filterChainDefinitionMap.put("/admin/anon/**", "anon");
+        filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
+        filterChainDefinitionMap.put("/swagger-resources/**", "anon");
+        filterChainDefinitionMap.put("/v2/api-docs", "anon");
+        filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
+        filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
+        filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
+        filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低
 
         // 设置拦截器
         shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);