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 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发消息,删除dummy_content_change中上一次存入的数据,将本次数据存入 + //没有变化-->不发消息,数据不处理 + + //先判断是发布还是撤回 1-->发布 2-->撤回 + if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){ + //发布,分别对比基础表数据和详情表数据 + + //1.基础表数据对比 + + + //详情表数据(一条基础数据可能对应多个详情数据---一对多) + + }else{ + //撤回 + + } + + + } }