lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -1,5 +1,7 @@ package org.jeecg.modules.mdc.controller; 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; @@ -33,6 +35,7 @@ /** * 根据id查询 * * @param id * @return */ @@ -47,6 +50,7 @@ /** * 新增 * * @param mdcTorqueConfig * @return */ @@ -60,6 +64,7 @@ /** * 修改 * * @param mdcTorqueConfig * @return */ @@ -73,6 +78,7 @@ /** * 根据id删除扭矩配置 * * @param id * @return */ @@ -86,6 +92,7 @@ /** * 批量删除 * * @param ids * @return */ @@ -100,6 +107,7 @@ /** * 导出excel * * @param request * @param mdcTorqueConfig * @return @@ -111,6 +119,7 @@ /** * 导入excel * * @param request * @param response * @return @@ -122,6 +131,7 @@ /** *根据扭矩值生成主轴运行曲线 * * @param torqueValue * @return */ @@ -133,4 +143,24 @@ List<MdcTorqueConfig> list= mdcTorqueConfigService.findSpindleRunningCurve(torqueValue, equipmentId); return Result.ok(list); } /** * 分页查询 * @param mdcTorqueConfig * @param pageNo * @param pageSize * @param req * @return */ @AutoLog(value = "扭矩配置管理-分页查询") @ApiOperation(value = "扭矩配置管理-分页查询",notes = "扭矩配置管理-分页查询") @GetMapping("/queryWrapper") public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize); IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req); return Result.ok(mdcTorqueConfigIPage); } } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.mdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.mdc.entity.MdcTorqueConfig; import org.jeecgframework.minidao.annotation.Param; @@ -21,4 +22,12 @@ * @return */ List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId); /** * 分页查询 * @param pageData * @param equipmentId * @return */ IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("equipmentId") String equipmentId); } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -5,4 +5,7 @@ <select id="findSpindleRunningCurve" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig"> select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId} </select> <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig"> select mtc.* from mdc_torque_config mtc,mdc_equipment me where mtc.equipment_id=me.equipment_id </select> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -57,4 +57,11 @@ */ List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId); /** * 分页查询 * @param page * @param req * @return */ IPage<MdcTorqueConfig> queryPageList(Page page,HttpServletRequest req); } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -57,5 +57,15 @@ return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId); } @Override public IPage<MdcTorqueConfig> queryPageList(Page page, HttpServletRequest req) { QueryWrapper<MdcTorqueConfig> queryWrapper=new QueryWrapper(); //检查请求体中是否有设备编号字段，存在则返回true if (req.getParameterMap().containsKey("equipmentId")){ //获取设备编号的值，不为空则添加到查询 String equipmentId=req.getParameterMap().get("equipmentId")[0]; queryWrapper.eq(StringUtils.isNotBlank(equipmentId),"equipment_id",equipmentId); } return this.page(page,queryWrapper); } }
