扭矩配置管理init

yangman

2023-07-03 d6ce92cc6a1ceb6808b90b505eee5310484eb865

扭矩配置管理init

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
package org.jeecg.modules.mdc.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
import org.jeecg.modules.mdc.service.impl.MdcTorqueConfigServiceImpl;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * @Description: æ‰­çŸ©é…ç½®ç®¡ç†
 * @Author: ym
 * @Date: 2023-06-29
 */
@Slf4j
@RestController
@Api(tags = "扭矩配置管理")
@RequestMapping("/mdc/MdcTorqueConfig")
public class MdcTorqueConfigController extends JeecgController<MdcTorqueConfig, IMdcTorqueConfigService> {

    @Resource
    private IMdcTorqueConfigService mdcTorqueConfigService;

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

    /**
     * æ–°å¢ž
     * @param mdcTorqueConfig
     * @return
     */
    @AutoLog(value = "扭矩配置管理-新增")
    @ApiOperation(value = "扭矩配置管理-新增",notes = "扭矩配置管理-新增")
    @PostMapping("/addMdcTorqueConfig")
    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 = "扭矩配置管理-修改")
    @PutMapping("/editMdcTorqueConfig")
    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删除扭矩配置")
    @DeleteMapping("/deleteMdcTorqueConfig")
    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 = "扭矩配置管理-批量删除")
    @DeleteMapping("/deleteBatchMdcTorqueConfig")
    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,"设备类型导出");
    }

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

    /**
     *根据扭矩值生成主轴运行曲线
     * @param torqueValue
     * @return
     */
    @AutoLog(value = "扭矩配置管理-根据扭矩值生成主轴运行曲线")
    @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);
        return Result.ok(list);
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
package org.jeecg.modules.mdc.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: æ‰­çŸ©é…ç½®ç®¡ç†
 * @Author: ym
 * @Date: 2023-06-29
 */
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("mdc_torque_config")
@ApiModel(value = "mdc_torque_config对象", description = "扭矩配置管理")
public class MdcTorqueConfig implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty("主键")
    private String id;

    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号",width = 15)
    @ApiModelProperty("设备编号")
    private String equipmentId;

    /**
     * è®¾å¤‡åç§°
     */
    @Excel(name = "设备名称",width = 15)
    @ApiModelProperty("设备名称")
    private String equipmentName;

    /**
     * æ—¥æœŸ
     */
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "日期")
    private Date date;

    /**
     * æ‰­çŸ©å€¼
     */
    @Excel(name = "扭矩值",width = 15)
    @ApiModelProperty("扭矩值")
    private float torqueValue;

    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注",width = 15)
    @ApiModelProperty("备注")
    private String notes;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * åˆ›å»ºäºº
     */
    @Excel(name = "创建人",width = 15)
    @ApiModelProperty("创建人")
    private String createBy;

    /**
     * æ›´æ–°æ—¶é—´
     */
    @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("更新时间")
    private Date updateTime;

    /**
     * æ›´æ–°äºº
     */
    @Excel(name = "更新人",width = 15)
    @ApiModelProperty("更新人")
    private String updateBy;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package org.jeecg.modules.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecgframework.minidao.annotation.Param;

import java.util.List;

/**
 * @Description: æ‰­çŸ©é…ç½®ç®¡ç†
 * @Author: ym
 * @Date: 2023-06-29
 */
@Mapper
public interface MdcTorqueConfigMapper extends BaseMapper<MdcTorqueConfig> {

    /**
     * æ ¹æ®æ‰­çŸ©å€¼å’Œè®¾å¤‡ç¼–号生成主轴运行曲线
     * @param torqueValue
     * @return
     */
    List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper">
    <!--根据扭矩值生成主轴运行曲线-->
    <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>
</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package org.jeecg.modules.mdc.service;

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.mdc.entity.MdcTorqueConfig;

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

/**
 * @Description: æ‰­çŸ©é…ç½®ç®¡ç†
 * @Author: ym
 * @Date: 2023-06-29
 */
public interface IMdcTorqueConfigService extends IService<MdcTorqueConfig> {

    /**
     * æ ¹æ®id查询
     * @param id
     * @return
     */
    MdcTorqueConfig queryById(String id);

    /**
     * æ–°å¢žæ‰­çŸ©é…ç½®
     * @param mdcTorqueConfig
     * @return
     */
    Boolean addTorque(MdcTorqueConfig mdcTorqueConfig);

    /**
     * ç¼–辑扭矩配置
     * @param mdcTorqueConfig
     * @return
     */
    Boolean editTorque(MdcTorqueConfig mdcTorqueConfig);

    /**
     * æ ¹æ®id删除
     * @param id
     * @return
     */
    Boolean deleteTorque(String id);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Boolean deleteBatchTorque(String ids);

    /**
     * ç”Ÿæˆä¸»è½´è¿è¡Œæ›²çº¿
     * @param torqueValue
     * @return
     */
    List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId);

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package org.jeecg.modules.mdc.service.impl;

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.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.StringUtil;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: æ‰­çŸ©é…ç½®ç®¡ç†
 * @Author: ym
 * @Date: 2023-06-29
 */
@Service
public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{


    @Override
    public MdcTorqueConfig queryById(String id) {
        return this.getById(id);
    }

    @Override
    public Boolean addTorque(MdcTorqueConfig mdcTorqueConfig) {
        return this.save(mdcTorqueConfig);
    }

    @Override
    public Boolean editTorque(MdcTorqueConfig mdcTorqueConfig) {
        return this.updateById(mdcTorqueConfig);
    }

    @Override
    public Boolean deleteTorque(String id) {
        return this.removeById(id);
    }

    @Override
    public Boolean deleteBatchTorque(String ids) {
        return this.removeBatchByIds(Arrays.asList(ids.split(",")));
    }

    @Override
    public List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId) {
        return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId);
    }


}