合格率

lius

2023-07-18 90f563ff5d3b0462e8013f4621148fffabec2d9f

合格率

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

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

import java.util.Arrays;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;

import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcPassRate;
import org.jeecg.modules.mdc.service.IMdcPassRateService;


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: 2023-07-18
 * @Version: V1.0
 */
@Slf4j
@Api(tags = "合格率")
@RestController
@RequestMapping("/mdc/mdcPassRate")
public class MdcPassRateController extends JeecgController<MdcPassRate, IMdcPassRateService> {

    @Resource
    private IMdcPassRateService mdcPassRateService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcPassRate
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "合格率-分页列表查询")
    @ApiOperation(value = "合格率-分页列表查询", notes = "合格率-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcPassRate mdcPassRate,
                                   @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<MdcPassRate> page = new Page<MdcPassRate>(pageNo, pageSize);
        IPage<MdcPassRate> pageList = mdcPassRateService.pageList(userId, page, mdcPassRate, req);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcPassRate
     * @return
     */
    @AutoLog(value = "合格率-添加")
    @ApiOperation(value = "合格率-添加", notes = "合格率-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcPassRate mdcPassRate) {
        if (StringUtils.isBlank(mdcPassRate.getEquipmentIds())) {
            return Result.error("未选择设备，请排查！");
        }
        boolean result = mdcPassRateService.addPassRate(mdcPassRate);
        return result ? Result.ok("添加成功!") : Result.error("添加失败!");
    }

    /**
     * ç¼–辑
     *
     * @param mdcPassRate
     * @return
     */
    @AutoLog(value = "合格率-编辑")
    @ApiOperation(value = "合格率-编辑", notes = "合格率-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcPassRate mdcPassRate) {
        boolean result = mdcPassRateService.updatePassRate(mdcPassRate);
        return result ? Result.ok("编辑成功!") : Result.error("编辑失败!");
    }

    /**
     * é€šè¿‡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) {
        mdcPassRateService.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.mdcPassRateService.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) {
        MdcPassRate mdcPassRate = mdcPassRateService.getById(id);
        return Result.OK(mdcPassRate);
    }

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

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

}

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

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

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.annotation.TableField;
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 com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;

/**
 * @Description: åˆæ ¼çŽ‡è¡¨
 * @Author: lius
 * @Date: 2023-07-18
 * @Version: V1.0
 */
@Data
@TableName("mdc_pass_rate")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_pass_rate对象", description = "合格率表")
public class MdcPassRate extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = 1863479534937744521L;

    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * è®¾å¤‡åç§°
     */
    @Excel(name = "设备名称", width = 15)
    @ApiModelProperty(value = "设备名称")
    private String equipmentName;
    /**
     * æ—¥æœŸ
     */
    @Excel(name = "日期", width = 20, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "日期")
    private Date efficientDate;
    /**
     * åŠ å·¥æ•°é‡
     */
    @Excel(name = "加工数量", width = 15)
    @ApiModelProperty(value = "加工数量")
    private Integer processQuantity;
    /**
     * ä¸åˆæ ¼æ•°é‡
     */
    @Excel(name = "不合格数量", width = 15)
    @ApiModelProperty(value = "不合格数量")
    private Integer unqualifiedQuantity;
    /**
     * åˆæ ¼çŽ‡
     */
    @Excel(name = "合格率", width = 15)
    @ApiModelProperty(value = "合格率")
    private BigDecimal passRate;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * å‰å°ä¼ å…¥ åˆ¤æ–­æ¯ä¸ªid
     */
    @TableField(exist = false)
    private String parentId;

    /**
     * å‰å°ä¼ å…¥ è½¦é—´å±‚级:1 éƒ¨é—¨å±‚级:2
     */
    @TableField(exist = false)
    private String typeTree;

    /**
     * éƒ¨é—¨parentId å…³è”子集id
     */
    @TableField(exist = false)
    private List<String> mdcSectionIds;

    @TableField(exist = false)
    private String equipmentIds;

    @TableField(exist = false)
    private String startTime;

    @TableField(exist = false)
    private String endTime;

}

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

@@ -29,6 +29,7 @@
@TableName("mdc_torque_config")
@ApiModel(value = "mdc_torque_config对象", description = "扭矩配置管理")
public class MdcTorqueConfig implements Serializable {

