设备管理 报表打印修改

qushaowei

2024-04-07 63a5530a85e6eaf7f8be733e87d32af2d16477a8

设备管理 报表打印修改

 lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -141,6 +141,7 @@
        filterChainDefinitionMap.put("/eam/repairOrder/equipmentAvailability", "anon");
        //生产故障间隔时间报表排除
        filterChainDefinitionMap.put("/eam/faultIntervalTime/getMTBF", "anon");
        filterChainDefinitionMap.put("/eam/faultIntervalTime/**","anon");
        //设备可开动率报表排除
            filterChainDefinitionMap.put("/eam/repairOrder/getStartRate", "anon");
        //大屏模板例子
@@ -163,6 +164,7 @@
        //测试模块排除
        filterChainDefinitionMap.put("/test/seata/**", "anon");


        // 添加自己的过滤器并且取名为jwt
        Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
        //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java

@@ -9,9 +9,13 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.FaultIntervalTime;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IFaultIntervalTimeService;
import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @Description: mom_eam_fault_interval_time
@@ -37,8 +38,11 @@
@RequestMapping("/eam/faultIntervalTime")
@Slf4j
public class FaultIntervalTimeController extends JeecgController<FaultIntervalTime, IFaultIntervalTimeService> {

    @Autowired
    private IFaultIntervalTimeService faultIntervalTimeService;
    @Autowired
    private IEamEquipmentService equipmentService;
    
    /**
     * 分页列表查询
@@ -182,4 +186,58 @@
        return jsonObject;
    }

    @GetMapping("/get2MTBF")
    public JSONObject get2MTBF(@RequestParam Map<String, Object> query) throws ParseException {
        List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query);
        List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
        for (Map<String, Object> map : equipmentList) {
            query.put("equipmentId",map.get("id"));

            List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query);

            FaultIntervalTime faultIntervalTime = new FaultIntervalTime();
            faultIntervalTime.setEquipmentId((String)map.get("id"));
            faultIntervalTime.setEquipmentNum((String)map.get("num"));
            faultIntervalTime.setEquipmentName((String)map.get("name"));
            faultIntervalTime.setEquipmentModel((String)map.get("model"));
            faultIntervalTime.setUserDepart((String)map.get("departName"));
            if(equipmentMTBF.size()>0){
                faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString());
                faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
                faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
                faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
                faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
                faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
                faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
                faultIntervalTimeList.add(faultIntervalTime);
            }else{
                List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query);
                if(query.get("startTime") != "" && query.get("endTime") != ""){
                    faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
                    faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
                    faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
                }else{
                    faultIntervalTime.setTotalAvailableTime("0");
                    faultIntervalTime.setNoFaultTime("0");
                    faultIntervalTime.setAverageFaultIntervalTime("0");
                }
                faultIntervalTime.setFaultTime("0");
                faultIntervalTime.setFaultNumber("0");
                faultIntervalTime.setAverageRepairTime("0");
                faultIntervalTime.setRepairTime("0");
                faultIntervalTimeList.add(faultIntervalTime);
            }

        }
//        Map<String,Object> result= new HashMap<>();
//        IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>();
//        List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("data",faultIntervalTimeList);
        return jsonObject;
    }




}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java

@@ -610,11 +610,8 @@
                                   @RequestParam Map<String, Object> params) {
         IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findDayInspectionProjectList(pageNo, 1000, params);
         List<Map<String, Object>> records = dayInspectionProjectList.getRecords();

         List<Map<String, Object>> maps = new ArrayList<>();

         for (Map<String, Object> record : records) {

             if(maps.size()>0){
                 Boolean flag = false;
                 for (Map<String, Object> map : maps) {
@@ -641,13 +638,49 @@
                 hashMap.put(record.get("createTime").toString(),record.get("insResult"));
                 maps.add(hashMap);
             }
//             hashMap.put("name",record.get("name"));
//             hashMap.put("equipmentNum",record.get("equipmentNum"));
//             hashMap.put("equipmentName",record.get("equipmentName"));
//             hashMap.put("detectionStandard",record.get("detectionStandard"));
//             hashMap.put(record.get("createTime").toString(),record.get("insResult"));
         }
//         maps.add(hashMap);
         return Result.ok(maps);
     }

     /**
      *生产设备自主维护周点检表 报表
      * 2024-3-27 qsw
      */
     @GetMapping("findWeekInspectionProjectList")
     public Result<?> findWeekInspectionProjectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
                                                @RequestParam Map<String, Object> params) {
         IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findWeekInspectionProjectList(pageNo, 1000, params);
         List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
         List<Map<String, Object>> maps = new ArrayList<>();
         for (Map<String, Object> record : records) {
             if(maps.size()>0){
                 Boolean flag = false;
                 for (Map<String, Object> map : maps) {
                     if(map.containsValue(record.get("name")) && map.containsValue(record.get("detectionStandard"))){
                         map.put(record.get("createTime").toString(),record.get("insResult"));
                         flag = true;
                     }
                 }
                 if(flag == false){
                     HashMap<String, Object> hashMap = new HashMap<>();
                     hashMap.put("name",record.get("name"));
                     hashMap.put("equipmentNum",record.get("equipmentNum"));
                     hashMap.put("equipmentName",record.get("equipmentName"));
                     hashMap.put("detectionStandard",record.get("detectionStandard"));
                     hashMap.put(record.get("createTime").toString(),record.get("insResult"));
                     maps.add(hashMap);
                 }
             }else{
                 HashMap<String, Object> hashMap = new HashMap<>();
                 hashMap.put("name",record.get("name"));
                 hashMap.put("equipmentNum",record.get("equipmentNum"));
                 hashMap.put("equipmentName",record.get("equipmentName"));
                 hashMap.put("detectionStandard",record.get("detectionStandard"));
                 hashMap.put(record.get("createTime").toString(),record.get("insResult"));
                 maps.add(hashMap);
             }
         }
         return Result.ok(maps);
     }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java

