From e86246cbd35aef35026dce45e005040fc93949bf Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 28 Jun 2021 17:39:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?meapi=E5=8A=A0=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foreverwin/mesnac/meapi/model/Bom.java | 13 ++++++------- .../foreverwin/mesnac/meapi/model/BomComponent.java | 4 +++- .../foreverwin/mesnac/meapi/model/CustomFields.java | 11 +++++------ .../com/foreverwin/mesnac/meapi/model/NcCode.java | 4 +++- .../com/foreverwin/mesnac/meapi/model/NcGroup.java | 4 +++- .../foreverwin/mesnac/meapi/model/ResourceType.java | 11 ++++++----- .../com/foreverwin/mesnac/meapi/model/Resrce.java | 12 ++++++------ .../com/foreverwin/mesnac/meapi/model/Router.java | 9 +++++---- .../mesnac/meapi/model/RouterSubstep.java | 4 +++- .../java/com/foreverwin/mesnac/meapi/model/Sfc.java | 9 +++++---- .../com/foreverwin/mesnac/meapi/model/SfcBom.java | 4 +++- .../foreverwin/mesnac/meapi/model/ShopOrder.java | 2 +- .../mesnac/meapi/model/WorkCenterMember.java | 10 +++++----- 13 files changed, 54 insertions(+), 43 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java index cc0a2841..e332dc53 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java @@ -1,16 +1,15 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; +import java.time.LocalDateTime; import java.util.List; -import com.baomidou.mybatisplus.annotation.IdType; - /** *

* @@ -25,7 +24,7 @@ public class Bom extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java index 88be2eb6..09b7f80c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -22,7 +24,7 @@ public class BomComponent extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("BOM_BO") private String bomBo; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java index 5240aa79..7ff61964 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java @@ -1,15 +1,14 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; - /** *

* @@ -25,7 +24,7 @@ public class CustomFields extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("ATTRIBUTE") private String attribute; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java index 725fdb16..4bd7a3f2 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -22,7 +24,7 @@ public class NcCode extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java index 6abf54a0..6ff7f09a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -22,7 +24,7 @@ public class NcGroup extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java index 9467618c..192d2879 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java @@ -1,13 +1,13 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; /** *

@@ -22,6 +22,7 @@ public class ResourceType extends Model { private static final long serialVersionUID = 1L; + @TableId(value = "HANDLE", type = IdType.INPUT) @TableField("HANDLE") private String handle; @TableField("CHANGE_STAMP") diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java index 874ee010..b4b3fd75 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java @@ -1,13 +1,13 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; /** *

@@ -22,7 +22,7 @@ public class Resrce extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java index 633bef3a..6b498aab 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java @@ -1,12 +1,13 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; /** *

@@ -22,7 +23,7 @@ public class Router extends Model { private static final long serialVersionUID = 1L; - @TableId("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java index 776497b0..b4cac02b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -21,7 +23,7 @@ public class RouterSubstep extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("ROUTER_STEP_BO") private String routerStepBo; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java index 273b9e6a..04ffca77 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java @@ -1,12 +1,13 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; /** *

@@ -22,7 +23,7 @@ public class Sfc extends Model { private static final long serialVersionUID = 1L; - @TableId("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java index b52a378d..5753b517 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -22,7 +24,7 @@ public class SfcBom extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java index 40f77cc3..d2e8f43d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java @@ -24,7 +24,7 @@ public class ShopOrder extends Model { private static final long serialVersionUID = 1L; - @TableId("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("CHANGE_STAMP") private Long changeStamp; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java index 2f5f59bb..ba9e76c3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java @@ -1,12 +1,12 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; /** *

@@ -21,7 +21,7 @@ public class WorkCenterMember extends Model { private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("WORK_CENTER_BO") private String workCenterBo; From d06b5aec4f4e79f8864a508f45fcd2d955b8e164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 29 Jun 2021 10:02:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E6=8A=A5=EF=BC=8C=E6=9C=AA=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anomaly/pom.xml | 5 +- .../controller/AbnormalBillController.java | 39 ++ console/pom.xml | 5 + .../meapi/controller/ItemController.java | 5 + .../meapi/controller/SfcController.java | 21 +- .../meapi/controller/ShopOrderController.java | 24 +- .../meapi/controller/UserGroupController.java | 120 +++++++ .../controller/WorkCenterController.java | 1 - .../mesnac/meapi/mapper/SfcMapper.java | 5 +- .../mesnac/meapi/mapper/ShopOrderMapper.java | 4 + .../mesnac/meapi/mapper/UserGroupMapper.java | 18 + .../mesnac/meapi/model/UserGroup.java | 142 ++++++++ .../mesnac/meapi/service/SfcService.java | 5 +- .../meapi/service/ShopOrderService.java | 4 +- .../meapi/service/UserGroupService.java | 28 ++ .../meapi/service/impl/SfcServiceImpl.java | 13 +- .../service/impl/ShopOrderServiceImpl.java | 9 + .../service/impl/UserGroupServiceImpl.java | 46 +++ meapi/src/main/resources/mapper/SfcMapper.xml | 22 ++ .../main/resources/mapper/ShopOrderMapper.xml | 14 +- .../main/resources/mapper/UserGroupMapper.xml | 332 ++++++++++++++++++ pom.xml | 6 + 22 files changed, 840 insertions(+), 28 deletions(-) create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java create mode 100644 meapi/src/main/resources/mapper/UserGroupMapper.xml diff --git a/anomaly/pom.xml b/anomaly/pom.xml index 53592803..061f313a 100644 --- a/anomaly/pom.xml +++ b/anomaly/pom.xml @@ -12,8 +12,9 @@ anomaly - 8 - 8 + UTF-8 + 1.8 + 1.8 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 31ee4964..df10842b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; +import com.foreverwin.mesnac.common.helper.NextNumberHelper; +import com.foreverwin.mesnac.meapi.controller.WorkCenterController; +import com.foreverwin.mesnac.meapi.model.NcCode; +import com.foreverwin.mesnac.meapi.model.WorkCenter; +import com.foreverwin.mesnac.meapi.service.NcCodeService; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; /** @@ -24,6 +31,15 @@ public class AbnormalBillController { @Autowired public AbnormalBillService abnormalBillService; + @Autowired + public NcCodeService ncCodeService; + + @Autowired + public WorkCenterController workCenterController; + + @Autowired + public NextNumberHelper nextNumberHelper; + /** * 根据id查询 * @@ -143,4 +159,27 @@ public class AbnormalBillController { public R removeByIds(List ids){ return R.ok(abnormalBillService.removeByIds(ids)); } + + @GetMapping("/init") + public R init(String messageType){ + List ncByNG = ncCodeService.findNcByNG(messageType); + WorkCenter workCenter = new WorkCenter(); + workCenter.setWcCategory("LEVEL4"); + R workCenterList = workCenterController.getWorkCenterList(workCenter); + HashMap hashMap = new HashMap<>(); + hashMap.put("ncByNG",ncByNG); + hashMap.put("workCenter",workCenterList); + return R.ok(hashMap); + } + + @GetMapping("/findAllUserByUserGroup") + public R findAllUserByUserGroup(String site, String userGroups){ + return R.ok(); + } + @GetMapping("/getNextNumber") + public R getNextNumber(String numberType){ + String site = CommonMethods.getSite(); + List nextNumber = nextNumberHelper.getNextNumber(site, numberType, 1, null); + return R.ok(nextNumber.get(0)); + } } \ No newline at end of file diff --git a/console/pom.xml b/console/pom.xml index d8584653..f65c57fb 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -59,6 +59,11 @@ production + + com.foreverwin.mesnac + anomaly + + com.foreverwin.mesnac quartz diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java index d926d80d..e14d5200 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java @@ -90,4 +90,9 @@ public class ItemController { return R.ok(itemService.updateById(item)); } + @GetMapping("selectById") + public R selectById( String itemBo){ + return R.ok(itemService.selectById(itemBo)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java index 58799f31..d35587ad 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java @@ -1,16 +1,15 @@ package com.foreverwin.mesnac.meapi.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.meapi.model.Sfc; +import com.foreverwin.mesnac.meapi.service.SfcService; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.meapi.service.SfcService; -import com.foreverwin.mesnac.meapi.model.Sfc; import java.util.List; /** @@ -26,6 +25,7 @@ public class SfcController { public SfcService sfcService; + /** * 查询所有数据 * @@ -51,11 +51,9 @@ public class SfcController { @GetMapping("/page") public R page(FrontPage frontPage, Sfc sfc){ IPage result; - try { String site = CommonMethods.getSite(); sfc.setSite(site); - QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(sfc); if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { @@ -118,4 +116,11 @@ public class SfcController { public R removeByIds(List ids){ return R.ok(sfcService.removeByIds(ids)); } + + @GetMapping("findBySfc") + public R findBySfc(Sfc sfc){ + sfc.setSite(CommonMethods.getSite()); + return R.ok(sfcService.findBySfc(sfc)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java index 30b119f2..a856ffe0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java @@ -1,17 +1,18 @@ package com.foreverwin.mesnac.meapi.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.ShopOrder; +import com.foreverwin.mesnac.meapi.service.ShopOrderService; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import com.sap.me.status.StatusBOHandle; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.foreverwin.mesnac.meapi.service.ShopOrderService; -import com.foreverwin.mesnac.meapi.model.ShopOrder; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; /** * @@ -25,6 +26,7 @@ public class ShopOrderController { @Autowired public ShopOrderService shopOrderService; + /** * 分页查询数据 * @@ -64,7 +66,11 @@ public class ShopOrderController { } catch (Exception e) { return R.failed(e.getMessage()); } - return R.ok(result); } + + @GetMapping("findByIdAndPlannedItemBo") + public R findByIdAndPlannedItemBo(String handle,String plannedItemBo){ + return R.ok(shopOrderService.findByIdAndPlannedItemBo(handle,plannedItemBo)); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java new file mode 100644 index 00000000..1d905405 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java @@ -0,0 +1,120 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.UserGroup; +import com.foreverwin.mesnac.meapi.service.UserGroupService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-29 + */ +@RestController +@RequestMapping("/USER-GROUP") +public class UserGroupController { + + @Autowired + public UserGroupService userGroupService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getUserGroupById(@PathVariable String id) { + return R.ok( userGroupService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getUserGroupList(UserGroup userGroup){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(userGroup); + result = userGroupService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, UserGroup userGroup){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(userGroup); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(UserGroup::getHandle, frontPage.getGlobalQuery()) + .or().like(UserGroup::getSite, frontPage.getGlobalQuery()) + .or().like(UserGroup::getUserGroup, frontPage.getGlobalQuery()) + .or().like(UserGroup::getDescription, frontPage.getGlobalQuery()) + .or().like(UserGroup::getWorkstationBo, frontPage.getGlobalQuery()) + ); + } + result = userGroupService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param userGroup 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody UserGroup userGroup) { + return R.ok(userGroupService.save(userGroup)); + } + + /** + * 修改 + * @param userGroup 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody UserGroup userGroup) { + return R.ok(userGroupService.updateById(userGroup)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(userGroupService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(userGroupService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java index d4e21678..58a18195 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java @@ -47,7 +47,6 @@ public class WorkCenterController { try { String site = CommonMethods.getSite(); workCenter.setSite(site); - QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(workCenter); result = workCenterService.list(queryWrapper); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java index 29d76ead..0ace0d98 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java @@ -1,7 +1,8 @@ package com.foreverwin.mesnac.meapi.mapper; -import com.foreverwin.mesnac.meapi.model.Sfc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.model.Sfc; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -20,4 +21,6 @@ public interface SfcMapper extends BaseMapper { * 获取资源上活动的sfc */ List getSfcListByResrceBO(String resrceBO); + + Sfc findBySfc(@Param("sfc") Sfc sfc); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java index e21f0765..9d886a83 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.meapi.mapper; import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** @@ -15,4 +16,7 @@ import org.springframework.stereotype.Repository; @Repository public interface ShopOrderMapper extends BaseMapper { + ShopOrder findByIdAndPlannedItemBo(@Param("handle")String handle, + @Param("plannedItemBo")String plannedItemBo, + @Param("status501")String status501); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java new file mode 100644 index 00000000..2df88a6f --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.UserGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Repository +public interface UserGroupMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java new file mode 100644 index 00000000..e3da2af6 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java @@ -0,0 +1,142 @@ +package com.foreverwin.mesnac.meapi.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author robert + * @since 2021-06-29 + */ + +@TableName("USER_GROUP") + +public class UserGroup extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("CHANGE_STAMP") + private Long changeStamp; + @TableField("SITE") + private String site; + @TableField("USER_GROUP") + private String userGroup; + @TableField("DESCRIPTION") + private String description; + @TableField("WORKSTATION_BO") + private String workstationBo; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public Long getChangeStamp() { + return changeStamp; + } + + public void setChangeStamp(Long changeStamp) { + this.changeStamp = changeStamp; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getUserGroup() { + return userGroup; + } + + public void setUserGroup(String userGroup) { + this.userGroup = userGroup; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getWorkstationBo() { + return workstationBo; + } + + public void setWorkstationBo(String workstationBo) { + this.workstationBo = workstationBo; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String CHANGE_STAMP = "CHANGE_STAMP"; + +public static final String SITE = "SITE"; + +public static final String USER_GROUP = "USER_GROUP"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String WORKSTATION_BO = "WORKSTATION_BO"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "UserGroup{" + + "handle = " + handle + + ", changeStamp = " + changeStamp + + ", site = " + site + + ", userGroup = " + userGroup + + ", description = " + description + + ", workstationBo = " + workstationBo + + ", createdDateTime = " + createdDateTime + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java index 7fec1cc5..d9737fa3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java @@ -1,8 +1,8 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.Sfc; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.model.Sfc; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -35,4 +35,7 @@ public interface SfcService extends IService { * 获取资源上活动的sfc */ List getSfcListByResrceBO(String resrceBO); + + Sfc findBySfc(Sfc sfc); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java index b86ea30a..f5ab0789 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java @@ -1,8 +1,8 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -25,4 +25,6 @@ public interface ShopOrderService extends IService { IPage selectPage(FrontPage frontPage, ShopOrder shopOrder); List selectList(ShopOrder shopOrder); + + ShopOrder findByIdAndPlannedItemBo(String handle,String plannedItemBo); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java new file mode 100644 index 00000000..e5f1a6ba --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.UserGroup; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +public interface UserGroupService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, UserGroup userGroup); + + List selectList(UserGroup userGroup); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java index 52e18561..a3a32aaa 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java @@ -1,14 +1,14 @@ package com.foreverwin.mesnac.meapi.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.Sfc; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.meapi.mapper.SfcMapper; +import com.foreverwin.mesnac.meapi.model.Sfc; import com.foreverwin.mesnac.meapi.service.SfcService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -57,5 +57,10 @@ public class SfcServiceImpl extends ServiceImpl implements SfcSe return sfc; } + @Override + public Sfc findBySfc(Sfc sfc) { + return sfcMapper.findBySfc(sfc); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java index d332510e..13d828ce 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.meapi.service.impl; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,6 +8,7 @@ import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper; import com.foreverwin.mesnac.meapi.service.ShopOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sap.me.status.StatusBOHandle; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -42,5 +44,12 @@ public class ShopOrderServiceImpl extends ServiceImpl + * 服务实现类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class UserGroupServiceImpl extends ServiceImpl implements UserGroupService { + + + @Autowired + private UserGroupMapper userGroupMapper; + + @Override + public IPage selectPage(FrontPage frontPage, UserGroup userGroup) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(userGroup); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(UserGroup userGroup) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(userGroup); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index e765d0cf..8e4d1287 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -634,4 +634,26 @@ WHERE RES.HANDLE = #{resrceBO} ORDER BY IW.DATE_STARTED DESC + + + diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml index 6a841b71..aad78059 100644 --- a/meapi/src/main/resources/mapper/ShopOrderMapper.xml +++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml @@ -986,5 +986,17 @@ - + diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml new file mode 100644 index 00000000..0fe9eea3 --- /dev/null +++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + HANDLE, CHANGE_STAMP, SITE, USER_GROUP, DESCRIPTION, WORKSTATION_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO USER_GROUP + + HANDLE, + CHANGE_STAMP, + SITE, + USER_GROUP, + DESCRIPTION, + WORKSTATION_BO, + CREATED_DATE_TIME, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{changeStamp}, + #{site}, + #{userGroup}, + #{description}, + #{workstationBo}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + INSERT INTO USER_GROUP + + + VALUES + + #{handle}, + #{changeStamp}, + #{site}, + #{userGroup}, + #{description}, + #{workstationBo}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + + + + + + UPDATE USER_GROUP + HANDLE=#{et.handle}, + CHANGE_STAMP=#{et.changeStamp}, + SITE=#{et.site}, + USER_GROUP=#{et.userGroup}, + DESCRIPTION=#{et.description}, + WORKSTATION_BO=#{et.workstationBo}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND CHANGE_STAMP=#{ew.entity.changeStamp} + AND SITE=#{ew.entity.site} + AND USER_GROUP=#{ew.entity.userGroup} + AND DESCRIPTION=#{ew.entity.description} + AND WORKSTATION_BO=#{ew.entity.workstationBo} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM USER_GROUP + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM USER_GROUP + + + + + HANDLE=#{ew.entity.handle} + + AND CHANGE_STAMP=#{ew.entity.changeStamp} + AND SITE=#{ew.entity.site} + AND USER_GROUP=#{ew.entity.userGroup} + AND DESCRIPTION=#{ew.entity.description} + AND WORKSTATION_BO=#{ew.entity.workstationBo} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/pom.xml b/pom.xml index 4f4134a2..abc37b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,12 @@ ${project.version} + + com.foreverwin.mesnac + anomaly + ${project.version} + + com.google.guava guava From 1dc6f78310e80909afe27071aa503d5445ef9921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 29 Jun 2021 11:36:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?DATA=5FFIELD=20=E5=92=8C=20DATA=5FFIELD=5FL?= =?UTF-8?q?IST=E8=A1=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meapi/controller/DataFieldController.java | 131 ++++++ .../controller/DataFieldListController.java | 123 +++++ .../meapi/mapper/DataFieldListMapper.java | 18 + .../mesnac/meapi/mapper/DataFieldMapper.java | 18 + .../mesnac/meapi/model/DataField.java | 246 ++++++++++ .../mesnac/meapi/model/DataFieldList.java | 157 +++++++ .../meapi/service/DataFieldListService.java | 28 ++ .../meapi/service/DataFieldService.java | 28 ++ .../impl/DataFieldListServiceImpl.java | 46 ++ .../service/impl/DataFieldServiceImpl.java | 46 ++ .../resources/mapper/DataFieldListMapper.xml | 346 ++++++++++++++ .../main/resources/mapper/DataFieldMapper.xml | 444 ++++++++++++++++++ 12 files changed, 1631 insertions(+) create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java create mode 100644 meapi/src/main/resources/mapper/DataFieldListMapper.xml create mode 100644 meapi/src/main/resources/mapper/DataFieldMapper.xml diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java new file mode 100644 index 00000000..e3c65c62 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java @@ -0,0 +1,131 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.DataFieldService; +import com.foreverwin.mesnac.meapi.model.DataField; +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-29 + */ +@RestController +@RequestMapping("/DATA-FIELD") +public class DataFieldController { + + @Autowired + public DataFieldService dataFieldService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getDataFieldById(@PathVariable String id) { + return R.ok( dataFieldService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getDataFieldList(DataField dataField){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataField); + result = dataFieldService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, DataField dataField){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataField); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(DataField::getHandle, frontPage.getGlobalQuery()) + .or().like(DataField::getDataTypeBo, frontPage.getGlobalQuery()) + .or().like(DataField::getDataField, frontPage.getGlobalQuery()) + .or().like(DataField::getFieldType, frontPage.getGlobalQuery()) + .or().like(DataField::getValidationType, frontPage.getGlobalQuery()) + .or().like(DataField::getDataDefault, frontPage.getGlobalQuery()) + .or().like(DataField::getSite, frontPage.getGlobalQuery()) + .or().like(DataField::getBrowseActivityBo, frontPage.getGlobalQuery()) + .or().like(DataField::getIsBrowse, frontPage.getGlobalQuery()) + .or().like(DataField::getIsErp, frontPage.getGlobalQuery()) + .or().like(DataField::getMaskGroupBo, frontPage.getGlobalQuery()) + .or().like(DataField::getDescription, frontPage.getGlobalQuery()) + .or().like(DataField::getValidationActivityBo, frontPage.getGlobalQuery()) + .or().like(DataField::getCategory, frontPage.getGlobalQuery()) + ); + } + result = dataFieldService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param dataField 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody DataField dataField) { + return R.ok(dataFieldService.save(dataField)); + } + + /** + * 修改 + * @param dataField 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody DataField dataField) { + return R.ok(dataFieldService.updateById(dataField)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(dataFieldService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(dataFieldService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java new file mode 100644 index 00000000..f704488a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java @@ -0,0 +1,123 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.DataFieldListService; +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-29 + */ +@RestController +@RequestMapping("/DATA-FIELD-LIST") +public class DataFieldListController { + + @Autowired + public DataFieldListService dataFieldListService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getDataFieldListById(@PathVariable String id) { + return R.ok( dataFieldListService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getDataFieldListList(DataFieldList dataFieldList){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataFieldList); + result = dataFieldListService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, DataFieldList dataFieldList){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataFieldList); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(DataFieldList::getHandle, frontPage.getGlobalQuery()) + .or().like(DataFieldList::getDataFieldBo, frontPage.getGlobalQuery()) + .or().like(DataFieldList::getDataValue, frontPage.getGlobalQuery()) + .or().like(DataFieldList::getIsDefault, frontPage.getGlobalQuery()) + .or().like(DataFieldList::getValuation, frontPage.getGlobalQuery()) + .or().like(DataFieldList::getErpCodeGroup, frontPage.getGlobalQuery()) + ); + } + result = dataFieldListService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param dataFieldList 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody DataFieldList dataFieldList) { + return R.ok(dataFieldListService.save(dataFieldList)); + } + + /** + * 修改 + * @param dataFieldList 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody DataFieldList dataFieldList) { + return R.ok(dataFieldListService.updateById(dataFieldList)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(dataFieldListService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(dataFieldListService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java new file mode 100644 index 00000000..c810a7fc --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Repository +public interface DataFieldListMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java new file mode 100644 index 00000000..4bbb8ef3 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.DataField; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Repository +public interface DataFieldMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java new file mode 100644 index 00000000..2447e486 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java @@ -0,0 +1,246 @@ +package com.foreverwin.mesnac.meapi.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author robert + * @since 2021-06-29 + */ + +@TableName("DATA_FIELD") + +public class DataField extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("DATA_TYPE_BO") + private String dataTypeBo; + @TableField("DATA_FIELD") + private String dataField; + @TableField("FIELD_TYPE") + private String fieldType; + @TableField("VALIDATION_TYPE") + private String validationType; + @TableField("DATA_DEFAULT") + private String dataDefault; + @TableField("SITE") + private String site; + @TableField("BROWSE_ACTIVITY_BO") + private String browseActivityBo; + @TableField("IS_BROWSE") + private String isBrowse; + @TableField("IS_ERP") + private String isErp; + @TableField("MASK_GROUP_BO") + private String maskGroupBo; + @TableField("DESCRIPTION") + private String description; + @TableField("VALIDATION_ACTIVITY_BO") + private String validationActivityBo; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + @TableField("CATEGORY") + private String category; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getDataTypeBo() { + return dataTypeBo; + } + + public void setDataTypeBo(String dataTypeBo) { + this.dataTypeBo = dataTypeBo; + } + + public String getDataField() { + return dataField; + } + + public void setDataField(String dataField) { + this.dataField = dataField; + } + + public String getFieldType() { + return fieldType; + } + + public void setFieldType(String fieldType) { + this.fieldType = fieldType; + } + + public String getValidationType() { + return validationType; + } + + public void setValidationType(String validationType) { + this.validationType = validationType; + } + + public String getDataDefault() { + return dataDefault; + } + + public void setDataDefault(String dataDefault) { + this.dataDefault = dataDefault; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getBrowseActivityBo() { + return browseActivityBo; + } + + public void setBrowseActivityBo(String browseActivityBo) { + this.browseActivityBo = browseActivityBo; + } + + public String getIsBrowse() { + return isBrowse; + } + + public void setIsBrowse(String isBrowse) { + this.isBrowse = isBrowse; + } + + public String getIsErp() { + return isErp; + } + + public void setIsErp(String isErp) { + this.isErp = isErp; + } + + public String getMaskGroupBo() { + return maskGroupBo; + } + + public void setMaskGroupBo(String maskGroupBo) { + this.maskGroupBo = maskGroupBo; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getValidationActivityBo() { + return validationActivityBo; + } + + public void setValidationActivityBo(String validationActivityBo) { + this.validationActivityBo = validationActivityBo; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + +public static final String HANDLE = "HANDLE"; + +public static final String DATA_TYPE_BO = "DATA_TYPE_BO"; + +public static final String DATA_FIELD = "DATA_FIELD"; + +public static final String FIELD_TYPE = "FIELD_TYPE"; + +public static final String VALIDATION_TYPE = "VALIDATION_TYPE"; + +public static final String DATA_DEFAULT = "DATA_DEFAULT"; + +public static final String SITE = "SITE"; + +public static final String BROWSE_ACTIVITY_BO = "BROWSE_ACTIVITY_BO"; + +public static final String IS_BROWSE = "IS_BROWSE"; + +public static final String IS_ERP = "IS_ERP"; + +public static final String MASK_GROUP_BO = "MASK_GROUP_BO"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String VALIDATION_ACTIVITY_BO = "VALIDATION_ACTIVITY_BO"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + +public static final String CATEGORY = "CATEGORY"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "DataField{" + + "handle = " + handle + + ", dataTypeBo = " + dataTypeBo + + ", dataField = " + dataField + + ", fieldType = " + fieldType + + ", validationType = " + validationType + + ", dataDefault = " + dataDefault + + ", site = " + site + + ", browseActivityBo = " + browseActivityBo + + ", isBrowse = " + isBrowse + + ", isErp = " + isErp + + ", maskGroupBo = " + maskGroupBo + + ", description = " + description + + ", validationActivityBo = " + validationActivityBo + + ", createdDateTime = " + createdDateTime + + ", modifiedDateTime = " + modifiedDateTime + + ", category = " + category + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java new file mode 100644 index 00000000..d1e35879 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java @@ -0,0 +1,157 @@ +package com.foreverwin.mesnac.meapi.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author robert + * @since 2021-06-29 + */ + +@TableName("DATA_FIELD_LIST") + +public class DataFieldList extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("SEQUENCE") + private Long sequence; + @TableField("DATA_FIELD_BO") + private String dataFieldBo; + @TableField("DATA_VALUE") + private String dataValue; + @TableField("IS_DEFAULT") + private String isDefault; + @TableField("VALUATION") + private String valuation; + @TableField("ERP_CODE_GROUP") + private String erpCodeGroup; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public Long getSequence() { + return sequence; + } + + public void setSequence(Long sequence) { + this.sequence = sequence; + } + + public String getDataFieldBo() { + return dataFieldBo; + } + + public void setDataFieldBo(String dataFieldBo) { + this.dataFieldBo = dataFieldBo; + } + + public String getDataValue() { + return dataValue; + } + + public void setDataValue(String dataValue) { + this.dataValue = dataValue; + } + + public String getIsDefault() { + return isDefault; + } + + public void setIsDefault(String isDefault) { + this.isDefault = isDefault; + } + + public String getValuation() { + return valuation; + } + + public void setValuation(String valuation) { + this.valuation = valuation; + } + + public String getErpCodeGroup() { + return erpCodeGroup; + } + + public void setErpCodeGroup(String erpCodeGroup) { + this.erpCodeGroup = erpCodeGroup; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SEQUENCE = "SEQUENCE"; + +public static final String DATA_FIELD_BO = "DATA_FIELD_BO"; + +public static final String DATA_VALUE = "DATA_VALUE"; + +public static final String IS_DEFAULT = "IS_DEFAULT"; + +public static final String VALUATION = "VALUATION"; + +public static final String ERP_CODE_GROUP = "ERP_CODE_GROUP"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "DataFieldList{" + + "handle = " + handle + + ", sequence = " + sequence + + ", dataFieldBo = " + dataFieldBo + + ", dataValue = " + dataValue + + ", isDefault = " + isDefault + + ", valuation = " + valuation + + ", erpCodeGroup = " + erpCodeGroup + + ", createdDateTime = " + createdDateTime + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java new file mode 100644 index 00000000..70518101 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +public interface DataFieldListService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, DataFieldList dataFieldList); + + List selectList(DataFieldList dataFieldList); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java new file mode 100644 index 00000000..b61eb63a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +public interface DataFieldService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, DataField dataField); + + List selectList(DataField dataField); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java new file mode 100644 index 00000000..146ed9c2 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper; +import com.foreverwin.mesnac.meapi.service.DataFieldListService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class DataFieldListServiceImpl extends ServiceImpl implements DataFieldListService { + + + @Autowired + private DataFieldListMapper dataFieldListMapper; + + @Override + public IPage selectPage(FrontPage frontPage, DataFieldList dataFieldList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataFieldList); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(DataFieldList dataFieldList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataFieldList); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java new file mode 100644 index 00000000..9b3602c3 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.mapper.DataFieldMapper; +import com.foreverwin.mesnac.meapi.service.DataFieldService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class DataFieldServiceImpl extends ServiceImpl implements DataFieldService { + + + @Autowired + private DataFieldMapper dataFieldMapper; + + @Override + public IPage selectPage(FrontPage frontPage, DataField dataField) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataField); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(DataField dataField) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dataField); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/DataFieldListMapper.xml b/meapi/src/main/resources/mapper/DataFieldListMapper.xml new file mode 100644 index 00000000..d0200842 --- /dev/null +++ b/meapi/src/main/resources/mapper/DataFieldListMapper.xml @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + HANDLE, SEQUENCE, DATA_FIELD_BO, DATA_VALUE, IS_DEFAULT, VALUATION, ERP_CODE_GROUP, CREATED_DATE_TIME, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO DATA_FIELD_LIST + + HANDLE, + SEQUENCE, + DATA_FIELD_BO, + DATA_VALUE, + IS_DEFAULT, + VALUATION, + ERP_CODE_GROUP, + CREATED_DATE_TIME, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{sequence}, + #{dataFieldBo}, + #{dataValue}, + #{isDefault}, + #{valuation}, + #{erpCodeGroup}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + INSERT INTO DATA_FIELD_LIST + + + VALUES + + #{handle}, + #{sequence}, + #{dataFieldBo}, + #{dataValue}, + #{isDefault}, + #{valuation}, + #{erpCodeGroup}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + + + + + + UPDATE DATA_FIELD_LIST + HANDLE=#{et.handle}, + SEQUENCE=#{et.sequence}, + DATA_FIELD_BO=#{et.dataFieldBo}, + DATA_VALUE=#{et.dataValue}, + IS_DEFAULT=#{et.isDefault}, + VALUATION=#{et.valuation}, + ERP_CODE_GROUP=#{et.erpCodeGroup}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SEQUENCE=#{ew.entity.sequence} + AND DATA_FIELD_BO=#{ew.entity.dataFieldBo} + AND DATA_VALUE=#{ew.entity.dataValue} + AND IS_DEFAULT=#{ew.entity.isDefault} + AND VALUATION=#{ew.entity.valuation} + AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM DATA_FIELD_LIST + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM DATA_FIELD_LIST + + + + + HANDLE=#{ew.entity.handle} + + AND SEQUENCE=#{ew.entity.sequence} + AND DATA_FIELD_BO=#{ew.entity.dataFieldBo} + AND DATA_VALUE=#{ew.entity.dataValue} + AND IS_DEFAULT=#{ew.entity.isDefault} + AND VALUATION=#{ew.entity.valuation} + AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/meapi/src/main/resources/mapper/DataFieldMapper.xml b/meapi/src/main/resources/mapper/DataFieldMapper.xml new file mode 100644 index 00000000..debaa0e1 --- /dev/null +++ b/meapi/src/main/resources/mapper/DataFieldMapper.xml @@ -0,0 +1,444 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, DATA_TYPE_BO, DATA_FIELD, FIELD_TYPE, VALIDATION_TYPE, DATA_DEFAULT, SITE, BROWSE_ACTIVITY_BO, IS_BROWSE, IS_ERP, MASK_GROUP_BO, DESCRIPTION, VALIDATION_ACTIVITY_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME, CATEGORY + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO DATA_FIELD + + HANDLE, + DATA_TYPE_BO, + DATA_FIELD, + FIELD_TYPE, + VALIDATION_TYPE, + DATA_DEFAULT, + SITE, + BROWSE_ACTIVITY_BO, + IS_BROWSE, + IS_ERP, + MASK_GROUP_BO, + DESCRIPTION, + VALIDATION_ACTIVITY_BO, + CREATED_DATE_TIME, + MODIFIED_DATE_TIME, + CATEGORY, + VALUES + + #{handle}, + #{dataTypeBo}, + #{dataField}, + #{fieldType}, + #{validationType}, + #{dataDefault}, + #{site}, + #{browseActivityBo}, + #{isBrowse}, + #{isErp}, + #{maskGroupBo}, + #{description}, + #{validationActivityBo}, + #{createdDateTime}, + #{modifiedDateTime}, + #{category}, + + + + + INSERT INTO DATA_FIELD + + + VALUES + + #{handle}, + #{dataTypeBo}, + #{dataField}, + #{fieldType}, + #{validationType}, + #{dataDefault}, + #{site}, + #{browseActivityBo}, + #{isBrowse}, + #{isErp}, + #{maskGroupBo}, + #{description}, + #{validationActivityBo}, + #{createdDateTime}, + #{modifiedDateTime}, + #{category}, + + + + + + + + + + UPDATE DATA_FIELD + HANDLE=#{et.handle}, + DATA_TYPE_BO=#{et.dataTypeBo}, + DATA_FIELD=#{et.dataField}, + FIELD_TYPE=#{et.fieldType}, + VALIDATION_TYPE=#{et.validationType}, + DATA_DEFAULT=#{et.dataDefault}, + SITE=#{et.site}, + BROWSE_ACTIVITY_BO=#{et.browseActivityBo}, + IS_BROWSE=#{et.isBrowse}, + IS_ERP=#{et.isErp}, + MASK_GROUP_BO=#{et.maskGroupBo}, + DESCRIPTION=#{et.description}, + VALIDATION_ACTIVITY_BO=#{et.validationActivityBo}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + CATEGORY=#{et.category}, + + + + + HANDLE=#{ew.entity.handle} + AND DATA_TYPE_BO=#{ew.entity.dataTypeBo} + AND DATA_FIELD=#{ew.entity.dataField} + AND FIELD_TYPE=#{ew.entity.fieldType} + AND VALIDATION_TYPE=#{ew.entity.validationType} + AND DATA_DEFAULT=#{ew.entity.dataDefault} + AND SITE=#{ew.entity.site} + AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo} + AND IS_BROWSE=#{ew.entity.isBrowse} + AND IS_ERP=#{ew.entity.isErp} + AND MASK_GROUP_BO=#{ew.entity.maskGroupBo} + AND DESCRIPTION=#{ew.entity.description} + AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND CATEGORY=#{ew.entity.category} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM DATA_FIELD + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM DATA_FIELD + + + + + HANDLE=#{ew.entity.handle} + + AND DATA_TYPE_BO=#{ew.entity.dataTypeBo} + AND DATA_FIELD=#{ew.entity.dataField} + AND FIELD_TYPE=#{ew.entity.fieldType} + AND VALIDATION_TYPE=#{ew.entity.validationType} + AND DATA_DEFAULT=#{ew.entity.dataDefault} + AND SITE=#{ew.entity.site} + AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo} + AND IS_BROWSE=#{ew.entity.isBrowse} + AND IS_ERP=#{ew.entity.isErp} + AND MASK_GROUP_BO=#{ew.entity.maskGroupBo} + AND DESCRIPTION=#{ew.entity.description} + AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND CATEGORY=#{ew.entity.category} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + From 817f186c596cf9e4375c2d1e0927173b68e37156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 29 Jun 2021 14:25:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Z=5FABNORMAL=5FBILL=5FDISPOSE=20=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbnormalBillDisposeController.java | 137 +++++ .../mapper/AbnormalBillDisposeMapper.java | 18 + .../anomaly/model/AbnormalBillDispose.java | 438 ++++++++++++++ .../service/AbnormalBillDisposeService.java | 28 + .../impl/AbnormalBillDisposeServiceImpl.java | 46 ++ .../mapper/AbnormalBillDisposeMapper.xml | 570 ++++++++++++++++++ 6 files changed, 1237 insertions(+) create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java create mode 100644 anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java new file mode 100644 index 00000000..3289225c --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java @@ -0,0 +1,137 @@ +package com.foreverwin.mesnac.anomaly.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-29 + */ +@RestController +@RequestMapping("/Z-ABNORMAL-BILL-DISPOSE") +public class AbnormalBillDisposeController { + + @Autowired + public AbnormalBillDisposeService abnormalBillDisposeService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getAbnormalBillDisposeById(@PathVariable String id) { + return R.ok( abnormalBillDisposeService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getAbnormalBillDisposeList(AbnormalBillDispose abnormalBillDispose){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillDispose); + result = abnormalBillDisposeService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, AbnormalBillDispose abnormalBillDispose){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillDispose); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(AbnormalBillDispose::getHandle, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getSite, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getAbnormalBillBo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutyUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutyDepart, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getPrincipalUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutyCauseDescription, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutyCauseType, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutySendUserGroup, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getResolveUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getAbnormalMethod, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getRouterBo, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getResolveShopOrder, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getResolveRemark, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getResolveSendUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getClosedUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getAbnormalReason, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getBeforeMeasure, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getCreatedUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getModifiedUser, frontPage.getGlobalQuery()) + ); + } + result = abnormalBillDisposeService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param abnormalBillDispose 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody AbnormalBillDispose abnormalBillDispose) { + return R.ok(abnormalBillDisposeService.save(abnormalBillDispose)); + } + + /** + * 修改 + * @param abnormalBillDispose 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody AbnormalBillDispose abnormalBillDispose) { + return R.ok(abnormalBillDisposeService.updateById(abnormalBillDispose)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(abnormalBillDisposeService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(abnormalBillDisposeService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java new file mode 100644 index 00000000..84555a7f --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.anomaly.mapper; + +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 异常单处置 Mapper 接口 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Repository +public interface AbnormalBillDisposeMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java new file mode 100644 index 00000000..7ffe574c --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java @@ -0,0 +1,438 @@ +package com.foreverwin.mesnac.anomaly.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 异常单处置 + *

+ * + * @author robert + * @since 2021-06-29 + */ + +@TableName("Z_ABNORMAL_BILL_DISPOSE") + +public class AbnormalBillDispose extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableField("HANDLE") + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 异常单BO + */ + @TableField("ABNORMAL_BILL_BO") + private String abnormalBillBo; + /** + * 责任划分填报人 + */ + @TableField("DUTY_USER") + private String dutyUser; + /** + * 责任划分填报时间 + */ + @TableField("DUTY_DATE_TIME") + private LocalDateTime dutyDateTime; + /** + * 责任部门 + */ + @TableField("DUTY_DEPART") + private String dutyDepart; + /** + * 责任人 + */ + @TableField("PRINCIPAL_USER") + private String principalUser; + /** + * 原因分析 + */ + @TableField("DUTY_CAUSE_DESCRIPTION") + private String dutyCauseDescription; + /** + * 原因分类 + */ + @TableField("DUTY_CAUSE_TYPE") + private String dutyCauseType; + /** + * 发送用户组 + */ + @TableField("DUTY_SEND_USER_GROUP") + private String dutySendUserGroup; + /** + * 解决方案填报人 + */ + @TableField("RESOLVE_USER") + private String resolveUser; + /** + * 解决方案填报时间 + */ + @TableField("RESOLVE_DATE_TIME") + private LocalDateTime resolveDateTime; + /** + * 异常方案 + */ + @TableField("ABNORMAL_METHOD") + private String abnormalMethod; + /** + * 返修工艺 + */ + @TableField("ROUTER_BO") + private String routerBo; + /** + * 返修工单 + */ + @TableField("RESOLVE_SHOP_ORDER") + private String resolveShopOrder; + /** + * 方案备注 + */ + @TableField("RESOLVE_REMARK") + private String resolveRemark; + /** + * 发送用户 + */ + @TableField("RESOLVE_SEND_USER") + private String resolveSendUser; + /** + * 闭环关闭填报人 + */ + @TableField("CLOSED_USER") + private String closedUser; + /** + * 闭环关闭填报时间 + */ + @TableField("CLOSED_DATE_TIME") + private LocalDateTime closedDateTime; + /** + * 异常原因 + */ + @TableField("ABNORMAL_REASON") + private String abnormalReason; + /** + * 预防措施 + */ + @TableField("BEFORE_MEASURE") + private String beforeMeasure; + /** + * 创建人 + */ + @TableField("CREATED_USER") + private String createdUser; + /** + * 创建日期 + */ + @TableField("CREATED_DATA_TIME") + private LocalDateTime createdDataTime; + /** + * 修改人 + */ + @TableField("MODIFIED_USER") + private String modifiedUser; + /** + * 修改日期 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getAbnormalBillBo() { + return abnormalBillBo; + } + + public void setAbnormalBillBo(String abnormalBillBo) { + this.abnormalBillBo = abnormalBillBo; + } + + public String getDutyUser() { + return dutyUser; + } + + public void setDutyUser(String dutyUser) { + this.dutyUser = dutyUser; + } + + public LocalDateTime getDutyDateTime() { + return dutyDateTime; + } + + public void setDutyDateTime(LocalDateTime dutyDateTime) { + this.dutyDateTime = dutyDateTime; + } + + public String getDutyDepart() { + return dutyDepart; + } + + public void setDutyDepart(String dutyDepart) { + this.dutyDepart = dutyDepart; + } + + public String getPrincipalUser() { + return principalUser; + } + + public void setPrincipalUser(String principalUser) { + this.principalUser = principalUser; + } + + public String getDutyCauseDescription() { + return dutyCauseDescription; + } + + public void setDutyCauseDescription(String dutyCauseDescription) { + this.dutyCauseDescription = dutyCauseDescription; + } + + public String getDutyCauseType() { + return dutyCauseType; + } + + public void setDutyCauseType(String dutyCauseType) { + this.dutyCauseType = dutyCauseType; + } + + public String getDutySendUserGroup() { + return dutySendUserGroup; + } + + public void setDutySendUserGroup(String dutySendUserGroup) { + this.dutySendUserGroup = dutySendUserGroup; + } + + public String getResolveUser() { + return resolveUser; + } + + public void setResolveUser(String resolveUser) { + this.resolveUser = resolveUser; + } + + public LocalDateTime getResolveDateTime() { + return resolveDateTime; + } + + public void setResolveDateTime(LocalDateTime resolveDateTime) { + this.resolveDateTime = resolveDateTime; + } + + public String getAbnormalMethod() { + return abnormalMethod; + } + + public void setAbnormalMethod(String abnormalMethod) { + this.abnormalMethod = abnormalMethod; + } + + public String getRouterBo() { + return routerBo; + } + + public void setRouterBo(String routerBo) { + this.routerBo = routerBo; + } + + public String getResolveShopOrder() { + return resolveShopOrder; + } + + public void setResolveShopOrder(String resolveShopOrder) { + this.resolveShopOrder = resolveShopOrder; + } + + public String getResolveRemark() { + return resolveRemark; + } + + public void setResolveRemark(String resolveRemark) { + this.resolveRemark = resolveRemark; + } + + public String getResolveSendUser() { + return resolveSendUser; + } + + public void setResolveSendUser(String resolveSendUser) { + this.resolveSendUser = resolveSendUser; + } + + public String getClosedUser() { + return closedUser; + } + + public void setClosedUser(String closedUser) { + this.closedUser = closedUser; + } + + public LocalDateTime getClosedDateTime() { + return closedDateTime; + } + + public void setClosedDateTime(LocalDateTime closedDateTime) { + this.closedDateTime = closedDateTime; + } + + public String getAbnormalReason() { + return abnormalReason; + } + + public void setAbnormalReason(String abnormalReason) { + this.abnormalReason = abnormalReason; + } + + public String getBeforeMeasure() { + return beforeMeasure; + } + + public void setBeforeMeasure(String beforeMeasure) { + this.beforeMeasure = beforeMeasure; + } + + public String getCreatedUser() { + return createdUser; + } + + public void setCreatedUser(String createdUser) { + this.createdUser = createdUser; + } + + public LocalDateTime getCreatedDataTime() { + return createdDataTime; + } + + public void setCreatedDataTime(LocalDateTime createdDataTime) { + this.createdDataTime = createdDataTime; + } + + public String getModifiedUser() { + return modifiedUser; + } + + public void setModifiedUser(String modifiedUser) { + this.modifiedUser = modifiedUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String ABNORMAL_BILL_BO = "ABNORMAL_BILL_BO"; + +public static final String DUTY_USER = "DUTY_USER"; + +public static final String DUTY_DATE_TIME = "DUTY_DATE_TIME"; + +public static final String DUTY_DEPART = "DUTY_DEPART"; + +public static final String PRINCIPAL_USER = "PRINCIPAL_USER"; + +public static final String DUTY_CAUSE_DESCRIPTION = "DUTY_CAUSE_DESCRIPTION"; + +public static final String DUTY_CAUSE_TYPE = "DUTY_CAUSE_TYPE"; + +public static final String DUTY_SEND_USER_GROUP = "DUTY_SEND_USER_GROUP"; + +public static final String RESOLVE_USER = "RESOLVE_USER"; + +public static final String RESOLVE_DATE_TIME = "RESOLVE_DATE_TIME"; + +public static final String ABNORMAL_METHOD = "ABNORMAL_METHOD"; + +public static final String ROUTER_BO = "ROUTER_BO"; + +public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER"; + +public static final String RESOLVE_REMARK = "RESOLVE_REMARK"; + +public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER"; + +public static final String CLOSED_USER = "CLOSED_USER"; + +public static final String CLOSED_DATE_TIME = "CLOSED_DATE_TIME"; + +public static final String ABNORMAL_REASON = "ABNORMAL_REASON"; + +public static final String BEFORE_MEASURE = "BEFORE_MEASURE"; + +public static final String CREATED_USER = "CREATED_USER"; + +public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME"; + +public static final String MODIFIED_USER = "MODIFIED_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "AbnormalBillDispose{" + + "handle = " + handle + + ", site = " + site + + ", abnormalBillBo = " + abnormalBillBo + + ", dutyUser = " + dutyUser + + ", dutyDateTime = " + dutyDateTime + + ", dutyDepart = " + dutyDepart + + ", principalUser = " + principalUser + + ", dutyCauseDescription = " + dutyCauseDescription + + ", dutyCauseType = " + dutyCauseType + + ", dutySendUserGroup = " + dutySendUserGroup + + ", resolveUser = " + resolveUser + + ", resolveDateTime = " + resolveDateTime + + ", abnormalMethod = " + abnormalMethod + + ", routerBo = " + routerBo + + ", resolveShopOrder = " + resolveShopOrder + + ", resolveRemark = " + resolveRemark + + ", resolveSendUser = " + resolveSendUser + + ", closedUser = " + closedUser + + ", closedDateTime = " + closedDateTime + + ", abnormalReason = " + abnormalReason + + ", beforeMeasure = " + beforeMeasure + + ", createdUser = " + createdUser + + ", createdDataTime = " + createdDataTime + + ", modifiedUser = " + modifiedUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java new file mode 100644 index 00000000..a8018ed9 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.anomaly.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 异常单处置 服务类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +public interface AbnormalBillDisposeService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, AbnormalBillDispose abnormalBillDispose); + + List selectList(AbnormalBillDispose abnormalBillDispose); +} \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java new file mode 100644 index 00000000..ebb7af58 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.anomaly.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 异常单处置 服务实现类 + *

+ * + * @author robert + * @since 2021-06-29 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class AbnormalBillDisposeServiceImpl extends ServiceImpl implements AbnormalBillDisposeService { + + + @Autowired + private AbnormalBillDisposeMapper abnormalBillDisposeMapper; + + @Override + public IPage selectPage(FrontPage frontPage, AbnormalBillDispose abnormalBillDispose) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillDispose); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(AbnormalBillDispose abnormalBillDispose) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(abnormalBillDispose); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml new file mode 100644 index 00000000..f08518a1 --- /dev/null +++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml @@ -0,0 +1,570 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_ABNORMAL_BILL_DISPOSE + + HANDLE, + SITE, + ABNORMAL_BILL_BO, + DUTY_USER, + DUTY_DATE_TIME, + DUTY_DEPART, + PRINCIPAL_USER, + DUTY_CAUSE_DESCRIPTION, + DUTY_CAUSE_TYPE, + DUTY_SEND_USER_GROUP, + RESOLVE_USER, + RESOLVE_DATE_TIME, + ABNORMAL_METHOD, + ROUTER_BO, + RESOLVE_SHOP_ORDER, + RESOLVE_REMARK, + RESOLVE_SEND_USER, + CLOSED_USER, + CLOSED_DATE_TIME, + ABNORMAL_REASON, + BEFORE_MEASURE, + CREATED_USER, + CREATED_DATA_TIME, + MODIFIED_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{abnormalBillBo}, + #{dutyUser}, + #{dutyDateTime}, + #{dutyDepart}, + #{principalUser}, + #{dutyCauseDescription}, + #{dutyCauseType}, + #{dutySendUserGroup}, + #{resolveUser}, + #{resolveDateTime}, + #{abnormalMethod}, + #{routerBo}, + #{resolveShopOrder}, + #{resolveRemark}, + #{resolveSendUser}, + #{closedUser}, + #{closedDateTime}, + #{abnormalReason}, + #{beforeMeasure}, + #{createdUser}, + #{createdDataTime}, + #{modifiedUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_ABNORMAL_BILL_DISPOSE + + + VALUES + + #{handle}, + #{site}, + #{abnormalBillBo}, + #{dutyUser}, + #{dutyDateTime}, + #{dutyDepart}, + #{principalUser}, + #{dutyCauseDescription}, + #{dutyCauseType}, + #{dutySendUserGroup}, + #{resolveUser}, + #{resolveDateTime}, + #{abnormalMethod}, + #{routerBo}, + #{resolveShopOrder}, + #{resolveRemark}, + #{resolveSendUser}, + #{closedUser}, + #{closedDateTime}, + #{abnormalReason}, + #{beforeMeasure}, + #{createdUser}, + #{createdDataTime}, + #{modifiedUser}, + #{modifiedDateTime}, + + + + + + + + + + UPDATE Z_ABNORMAL_BILL_DISPOSE + HANDLE=#{et.handle}, + SITE=#{et.site}, + ABNORMAL_BILL_BO=#{et.abnormalBillBo}, + DUTY_USER=#{et.dutyUser}, + DUTY_DATE_TIME=#{et.dutyDateTime}, + DUTY_DEPART=#{et.dutyDepart}, + PRINCIPAL_USER=#{et.principalUser}, + DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription}, + DUTY_CAUSE_TYPE=#{et.dutyCauseType}, + DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup}, + RESOLVE_USER=#{et.resolveUser}, + RESOLVE_DATE_TIME=#{et.resolveDateTime}, + ABNORMAL_METHOD=#{et.abnormalMethod}, + ROUTER_BO=#{et.routerBo}, + RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, + RESOLVE_REMARK=#{et.resolveRemark}, + RESOLVE_SEND_USER=#{et.resolveSendUser}, + CLOSED_USER=#{et.closedUser}, + CLOSED_DATE_TIME=#{et.closedDateTime}, + ABNORMAL_REASON=#{et.abnormalReason}, + BEFORE_MEASURE=#{et.beforeMeasure}, + CREATED_USER=#{et.createdUser}, + CREATED_DATA_TIME=#{et.createdDataTime}, + MODIFIED_USER=#{et.modifiedUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo} + AND DUTY_USER=#{ew.entity.dutyUser} + AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} + AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND PRINCIPAL_USER=#{ew.entity.principalUser} + AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} + AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} + AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup} + AND RESOLVE_USER=#{ew.entity.resolveUser} + AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime} + AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod} + AND ROUTER_BO=#{ew.entity.routerBo} + AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} + AND RESOLVE_REMARK=#{ew.entity.resolveRemark} + AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND CLOSED_USER=#{ew.entity.closedUser} + AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} + AND ABNORMAL_REASON=#{ew.entity.abnormalReason} + AND BEFORE_MEASURE=#{ew.entity.beforeMeasure} + AND CREATED_USER=#{ew.entity.createdUser} + AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND MODIFIED_USER=#{ew.entity.modifiedUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM Z_ABNORMAL_BILL_DISPOSE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_ABNORMAL_BILL_DISPOSE + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo} + AND DUTY_USER=#{ew.entity.dutyUser} + AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} + AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND PRINCIPAL_USER=#{ew.entity.principalUser} + AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} + AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} + AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup} + AND RESOLVE_USER=#{ew.entity.resolveUser} + AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime} + AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod} + AND ROUTER_BO=#{ew.entity.routerBo} + AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} + AND RESOLVE_REMARK=#{ew.entity.resolveRemark} + AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND CLOSED_USER=#{ew.entity.closedUser} + AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} + AND ABNORMAL_REASON=#{ew.entity.abnormalReason} + AND BEFORE_MEASURE=#{ew.entity.beforeMeasure} + AND CREATED_USER=#{ew.entity.createdUser} + AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND MODIFIED_USER=#{ew.entity.modifiedUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + +