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("编辑成功!"); }
@@ -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; @@ -153,4 +155,14 @@ 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); } }
