From d6ce92cc6a1ceb6808b90b505eee5310484eb865 Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期一, 03 七月 2023 11:10:43 +0800
Subject: [PATCH] 扭矩配置管理init

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java                  |  103 ++++++++++++++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java         |   60 ++++++++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java    |  136 +++++++++++++++++++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java            |   24 +++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml         |    8 +
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java |   61 ++++++++
 6 files changed, 392 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
new file mode 100644
index 0000000..eb59b61
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
new file mode 100644
index 0000000..4e1dcd0
--- /dev/null
+++ b/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;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
new file mode 100644
index 0000000..9c375cf
--- /dev/null
+++ b/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);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
new file mode 100644
index 0000000..4340f0f
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
new file mode 100644
index 0000000..602cedb
--- /dev/null
+++ b/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);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
new file mode 100644
index 0000000..513872c
--- /dev/null
+++ b/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);
+    }
+
+
+}

--
Gitblit v1.9.3