src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java

@@ -7,6 +7,7 @@
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;

import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;

import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import io.lettuce.core.dynamic.annotation.Param;

import org.springframework.stereotype.Repository;



import java.util.List;

@@ -31,7 +32,11 @@
     * */

    int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);

    /**

     * 批量插入任务记录

     * 插入任务记录

     * */

    int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);

    /**

     * 批量插入任务记录

     * */

    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java

@@ -63,4 +63,6 @@
    List<PreventRiskControlMeasure> listRiskControlMeasure();

    PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);

    List<PreventRiskControlMeasure> getAllMeasureList();
}

 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java

@@ -1,9 +1,11 @@
package com.ruoyi.doublePrevention.repository;



import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;

import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;

import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import org.springframework.stereotype.Repository;



import java.util.Date;

import java.util.List;



@Repository

@@ -36,4 +38,6 @@
    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);



    int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java

@@ -12,4 +12,6 @@
    PreventTaskType getInfoByTaskId(Long taskId);



    List<PreventTaskType> getInfoByJobId(Long jobId);



    List<PreventTaskType> getAllTaskTypeList();

}


 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java

@@ -450,18 +450,22 @@


            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();

            List<Long> taskIds = new ArrayList<>();

            //获取上报数据对象

            List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();

            HandlerReportParam handlerReportParam = new HandlerReportParam();

//            HandlerReportParam handlerReportParam = new HandlerReportParam();

//            List<HandlerReportParam> handlerReportParamList = new ArrayList<>();

            if (ObjectUtils.isNotEmpty(tasks)){

                //获取信息

                List<User> allUserList = trUserService.getAllUser();

                List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();

                List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();

                //遍历，封装数据

                for (PreventRiskDangerCheckLog task : tasks) {

                    //获取任务记录主表信息

                    HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());

                    //获取任务附属表信息

                    PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());

                    //转换检查结果

                    //如果已经执行过，进入方法 todo

                    //如果已经执行过，进入方法

                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){



                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());

@@ -477,12 +481,34 @@
                                if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){

                                    CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他

                                }



                                User createUser = new User();

                                createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());

                                if(ObjectUtils.isEmpty(createUser)){

                                    createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());

                                User updateUser = new User();

//                                createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());

//                                if(ObjectUtils.isEmpty(createUser)){

//                                    createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());

//                                }

//                                updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());





                                // todo 取出所有用户信息，再循环在匹配

                                for (User user : allUserList) {

                                    if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){

                                        createUser = user;

                                    }

                                    if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){

                                        updateUser = user;

                                    }

                                }

                                User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());

                                if(ObjectUtils.isEmpty(createUser)){

                                    for (User user : allUserList) {

                                        if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){

                                            createUser = user;

                                        }

                                    }

                                }







                                //封装上报昌吉州的任务数据

//                                String taskUuid = UUID.randomUUID().toString();

@@ -515,22 +541,43 @@
                                for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {

                                    controlMeasureId = checkAndMeasure.getControlMeasureId();

                                }

                                //获取该条记录对应的管控措施uuid

                                PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);

                                //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid

                                PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());

                                CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

//                                //获取该条记录对应的管控措施uuid

//                                PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);

//                                //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid

//                                PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());

//                                CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

                                // todo 取出所有措施，再循环在匹配

                                for (PreventRiskControlMeasure measure : allMeasureList) {

                                    if (controlMeasureId.equals(measure.getId())){

                                        //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid

                                        PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());

                                        CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());

                                    }

                                }





                                CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());

                                CJRecordFromTask.setTaskId(task.getCheckId());

                                //第二版标准新增

                                CJRecordFromTask.setMobileCode(task.getMobileCode().toString());

                                List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());



                                int typeTag = 0;

                                for (PreventTaskType typeByJobId : typeByJobIds) {

                                    if (typeByJobId.getType()!= 0) {

                                        typeTag = 1;

//                                List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());

//                                for (PreventTaskType typeByJobId : typeByJobIds) {

//                                    if (typeByJobId.getType()!= 0) {

//                                        typeTag = 1;

//                                    }

//                                }



                                // todo 取出所有任务信息表，再循环在匹配

                                for (PreventTaskType taskType : allTaskTypeList) {

                                    if (taskType.getJobId().equals(task.getJobId())){

                                        if (taskType.getType()!= 0) {

                                            typeTag = 1;

                                        }

                                    }

                                }





                                CJRecordFromTask.setDefend(String.valueOf(typeTag));

                                //封装数据

@@ -539,37 +586,34 @@
                        }



                            //设置原始数据上报状态

                            handlerReportParam.setId(task.getId());

                            handlerReportParam.setReportTime(new Date());

                            handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                            preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);

