修改扭矩配置管理2

yangman

2023-07-03 366089899bf7babed365fb7e9deace9c4b894adf

修改扭矩配置管理2

 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,104 +35,132 @@

    /**
     * 根据id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "扭矩配置管理-根据id查询")
    @ApiOperation(value = "扭矩配置管理-根据id查询",notes = "扭矩配置管理-根据id查询")
    @ApiOperation(value = "扭矩配置管理-根据id查询", notes = "扭矩配置管理-根据id查询")
    @GetMapping("/queryById")
    public Result<?> queryById(@RequestParam(required = true,name = "id") String id){
        MdcTorqueConfig mdcTorqueConfig=mdcTorqueConfigService.queryById(id);
    public Result<?> queryById(@RequestParam(required = true, name = "id") String id) {
        MdcTorqueConfig mdcTorqueConfig = mdcTorqueConfigService.queryById(id);
        //查询不为空则返回数据
        return null!=mdcTorqueConfig?Result.OK(mdcTorqueConfig):Result.error("未找到对应数据");
        return null != mdcTorqueConfig ? Result.OK(mdcTorqueConfig) : Result.error("未找到对应数据");
    }

    /**
     * 新增
     *
     * @param mdcTorqueConfig
     * @return
     */
    @AutoLog(value = "扭矩配置管理-新增")
    @ApiOperation(value = "扭矩配置管理-新增",notes = "扭矩配置管理-新增")
    @ApiOperation(value = "扭矩配置管理-新增", notes = "扭矩配置管理-新增")
    @PostMapping("/addMdcTorqueConfig")
    public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig){
        boolean flag= mdcTorqueConfigService.addTorque(mdcTorqueConfig);
        return flag?Result.ok("新增成功"):Result.error("新增失败");
    public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
        boolean flag = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
        return flag ? Result.ok("新增成功") : Result.error("新增失败");
    }

    /**
     * 修改
     *
     * @param mdcTorqueConfig
     * @return
     */
    @AutoLog(value = "扭矩配置管理-修改")
    @ApiOperation(value = "扭矩配置管理-修改",notes = "扭矩配置管理-修改")
    @ApiOperation(value = "扭矩配置管理-修改", notes = "扭矩配置管理-修改")
    @PutMapping("/editMdcTorqueConfig")
    public Result<?> editMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig){
        boolean flag= mdcTorqueConfigService.editTorque(mdcTorqueConfig);
        return flag?Result.ok("修改成功"):Result.error("修改失败");
    public Result<?> editMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
        boolean flag = mdcTorqueConfigService.editTorque(mdcTorqueConfig);
        return flag ? Result.ok("修改成功") : Result.error("修改失败");
    }

    /**
     * 根据id删除扭矩配置
     *
     * @param id
     * @return
     */
    @AutoLog(value = "扭矩配置管理-根据id删除扭矩配置")
    @ApiOperation(value = "扭矩配置管理-根据id删除扭矩配置",notes = "扭矩配置管理-根据id删除扭矩配置")
    @ApiOperation(value = "扭矩配置管理-根据id删除扭矩配置", notes = "扭矩配置管理-根据id删除扭矩配置")
    @DeleteMapping("/deleteMdcTorqueConfig")
    public Result<?> deleteMdcTorqueConfig(@RequestParam(name = "id",required = true) String id){
        boolean flag= mdcTorqueConfigService.deleteTorque(id);
        return flag?Result.ok("删除成功"):Result.error("删除失败");
    public Result<?> deleteMdcTorqueConfig(@RequestParam(name = "id", required = true) String id) {
        boolean flag = mdcTorqueConfigService.deleteTorque(id);
        return flag ? Result.ok("删除成功") : Result.error("删除失败");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "扭矩配置管理-批量删除")
    @ApiOperation(value = "扭矩配置管理-批量删除",notes = "扭矩配置管理-批量删除")
    @ApiOperation(value = "扭矩配置管理-批量删除", notes = "扭矩配置管理-批量删除")
    @DeleteMapping("/deleteBatchMdcTorqueConfig")
    public Result<?> deleteBatchMdcTorqueConfig(@RequestParam(name = "ids",required = true) String ids){
        boolean flag= mdcTorqueConfigService.deleteBatchTorque(ids);
        return flag?Result.ok("批量删除成功"):Result.error("删除失败");
    public Result<?> deleteBatchMdcTorqueConfig(@RequestParam(name = "ids", required = true) String ids) {
        boolean flag = mdcTorqueConfigService.deleteBatchTorque(ids);
        return flag ? Result.ok("批量删除成功") : Result.error("删除失败");
    }


    /**
     * 导出excel
     *
     * @param request
     * @param mdcTorqueConfig
     * @return
     */
    @RequestMapping("/exportXls")
    public ModelAndView exportXls(HttpServletRequest request,MdcTorqueConfig mdcTorqueConfig){
        return super.exportXls(request,mdcTorqueConfig,MdcTorqueConfig.class,"扭矩配置管理导出");
    public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
        return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "扭矩配置管理导出");
    }

    /**
     * 导入excel
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping("/importExcel")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response){
        return super.importExcel(request,response,MdcTorqueConfig.class);
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcTorqueConfig.class);
    }

    /**
     *根据扭矩值生成主轴运行曲线
     * 根据扭矩值生成主轴运行曲线
     *
     * @param torqueValue
     * @return
     */
    @AutoLog(value = "扭矩配置管理-根据扭矩值生成主轴运行曲线")
    @ApiOperation(value = "扭矩配置管理-根据扭矩值生成主轴运行曲线",notes = "扭矩配置管理-根据扭矩值生成主轴运行曲线")
    @ApiOperation(value = "扭矩配置管理-根据扭矩值生成主轴运行曲线", notes = "扭矩配置管理-根据扭矩值生成主轴运行曲线")
    @GetMapping("/findSpindleRunningCurve")
    public Result<List<MdcTorqueConfig>> findSpindleRunningCurve(@RequestParam(name = "torqueValue",required=true) float torqueValue,
                                                                 @RequestParam(name = "equipmentId",required = true) String equipmentId){
        List<MdcTorqueConfig> list= mdcTorqueConfigService.findSpindleRunningCurve(torqueValue, equipmentId);
    public Result<List<MdcTorqueConfig>> findSpindleRunningCurve(@RequestParam(name = "torqueValue", required = true) float torqueValue,
                                                                 @RequestParam(name = "equipmentId", required = true) String equipmentId) {
        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);
    }
}