加工数量init

lius

2023-07-17 187bc7f5fbf919a6f1844ba16dc0b046c5a923ff

加工数量init

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
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.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.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;


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-17
 * @Version: V1.0
 */
@Slf4j
@Api(tags = "加工数量表")
@RestController
@RequestMapping("/mdc/mdcProcessQuantity")
public class MdcProcessQuantityController extends JeecgController<MdcProcessQuantity, IMdcProcessQuantityService> {

    @Resource
    private IMdcProcessQuantityService mdcProcessQuantityService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcProcessQuantity
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "加工数量表-分页列表查询")
    @ApiOperation(value = "加工数量表-分页列表查询", notes = "加工数量表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcProcessQuantity mdcProcessQuantity,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<MdcProcessQuantity> queryWrapper = QueryGenerator.initQueryWrapper(mdcProcessQuantity, req.getParameterMap());
        Page<MdcProcessQuantity> page = new Page<MdcProcessQuantity>(pageNo, pageSize);
        IPage<MdcProcessQuantity> pageList = mdcProcessQuantityService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcProcessQuantity
     * @return
     */
    @AutoLog(value = "加工数量表-添加")
    @ApiOperation(value = "加工数量表-添加", notes = "加工数量表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcProcessQuantity mdcProcessQuantity) {
        mdcProcessQuantityService.save(mdcProcessQuantity);
        return Result.OK("添加成功！");
    }

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

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcProcessQuantity
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantity mdcProcessQuantity) {
        return super.exportXls(request, mdcProcessQuantity, MdcProcessQuantity.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, MdcProcessQuantity.class);
    }

}

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

@@ -8,6 +8,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@@ -76,8 +77,11 @@
    @ApiOperation(value = "标准加工时间表-添加", notes = "标准加工时间表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcStandardProcessDuration mdcStandardProcessDuration) {
        mdcStandardProcessDurationService.save(mdcStandardProcessDuration);
        return Result.OK("添加成功！");
        if (StringUtils.isBlank(mdcStandardProcessDuration.getEquipmentIds())) {
            return Result.error("未选择设备，请排查");
        }
        boolean flag = mdcStandardProcessDurationService.addData(mdcStandardProcessDuration);
        return flag ? Result.ok("添加成功") : Result.error("添加失败");
    }

    /**

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

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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-17
 * @Version: V1.0
 */
@Data
@TableName("mdc_process_quantity")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_process_quantity对象", description = "加工数量表")
public class MdcProcessQuantity extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = 1647552201662667690L;

    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * æ ‡å‡†åŠ å·¥æ—¶é—´id
     */
    @Excel(name = "标准加工时间id", width = 15)
    @ApiModelProperty(value = "标准加工时间id")
    private String standardId;
    /**
     * æ—¥æœŸ
     */
    @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 String remark;

}

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

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;

/**
 * @Description: åŠ å·¥æ•°é‡è¡¨
 * @Author: lius
 * @Date: 2023-07-17
 * @Version: V1.0
 */
public interface MdcProcessQuantityMapper extends BaseMapper<MdcProcessQuantity> {

}

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

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

</mapper>

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

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


import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;

/**
 * @Description: åŠ å·¥æ•°é‡è¡¨
 * @Author: Lius
 * @Date: 2023-07-17
 * @Version: V1.0
 */
public interface IMdcProcessQuantityService extends IService<MdcProcessQuantity> {

}

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

@@ -37,4 +37,12 @@
     */
    ModelAndView exportXls(String userId, MdcStandardProcessDuration mdcStandardProcessDuration);

    /**
     * æ·»åŠ 
     *
     * @param mdcStandardProcessDuration
     * @return
     */
    boolean addData(MdcStandardProcessDuration mdcStandardProcessDuration);

}

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

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


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.mapper.MdcProcessQuantityMapper;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
import org.springframework.stereotype.Service;


/**
 * @Description: åŠ å·¥æ•°é‡è¡¨
 * @Author: Lius
 * @Date: 2023-07-17
 * @Version: V1.0
 */
@Service
public class MdcProcessQuantityServiceImpl extends ServiceImpl<MdcProcessQuantityMapper, MdcProcessQuantity> implements IMdcProcessQuantityService {

}

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

@@ -8,6 +8,7 @@
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.MdcNoplanClose;
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.mapper.MdcStandardProcessDurationMapper;
@@ -16,6 +17,7 @@
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;

@@ -146,9 +148,33 @@
        //获取当前登录用户
        //update-begin---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("标准加工时间列表数据", "导出人:"+user.getRealname(), "导出信息"));
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("标准加工时间列表数据", "导出人:" + user.getRealname(), "导出信息"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, mdcStandardProcessDurations);
        return mv;
    }

    /**
     * æ·»åŠ æ•°æ®
     *
     * @param mdcStandardProcessDuration
     * @return
     */
    @Override
    public boolean addData(MdcStandardProcessDuration mdcStandardProcessDuration) {
        boolean result = false;
        String[] equipmentIds = mdcStandardProcessDuration.getEquipmentIds().split(",");
        for (String equipmentId : equipmentIds) {
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcStandardProcessDuration standardProcessDuration = new MdcStandardProcessDuration();
            BeanUtils.copyProperties(mdcStandardProcessDuration, standardProcessDuration);
            standardProcessDuration.setEquipmentId(mdcEquipment.getEquipmentId());
            standardProcessDuration.setEquipmentId(mdcEquipment.getEquipmentName());
            boolean b = super.save(standardProcessDuration);
            if (b) {
                result = true;
            }
        }
        return result;
    }
}