Merge remote-tracking branch 'origin/master'

zhangherong

2025-04-03 bdec8b24b78a6f52d21fff2cc8dfab847304dacc

Merge remote-tracking branch 'origin/master'

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;

import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
@Slf4j
@Api(tags = "故障报修")
@RestController
@RequestMapping("/eam/eamReportRepair")
public class EamReportRepairController extends JeecgController<EamReportRepair, IEamReportRepairService> {

    @Resource
    private IEamReportRepairService eamReportRepairService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamReportRepairQuery
     * @param pageNo
     * @param pageSize
     * @return
     */
    @AutoLog(value = "故障报修-分页列表查询")
    @ApiOperation(value = "故障报修-分页列表查询", notes = "故障报修-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamReportRepairQuery eamReportRepairQuery,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<EamReportRepair> page = new Page<EamReportRepair>(pageNo, pageSize);
        IPage<EamReportRepair> pageList = eamReportRepairService.pageList(page, eamReportRepairQuery);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param eamReportRepair
     * @return
     */
    @AutoLog(value = "故障报修-添加")
    @ApiOperation(value = "故障报修-添加", notes = "故障报修-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
//        eamReportRepair.setReportStatus();
        eamReportRepairService.save(eamReportRepair);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param eamReportRepair
     * @return
     */
    @AutoLog(value = "故障报修-编辑")
    @ApiOperation(value = "故障报修-编辑", notes = "故障报修-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
        eamReportRepairService.updateById(eamReportRepair);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "故障报修-通过id删除")
    @ApiOperation(value = "故障报修-通过id删除", notes = "故障报修-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        eamReportRepairService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "故障报修-批量删除")
    @ApiOperation(value = "故障报修-批量删除", notes = "故障报修-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamReportRepairService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "故障报修-通过id查询")
    @ApiOperation(value = "故障报修-通过id查询", notes = "故障报修-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamReportRepair eamReportRepair = eamReportRepairService.getById(id);
        return Result.OK(eamReportRepair);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param eamReportRepair
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamReportRepair eamReportRepair) {
        return super.exportXls(request, eamReportRepair, EamReportRepair.class, "故障报修");
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamReportRepair.class);
    }

}

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -50,19 +49,10 @@
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**工单ID*/
    @Excel(name = "工单ID", width = 15)
    @ApiModelProperty(value = "工单ID")
    private String orderId;
    /**点检项ID*/
    @Excel(name = "点检项ID", width = 15)
    @ApiModelProperty(value = "点检项ID")
    private String itemId;
    /**点检结果*/
    @Excel(name = "点检结果", width = 15)
    @ApiModelProperty(value = "点检结果-正常-异常")
@@ -72,8 +62,17 @@
    @ApiModelProperty(value = "异常描述")
    private String exceptionDescription;
    /**异常是否保修*/
    @Excel(name = "异常是否保修", width = 15)
    @ApiModelProperty(value = "异常是否保修")
    private String whetherWarranty;
    @Excel(name = "异常是否报修", width = 15)
    @ApiModelProperty(value = "异常是否报修")
    private String reportFlag;
    /**保养项序号*/
    @ApiModelProperty(value = "保养项序号")
    private Integer itemCode;
    /**保养项*/
    @ApiModelProperty(value = "保养项")
    private String itemName;
    /**保养要求*/
    @ApiModelProperty(value = "保养要求")
    private String itemDemand;

}

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

@@ -26,7 +26,7 @@
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard对象", description="保养标准")
public class EamMaintenanceStandard implements Serializable {
    

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
@@ -87,4 +87,8 @@
     */
    @ApiModelProperty(value = "最新生成工单时间")
    private Date lastGenerateTime;

    /**设备编号*/
    private transient String equipmentText;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
@Data
@TableName("eam_report_repair")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_report_repair对象", description = "故障报修")
public class EamReportRepair extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = 3966250456529614720L;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @Dict(dicCode = "del_flag")
    private Integer delFlag;
    /**
     * æ•…障开始时间
     */
    @ApiModelProperty(value = "故障开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date faultStartTime;
    /**
     * æ˜¯å¦åœæœº
     */
    @Excel(name = "是否停机", width = 15)
    @ApiModelProperty(value = "是否停机")
    @Dict(dicCode = "breakdown_flag")
    private String breakdownFlag;
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * æ•…障简称
     */
    @Excel(name = "故障简称", width = 15)
    @ApiModelProperty(value = "故障简称")
    private String faultName;
    /**
     * æ•…障分类
     */
    @Excel(name = "故障分类", width = 15)
    @ApiModelProperty(value = "故障分类")
    @Dict(dicCode = "fault_reason_category")
    private String faultType;
    /**
     * æ•…障描述
     */
    @Excel(name = "故障描述", width = 15)
    @ApiModelProperty(value = "故障描述")
    private String faultDescription;
    /**
     * æŠ¥ä¿®çŠ¶æ€
     */
    @Excel(name = "报修状态", width = 15)
    @ApiModelProperty(value = "报修状态")
    @Dict(dicCode = "report_repair_status")
    private String reportStatus;
    /**
     * ç…§ç‰‡æ–‡ä»¶ids;id以逗号分隔
     */
    @Excel(name = "照片", width = 15)
    @ApiModelProperty(value = "照片")
    private String imageFiles;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    @TableField(exist = false)
    @ApiModelProperty(value = "设备名称")
    private String equipmentName;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamReportRepair;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.request.EamReportRepairQuery;

import java.util.List;

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
public interface EamReportRepairMapper extends BaseMapper<EamReportRepair> {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param eamReportRepairQuery
     * @param equipmentIds
     * @return
     */
    IPage<EamReportRepair> pageList(Page<EamReportRepair> page, @Param("eamReportRepair") EamReportRepairQuery eamReportRepairQuery, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds);
}

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

@@ -4,27 +4,31 @@

    <select id="queryListBykeywordAndCategory" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard">
        SELECT
            m.*
            e.equipment_code+ '[' + e.equipment_name+ ']' AS 'equipmentText',
            m.id,
            m.standard_code,
            m.standard_name,
            m.maintenance_period,
            m.equipment_id
        FROM
            eam_maintenance_standard m
            eam_maintenance_standard m -- å…ˆè¿‡æ»¤è®¾å¤‡è¡¨ï¼Œå‡å°‘ JOIN é‡
                INNER JOIN (
                SELECT
                    id,
                    eam_equipment.equipment_code as equipment_code,
                    eam_equipment.equipment_name as equipment_name,
                    org_id
                FROM
                    eam_equipment
                WHERE
                    del_flag = 0
                  AND ( equipment_code LIKE CONCAT ( #{ keyword }, '%' ) -- å³æ¨¡ç³Šåˆ©ç”¨ç´¢å¼•
                    OR equipment_name LIKE CONCAT ( #{ keyword }, '%' ) )
            ) e ON m.equipment_id = e.id
        WHERE
            m.del_flag = 0
          AND m.standard_status= 'NORMAL'
          AND m.maintenance_category = #{maintenanceCategory}
          AND EXISTS (
            SELECT 1
            FROM
                eam_equipment e
                    INNER JOIN mdc_user_production t
                               ON t.user_id = #{userId}
                                   AND t.pro_id = e.org_id  -- å…³è”条件移到JOIN中
            WHERE
                e.id = m.equipment_id
              AND e.del_flag = 0
              AND (
                e.equipment_code LIKE CONCAT('%', #{keyword}, '%')
                    OR e.equipment_name LIKE CONCAT('%', #{keyword}, '%')
                )
        )
          AND EXISTS ( SELECT 1 FROM mdc_user_production t WHERE t.user_id = #{ userId } AND t.pro_id = e.org_id );
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.EamReportRepairMapper">

    <select id="pageList" resultType="org.jeecg.modules.eam.entity.EamReportRepair">
        SELECT
            t1.*,
            t2.equipment_name
        FROM
            eam_report_repair t1
                LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.equipment_code
        <where>
            <choose>
                <when test="equipmentIds != null and equipmentIds.size() > 0 ">
                    AND t1.equipment_id IN
                    <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
                        {equipmentId}
                    </foreach>
                </when>
                <otherwise>
                    EXISTS ( SELECT 1 FROM mdc_user_production t3 WHERE t3.user_id = #{userId} AND t3.pro_id= t2.org_id )
                </otherwise>
            </choose>
            <if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
                AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
            </if>
            <if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''">
                AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%')
            </if>
            <if test="eamReportRepair.breakdownFlag != null and eamReportRepair.breakdownFlag != ''">
                AND t1.breakdown_flag = #{ eamReportRepair.breakdownFlag }
            </if>
            <if test="eamReportRepair.faultType != null and eamReportRepair.faultType != ''">
                AND t1.fault_type = #{ eamReportRepair.faultType }
            </if>
            <if test="eamReportRepair.reportStatus != null and eamReportRepair.reportStatus != ''">
                AND t1.report_status = #{ eamReportRepair.reportStatus }
            </if>
            <if test="eamReportRepair.faultName != null and eamReportRepair.faultName != ''">
                AND t1.fault_name = #{ eamReportRepair.faultName }
            </if>
            <if test="eamReportRepair.startTime != null and eamReportRepair.startTime != '' and eamReportRepair.endTime != null and eamReportRepair.endTime != ''">
                AND t1.fault_start_time BETWEEN #{ eamReportRepair.startTime } AND #{ eamReportRepair.endTime }
            </if>
        </where>
        ORDER BY t1.fault_start_time DESC
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package org.jeecg.modules.eam.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Author: Lius
 * @CreateTime: 2025-04-03
 * @Description:
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="请求对象", description="设备报修")
public class EamReportRepairQuery extends EamReportRepair implements Serializable {

    private static final long serialVersionUID = -7111580122226167877L;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

    @ApiModelProperty(value = "结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamReportRepair;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamReportRepairQuery;

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
public interface IEamReportRepairService extends IService<EamReportRepair> {

    /**
     * åˆ†é¡µåˆ—表
     * @param page
     * @param eamReportRepairQuery
     * @return
     */
    IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.mapper.EamReportRepairMapper;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
@Service
public class EamReportRepairServiceImpl extends ServiceImpl<EamReportRepairMapper, EamReportRepair> implements IEamReportRepairService {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param eamReportRepairQuery
     * @return
     */
    @Override
    public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery) {
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
        }
        return this.baseMapper.pageList(page, eamReportRepairQuery, sysUser.getId(), equipmentIds);
    }
}