@@ -51,32 +51,32 @@
    @ApiModelProperty(value = "yearMonth")
    private String yearMonth;
    /**totalAvailableTime*/
    @Excel(name = "totalAvailableTime", width = 15)
    @ApiModelProperty(value = "totalAvailableTime")
    @Excel(name = "总可利用时间（小时）", width = 15)
    @ApiModelProperty(value = "总可利用时间（小时）")
    private String totalAvailableTime;
    /**noFaultTime*/
    @Excel(name = "noFaultTime", width = 15)
    @ApiModelProperty(value = "noFaultTime")
    @Excel(name = "无故障时间（小时）", width = 15)
    @ApiModelProperty(value = "无故障时间（小时）")
    private String noFaultTime;
    /**faultTime*/
    @Excel(name = "faultTime", width = 15)
    @ApiModelProperty(value = "faultTime")
    @Excel(name = "故障时间（小时）", width = 15)
    @ApiModelProperty(value = "故障时间（小时）")
    private String faultTime;
    /**repairTime*/
    @Excel(name = "repairTime", width = 15)
    @ApiModelProperty(value = "repairTime")
    @Excel(name = "修复时间（小时）", width = 15)
    @ApiModelProperty(value = "修复时间（小时）")
    private String repairTime;
    /**faultNumber*/
    @Excel(name = "faultNumber", width = 15)
    @ApiModelProperty(value = "faultNumber")
    @Excel(name = "故障次数", width = 15)
    @ApiModelProperty(value = "故障次数")
    private String faultNumber;
    /**averageRepairTime*/
    @Excel(name = "averageRepairTime", width = 15)
    @ApiModelProperty(value = "averageRepairTime")
    @Excel(name = "MTTM（平均修复时间）（小时）", width = 15)
    @ApiModelProperty(value = "MTTM（平均修复时间）（小时）")
    private String averageRepairTime;
    /**averageFaultIntervalTime*/
    @Excel(name = "averageFaultIntervalTime", width = 15)
    @ApiModelProperty(value = "averageFaultIntervalTime")
    @Excel(name = "MTBF（平均故障间隔时间）（小时）", width = 15)
    @ApiModelProperty(value = "MTBF（平均故障间隔时间）（小时）")
    private String averageFaultIntervalTime;
    /**createBy*/
    @ApiModelProperty(value = "createBy")
@@ -104,5 +104,11 @@
    @TableField(exist = false)
    private String userDepart;

    @TableField(exist = false)
    private String startTime;

    @TableField(exist = false)
    private String endTime;


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java

@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.FaultIntervalTime;

import java.util.List;
import java.util.Map;

