From fb948cdb70a1ee60731f145a513f32fec3eb44fb Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Apr 2022 13:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryBaseEOController.java       | 27 ++++++++++++++
 .../dummy/entity/DummyInventoryBaseEO.java    |  4 ++
 .../service/IDummyInventoryBaseEOService.java |  6 +++
 .../impl/DummyInventoryBaseEOServiceImpl.java | 37 +++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
index 7fd3c2f11..b7e0f5028 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
@@ -197,4 +198,30 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 		return Result.OK("取消订阅成功");
 	}
 
+     /**
+      *  发布
+      *
+      * @param dummyInventoryBaseEO
+      * @return
+      */
+     @AutoLog(value = "发布")
+     @ApiOperation(value="发布", notes="发布")
+     @PostMapping(value = "/issue")
+     public Result<?> issue(@Validated @RequestBody DummyInventoryBaseEO dummyInventoryBaseEO) {
+         try {
+             dummyInventoryBaseEOService.issue(dummyInventoryBaseEO);
+         } catch (Exception e) {
+             if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())){
+                 return Result.OK("发布失败!");
+             }else{
+                 return Result.OK("Post failure!");
+             }
+         }
+         if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())){
+             return Result.OK("发布!");
+         }else{
+             return Result.OK("Release success!");
+         }
+     }
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
index 929856f88..16bf188a8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
@@ -83,4 +83,8 @@ public class DummyInventoryBaseEO implements Serializable {
     @TableField(exist = false)
 	private String readFlag;
 
+    /**中英文切换*/
+    @TableField(exist = false)
+	private String cut;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
index 9943004b5..90159ed6d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
@@ -32,6 +32,12 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
 	 */
     void editById(DummyInventoryBaseEO dummyInventoryBaseEO);
 
+	/**
+	 * 发布
+	 * @param dummyInventoryBaseEO
+	 */
+	void issue(DummyInventoryBaseEO dummyInventoryBaseEO);
+
 	/**
 	 * 通过id删除
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 69da10cca..8d40fdc4a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -67,6 +67,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
         saveOrUpdate(dummyInventoryBaseEO);
     }
 
+
+
     /**
      * 通过id删除
      *
@@ -162,4 +164,39 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
         wrapper.in(DummyReadEO::getDummyInventoryBaseId, dummyId).in(DummyReadEO::getCreateBy, sysUser.getUsername());
         dummyReadEOService.remove(wrapper);
     }
+
+    /**
+     * 发布
+     * 发布与撤回均需要发消息
+     * 首次发布不发消息
+     *
+     * @param dummyInventoryBaseEO
+     */
+    @Override
+    public void issue(DummyInventoryBaseEO dummyInventoryBaseEO) {
+
+        //发布与撤回均需要发消息
+        //首次发布不发消息
+        //(1)首次发布将虚拟清单的基础数据和详情数据存入维护清单内容变更表_dummy_content_change
+        //(2)撤回再次编辑完后再次发布
+        //A. 分别判断基础数据和详情数据同上次发布的数据是否发生变化
+        //发生变化-->发消息,删除dummy_content_change中上一次存入的数据,将本次数据存入
+        //没有变化-->不发消息,数据不处理
+
+        //先判断是发布还是撤回 1-->发布  2-->撤回
+        if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){
+            //发布,分别对比基础表数据和详情表数据
+
+            //1.基础表数据对比
+
+
+            //详情表数据(一条基础数据可能对应多个详情数据---一对多)
+
+        }else{
+            //撤回
+
+        }
+
+
+    }
 }