Browse Source

微调

v1.0
Yen 2 years ago
parent
commit
1d92585ff6
  1. 5
      src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java
  2. 1
      src/main/java/com/qs/serve/controller/CommonController.java
  3. 2
      src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java
  4. 1
      src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java
  5. 3
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
  6. 3
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
  7. 2
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
  8. 2
      src/main/java/com/qs/serve/task/TbsTask.java

5
src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java

@ -80,7 +80,12 @@ public class SysLogAspect {
if (controllerLog == null) { if (controllerLog == null) {
return; return;
} }
HttpServletRequest request = ServletUtils.getRequest(); HttpServletRequest request = ServletUtils.getRequest();
//忽略GET
if(request.getMethod().equals("GET")){
return;
}
// 获取当前的用户 // 获取当前的用户
LoginUser loginUser = AuthContextUtils.getLoginUser(false); LoginUser loginUser = AuthContextUtils.getLoginUser(false);
SysOperationLog operLog = new SysOperationLog(); SysOperationLog operLog = new SysOperationLog();

1
src/main/java/com/qs/serve/controller/CommonController.java

@ -40,7 +40,6 @@ public class CommonController {
* @param request * @param request
* @return * @return
*/ */
@SysLog(title = "文件",biz = BizType.UPLOAD)
@GetMapping("/getSign") @GetMapping("/getSign")
public R getSign(HttpServletRequest request) { public R getSign(HttpServletRequest request) {
return R.ok(ossService.getPolicySign()); return R.ok(ossService.getPolicySign());

2
src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java

@ -95,7 +95,7 @@ public class BazVisitController {
* @return * @return
*/ */
//@GetMapping("/getById/{id}") //@GetMapping("/getById/{id}")
@SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.QUERY) //@SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.QUERY)
@PreAuthorize("hasRole('baz:visit:query')") @PreAuthorize("hasRole('baz:visit:query')")
public R<BazVisit> getById(@PathVariable("id") String id){ public R<BazVisit> getById(@PathVariable("id") String id){
BazVisit bazVisit = bazVisitService.getById(id); BazVisit bazVisit = bazVisitService.getById(id);

1
src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java

@ -40,7 +40,6 @@ public class SysConfigController {
* @return * @return
*/ */
@GetMapping("/getByKey/{key}") @GetMapping("/getByKey/{key}")
@SysLog(module = SystemModule.SYSTEM, title = "系统配置", biz = BizType.QUERY)
public R<SysConfig> getById(@PathVariable("key") String key){ public R<SysConfig> getById(@PathVariable("key") String key){
LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
lqw.eq(SysConfig::getConfigKey,key); lqw.eq(SysConfig::getConfigKey,key);

3
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.qs.serve.common.model.annotation.LimitSubmit;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.dto.R;
@ -334,6 +335,7 @@ public class TbsActivityController {
* @param param * @param param
* @return * @return
*/ */
@LimitSubmit
@PostMapping("/reopen") @PostMapping("/reopen")
@SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.UPDATE) @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.UPDATE)
@PreAuthorize("hasRole('tbs:activity:update')") @PreAuthorize("hasRole('tbs:activity:update')")
@ -347,6 +349,7 @@ public class TbsActivityController {
* @param param * @param param
* @return * @return
*/ */
@LimitSubmit
@PostMapping("/save") @PostMapping("/save")
@SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.INSERT) @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.INSERT)
@PreAuthorize("hasRole('tbs:activity:insert')") @PreAuthorize("hasRole('tbs:activity:insert')")

3
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -183,7 +183,6 @@ public class VtbVerificationController {
* @return * @return
*/ */
@GetMapping("/getById/{id}") @GetMapping("/getById/{id}")
@SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.QUERY)
@PreAuthorize("hasRole('vtb:verification:query')") @PreAuthorize("hasRole('vtb:verification:query')")
public R<VtbVerification> getById(@PathVariable("id") String id){ public R<VtbVerification> getById(@PathVariable("id") String id){
VtbVerification vtbVerification = vtbVerificationService.getById(id); VtbVerification vtbVerification = vtbVerificationService.getById(id);
@ -254,7 +253,7 @@ public class VtbVerificationController {
* @param param * @param param
* @return * @return
*/ */
@LimitSubmit @LimitSubmit(interval = 3000)
@PostMapping("/commit") @PostMapping("/commit")
@SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE) @SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE)
@PreAuthorize("hasRole('vtb:verification:commit')") @PreAuthorize("hasRole('vtb:verification:commit')")

2
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@ -911,7 +911,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
boolean isOverTime = boolean isOverTime =
(nowDate.isAfter(activity.getPreCheckDate())&&activity.getPreEndDateBack()==null) (nowDate.isAfter(activity.getPreCheckDate())&&activity.getPreEndDateBack()==null)
||nowDate.isAfter(activity.getPreEndDateBack()); ||(activity.getPreEndDateBack()!=null&&nowDate.isAfter(activity.getPreEndDateBack()));
if(!cotractFlag && activity.getReopenFlag().equals(0) if(!cotractFlag && activity.getReopenFlag().equals(0)
&& filterActTime && filterActTime
&& isOverTime){ && isOverTime){

2
src/main/java/com/qs/serve/task/TbsTask.java

@ -42,7 +42,7 @@ public class TbsTask {
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
//拓展已解冻的费用限制在三天内可核销,逾期自动冻结 //拓展已解冻的费用限制在三天内可核销,逾期自动冻结
LocalDate closeDay = now.plusDays(3); LocalDate closeDay = now.plusDays(-3);
LambdaQueryWrapper<TbsActivity> updReopen = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsActivity> updReopen = new LambdaQueryWrapper<>();
updReopen.eq(TbsActivity::getReopenFlag,1) updReopen.eq(TbsActivity::getReopenFlag,1)
.lt(TbsActivity::getReopenTime, closeDay) .lt(TbsActivity::getReopenTime, closeDay)

Loading…
Cancel
Save