diff --git a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java index 37ee69d..32a62c9 100644 --- a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java +++ b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java @@ -34,6 +34,7 @@ public class InterceptorConfig implements WebMvcConfigurer { .excludePathPatterns("/login") .excludePathPatterns("/auth/self") .excludePathPatterns("/file/stream/**", "/templates/**") + .excludePathPatterns("/score/police", "/score/depart") .excludePathPatterns(List.of("/doc.html", "/webjars/**", "/favicon.ico", "/v3/api-docs/**")); registry.addInterceptor(new ApiInterceptor()) diff --git a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java index 99a44f0..ff6fe53 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java @@ -60,12 +60,6 @@ public class ProfileDepartController { } Page page = profileDepartMapper.queryDepartNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime, param.getDepartName(), param.getDepartId(), param.getDepartGroupId()); - long l = System.currentTimeMillis(); - for (DepartNegativeModel item : page.getRecords()) { - List result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getDepartId()); - item.setScore((BigDecimal) result.get(0)); - } - log.info("风险指数计算耗时:{}s", (System.currentTimeMillis() - l) / 1000); return Result.success(page); } diff --git a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java index bbc48f3..abfd15d 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java @@ -63,12 +63,6 @@ public class ProfilePoliceController { } Page page = profilePoliceMapper.queryPoliceNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime, param.getName(),param.getEmpNo(), param.getDepartId(), param.getDepartGroupId()); - long l = System.currentTimeMillis(); - for (PoliceNegativeModel item : page.getRecords()) { - List result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode()); - item.setScore((BigDecimal) result.get(0)); - } - log.info("风险指数计算耗时:{}s", (System.currentTimeMillis() - l) / 1000); return Result.success(page); } @@ -154,8 +148,7 @@ public class ProfilePoliceController { List result = negativeScoreService.calculatePoliceScore(beginTime, endTime, idCode); profilePolice.setScore((BigDecimal) result.get(0)); profilePolice.setExpression(result.get(1).toString()); - - + profilePolice.setRemarks(result.get(2).toString()); return Result.success(profilePolice); } diff --git a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java index 0bd5ef2..be5fde3 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Date; @@ -44,7 +45,7 @@ public class ScoreController { List result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode()); PoliceScore score = new PoliceScore(); score.setIdCode(item.getIdCode()); - score.setScore((Double) result.get(0)); + score.setScore((BigDecimal) result.get(0)); score.setExpression((String) result.get(1)); score.setBeginTime(beginTime); score.setEndTime(endTime); @@ -64,7 +65,7 @@ public class ScoreController { List result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getId()); DepartScore score = new DepartScore(); score.setDepartId(item.getId()); - score.setScore((Double) result.get(0)); + score.setScore((BigDecimal) result.get(0)); score.setExpression((String) result.get(1)); score.setBeginTime(beginTime); score.setEndTime(endTime); diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index 60f8b11..6cf3fb7 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -49,7 +49,7 @@ public class ApplyCompletionAction implements Action { //validator.validate(verifyData); // 新增审批数据 Negative negative = negativeService.getById(actionDto.getNegativeId()); - updateNegative(actionDto.getNegativeId(), actionDto.getNextFlowKey(), verifyData, negative); + updateNegative(actionDto.getNegativeId(), verifyData, negative); doneWork(actionDto.getWorkId()); addWork(actionDto.getNegativeId(), actionDto.getWorkId(), // 是否是本级办理 @@ -57,11 +57,11 @@ public class ApplyCompletionAction implements Action { negative); } - public void updateNegative(String negativeId, String nextFlowKey, VerifyData verifyData, Negative negative) { + public void updateNegative(String negativeId, VerifyData verifyData, Negative negative) { LocalDateTime now = LocalDateTime.now(); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() .eq(Negative::getId, negativeId) - .set(Negative::getFlowKey, nextFlowKey) + .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.FIRST_APPROVE.getKey() : FlowNodeEnum.SECOND_APPROVE.getKey()) .set(Negative::getUpdTime, now) .set(Negative::getProcessingStatus, ProcessingStatusEnum.approval.name()) .set(Negative::getCheckStatus, verifyData.getCheckStatus()) diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DepartScore.java b/src/main/java/com/biutag/supervision/pojo/entity/DepartScore.java index ea4e503..b96f1b4 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DepartScore.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DepartScore.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; import java.util.Date; @Setter @@ -17,7 +18,7 @@ public class DepartScore { // @TableField("score") - private Double score; + private BigDecimal score; // @TableField("expression") diff --git a/src/main/java/com/biutag/supervision/pojo/entity/PoliceScore.java b/src/main/java/com/biutag/supervision/pojo/entity/PoliceScore.java index f425bd1..44af249 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/PoliceScore.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/PoliceScore.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; import java.util.Date; @Setter @@ -17,7 +18,7 @@ public class PoliceScore { // @TableField("score") - private Double score; + private BigDecimal score; // @TableField("expression") diff --git a/src/main/resources/mapper/ProfileDepartMapper.xml b/src/main/resources/mapper/ProfileDepartMapper.xml index d73ef2f..ca609d6 100644 --- a/src/main/resources/mapper/ProfileDepartMapper.xml +++ b/src/main/resources/mapper/ProfileDepartMapper.xml @@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"