art: 设备管理-设备精度参数-接口修改

zhangherong

2025-04-29 f9aacc433427d9100b07f041e2dc4dc84a086580

art: 设备管理-设备精度参数-接口修改

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

@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -26,7 +25,7 @@
@Slf4j
@Api(tags="设备精度参数")
@RestController
@RequestMapping("/eam/eamEquipmentPrecisionParameters")
@RequestMapping("/eam/equipmentPrecisionParameters")
public class EamEquipmentPrecisionParametersController extends JeecgController<EamEquipmentPrecisionParameters, IEamEquipmentPrecisionParametersService> {
    @Autowired
    private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
@@ -46,38 +45,44 @@
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("equipment_id", equipmentId);
        Page<EamEquipmentPrecisionParameters> page = new Page<EamEquipmentPrecisionParameters>(pageNo, pageSize);
        IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.page(page, queryWrapper);
        IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.queryPageList(equipmentId, page);
        return Result.OK(pageList);
    }
    
    /**
     * 添加
     *
     * @param eamEquipmentPrecisionParameters
     * @param req
     * @return
     */
    @AutoLog(value = "设备精度参数-添加")
    @ApiOperation(value="设备精度参数-添加", notes="设备精度参数-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
        eamEquipmentPrecisionParametersService.save(eamEquipmentPrecisionParameters);
    public Result<?> add(@RequestBody EamEquipmentPrecisionParameters req) {
        EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
        if(entity != null){
            return Result.error("参数已存在，不能重复添加！");
        }
        eamEquipmentPrecisionParametersService.save(req);
        return Result.OK("添加成功！");
    }
    
    /**
     * 编辑
     *
     * @param eamEquipmentPrecisionParameters
     * @param req
     * @return
     */
    @AutoLog(value = "设备精度参数-编辑")
    @ApiOperation(value="设备精度参数-编辑", notes="设备精度参数-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
        eamEquipmentPrecisionParametersService.updateById(eamEquipmentPrecisionParameters);
    public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters req) {
        EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.getById(req.getId());
        if(entity == null){
            return Result.error("要编辑的参数不存在，请刷新重试!");
        }
        eamEquipmentPrecisionParametersService.updateById(req);
        return Result.OK("编辑成功!");
    }
    

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

@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;

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

@@ -13,6 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamPrecisionParameters;
import org.jeecg.modules.eam.entity.EamProcessParameters;
import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,135 +23,145 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

 /**
/**
 * @Description: 精度参数维护
 * @Author: jeecg-boot
 * @Date:   2025-03-17
 * @Date: 2025-03-17
 * @Version: V1.0
 */
@Slf4j
@Api(tags="精度参数维护")
@Api(tags = "精度参数维护")
@RestController
@RequestMapping("/eam/precisionParameters")
public class EamPrecisionParametersController extends JeecgController<EamPrecisionParameters, IEamPrecisionParametersService> {
    @Autowired
    private IEamPrecisionParametersService eamPrecisionParametersService;
    @Autowired
    private IEamPrecisionParametersService eamPrecisionParametersService;

    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
	
    /**
     * 分页列表查询
     *
     * @param eamPrecisionParameters
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value="精度参数维护-分页列表查询", notes="精度参数维护-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionParameters, req.getParameterMap());
        Page<EamPrecisionParameters> page = new Page<EamPrecisionParameters>(pageNo, pageSize);
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        IPage<EamPrecisionParameters> pageList = eamPrecisionParametersService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * 添加
     *
     * @param eamPrecisionParameters
     * @return
     */
    @ApiOperation(value="精度参数维护-添加", notes="精度参数维护-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PRECISION_PARAMETERS_RULE);
        eamPrecisionParameters.setParameterCode(codeSeq);
        eamPrecisionParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamPrecisionParametersService.save(eamPrecisionParameters);
        return Result.OK("添加成功！");
    }
	
    /**
     * 编辑
     *
     * @param eamPrecisionParameters
     * @return
     */
    @ApiOperation(value="精度参数维护-编辑", notes="精度参数维护-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
        eamPrecisionParametersService.updateById(eamPrecisionParameters);
        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) {
        eamPrecisionParametersService.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.eamPrecisionParametersService.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) {
        EamPrecisionParameters eamPrecisionParameters = eamPrecisionParametersService.getById(id);
        return Result.OK(eamPrecisionParameters);
    }
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;

  /**
   * 导出excel
   *
   * @param request
   * @param eamPrecisionParameters
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamPrecisionParameters eamPrecisionParameters) {
      return super.exportXls(request, eamPrecisionParameters, EamPrecisionParameters.class, "精度参数维护");
  }
    /**
     * 分页列表查询
     *
     * @param eamPrecisionParameters
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value = "精度参数维护-分页列表查询", notes = "精度参数维护-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionParameters, req.getParameterMap());
        Page<EamPrecisionParameters> page = new Page<EamPrecisionParameters>(pageNo, pageSize);
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        IPage<EamPrecisionParameters> pageList = eamPrecisionParametersService.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, EamPrecisionParameters.class);
  }
    /**
     * 添加
     *
     * @param eamPrecisionParameters
     * @return
     */
    @ApiOperation(value = "精度参数维护-添加", notes = "精度参数维护-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PRECISION_PARAMETERS_RULE);
        eamPrecisionParameters.setParameterCode(codeSeq);
        eamPrecisionParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamPrecisionParametersService.save(eamPrecisionParameters);
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     *
     * @param eamPrecisionParameters
     * @return
     */
    @ApiOperation(value = "精度参数维护-编辑", notes = "精度参数维护-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
        eamPrecisionParametersService.updateById(eamPrecisionParameters);
        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) {
        eamPrecisionParametersService.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.eamPrecisionParametersService.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) {
        EamPrecisionParameters eamPrecisionParameters = eamPrecisionParametersService.getById(id);
        return Result.OK(eamPrecisionParameters);
    }

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

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

}

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

@@ -1,6 +1,9 @@
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.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;

/**
@@ -11,4 +14,11 @@
 */
public interface EamEquipmentPrecisionParametersMapper extends BaseMapper<EamEquipmentPrecisionParameters> {

    /**
     * 分页查询
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<EamEquipmentPrecisionParameters> queryPageList(Page<EamEquipmentPrecisionParameters> page, QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.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.EamEquipmentPrecisionParametersMapper">

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

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

@@ -1,7 +1,9 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;

/**
 * @Description: 设备精度参数
@@ -10,5 +12,19 @@
 * @Version: V1.0
 */
public interface IEamEquipmentPrecisionParametersService extends IService<EamEquipmentPrecisionParameters> {
    /**
     * 查询设备精度参数
     * @param equipmentId 设备ID
     * @param parameterId 参数ID
     * @return
     */
    EamEquipmentPrecisionParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId);

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

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

@@ -1,11 +1,16 @@
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
import org.jeecg.modules.eam.mapper.EamEquipmentPrecisionParametersMapper;
import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;

/**
 * @Description: 设备精度参数
@@ -16,4 +21,22 @@
@Service
public class EamEquipmentPrecisionParametersServiceImpl extends ServiceImpl<EamEquipmentPrecisionParametersMapper, EamEquipmentPrecisionParameters> implements IEamEquipmentPrecisionParametersService {

    @Resource
    private EamEquipmentPrecisionParametersMapper eamEquipmentPrecisionParametersMapper;

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

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