优化每年专项数据获取

heheng

2025-04-15 7be0d5b901b999d2347774df3cc1a64927838bb3

 src/main/java/com/ruoyi/project/mobile/service/ApiDangerReportService.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -17,6 +18,7 @@
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.lang.reflect.AnnotatedType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -43,6 +46,9 @@

    @Autowired
    IUserService userService;//用户Service

    @Autowired
    private PreventRiskDangerConfirmLogService confirmLogService;

    /**
     * 获取隐患上报列表
@@ -133,7 +139,12 @@
        try {
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            HiddenDangerCheck hdc = new HiddenDangerCheck();

            if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
                throw new RuntimeException("检查人不能为空");
            }
            if (ObjectUtils.isEmpty(hdcp.getFindTime())){
                throw new RuntimeException("发现时间不能为空");
            }
            hdc.setCreateBy(header.loginName);//创建者
            hdc.setCreateTime(DateUtils.getNowDate());//获取创建时间
            hdc.setDangerDeptId(hdcp.getDangerDeptId());
@@ -156,7 +167,7 @@
            hdcp.setRegisterSubmitTime(DateUtils.getNowDate());//设置隐患上报提交时间

            hdcp.setCompanyId(user.getCompanyId());
            hdcpService.insertHiddenDangerCheckPoint(hdcp);
            int result = hdcpService.insertHiddenDangerCheckPoint(hdcp);

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送

@@ -196,6 +207,11 @@
            }
            hdcpService.updateHiddenDangerCheckPoint(hdcp);

            int result = confirmLogService.saveConfirmLog(hdcp);
            if (result < 1){
                return ApiResult.error("操作失败");
            }

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送

            return ApiResult.success("判定成功");