/**
 * @Description: mom_eam_fault_interval_time
@@ -11,4 +15,9 @@
 */
public interface FaultIntervalTimeMapper extends BaseMapper<FaultIntervalTime> {

    List<Map<String, Object>> getEquipmentList(@Param("params")Map<String, Object> params);

    List<Map<String, Object>> getEquipmentMTBF(@Param("params")Map<String, Object> params);

    List<Map<String, Object>> getMTBFTotalAvailableTime(@Param("params")Map<String, Object> params);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java

@@ -38,5 +38,7 @@

    IPage<Map<String, Object>> findDayInspectionProjectList(IPage<Map> pageData, @Param("params") Map<String,Object> params);

    IPage<Map<String, Object>> findWeekInspectionProjectList(IPage<Map> pageData, @Param("params") Map<String,Object> params);


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml

@@ -2,4 +2,57 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.FaultIntervalTimeMapper">

    <select id="getEquipmentList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id,
            t1.num,
            t1.name,
            t1.model,
            t1.specification,
            t2.depart_name as departName
        FROM
            mom_eam_equipment t1
                LEFT JOIN sys_depart t2 ON t1.use_id = t2.id
        WHERE
            t1.del_flag = '0'
            <if test="params.useDepartName != null and params.useDepartName != ''">
                and t2.depart_name like concat('%',#{params.useDepartName},'%')
            </if>
            <if test="params.useDepartName == ''">
                and t2.depart_name = '-1'
            </if>

    </select>

    <select id="getEquipmentMTBF"  parameterType="Map" resultType="Map">
        SELECT
            COUNT(tt.equipmentId) AS faultNumber,
            tt.totalAvailableTime,
            SUM(tt.faultTime) AS faultTime,
            SUM(tt.repairTime) AS repairTime,
            SUM(tt.noFaultTime) AS noFaultTime,
            SUM(tt.repairTime) /COUNT(tt.equipmentId) AS averageRepairTime,
            SUM(tt.noFaultTime) /COUNT(tt.equipmentId) AS averageFaultIntervalTime
        FROM(
                SELECT
                    t1.equipment_id AS equipmentId,
                    datediff( HOUR, #{params.startTime}, #{params.endTime} ) + 24 AS totalAvailableTime,
                    datediff( HOUR, isnull( t1.fault_time, GETDATE( ) ), isnull( t1.accept_time, GETDATE( ) ) ) AS faultTime,
                    datediff( HOUR, isnull( t2.actual_start_time, GETDATE( ) ), isnull( t2.actual_end_time, GETDATE( ) ) ) AS repairTime,
                    (datediff( HOUR, #{params.startTime}, #{params.endTime}) + 24) - datediff( HOUR, isnull( t1.fault_time, GETDATE( ) ), isnull( t1.accept_time, GETDATE( ) ) ) AS noFaultTime
                FROM
                    mom_eam_equipment_report_repair t1
                LEFT JOIN mom_eam_repair_order t2 ON t2.report_repair_id = t1.id
                WHERE 1=1
                AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.fault_time, 120 ), 1, 10 ) &gt;= #{params.startTime}
                AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.fault_time, 120 ), 1, 10 ) &lt;= #{params.endTime}
                AND t1.equipment_id  = #{params.equipmentId}
            ) AS tt
        GROUP BY
            tt.equipmentId,tt.totalAvailableTime
    </select>

    <select id="getMTBFTotalAvailableTime"  parameterType="Map" resultType="Map">
        select  datediff( HOUR, #{params.startTime}, #{params.endTime} ) + 24 AS totalAvailableTime
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -197,7 +197,7 @@
            t4.name as equipmentName,
            t3.name,
            t1.detection_standard as detectionStandard,
            t1.inspection_project_result as insResult,
            case t1.inspection_project_result  when '1' then '√' when '2' then 'x' when '3' then '△'  when '4' then 'T' else '' end as insResult,
            SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 9, 10 ) as createTime
        FROM
            mom_eam_inspection_order_detail t1
@@ -208,8 +208,10 @@
                left join (SELECT * FROM v_sys_dict WHERE dict_code = 'inspection_project_result') t6 on t1.inspection_project_result = t6.item_value
        WHERE
            t5.name = '1日'
          AND t4.num = 'HQ1901124'
          AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
            <if test="params.num != null and params.num != ''"> and t4.num = #{params.num} </if>
            <if test="params.num == null "> and t4.num = '-1' </if>
            <if test="params.dataTime != null and params.dataTime != ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{params.dataTime}, 120 ), 2, 7 ) </if>
            <if test="params.dataTime == null ">AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if>
          AND t1.inspection_standard_detail_id IN (
            SELECT
                tt2.id
@@ -220,7 +222,46 @@
                    LEFT JOIN mom_eam_inspection_cycle tt4 ON tt2.inspection_cycle_id = tt4.id
            WHERE
                tt4.name = '1日'
              AND tt3.num = 'HQ1901124'
                <if test="params.num != null and params.num != ''"> and tt3.num = #{params.num} </if>
                <if test="params.num == null "> and tt3.num = '-1' </if>
                AND tt1.version_status = '2'
                AND tt1.del_flag = '0'
        )
    </select>

