diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 609d2159..43c65cda 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -45,7 +45,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/login?redirect=#/index`) // 否则全部重定向到登录页 NProgress.done() } } diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index fb75b12e..00addf88 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -113,7 +113,6 @@ export default { created() { this.getCode(); this.getCookie(); - location.hash = "#/login?redirect=%2Findex"; }, methods: { getCode() { @@ -137,6 +136,7 @@ export default { }; }, handleLogin() { + this.redirect=this.$route.query.redirect; this.$refs.loginForm.validate((valid) => { if (valid) { this.loading = true; @@ -152,7 +152,7 @@ export default { this.$store .dispatch("Login", this.loginForm) .then(() => { - this.$router.push({ path: this.redirect || "#/index" }).catch(() => {}); + window.open( this.redirect || "#/index",'_self'); }) .catch(() => { this.loading = false; diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java index 4967f6ee..86a3d39b 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java @@ -1,12 +1,15 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisCache; import com.yanzhu.jh.project.domain.SurProjectBuildNodeData; import com.yanzhu.jh.project.service.ISurProjectBuildNodeDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/bgscreen/projectBuildNode") @@ -15,7 +18,8 @@ public class ProjectBuildNodeController { @Autowired ISurProjectBuildNodeDataService surProjectBuildNodeDataService; - + @Autowired + private RedisCache redisCache; /** * 节点计划预警 * @param where @@ -62,4 +66,22 @@ public class ProjectBuildNodeController { list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData); return AjaxResult.success(list); } + + /** + * 按项目类型查询计划节点数据 + * @param type + * @return + */ + @GetMapping("queryByProjectType") + public AjaxResult queryByProjectType(long type){ + String key="bgscreen_projectBuildNode_queryByProjectType_"+type; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=surProjectBuildNodeDataService.queryByProjectType(type); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + + } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java index bc5278a0..637cc920 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java @@ -3,15 +3,14 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; import com.yanzhu.jh.project.domain.SmzProjectQuarterlyAssess; import com.yanzhu.jh.project.service.ISmzProjectQuarterlyAssessService; 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 org.springframework.web.bind.annotation.*; import java.util.Calendar; import java.util.List; @@ -30,12 +29,11 @@ public class ProjectQuarterlyAssessController extends BaseController { @Log(title = "按部门获取当前季度考核目标", businessType = BusinessType.INSERT) @GetMapping("/currentListByDept") public TableDataInfo currentListByDept(Long deptId){ - String key="bgscreen_currentListByDept"+deptId; + String key="bgscreen_asscess_currentListByDept"+deptId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return getDataTable((List) obj); } - SmzProjectQuarterlyAssess smzProjectQuarterlyAssess=new SmzProjectQuarterlyAssess(); smzProjectQuarterlyAssess.setDeptId(deptId); Calendar calendar=Calendar.getInstance(); @@ -46,4 +44,25 @@ public class ProjectQuarterlyAssessController extends BaseController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } + + /** + * 根据项目类型查询项目的季度计划 + * @param + * @return + */ + @PostMapping("/queryByProjectType") + public AjaxResult queryByProjectType(@RequestBody SmzProjectQuarterlyAssess where){ + String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + List list=smzProjectQuarterlyAssessService.queryByProjectType(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + + } + + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SmzProjectQuarterlyAssessMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SmzProjectQuarterlyAssessMapper.java index de5ffd46..3a883fe1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SmzProjectQuarterlyAssessMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SmzProjectQuarterlyAssessMapper.java @@ -65,4 +65,11 @@ public interface SmzProjectQuarterlyAssessMapper * @return */ public List currentListByDept(SmzProjectQuarterlyAssess smzProjectQuarterlyAssess); + + /** + * 根据项目类型查询项目的季度计划 + * @param where + * @return + */ + public List queryByProjectType(SmzProjectQuarterlyAssess where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java index 6f63db80..7acbbb39 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java @@ -74,4 +74,6 @@ public interface SurProjectBuildNodeDataMapper public List selectCurrent(SurProjectBuildNodeData where); public List countCompletionRate(SurProjectBuildNodeData where); + + public List queryByProjectType(long type); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISmzProjectQuarterlyAssessService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISmzProjectQuarterlyAssessService.java index 1ff2ca7c..705f60ba 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISmzProjectQuarterlyAssessService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISmzProjectQuarterlyAssessService.java @@ -62,4 +62,11 @@ public interface ISmzProjectQuarterlyAssessService public void addYear(SmzProjectQuarterlyAssess smzProjectQuarterlyAssess); public List currentListByDept( SmzProjectQuarterlyAssess smzProjectQuarterlyAssess); + + /** + * 根据项目类型查询项目的季度计划 + * @param where + * @return + */ + public List queryByProjectType(SmzProjectQuarterlyAssess where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java index 03f7bb4b..374a62b1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java @@ -79,4 +79,6 @@ public interface ISurProjectBuildNodeDataService public List selectCurrent(SurProjectBuildNodeData where); public List countCompletionRate(SurProjectBuildNodeData where); + + public List queryByProjectType(long type); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SmzProjectQuarterlyAssessServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SmzProjectQuarterlyAssessServiceImpl.java index 9628204a..9bb9ad06 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SmzProjectQuarterlyAssessServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SmzProjectQuarterlyAssessServiceImpl.java @@ -128,4 +128,14 @@ public class SmzProjectQuarterlyAssessServiceImpl implements ISmzProjectQuarterl public List currentListByDept( SmzProjectQuarterlyAssess smzProjectQuarterlyAssess) { return smzProjectQuarterlyAssessMapper.currentListByDept(smzProjectQuarterlyAssess); } + + /** + * 根据项目类型查询项目的季度计划 + * @param where + * @return + */ + @Override + public List queryByProjectType(SmzProjectQuarterlyAssess where) { + return smzProjectQuarterlyAssessMapper.queryByProjectType(where); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java index c62ea1c2..c2e36bd5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java @@ -180,4 +180,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD public List countCompletionRate(SurProjectBuildNodeData where) { return surProjectBuildNodeDataMapper.countCompletionRate(where); } + + @Override + public List queryByProjectType(long type) { + return surProjectBuildNodeDataMapper.queryByProjectType(type); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index 5b98346a..488f3101 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + \ No newline at end of file