From 5288b7ad97b390e1d676150ccfb75ad400def989 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Tue, 20 Aug 2024 17:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/common/utils/TaskUtils.java | 16 ++++----
 .../sys/modules/fanuc/dao/CostMapper.java     |  5 +--
 .../fanuc/dao/LaborClassCostMapper.java       |  5 +--
 .../sys/modules/fanuc/entity/CostEntity.java  |  1 +
 .../resources/mapper/fanuc/CostMapper.xml     | 38 ++++++++++++-------
 .../mapper/fanuc/LaborClassCostMapper.xml     | 32 ++++++++--------
 6 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
index bcacfbbc..31642b77 100644
--- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
+++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
@@ -38,10 +38,10 @@ public class TaskUtils {
     }
 
 //    添加定時任務
-    @Scheduled(cron = "${task.data.getExcelInformation}" ) //每五秒执行 读取文件数据
-    public void getExcel(){
-        getInformationForExcelService.saveByExcel();
-    }
+//    @Scheduled(cron = "${task.data.getExcelInformation}" ) //每五秒执行 读取文件数据
+//    public void getExcel(){
+//        getInformationForExcelService.saveByExcel();
+//    }
 
 //    添加未上传文件邮件通知定時任務
     @Scheduled(cron = "${task.data.sendEmail}" )
@@ -50,10 +50,10 @@ public class TaskUtils {
     }
 
     //添加定時任務
-    @Scheduled(cron = "${task.data.modbusCommunicate}" ) //每五秒执行 读取文件数据
-    public void getModbus(){
-        modbusCommunicateService.getInfoByModbus();
-    }
+//    @Scheduled(cron = "${task.data.modbusCommunicate}" ) //每五秒执行 读取文件数据
+//    public void getModbus(){
+//        modbusCommunicateService.getInfoByModbus();
+//    }
 
 
 }
diff --git a/src/main/java/com/xujie/sys/modules/fanuc/dao/CostMapper.java b/src/main/java/com/xujie/sys/modules/fanuc/dao/CostMapper.java
index 8165cade..abd5b8f1 100644
--- a/src/main/java/com/xujie/sys/modules/fanuc/dao/CostMapper.java
+++ b/src/main/java/com/xujie/sys/modules/fanuc/dao/CostMapper.java
@@ -3,11 +3,10 @@ package com.xujie.sys.modules.fanuc.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xujie.sys.modules.fanuc.entity.CostEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface CostMapper extends BaseMapper<CostEntity> {
-    void updateByEntity(@Param("costEntity") CostEntity costEntity);
+    void updateByEntity(CostEntity costEntity);
 
-    void deleteByEntity(@Param("costEntity") CostEntity costEntity);
+    void deleteByEntity(CostEntity costEntity);
 }
diff --git a/src/main/java/com/xujie/sys/modules/fanuc/dao/LaborClassCostMapper.java b/src/main/java/com/xujie/sys/modules/fanuc/dao/LaborClassCostMapper.java
index a6304475..103e0423 100644
--- a/src/main/java/com/xujie/sys/modules/fanuc/dao/LaborClassCostMapper.java
+++ b/src/main/java/com/xujie/sys/modules/fanuc/dao/LaborClassCostMapper.java
@@ -3,11 +3,10 @@ package com.xujie.sys.modules.fanuc.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xujie.sys.modules.fanuc.entity.LaborClassCostEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface LaborClassCostMapper extends BaseMapper<LaborClassCostEntity> {
-    void updateByEntity(@Param("laborClassCostEntity") LaborClassCostEntity laborClassCostEntity);
+    void updateByEntity( LaborClassCostEntity laborClassCostEntity);
 
-    void removeByEntity(@Param("laborClassCostEntity")LaborClassCostEntity laborClassCostEntity);
+    void removeByEntity(LaborClassCostEntity laborClassCostEntity);
 }
diff --git a/src/main/java/com/xujie/sys/modules/fanuc/entity/CostEntity.java b/src/main/java/com/xujie/sys/modules/fanuc/entity/CostEntity.java
index 0f7819c5..b0192092 100644
--- a/src/main/java/com/xujie/sys/modules/fanuc/entity/CostEntity.java
+++ b/src/main/java/com/xujie/sys/modules/fanuc/entity/CostEntity.java
@@ -34,4 +34,5 @@ public class CostEntity extends QueryPage implements Serializable {
     private Date endDate;
     //备注
     private String remark;
+
 }
diff --git a/src/main/resources/mapper/fanuc/CostMapper.xml b/src/main/resources/mapper/fanuc/CostMapper.xml
index 1a097c1f..2acaa717 100644
--- a/src/main/resources/mapper/fanuc/CostMapper.xml
+++ b/src/main/resources/mapper/fanuc/CostMapper.xml
@@ -1,29 +1,39 @@
 <?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="com.xujie.sys.modules.fanuc.dao.CostMapper">
