art: 设备管理-设备工艺参数-接口修改

zhangherong

2025-04-29 bff7dd282aa2f1ab1cea9452a6c7d7fc0864f731

art: 设备管理-设备工艺参数-接口修改

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

@@ -47,38 +47,44 @@
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamEquipmentProcessParameters> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("equipment_id", equipmentId);
        Page<EamEquipmentProcessParameters> page = new Page<EamEquipmentProcessParameters>(pageNo, pageSize);
        IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.page(page, queryWrapper);
        Page<EamEquipmentProcessParameters> page = new Page<>(pageNo, pageSize);
        IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.queryPageList(equipmentId, page);
        return Result.OK(pageList);
    }
    
    /**
     * 添加
     *
     * @param eamEquipmentProcessParameters
     * @param req
     * @return
     */
    @AutoLog(value = "设备工艺参数-添加")
    @ApiOperation(value="设备工艺参数-添加", notes="设备工艺参数-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
        eamEquipmentProcessParametersService.save(eamEquipmentProcessParameters);
    public Result<?> add(@RequestBody EamEquipmentProcessParameters req) {
        EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
        if(entity != null){
            return Result.error("参数已存在，不能重复添加！");
        }
        eamEquipmentProcessParametersService.save(req);
        return Result.OK("添加成功！");
    }
    
    /**
     * 编辑
     *
     * @param eamEquipmentProcessParameters
     * @param req
     * @return
     */
    @AutoLog(value = "设备工艺参数-编辑")
    @ApiOperation(value="设备工艺参数-编辑", notes="设备工艺参数-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
        eamEquipmentProcessParametersService.updateById(eamEquipmentProcessParameters);
    public Result<?> edit(@RequestBody EamEquipmentProcessParameters req) {
        EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.getById(req.getId());
        if(entity == null){
            return Result.error("要编辑的参数不存在，请刷新重试!");
        }
        eamEquipmentProcessParametersService.updateById(req);
        return Result.OK("编辑成功!");
    }
    

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

@@ -1,8 +1,10 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
@@ -23,134 +25,144 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 /**
/**
 * @Description: 工序参数维护
 * @Author: jeecg-boot
 * @Date:   2025-03-17
 * @Date: 2025-03-17
 * @Version: V1.0
 */
@Slf4j
@Api(tags="工序参数维护")
@Api(tags = "工序参数维护")
@RestController
@RequestMapping("/eam/processParameters")
public class EamProcessParametersController extends JeecgController<EamProcessParameters, IEamProcessParametersService> {
    @Autowired
    private IEamProcessParametersService eamProcessParametersService;
    @Autowired
    private IEamProcessParametersService eamProcessParametersService;

    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
	
    /**
     * 分页列表查询
     *
     * @param eamProcessParameters
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value="工序参数维护-分页列表查询", notes="工序参数维护-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamProcessParameters eamProcessParameters,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamProcessParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamProcessParameters, req.getParameterMap());
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        Page<EamProcessParameters> page = new Page<EamProcessParameters>(pageNo, pageSize);
        IPage<EamProcessParameters> pageList = eamProcessParametersService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * 添加
     *
     * @param eamProcessParameters
     * @return
     */
    @ApiOperation(value="工序参数维护-添加", notes="工序参数维护-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PROCESS_PARAMETERS_RULE);
        eamProcessParameters.setParameterCode(codeSeq);
        eamProcessParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamProcessParametersService.save(eamProcessParameters);
        return Result.OK("添加成功！");
    }
	
    /**
     * 编辑
     *
     * @param eamProcessParameters
     * @return
     */
    @ApiOperation(value="工序参数维护-编辑", notes="工序参数维护-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) {
        eamProcessParametersService.updateById(eamProcessParameters);
        return Result.OK("编辑成功!");
    }
	
    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value="工序参数维护-通过id删除", notes="工序参数维护-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamProcessParametersService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @ApiOperation(value="工序参数维护-批量删除", notes="工序参数维护-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamProcessParametersService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    @ApiOperation(value="工序参数维护-通过id查询", notes="工序参数维护-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamProcessParameters eamProcessParameters = eamProcessParametersService.getById(id);
        return Result.OK(eamProcessParameters);
    }
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;

  /**
   * 导出excel
   *
   * @param request
   * @param eamProcessParameters
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamProcessParameters eamProcessParameters) {
      return super.exportXls(request, eamProcessParameters, EamProcessParameters.class, "工序参数维护");
  }
    /**
     * 分页列表查询
     *
     * @param eamProcessParameters
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value = "工序参数维护-分页列表查询", notes = "工序参数维护-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamProcessParameters eamProcessParameters,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamProcessParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamProcessParameters, req.getParameterMap());
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        Page<EamProcessParameters> page = new Page<EamProcessParameters>(pageNo, pageSize);
        IPage<EamProcessParameters> pageList = eamProcessParametersService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

  /**
   * 通过excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamProcessParameters.class);
  }
    /**
     * 添加
     *
     * @param eamProcessParameters
     * @return
     */
    @ApiOperation(value = "工序参数维护-添加", notes = "工序参数维护-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PROCESS_PARAMETERS_RULE);
        eamProcessParameters.setParameterCode(codeSeq);
        eamProcessParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamProcessParametersService.save(eamProcessParameters);
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     *
     * @param eamProcessParameters
     * @return
     */
    @ApiOperation(value = "工序参数维护-编辑", notes = "工序参数维护-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) {
        eamProcessParametersService.updateById(eamProcessParameters);
        return Result.OK("编辑成功!");
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "工序参数维护-通过id删除", notes = "工序参数维护-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        eamProcessParametersService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @ApiOperation(value = "工序参数维护-批量删除", notes = "工序参数维护-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamProcessParametersService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "工序参数维护-通过id查询", notes = "工序参数维护-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamProcessParameters eamProcessParameters = eamProcessParametersService.getById(id);
        return Result.OK(eamProcessParameters);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param eamProcessParameters
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamProcessParameters eamProcessParameters) {
        return super.exportXls(request, eamProcessParameters, EamProcessParameters.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, EamProcessParameters.class);
    }


    @ApiOperation(value = "工序参数维护-查询所有", notes = "工序参数维护-查询所有")
    @GetMapping(value = "/listAll")
    public Result<?> listAll() {
        QueryWrapper<EamProcessParameters> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        List<EamProcessParameters> list = eamProcessParametersService.list(queryWrapper);
        return Result.OK(list);
    }

}

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

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -55,4 +56,8 @@
    @Excel(name = "参数范围", width = 15)
    @ApiModelProperty(value = "参数范围")
    private String parameterPeriod;
    @TableField(exist = false)
    private String parameterCode;
    @TableField(exist = false)
    private String parameterUnit;
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentProcessParameters;

/**
@@ -11,4 +16,11 @@
 */
public interface EamEquipmentProcessParametersMapper extends BaseMapper<EamEquipmentProcessParameters> {

    /**
     * 分页查询
     * @param queryWrapper
     * @param page
     * @return
     */
    IPage<EamEquipmentProcessParameters> queryPageList(Page<EamEquipmentProcessParameters> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentProcessParameters> queryWrapper);
}

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

@@ -2,4 +2,11 @@
<!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.EamEquipmentProcessParametersMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentProcessParameters">
        select wmo.*, e.parameter_code, e.parameter_unit
        from eam_equipment_process_parameters wmo
        inner join eam_process_parameters e
        on wmo.parameter_id = e.id
        ${ew.customSqlSegment}
    </select>
</mapper>

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

@@ -1,5 +1,7 @@
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.EamEquipmentProcessParameters;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -11,4 +13,19 @@
 */
public interface IEamEquipmentProcessParametersService extends IService<EamEquipmentProcessParameters> {

    /**
     * 查询设备工艺参数
     * @param equipmentId 设备编号
     * @param parameterId 参数编号
     * @return
     */
    EamEquipmentProcessParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId);

    /**
     * 分页查询
     * @param equipmentId
     * @param page
     * @return
     */
    IPage<EamEquipmentProcessParameters> queryPageList(String equipmentId, Page<EamEquipmentProcessParameters> page);
}

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

@@ -1,11 +1,17 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.modules.eam.entity.EamEquipmentProcessParameters;
import org.jeecg.modules.eam.mapper.EamEquipmentProcessParametersMapper;
import org.jeecg.modules.eam.service.IEamEquipmentProcessParametersService;
import org.springframework.stereotype.Service;

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

import javax.annotation.Resource;

/**
 * @Description: 设备工艺参数
@@ -16,4 +22,22 @@
@Service
public class EamEquipmentProcessParametersServiceImpl extends ServiceImpl<EamEquipmentProcessParametersMapper, EamEquipmentProcessParameters> implements IEamEquipmentProcessParametersService {

    @Resource
    private EamEquipmentProcessParametersMapper eamEquipmentProcessParametersMapper;

    @Override
    public EamEquipmentProcessParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId) {
        LambdaQueryWrapper<EamEquipmentProcessParameters> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamEquipmentProcessParameters::getEquipmentId, equipmentId);
        queryWrapper.eq(EamEquipmentProcessParameters::getParameterId, parameterId);
        return eamEquipmentProcessParametersMapper.selectOne(queryWrapper);
    }

    @Override
    public IPage<EamEquipmentProcessParameters> queryPageList(String equipmentId, Page<EamEquipmentProcessParameters> page) {
        QueryWrapper<EamEquipmentProcessParameters> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("wmo.equipment_id", equipmentId);
        queryWrapper.orderByDesc("wmo.create_time");
        return eamEquipmentProcessParametersMapper.queryPageList(page, queryWrapper);
    }
}