//                            handlerReportParam.setId(task.getId());

//                            handlerReportParam.setReportTime(new Date());

//                            handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

//                            handlerReportParamList.add(handlerReportParam);

//                            preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);

                            int i = 1;

//                        System.out.println("【##】数据封装" + 1);

                        taskIds.add(task.getId());

                    }

                    System.out.println("【##】5.数据封装完成...");

//                    String checkStatus = null;

//                    if (ObjectUtils.isEmpty(task.getResult() )){

//                        checkStatus = "2";

//                    }else if (task.getResult() == 2){

//                        checkStatus = "1";

//                    }else if (task.getResult() == 1){

//                        checkStatus = "0";

//                    }



                }

            }else {

                logger.info("【双重预防】当前无排查任务记录需要处理");

            }



            //插入上报昌吉州转换表

            for (PreventCJReportCheckRecordFromTask CJRecordFromTasks : CJRecordFromTaskLists) {

                int result = CJTaskRecordService.insert(CJRecordFromTasks);

                if (result < 0){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败");

                }

            if (CJRecordFromTaskLists.size() > 0){

                logger.info("【双重预防】排查任务记录CJ：数据处理...");

                //设置原始数据状态

                int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);

                if (taskUpdateResult < tasks.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");

                }

                int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);

                if (result < CJRecordFromTaskLists.size()){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");

                }

            }

            step = 6;



        }else {

            step = 6;

            logger.info("排查任务记录数据上报已关闭");


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java

@@ -4,6 +4,7 @@
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;

import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;

import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import io.lettuce.core.dynamic.annotation.Param;



import java.util.List;



@@ -12,6 +13,10 @@
     * 插入任务记录

     * */

    int insert(PreventCJReportCheckRecordFromTask recordFromTasks);

    /**

     * 插入任务记录

     * */

    int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);

//    /**

//     * 任务记录-分页查询

//     * */


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java

@@ -59,4 +59,6 @@
    List<PreventRiskControlMeasure> listRiskControlMeasure();

    PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);

    List<PreventRiskControlMeasure> getAllMeasureList();
}

 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java

@@ -33,4 +33,6 @@
    PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);



    int updateCheckLog(Long checkId, Long mobileCode);



    int updateTaskReportStatusByList(List<Long> taskIds);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java

@@ -10,4 +10,5 @@


    List<PreventTaskType> getInfoByJobId(Long jobId);



    List<PreventTaskType> getAllTaskTypeList();

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java

@@ -30,6 +30,11 @@
        return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);

    }



    @Override

    public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {

        return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);

    }



//    /**

//     * 任务记录-分页查询

//     * */


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java

@@ -81,6 +81,11 @@
        return preventRiskControlMeasureRepository.getPreventRiskControlMeasureByUuid(riskMeasureId);
    }

    @Override
    public List<PreventRiskControlMeasure> getAllMeasureList() {
        return preventRiskControlMeasureRepository.getAllMeasureList();
    }


    /**
     * 检索需要上报的风险管控措施

 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java

@@ -9,6 +9,8 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;



import java.util.ArrayList;

import java.util.Date;

import java.util.List;



@Service("PreventRiskDangerCheckLogService")

@@ -68,4 +70,12 @@
    public int updateCheckLog(Long checkId, Long mobileCode) {

        return preventRiskDangerCheckLogRepository.updateCheckLog(checkId, mobileCode);

    }



    @Override

    public int updateTaskReportStatusByList(List<Long> taskIds) {

        List<Long> ids = new ArrayList<>();

        Byte reportStatus = 1;

        Date reportTime = new Date();

        return preventRiskDangerCheckLogRepository.updateTaskReportStatusByList(taskIds, reportStatus, reportTime);

    }

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java

@@ -25,4 +25,9 @@
        return taskTypeRepository.getInfoByJobId(jobId);

    }



    @Override

    public List<PreventTaskType> getAllTaskTypeList() {

        return taskTypeRepository.getAllTaskTypeList();

    }



}

 src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java

@@ -144,4 +144,6 @@
    User getUserByLoginName(String createBy);

    User getUserByName(String createBy);

    List<User> getAllUser();
}

 src/main/java/com/ruoyi/project/system/user/service/IUserService.java

@@ -232,4 +232,6 @@
    User getUserByLoginName(String createBy);

    User getUserByName(String createBy);

    List<User> getAllUser();
}

 src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java

@@ -576,4 +576,9 @@
    public User getUserByName(String createBy) {
        return userMapper.getUserByName(createBy);
    }

    @Override
    public List<User> getAllUser() {
        return userMapper.getAllUser();
    }
}

 src/main/java/com/ruoyi/project/system/user/test.java

对比新文件
@@ -0,0 +1,21 @@
package com.ruoyi.project.system.user;



import com.ruoyi.framework.shiro.service.PasswordService;

import org.apache.shiro.crypto.hash.Md5Hash;

import org.springframework.beans.factory.annotation.Autowired;



public class test {



//    @Autowired

//    private  PasswordService passwordService;

//

//    public static void main(String[] args) {

//

//        String userName = "马文川";

//        String password = "Gkhy@c413";

//        String salt = "33402b";

//

//        String s = new Md5Hash(userName + password + salt).toHex();

//        System.out.println(s);

//    }

}


 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java

@@ -251,7 +251,7 @@
//                //隐患名称
//                export.setDangerName(hcp.getDangerName());
//
//                //隐患描述   todo
//                //隐患描述
//                export.setDangerDescription(hcp.getDangerDescription());
//
//                //隐患级别

 src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml

@@ -64,4 +64,17 @@
    </insert>





    <insert id="insertRecordList">

        insert into prevent_cj_report_check_record_from_task

            (index_id, id, company_code, deleted, create_date, create_by, update_date, update_by,

             report_status, report_time,data_source, check_task_id, check_status, check_time,

             create_by_mobile, update_by_mobile, task_id, mobile_code, defend)

        values

        <foreach collection="list" item="record" separator=",">

            (null, #{record.id}, #{record.companyCode}, #{record.deleted}, #{record.createDate}, #{record.createBy}, #{record.updateDate},#{record.updateBy},

            #{record.reportStatus}, #{record.reportTime}, #{record.dataSource}, #{record.checkTaskId}, #{record.checkStatus}, #{record.checkTime},

            #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend})

        </foreach>

    </insert>



</mapper>


 src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml

@@ -187,6 +187,11 @@
        select * from prevent_risk_control_measure
        where delete_status = 0 and uuid = #{riskMeasureId}
    </select>
<!--    List<PreventRiskControlMeasure> getAllMeasureList();-->
    <select id="getAllMeasureList" resultMap="BaseResultMap">
        select * from prevent_risk_control_measure
        where delete_status = 0
    </select>




 src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml

@@ -38,7 +38,7 @@
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
<!--        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
        order by update_report_data_time
        limit 15
        limit 10
    </select>

<!--    int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
@@ -67,6 +67,17 @@
        where check_id = #{checkId}
    </update>

<!--    int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);-->
    <update id="updateTaskReportStatusByList" >
        update prevent_risk_danger_check_log set
        report_status =  #{reportStatus},
        report_time = #{reportTime}
        WHERE 1=1 and id in
        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
    </update>

</mapper>



 src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml

@@ -23,6 +23,10 @@
        select * from prevent_task_type where delete_status = 0 and job_id = #{jobId}

    </select>



<!--    List<PreventTaskType> getAllTaskTypeList();-->

    <select id="getAllTaskTypeList" resultMap="BaseResultMap">

        select * from prevent_task_type where delete_status = 0

    </select>



</mapper>




 src/main/resources/mybatis/system/UserMapper.xml

@@ -290,4 +290,9 @@
    <select id="getUserByName" parameterType="User" resultMap="UserResult">
        select * from sys_user where login_name = #{createBy}
    </select>
<!--    List<User> getAllUser();-->
    <select id="getAllUser" resultMap="UserResult">
        select * from sys_user
        where del_flag = 0 and status = 0
    </select>
</mapper>