    private static final long serialVersionUID = -8646261637017242975L;

    /**

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
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.MdcPassRate;

/**
 * @Description: åˆæ ¼çŽ‡è¡¨
 * @Author: lius
 * @Date: 2023-07-18
 * @Version: V1.0
 */
public interface MdcPassRateMapper extends BaseMapper<MdcPassRate> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param mdcPassRate
     * @return
     */
    IPage<MdcPassRate> pageList(Page<MdcPassRate> page, @Param("mdcPassRate") MdcPassRate mdcPassRate);
}

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

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

    <!--分页查询-->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcPassRate">
        SELECT * FROM mdc_pass_date
        <where>
            <if test="mdcPassRate.equipmentName != null and mdcPassRate.equipmentName != '' ">
                AND equipment_name LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentName}),'%')
            </if>
            <if test="mdcPassRate.equipmentId != null and mdcPassRate.equipmentId != '' ">
                AND equipment_id LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentId}),'%')
            </if>
            <if test="mdcPassRate.startTime != null and mdcPassRate.endTime != null">
                AND efficient_date BETWEEN #{ mdcPassRate.startTime } AND #{ mdcPassRate.endTime }
            </if>
            <if test="mdcPassRate.mdcSectionIds != null and mdcPassRate.mdcSectionIds.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcPassRate.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
            </if>
        </where>
        ORDER BY equipment_name ASC, efficient_date DESC
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
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.MdcPassRate;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: åˆæ ¼çŽ‡è¡¨
 * @Author: lius
 * @Date: 2023-07-18
 * @Version: V1.0
 */
public interface IMdcPassRateService extends IService<MdcPassRate> {

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

    /**
     * æ·»åŠ æ•°æ®
     *
     * @param mdcPassRate
     * @return
     */
    boolean addPassRate(MdcPassRate mdcPassRate);

    /**
     * ç¼–辑数据
     *
     * @param mdcPassRate
     * @return
     */
    boolean updatePassRate(MdcPassRate mdcPassRate);

    /**
     * å¯¼å‡º
     *
     * @param userId
     * @param mdcPassRate
     * @return
     */
    ModelAndView exportXls(String userId, MdcPassRate mdcPassRate);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,196 @@
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.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcPassRate;
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.mapper.MdcPassRateMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcPassRateService;
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.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;


/**
 * @Description: åˆæ ¼çŽ‡è¡¨
 * @Author: lius
 * @Date: 2023-07-18
 * @Version: V1.0
 */
@Service
public class MdcPassRateServiceImpl extends ServiceImpl<MdcPassRateMapper, MdcPassRate> implements IMdcPassRateService {

    @Resource
    private IMdcEquipmentService mdcEquipmentService;

