From e3e9c20090f2d1f24e9ffb30d4043192a58b38a9 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Tue, 19 May 2020 17:35:08 +0800 Subject: [PATCH] swagger mysql --- .../controller/ActivityController.java | 29 +++++++------------ .../service/IPmnActivityInstanceService.java | 2 -- .../impl/PmnActivityCategoryServiceImpl.java | 4 +-- .../PmnActivityInstanceConfigServiceImpl.java | 4 +-- .../impl/PmnActivityInstanceServiceImpl.java | 13 ++------- .../impl/PmnActivityScheduleServiceImpl.java | 4 +-- 6 files changed, 20 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java index 6ed5b9d..b0fbee2 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java @@ -8,6 +8,7 @@ import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; import com.kiisoo.ic.activity.mapper.PmnActivityInstanceDOMapper; import com.kiisoo.ic.activity.mapper.PmnActivityScheduleDOMapper; import com.kiisoo.ic.activity.mapper.PmnActivityStoreRelationMapper; +import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; import com.kiisoo.ic.common.BaseController; import io.swagger.annotations.Api; @@ -33,10 +34,11 @@ public class ActivityController extends BaseController { PmnActivityStoreRelationMapper pmnActivityStoreRelationMapper; @Resource IPmnActivityStoreRelationService pmnActivityStoreRelationService; + @Resource + IPmnActivityInstanceService pmnActivityInstanceService; @ApiOperation(value = "所有活动池列表") - @RequestMapping(value = "/schedule/list/all") - @ResponseBody + @GetMapping(value = "/schedule/list/all") public Map listAll() { try { List list = pmnActivityScheduleDOMapper.selectList(null); @@ -48,15 +50,13 @@ public class ActivityController extends BaseController { } @ApiOperation(value = "新增或修改活动池") - @RequestMapping(value = "/schedule/save") - @ResponseBody + @PostMapping(value = "/schedule/save") public Map save() { return data(null); } @ApiOperation(value = "根据活动池新建实例，修改实例详情") @PostMapping(value = "/instance/save") - @ResponseBody public Map saveInstance(@ModelAttribute PmnActivityInstance instance) { // TODO 第一步先创建活动实例，包括活动时间范围，状态等() // TODO 第二步拿到活动实例ID，再根据公司创建场景(promotion_case)，控制器单独写 @@ -64,12 +64,8 @@ public class ActivityController extends BaseController { // TODO 店铺有店铺的二维码，店铺下的店员都有自己的二维码 // TODO 异步批量生成店铺二维码，店铺二维码 try { - if(instance.getId() != null && instance.getId() > 0) { - pmnActivityInstanceDOMapper.updateById(instance); - }else { - instance.setId(Long.valueOf(pmnActivityInstanceDOMapper.insert(instance))); - } - return data(instance); + boolean save = pmnActivityInstanceService.saveOrUpdate(instance); + return save ? data(instance) : fail("操作失败"); } catch (Exception e) { log.error("查询出错", e); return fail(); @@ -78,7 +74,7 @@ public class ActivityController extends BaseController { @ApiOperation(value = "根据活动实例修改场景") @PostMapping(value = "/promotionCase/save") - public Map savePromotionCase(@ModelAttribute PmnActivityPromotionCase promotionCase){ + public Map savePromotionCase(@ModelAttribute List promotionCase){ try { return data(null); } catch (Exception e) { @@ -125,23 +121,20 @@ public class ActivityController extends BaseController { } @ApiOperation(value = "活动实例分页列表") - @RequestMapping(value = "/instance/list") - @ResponseBody + @GetMapping(value = "/instance/list") public Map instanceList() { // TODO 需要根据当前用户角色分开查询 return data(null); } @ApiOperation(value = "活动实例详情") - @RequestMapping(value = "/instance/detail") - @ResponseBody + @GetMapping(value = "/instance/detail") public Map instanceDetail() { return data(null); } @ApiOperation(value = "活动实例终止") - @RequestMapping(value = "/instance/terminate") - @ResponseBody + @PostMapping(value = "/instance/terminate") public Map instanceTerminate() { // TODO 终止后不可恢复 return data(null); diff --git a/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java b/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java index 17ac532..b882f0a 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java +++ b/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java @@ -15,6 +15,4 @@ import com.kiisoo.ic.activity.vo.ActivityInstanceVO; * @since 2020-05-19 */ public interface IPmnActivityInstanceService extends IService { - - IPage selectPageVO(Page page); } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityCategoryServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityCategoryServiceImpl.java index ce42cc1..1bb0654 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityCategoryServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityCategoryServiceImpl.java @@ -1,7 +1,7 @@ package com.kiisoo.ic.activity.service.impl; import com.kiisoo.ic.activity.entity.PmnActivityCategory; -import com.kiisoo.ic.activity.mapper.PmnActivityCategoryMapper; +import com.kiisoo.ic.activity.mapper.PmnActivityCategoryDOMapper; import com.kiisoo.ic.activity.service.IPmnActivityCategoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2020-05-19 */ @Service -public class PmnActivityCategoryServiceImpl extends ServiceImpl implements IPmnActivityCategoryService { +public class PmnActivityCategoryServiceImpl extends ServiceImpl implements IPmnActivityCategoryService { } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceConfigServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceConfigServiceImpl.java index 3eb5fcb..289f827 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceConfigServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceConfigServiceImpl.java @@ -1,7 +1,7 @@ package com.kiisoo.ic.activity.service.impl; import com.kiisoo.ic.activity.entity.PmnActivityInstanceConfig; -import com.kiisoo.ic.activity.mapper.PmnActivityInstanceConfigMapper; +import com.kiisoo.ic.activity.mapper.PmnActivityInstanceConfigDOMapper; import com.kiisoo.ic.activity.service.IPmnActivityInstanceConfigService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2020-05-19 */ @Service -public class PmnActivityInstanceConfigServiceImpl extends ServiceImpl implements IPmnActivityInstanceConfigService { +public class PmnActivityInstanceConfigServiceImpl extends ServiceImpl implements IPmnActivityInstanceConfigService { } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index 608b4ce..c0d098c 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -1,12 +1,9 @@ package com.kiisoo.ic.activity.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kiisoo.ic.activity.entity.PmnActivityInstance; -import com.kiisoo.ic.activity.mapper.PmnActivityInstanceMapper; +import com.kiisoo.ic.activity.mapper.PmnActivityInstanceDOMapper; import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kiisoo.ic.activity.vo.ActivityInstanceVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,11 +16,7 @@ import org.springframework.stereotype.Service; * @since 2020-05-19 */ @Service -public class PmnActivityInstanceServiceImpl extends ServiceImpl implements IPmnActivityInstanceService { +public class PmnActivityInstanceServiceImpl extends ServiceImpl implements IPmnActivityInstanceService { @Autowired - private PmnActivityInstanceMapper pmnActivityInstanceMapper; - @Override - public IPage selectPageVO(Page page) { - return pmnActivityInstanceMapper.selectPageVO(page); - } + private PmnActivityInstanceDOMapper pmnActivityInstanceMapper; } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java index ad41cfa..1a87753 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java @@ -1,7 +1,7 @@ package com.kiisoo.ic.activity.service.impl; import com.kiisoo.ic.activity.entity.PmnActivitySchedule; -import com.kiisoo.ic.activity.mapper.PmnActivityScheduleMapper; +import com.kiisoo.ic.activity.mapper.PmnActivityScheduleDOMapper; import com.kiisoo.ic.activity.service.IPmnActivityScheduleService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2020-05-19 */ @Service -public class PmnActivityScheduleServiceImpl extends ServiceImpl implements IPmnActivityScheduleService { +public class PmnActivityScheduleServiceImpl extends ServiceImpl implements IPmnActivityScheduleService { }