From 3f55d897a99de7befb7c9264053d312543b5634f Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期三, 05 七月 2023 14:20:55 +0800
Subject: [PATCH] 修改扭矩配置管理3

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java               |   20 ++++++++++----------
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java      |    4 ++--
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java |   26 +++++++++-----------------
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java         |    4 ++--
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml      |    4 +++-
 5 files changed, 26 insertions(+), 32 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
index 7a1ad30..9698504 100644
--- 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
@@ -37,7 +37,6 @@
 
     /**
      * 鏍规嵁id鏌ヨ
-     *
      * @param id
      * @return
      */
@@ -52,7 +51,6 @@
 
     /**
      * 鏂板
-     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -66,7 +64,6 @@
 
     /**
      * 淇敼
-     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -80,7 +77,6 @@
 
     /**
      * 鏍规嵁id鍒犻櫎鎵煩閰嶇疆
-     *
      * @param id
      * @return
      */
@@ -94,7 +90,6 @@
 
     /**
      * 鎵归噺鍒犻櫎
-     *
      * @param ids
      * @return
      */
@@ -109,7 +104,6 @@
 
     /**
      * 瀵煎嚭excel
-     *
      * @param request
      * @param mdcTorqueConfig
      * @return
@@ -121,7 +115,6 @@
 
     /**
      * 瀵煎叆excel
-     *
      * @param request
      * @param response
      * @return
@@ -133,7 +126,6 @@
 
     /**
      * 鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
-     *
      * @param torqueValue
      * @return
      */
@@ -155,19 +147,19 @@
      * @return
      */
     @AutoLog(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
-    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ", notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
     @GetMapping("/pageList")
     public Result pageList(MdcTorqueConfig mdcTorqueConfig,
-                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                  HttpServletRequest req) {
-        if (mdcTorqueConfig==null){
+                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                           HttpServletRequest req) {
+        if (mdcTorqueConfig == null) {
             return Result.error("璇蜂紶閫掓湁鏁堝弬鏁�");
         }
-        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String userId= user.getId();
-        Page page=new Page(pageNo,pageSize);
-        IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.pageList(userId,page,req,mdcTorqueConfig);
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Page page = new Page(pageNo, pageSize);
+        IPage<MdcTorqueConfig> mdcTorqueConfigIPage = mdcTorqueConfigService.pageList(userId, page, req, mdcTorqueConfig);
         return Result.ok(mdcTorqueConfigIPage);
     }
 }
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
index 8615f0b..3b0b8bb 100644
--- 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
@@ -40,43 +40,43 @@
     /**
      * 璁惧缂栧彿
      */
-    @Excel(name = "璁惧缂栧彿",width = 15)
+    @Excel(name = "璁惧缂栧彿", width = 15)
     @ApiModelProperty("璁惧缂栧彿")
     private String equipmentId;
 
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О",width = 15)
+    @Excel(name = "璁惧鍚嶇О", width = 15)
     @ApiModelProperty("璁惧鍚嶇О")
     private String equipmentName;
 
     /**
      * 鏃ユ湡
      */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "鏃ユ湡")
-    private Date date;
+    private Date torqueDate;
 
     /**
      * 鎵煩鍊�
      */
-    @Excel(name = "鎵煩鍊�",width = 15)
+    @Excel(name = "鎵煩鍊�", width = 15)
     @ApiModelProperty("鎵煩鍊�")
     private float torqueValue;
 
     /**
      * 澶囨敞
      */
-    @Excel(name = "澶囨敞",width = 15)
+    @Excel(name = "澶囨敞", width = 15)
     @ApiModelProperty("澶囨敞")
     private String notes;
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
@@ -84,14 +84,14 @@
     /**
      * 鍒涘缓浜�
      */
-    @Excel(name = "鍒涘缓浜�",width = 15)
+    @Excel(name = "鍒涘缓浜�", width = 15)
     @ApiModelProperty("鍒涘缓浜�")
     private String createBy;
 
     /**
      * 鏇存柊鏃堕棿
      */
-    @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("鏇存柊鏃堕棿")
     private Date updateTime;
@@ -99,7 +99,7 @@
     /**
      * 鏇存柊浜�
      */
-    @Excel(name = "鏇存柊浜�",width = 15)
+    @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
index 800ca49..b47dbd8 100644
--- 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
@@ -21,7 +21,7 @@
      * @param torqueValue
      * @return
      */
-    List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId);
+    List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue, @Param("equipmentId") String equipmentId);
 
 
     /**
@@ -30,5 +30,5 @@
      * @param mdcTorqueConfig
      * @return
      */
-    IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("mdcTorqueConfig") MdcTorqueConfig mdcTorqueConfig);
+    IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData, @Param("mdcTorqueConfig") MdcTorqueConfig mdcTorqueConfig);
 }
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
index 5274841..61025a0 100644
--- 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
@@ -5,6 +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
         <if test="mdcTorqueConfig.equipmentName !=null and mdcTorqueConfig.equipmentName !='' ">
@@ -15,7 +16,8 @@
         </if>
         <if test="mdcTorqueConfig.mdcSectionIds !=null || mdcTorqueConfig.mdcSectionIds.size() > 0 ">
             and mtc.equipment_id in
-            <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
+            <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")"
+                     separator=",">
                 #{id}
             </foreach>
         </if>
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
index 46e50c7..797db61 100644
--- 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
@@ -55,7 +55,7 @@
      * @param torqueValue
      * @return
      */
-    List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId);
+    List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId);
 
 
     /**
@@ -66,5 +66,5 @@
      * @param mdcTorqueConfig
      * @return
      */
-    IPage<MdcTorqueConfig> pageList(String userId,Page page,HttpServletRequest req,MdcTorqueConfig mdcTorqueConfig);
+    IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig);
 }

--
Gitblit v1.9.3