+    <resultMap id="BaseResultMap" type="com.xujie.sys.modules.fanuc.entity.CostEntity">
+        <result column="site" jdbcType="VARCHAR" property="site" />
+        <result column="item_no" jdbcType="VARCHAR" property="itemNo" />
+        <result column="work_center_no" jdbcType="VARCHAR" property="workCenterNo" />
+        <result column="unit_cost" jdbcType="DOUBLE" property="unitCost" />
+        <result column="overhead_cost" jdbcType="DOUBLE" property="overheadCost" />
+        <result column="labor_cost" jdbcType="DOUBLE" property="laborCost" />
+        <result column="um_id" jdbcType="VARCHAR" property="umId" />
+        <result column="begin_date" jdbcType="DATE" property="beginDate" />
+        <result column="end_date" jdbcType="DATE" property="endDate" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+    </resultMap>
 
 
-    <update id="updateByEntity">
+    <update id="updateByEntity" parameterType="com.xujie.sys.modules.fanuc.entity.CostEntity" >
         UPDATE Work_Center_Cost
-        SET
-        <if test="costEntity.itemNo != null and costEntity.itemNo != ''">item_no = #{itemNo},</if>
-        <if test="costEntity.unitCost != null and costEntity.unitCost != ''">unit_cost = #{unitCost},</if>
-        <if test="costEntity.overheadCost != null and costEntity.overheadCost != ''">overhead_cost = #{overheadCost},
-        </if>
-        <if test="costEntity.laborCost != null and costEntity.laborCost != ''">labor_cost = #{laborCost},</if>
-        <if test="costEntity.umId != null and costEntity.umId != ''">um_id = #{umId},</if>
-        <if test="costEntity.beginDate != null ">begin_date = #{beginDate},</if>
-        <if test="costEntity.endDate != null ">end_date = #{endDate},</if>
-        <if test="costEntity.remark != null and costEntity.remark != ''">remark = #{remark}</if>
+        <set>
+        <if test="unitCost != null ">unit_cost = #{unitCost},</if>
+        <if test="overheadCost != null ">overhead_cost = #{overheadCost},</if>
+        <if test="laborCost != null ">labor_cost = #{laborCost},</if>
+        <if test="umId != null and costEntity.umId != ''">um_id = #{umId},</if>
+        <if test="beginDate != null  ">begin_date = #{beginDate},</if>
+        <if test="endDate != null ">end_date = #{endDate},</if>
+        <if test="remark != null and remark != ''">remark = #{remark}</if>
+        </set>
         WHERE site = #{site}
         And work_center_no=#{workCenterNo}
         And item_no=#{itemNo}
-
     </update>
 
-    <delete id="deleteByEntity">
+    <delete id="deleteByEntity" parameterType="CostEntity">
         Delete
-        from labor_class_cost
+        from Work_Center_Cost
         WHERE site = #{site}
           And work_center_no = #{workCenterNo}
           And item_no = #{itemNo}
diff --git a/src/main/resources/mapper/fanuc/LaborClassCostMapper.xml b/src/main/resources/mapper/fanuc/LaborClassCostMapper.xml
index 85a7b122..7459ec08 100644
--- a/src/main/resources/mapper/fanuc/LaborClassCostMapper.xml
+++ b/src/main/resources/mapper/fanuc/LaborClassCostMapper.xml
@@ -3,28 +3,28 @@
 <mapper namespace="com.xujie.sys.modules.fanuc.dao.LaborClassCostMapper">
 
 
-    <update id="updateByEntity">
+    <update id="updateByEntity" parameterType="com.xujie.sys.modules.fanuc.entity.LaborClassCostEntity">
         UPDATE labor_class_cost
-        SET
-        <if test="laborClassCostEntity.itemNo != null and laborClassCostEntity.itemNo != ''">item_no = #{itemNo},</if>
-        <if test="laborClassCostEntity.unitCost != null and laborClassCostEntity.unitCost != ''">unit_cost =
-            #{unitCost},
-        </if>
-        <if test="laborClassCostEntity.overheadCost != null and laborClassCostEntity.overheadCost != ''">overhead_cost =
-            #{overheadCost},
-        </if>
-        <if test="laborClassCostEntity.umId != null and laborClassCostEntity.umId != ''">um_id = #{umId},</if>
-        <if test="laborClassCostEntity.beginDate != null ">begin_date =#{beginDate},
-        </if>
-        <if test="laborClassCostEntity.endDate != null ">end_date = #{endDate},
-        </if>
-        <if test="laborClassCostEntity.remark != null and laborClassCostEntity.remark != ''">remark = #{remark}</if>
+        <set>
+            <if test="unitCost != null ">unit_cost =
+                #{unitCost},
+            </if>
+            <if test="overheadCost != null ">overhead_cost =
+                #{overheadCost},
+            </if>
+            <if test="umId != null and umId != ''">um_id = #{umId},</if>
+            <if test="beginDate != null  ">begin_date =#{beginDate},
+            </if>
+            <if test="endDate != null ">end_date = #{endDate},
+            </if>
+            <if test="remark != null and remark != ''">remark = #{remark}</if>
+        </set>
         WHERE site = #{site}
         And class_no=#{classNo}
         And item_no=#{itemNo}
     </update>
 
-    <delete id="removeByEntity">
+    <delete id="removeByEntity" parameterType="com.xujie.sys.modules.fanuc.entity.LaborClassCostEntity">
         Delete
         from labor_class_cost
         WHERE site = #{site}