From 2495ce88f591b60d3ec349a8630c6e9f96bd2e38 Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Fri, 22 Dec 2023 17:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE=E4=BA=8C?=
 =?UTF-8?q?=E6=94=B9=20=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/base/api/domain/MaMachine.java |  6 +++---
 .../sgzb/base/mapper/MaLabelBindMapper.java   |  9 +++++++++
 .../service/impl/MaLabelBindServiceImpl.java  | 19 +++++++++++++------
 .../mapper/base/MaLabelBindMapper.xml         | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
index 05d938ef..af2927ab 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
@@ -4,8 +4,10 @@ package com.bonus.sgzb.base.api.domain;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel(value="com.bonus.sgzb.base.api.domain.MaMachine")
+@Data
 public class MaMachine extends BaseEntity {
   /**
    * 机具ID
@@ -149,9 +151,7 @@ public class MaMachine extends BaseEntity {
   private String labelCode;
 
 
-  public long getMaId() {
-    return maId;
-  }
+
 
   public void setMaId(long maId) {
     this.maId = maId;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
index 1d1ff479..78477b80 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.base.mapper;
 import java.util.List;
 
+import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.domain.MaLabelBind;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -44,6 +45,14 @@ public interface MaLabelBindMapper
      * @return 结果
      */
     public int insertMaLabelBindS(MaLabelBindVO maLabelBindVO);
+
+    /**
+     * 新增机具设备标签ma_label_bind
+     *
+     * @param maMachine 机具设备标签ma_label_bind
+     * @return 结果
+     */
+    public int insertMaLabel(MaMachine maMachine);
     /**
      * 查询机具设备ma_id
      *
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
index c4493f64..cbcebc3e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
+import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
 import com.bonus.sgzb.base.service.IMaLabelBindService;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
@@ -8,6 +9,7 @@ import lombok.extern.flogger.Flogger;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -58,7 +60,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
         return maLabelBindMapper.selecthistoryList(maLabelBindVO);
     }
     /**
-     * 新增机具设备标签ma_label_bind
+     * 绑定机具设备标签ma_label_bind
      *
      * @param maLabelBind 机具设备标签ma_label_bind
      * @return 结果
@@ -69,15 +71,20 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
         int i = 0;
         int b =0;
         MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode());
-        if(StringHelper.isNotEmpty(bean.getMaId())){
-            maLabelBind.setMaId(bean.getMaId());
-            maLabelBind.setTypeId(bean.getTypeId());
+        if(null != bean){
+             return b;
+        }else {
+            MaMachine maMachine =new MaMachine();
+            maMachine.setMaCode(maLabelBind.getMaCode());
+            maMachine.setTypeId(maLabelBind.getTypeId());
+            maLabelBindMapper.insertMaLabel(maMachine);
+            maLabelBind.setMaId(String.valueOf(maMachine.getMaId()));
             maLabelBind.setStatus("1");
             maLabelBind.setIsBind("1");
             b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind);
             i = maLabelBindMapper.insertMaLabelBindS(maLabelBind);
-        }
-        return i ;
+            }
+        return i;
     }
 
     /**
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 33ffaf8e..7bc9597c 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -176,4 +176,19 @@
           ma_id = #{maId},is_bind =#{isBind}
           where label_id =#{labelId}
     </update>
+    <insert id="insertMaLabels">
+        insert into ma_maLabel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="typeId != null">type_id,</if>
+            <if test="maCode != null">ma_code,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="typeId != null">#{typeId},</if>
+            <if test="labelCode != null">#{maCode},</if>
+        </trim>
+    </insert>
+    <insert id="insertMaLabel" useGeneratedKeys="true" keyProperty="maId">
+        insert into ma_machine (type_id,ma_code,create_time)
+        values (#{typeId},#{maCode},now());
+    </insert>
 </mapper>
\ No newline at end of file