零件加工数据维护功能

Lius

2024-12-11 13552d0d5da5c990e037825f43cde55cbf00aa67

零件加工数据维护功能

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcPartProcessInfoController.java

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcPartProcessInfo;
import org.jeecg.modules.mdc.service.IMdcPartProcessInfoService;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Slf4j
@Api(tags = "零件加工数据表")
@RestController
@RequestMapping("/mdc/mdcPartProcessInfo")
public class MdcPartProcessInfoController extends JeecgController<MdcPartProcessInfo, IMdcPartProcessInfoService> {

    @Resource
    private IMdcPartProcessInfoService mdcPartProcessInfoService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcPartProcessInfo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "零件加工数据表-分页列表查询")
    @ApiOperation(value = "零件加工数据表-分页列表查询", notes = "零件加工数据表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcPartProcessInfoVo mdcPartProcessInfo,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        Page<MdcPartProcessInfo> page = new Page<MdcPartProcessInfo>(pageNo, pageSize);
        IPage<MdcPartProcessInfo> pageList = mdcPartProcessInfoService.pageList(userId, page, mdcPartProcessInfo, req);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcPartProcessInfo
     * @return
     */
    @AutoLog(value = "零件加工数据表-添加")
    @ApiOperation(value = "零件加工数据表-添加", notes = "零件加工数据表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcPartProcessInfoVo mdcPartProcessInfo) {
        if (StringUtils.isBlank(mdcPartProcessInfo.getEquipmentIds())) {
            return Result.error("未选择设备，请排查！");
        }
        boolean result = mdcPartProcessInfoService.addPartProcess(mdcPartProcessInfo);
        if (!result) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param mdcPartProcessInfo
     * @return
     */
    @AutoLog(value = "零件加工数据表-编辑")
    @ApiOperation(value = "零件加工数据表-编辑", notes = "零件加工数据表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcPartProcessInfo mdcPartProcessInfo) {
        mdcPartProcessInfoService.updateById(mdcPartProcessInfo);
        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) {
        mdcPartProcessInfoService.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.mdcPartProcessInfoService.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) {
        MdcPartProcessInfo mdcPartProcessInfo = mdcPartProcessInfoService.getById(id);
        return Result.OK(mdcPartProcessInfo);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcPartProcessInfo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcPartProcessInfoVo mdcPartProcessInfo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        return mdcPartProcessInfoService.exportXls(userId, mdcPartProcessInfo);
    }

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

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java

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

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Data
@TableName("mdc_part_process_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_part_process_info对象", description = "零件加工数据表")
public class MdcPartProcessInfo extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = -5287766951707976335L;

    /**
     * æ—¥æœŸ
     */
    @Excel(name = "日期", width = 15)
    @ApiModelProperty(value = "日期")
    private String theDate;
    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * é›¶ä»¶å·
     */
    @Excel(name = "零件号", width = 15)
    @ApiModelProperty(value = "零件号")
    private String partId;
    /**
     * æ ‡å‡†åŠ å·¥æ—¶é•¿ï¼ˆmin）
     */
    @Excel(name = "标准加工时长（min）", width = 15)
    @ApiModelProperty(value = "标准加工时长（min）")
    private Integer standardProcessLong;
    /**
     * åŠ å·¥é›¶ä»¶æ•°é‡
     */
    @Excel(name = "加工零件数量", width = 15)
    @ApiModelProperty(value = "加工零件数量")
    private Integer processCount;
    /**
     * åˆæ ¼é›¶ä»¶æ•°é‡
     */
    @Excel(name = "合格零件数量", width = 15)
    @ApiModelProperty(value = "合格零件数量")
    private Integer passCount;
    /**
     * åŠ å·¥æ€»æ—¶é•¿(min)
     */
    @Excel(name = "加工总时长(min)", width = 15)
    @ApiModelProperty(value = "加工总时长(min)")
    private Integer totalProcessLong;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcPartProcessInfoMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.mdc.entity.MdcPartProcessInfo;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
public interface MdcPartProcessInfoMapper extends BaseMapper<MdcPartProcessInfo> {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param mdcPartProcessInfo
     * @return
     */
    IPage<MdcPartProcessInfo> pageList(Page<MdcPartProcessInfo> page, @Param("mdcPartProcessInfo") MdcPartProcessInfoVo mdcPartProcessInfo);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPartProcessInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
<?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.mdc.mapper.MdcPartProcessInfoMapper">

    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcPartProcessInfo">
        SELECT
            *
        FROM
            mdc_part_process_info
        <where>
            <if test="mdcPartProcessInfo.equipmentId != null and mdcPartProcessInfo.equipmentId != ''">
                AND equipment_id = #{ mdcPartProcessInfo.equipmentId }
            </if>
            <if test="mdcPartProcessInfo.partId != null and mdcPartProcessInfo.partId != ''">
                AND part_id = #{ mdcPartProcessInfo.partId }
            </if>
            <if test="mdcPartProcessInfo.theDate != null and mdcPartProcessInfo.theDate != ''">
                AND the_date LIKE CONCAT('%',#{ mdcPartProcessInfo.theDate },'%')
            </if>
            <if test="mdcPartProcessInfo.startTime != null and mdcPartProcessInfo.startTime != ''">
                AND the_date &gt;= #{ mdcPartProcessInfo.startTime }
            </if>
            <if test="mdcPartProcessInfo.endTime != null and mdcPartProcessInfo.endTime != ''">
                AND the_date &lt;= #{mdcPartProcessInfo.endTime }
            </if>
            <if test="mdcPartProcessInfo.equipmentIdList != null and mdcPartProcessInfo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcPartProcessInfo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
            </if>
        </where>
        ORDER BY the_date DESC, equipment_id ASC
    </select>

</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcPartProcessInfoService.java

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcPartProcessInfo;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
public interface IMdcPartProcessInfoService extends IService<MdcPartProcessInfo> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param userId
     * @param page
     * @param mdcPartProcessInfo
     * @param req
     * @return
     */
    IPage<MdcPartProcessInfo> pageList(String userId, Page<MdcPartProcessInfo> page, MdcPartProcessInfoVo mdcPartProcessInfo, HttpServletRequest req);

    /**
     * æ·»åŠ 
     *
     * @param mdcPartProcessInfo
     * @return
     */
    boolean addPartProcess(MdcPartProcessInfoVo mdcPartProcessInfo);

    /**
     * å¯¼å‡º
     *
     * @param userId
     * @param mdcPartProcessInfo
     * @return
     */
    ModelAndView exportXls(String userId, MdcPartProcessInfoVo mdcPartProcessInfo);

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPartProcessInfoServiceImpl.java

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcPartProcessInfo;
import org.jeecg.modules.mdc.mapper.MdcPartProcessInfoMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcPartProcessInfoService;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Service
public class MdcPartProcessInfoServiceImpl extends ServiceImpl<MdcPartProcessInfoMapper, MdcPartProcessInfo> implements IMdcPartProcessInfoService {

    @Resource
    private IMdcEquipmentService mdcEquipmentService;

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param userId
     * @param page
     * @param mdcPartProcessInfo
     * @param req
     * @return
     */
    @Override
    public IPage<MdcPartProcessInfo> pageList(String userId, Page<MdcPartProcessInfo> page, MdcPartProcessInfoVo mdcPartProcessInfo, HttpServletRequest req) {
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getParentId()) && StringUtils.isEmpty(mdcPartProcessInfo.getEquipmentId())) {
            if ("2".equals(mdcPartProcessInfo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcPartProcessInfo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcPartProcessInfo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcPartProcessInfo.getEquipmentId())) {
            //单台设备信息
            mdcPartProcessInfo.setEquipmentIdList(Collections.singletonList(mdcPartProcessInfo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcPartProcessInfo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

        if (mdcPartProcessInfo.getEquipmentIdList() == null || mdcPartProcessInfo.getEquipmentIdList().isEmpty()) {
            mdcPartProcessInfo.setEquipmentIdList(equipmentIds);
        }

        if (mdcPartProcessInfo.getEquipmentIdList() == null || mdcPartProcessInfo.getEquipmentIdList().isEmpty()) {
            return null;
        }
        return this.baseMapper.pageList(page, mdcPartProcessInfo);
    }

    @Override
    public boolean addPartProcess(MdcPartProcessInfoVo mdcPartProcessInfo) {
        String[] equipmentIdList = mdcPartProcessInfo.getEquipmentIds().split(",");
        List<MdcPartProcessInfo> partProcessInfoList = new ArrayList<>();
        for (String equipmentId : equipmentIdList) {
            MdcPartProcessInfo mppi = new MdcPartProcessInfo();
            BeanUtils.copyProperties(mdcPartProcessInfo, mppi);
            mppi.setEquipmentId(equipmentId);
            partProcessInfoList.add(mppi);
        }
        this.saveBatch(partProcessInfoList);
        return true;
    }

    @Override
    public ModelAndView exportXls(String userId, MdcPartProcessInfoVo mdcPartProcessInfo) {
        LambdaQueryWrapper<MdcPartProcessInfo> queryWrapper = new LambdaQueryWrapper<>();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getParentId()) && StringUtils.isEmpty(mdcPartProcessInfo.getEquipmentId())) {
            if ("2".equals(mdcPartProcessInfo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcPartProcessInfo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcPartProcessInfo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcPartProcessInfo.getEquipmentId())) {
            //单台设备信息
            mdcPartProcessInfo.setEquipmentIdList(Collections.singletonList(mdcPartProcessInfo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcPartProcessInfo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

        if (mdcPartProcessInfo.getEquipmentIdList() == null || mdcPartProcessInfo.getEquipmentIdList().isEmpty()) {
            mdcPartProcessInfo.setEquipmentIdList(equipmentIds);
        }

        if (mdcPartProcessInfo.getEquipmentIdList() == null || mdcPartProcessInfo.getEquipmentIdList().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcPartProcessInfo::getEquipmentId, mdcPartProcessInfo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getEquipmentId())) {
            queryWrapper.eq(MdcPartProcessInfo::getEquipmentId, mdcPartProcessInfo.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getPartId())) {
            queryWrapper.eq(MdcPartProcessInfo::getPartId, mdcPartProcessInfo.getPartId());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getStartTime()) && StringUtils.isNotEmpty(mdcPartProcessInfo.getEndTime())) {
            queryWrapper.between(MdcPartProcessInfo::getTheDate, mdcPartProcessInfo.getStartTime(), mdcPartProcessInfo.getEndTime());
        }
        queryWrapper.orderByDesc(MdcPartProcessInfo::getTheDate).orderByDesc(MdcPartProcessInfo::getEquipmentId);
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcPartProcessInfo> mdcPartProcessInfos = this.baseMapper.selectList(queryWrapper);
        // å¯¼å‡ºæ–‡ä»¶åç§°
        mv.addObject(NormalExcelConstants.FILE_NAME,  "零件加工数据列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcPartProcessInfo.class);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("零件加工数据列表数据", "导出人:" + user.getRealname(), "零件加工数据"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, mdcPartProcessInfos);
        return mv;
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcPartProcessInfoVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.jeecg.modules.mdc.vo;

import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcPartProcessInfo;

import java.util.List;

/**
 * @author Lius
 * @date 2024/12/11 15:47
 */
@Data
public class MdcPartProcessInfoVo extends MdcPartProcessInfo {
    private String startTime;
    private String endTime;
    private String parentId;
    private String typeTree;
    private List<String> equipmentIdList;
    private String equipmentIds;
}