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] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E6=8A=A5=EF=BC=8C=E6=9C=AA=E5=BC=80=E5=8F=91=E5=AE=8C=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