    @Override
    public IPage<MdcPassRate> pageList(String userId, Page<MdcPassRate> page, MdcPassRate mdcPassRate, HttpServletRequest req) {
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcPassRate.getParentId()) && StringUtils.isEmpty(mdcPassRate.getEquipmentId())) {
            if ("2".equals(mdcPassRate.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcPassRate.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcPassRate.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcPassRate.getEquipmentId())) {
            //单台设备信息
            mdcPassRate.setMdcSectionIds(Collections.singletonList(mdcPassRate.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcPassRate.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

        if (mdcPassRate.getMdcSectionIds() == null || mdcPassRate.getMdcSectionIds().isEmpty()) {
            mdcPassRate.setMdcSectionIds(equipmentIds);
        }

        if (mdcPassRate.getMdcSectionIds() == null || mdcPassRate.getMdcSectionIds().isEmpty()) {
            return null;
        }

        return this.baseMapper.pageList(page, mdcPassRate);
    }

    /**
     * æ·»åŠ æ•°æ®
     *
     * @param mdcPassRate
     * @return
     */
    @Override
    public boolean addPassRate(MdcPassRate mdcPassRate) {
        boolean result = false;
        String[] equipmentIds = mdcPassRate.getEquipmentIds().split(",");
        for (String equipmentId : equipmentIds) {
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcPassRate passRate = new MdcPassRate();
            BeanUtils.copyProperties(mdcPassRate, passRate);
            passRate.setEquipmentId(mdcEquipment.getEquipmentId());
            passRate.setEquipmentName(mdcEquipment.getEquipmentName());
            if (passRate.getProcessQuantity() == null || passRate.getProcessQuantity() == 0) {
                passRate.setPassRate(new BigDecimal("0"));
            } else {
                if (passRate.getUnqualifiedQuantity() == null || passRate.getUnqualifiedQuantity() == 0) {
                    passRate.setPassRate(new BigDecimal("1"));
                } else {
                    passRate.setPassRate(new BigDecimal(passRate.getUnqualifiedQuantity()).divide(new BigDecimal(passRate.getProcessQuantity())).setScale(2, BigDecimal.ROUND_HALF_UP));
                }
            }
            boolean b = super.save(passRate);
            if (b) {
                result = true;
            }
        }
        return result;
    }

    /**
     * ç¼–辑数据
     *
     * @param mdcPassRate
     * @return
     */
    @Override
    public boolean updatePassRate(MdcPassRate mdcPassRate) {
        if (mdcPassRate.getProcessQuantity() == null || mdcPassRate.getProcessQuantity() == 0) {
            mdcPassRate.setPassRate(new BigDecimal("0"));
        } else {
            if (mdcPassRate.getUnqualifiedQuantity() == null || mdcPassRate.getUnqualifiedQuantity() == 0) {
                mdcPassRate.setPassRate(new BigDecimal("1"));
            } else {
                mdcPassRate.setPassRate(new BigDecimal(mdcPassRate.getUnqualifiedQuantity()).divide(new BigDecimal(mdcPassRate.getProcessQuantity())).setScale(2, BigDecimal.ROUND_HALF_UP));
            }
        }
        return super.updateById(mdcPassRate);
    }

    /**
     * å¯¼å‡º
     *
     * @param userId
     * @param mdcPassRate
     * @return
     */
    @Override
    public ModelAndView exportXls(String userId, MdcPassRate mdcPassRate) {
        LambdaQueryWrapper<MdcPassRate> queryWrapper = new LambdaQueryWrapper<>();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcPassRate.getParentId()) && StringUtils.isEmpty(mdcPassRate.getEquipmentId())) {
            if ("2".equals(mdcPassRate.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcPassRate.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcPassRate.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcPassRate.getEquipmentId())) {
            //单台设备信息
            mdcPassRate.setMdcSectionIds(Collections.singletonList(mdcPassRate.getEquipmentId()));
        } else {
            //查询用户所拥有的所有设备信息
            if ("2".equals(mdcPassRate.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        if (mdcPassRate.getMdcSectionIds() == null || mdcPassRate.getMdcSectionIds().isEmpty()) {
            mdcPassRate.setMdcSectionIds(equipmentIds);
        }
        if (mdcPassRate.getMdcSectionIds() == null || mdcPassRate.getMdcSectionIds().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcPassRate::getEquipmentId, mdcPassRate.getMdcSectionIds());
        }
        if (StringUtils.isNotEmpty(mdcPassRate.getEquipmentId())) {
            queryWrapper.like(MdcPassRate::getEquipmentId, mdcPassRate.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcPassRate.getEquipmentName())) {
            queryWrapper.like(MdcPassRate::getEquipmentName, mdcPassRate.getEquipmentName());
        }
        if (StringUtils.isNotEmpty(mdcPassRate.getStartTime()) && StringUtils.isNotEmpty(mdcPassRate.getEndTime())) {
            queryWrapper.between(MdcPassRate::getEfficientDate, mdcPassRate.getStartTime(), mdcPassRate.getEndTime());
        }
        queryWrapper.orderByAsc(MdcPassRate::getEquipmentName).orderByDesc(MdcPassRate::getEfficientDate);
        // Step.2 AutoPoi å¯¼å‡ºExcel
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcPassRate> mdcPassRates = this.baseMapper.selectList(queryWrapper);
        // å¯¼å‡ºæ–‡ä»¶åç§°
        mv.addObject(NormalExcelConstants.FILE_NAME, "合格率列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcPassRate.class);
        //获取当前登录用户
        //update-begin---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        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, mdcPassRates);
        return mv;
    }
}