    <select id="findWeekInspectionProjectList"  parameterType="Map" resultType="Map">
        SELECT
            t4.num as equipmentNum,
            t4.name as equipmentName,
            t3.name,
            t1.detection_standard as detectionStandard,
            case t1.inspection_project_result  when '1' then '√' when '2' then 'x' when '3' then '△'  when '4' then 'T' else '' end as insResult,
            SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 9, 10 ) as createTime
        FROM
            mom_eam_inspection_order_detail t1
        LEFT JOIN mom_eam_inspection_order t2 ON t1.inspection_order_id = t2.id
        LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
        LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
        LEFT JOIN mom_eam_inspection_cycle t5 ON t2.inspection_cycle_id = t5.id
        left join (SELECT * FROM v_sys_dict WHERE dict_code = 'inspection_project_result') t6 on t1.inspection_project_result = t6.item_value
        WHERE
            t5.name = '1周'
            <if test="params.num != null and params.num != ''"> and t4.num = #{params.num} </if>
            <if test="params.num == null "> and t4.num = '-1' </if>
            <if test="params.dataTime != null and params.dataTime != ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{params.dataTime}, 120 ), 2, 7 ) </if>
            <if test="params.dataTime == null ">AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if>
        AND t1.inspection_standard_detail_id IN (
            SELECT
                tt2.id
            FROM
                mom_eam_daily_inspection_standard tt1
            LEFT JOIN mom_eam_daily_inspection_standard_detail tt2 ON tt1.id= tt2.daily_inspection_standard_id
            LEFT JOIN mom_eam_equipment tt3 ON tt1.equipment_id = tt3.id
            LEFT JOIN mom_eam_inspection_cycle tt4 ON tt2.inspection_cycle_id = tt4.id
            WHERE
                tt4.name = '1周'
                <if test="params.num != null and params.num != ''"> and tt3.num = #{params.num} </if>
                <if test="params.num == null "> and tt3.num = '-1' </if>
              AND tt1.version_status = '2'
              AND tt1.del_flag = '0'
        )

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java

@@ -16,5 +16,11 @@
 */
public interface IFaultIntervalTimeService extends IService<FaultIntervalTime> {

    List<Map<String, Object>> getEquipmentList(Map<String, Object> params);

    List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params);

    List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params);

    public List<FaultIntervalTime> getMTBF(Map<String, String> query) throws ParseException;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java

@@ -37,4 +37,6 @@

    IPage<Map<String, Object>> findDayInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params);

    IPage<Map<String, Object>> findWeekInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java

@@ -189,4 +189,20 @@
        }
        return faultIntervalTimeList;
    }


    @Override
    public List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params) {
        return this.baseMapper.getEquipmentMTBF(params);
    }

    @Override
    public List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params) {
        return this.baseMapper.getMTBFTotalAvailableTime(params);
    }

    @Override
    public List<Map<String, Object>> getEquipmentList(Map<String, Object> params) {
        return this.baseMapper.getEquipmentList(params);
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java

@@ -61,4 +61,10 @@
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return  this.baseMapper.findDayInspectionProjectList(pageData,params);
    }

    @Override
    public IPage<Map<String, Object>> findWeekInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return  this.baseMapper.findWeekInspectionProjectList(pageData,params);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java

@@ -34,6 +34,7 @@

    @Override
    public String getToken(HttpServletRequest request) {

        return TokenUtils.getTokenByRequest(request);
    }