zhanghua
2024-03-12 0c420edb24c2f3a783706e65f0ad76f282518d22
bug修改
3个文件已修改
28 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -163,13 +163,13 @@
                                        @RequestParam(required = false) Integer videoId) {
        Page<Object> queryList;
       // 处理状态(wait(0-待处理)  handle(5立案6调度7处置8核查)  finish(1-误报2-上报3-再学习/再训练4暂不处理 9结案)
        // 处理状态(wait(0-待处理)  handle(5立案6调度7处置8核查)  finish(1-误报2-上报3-再学习/再训练4暂不处理 9结案)
        List<Integer> stateList = new ArrayList<>();
        switch (state){
        switch (state) {
            case "wait":
                stateList.add(0);
                break;
            case  "handle":
            case "handle":
                stateList.add(5);
                stateList.add(6);
                stateList.add(7);
@@ -181,6 +181,9 @@
                stateList.add(3);
                stateList.add(4);
                stateList.add(9);
                break;
            default:
                stateList.add(Integer.valueOf(state));
                break;
        }
        if (type == 1) {
@@ -542,8 +545,8 @@
    @GetMapping("/work_order")
    @ApiOperation("工单统计")
    public CommonResult getWorkOrder(@RequestParam Integer currentPage,
                                              @RequestParam Integer pageSize,
                                              @RequestParam(required = false) String keyword) {
                                     @RequestParam Integer pageSize,
                                     @RequestParam(required = false) String keyword) {
        return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword));
    }
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -56,7 +56,7 @@
        checkApiUtil.cockpit(params);
        CommonResult.success(iBaseCaseService.statistics());
        StatisticsVO report = new StatisticsVO();
        report.setCount(2521L);
        report.setCount(63L);
        report.setRatio(BigDecimal.valueOf(0.9141));
        report.setUp(true);
        StatisticsVO dispose = new StatisticsVO();
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -232,12 +232,15 @@
        HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
        ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
        SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
        if (sendRes.getRspcod().equals("success")) {
            return 2;
        } else {
            return 3;
        if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank( response.getBody())) {
            SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
            if (sendRes.getRspcod().equals("success")) {
                return 2;
            } else {
                return 3;
            }
        }
        return 3;
    }
    //发送邮件