记得上下班打卡 | git大法好,push需谨慎

Commit 7a65a54d authored by jiangxiulong's avatar jiangxiulong

isOnline

parent b5b0bed2
......@@ -18,9 +18,14 @@ import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* <p>
......@@ -31,6 +36,7 @@ import javax.validation.Valid;
* @since 2021-10-20
*/
@Api(tags = "积分活动管理")
@Validated
@Controller
@RequestMapping("/sweet/integralActivity")
public class SweetIntegralActivityController extends BaseController {
......@@ -39,26 +45,32 @@ public class SweetIntegralActivityController extends BaseController {
@Autowired
private ISweetIntegralActivityService iSweetIntegralActivityService;
@GetMapping("listView")
@ApiOperation(value = "积分活动列表view")
public String listView() {
return prefix + "/list";
}
@GetMapping("formView")
@ApiOperation(value = "积分活动添加编辑view")
public String formView () {
return prefix + "/form";
@Log(title = "积分活动创建", businessType = BusinessType.INSERT)
@RequiresPermissions("sweet:integralActivity:create")
@PostMapping("create")
@ApiOperation(value = "积分活动创建")
@ResponseBody
public AjaxResult create(@Valid @RequestBody SweetIntegralActivityFromParam param) {
Integer result = iSweetIntegralActivityService.createForm(param);
if (result > 0) {
return success("操作成功");
} else {
return error("操作失败");
}
}
@Log(title = "积分活动列表数据", businessType = BusinessType.LIST)
@RequiresPermissions("sweet:integralActivity:list")
@ApiOperation(value = "积分活动列表数据")
@PostMapping("list")
@Log(title = "积分活动编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("sweet:integralActivity:update")
@PutMapping("update")
@ApiOperation(value = "积分活动编辑")
@ResponseBody
public TableDataInfo list(SweetIntegralActivityListSearchParam listParam) {
PageInfo<SweetIntegralActivity> result = iSweetIntegralActivityService.list(listParam);
return getDataTable(result.getList());
public AjaxResult update(@Valid @RequestBody SweetIntegralActivityFromParam param) {
Integer result = iSweetIntegralActivityService.updateForm(param);
if (result > 0) {
return success("操作成功");
} else {
return error("操作失败");
}
}
@Log(title = "积分活动上下线", businessType = BusinessType.UPDATE)
......@@ -70,7 +82,10 @@ public class SweetIntegralActivityController extends BaseController {
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "integralActivityId", value = "活动id"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "isOnline", value = "是否上线 1下线 2上线"),
})
public AjaxResult isOnline(@RequestParam("integralActivityId") String integralActivityId, @RequestParam("isOnline") Integer isOnline) {
public AjaxResult isOnline(
@RequestParam("integralActivityId") @NotEmpty(message = "integralActivityId不能为空") String integralActivityId,
@RequestParam("isOnline") @NotNull(message = "isOnline不能为空") @Min(value = 1, message = "isOnline无效") @Max(value = 2, message = "isOnline无效") Integer isOnline
) {
Integer result = iSweetIntegralActivityService.isOnline(integralActivityId, isOnline);
if (result > 0) {
return success("操作成功");
......@@ -91,31 +106,26 @@ public class SweetIntegralActivityController extends BaseController {
return AjaxResult.success(result);
}
@Log(title = "积分活动创建", businessType = BusinessType.INSERT)
@RequiresPermissions("sweet:integralActivity:create")
@PostMapping("create")
@ApiOperation(value = "积分活动创建")
@Log(title = "积分活动列表数据", businessType = BusinessType.LIST)
@RequiresPermissions("sweet:integralActivity:list")
@ApiOperation(value = "积分活动列表数据")
@PostMapping("list")
@ResponseBody
public AjaxResult create(@Valid @RequestBody SweetIntegralActivityFromParam param) {
Integer result = iSweetIntegralActivityService.createForm(param);
if (result > 0) {
return success("操作成功");
} else {
return error("操作失败");
}
public TableDataInfo list(SweetIntegralActivityListSearchParam listParam) {
PageInfo<SweetIntegralActivity> result = iSweetIntegralActivityService.list(listParam);
return getDataTable(result.getList());
}
@Log(title = "积分活动编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("sweet:integralActivity:update")
@PutMapping("update")
@ApiOperation(value = "积分活动编辑")
@ResponseBody
public AjaxResult update(@Valid @RequestBody SweetIntegralActivityFromParam param) {
Integer result = iSweetIntegralActivityService.updateForm(param);
if (result > 0) {
return success("操作成功");
} else {
return error("操作失败");
}
@GetMapping("listView")
@ApiOperation(value = "积分活动列表view")
public String listView() {
return prefix + "/list";
}
@GetMapping("formView")
@ApiOperation(value = "积分活动添加编辑view")
public String formView() {
return prefix + "/form";
}
}
......@@ -17,13 +17,14 @@ import com.liquidnet.service.sweet.entity.SweetIntegralActivity;
*/
public interface ISweetIntegralActivityService extends IService<SweetIntegralActivity> {
PageInfo<SweetIntegralActivity> list(SweetIntegralActivityListSearchParam listParam);
Integer createForm(SweetIntegralActivityFromParam param);
Integer updateForm(SweetIntegralActivityFromParam param);
Integer isOnline(String integralActivityId, Integer isOnline);
SweetIntegralActivityVo detail(String integralActivityId);
Integer createForm(SweetIntegralActivityFromParam param);
PageInfo<SweetIntegralActivity> list(SweetIntegralActivityListSearchParam listParam);
Integer updateForm(SweetIntegralActivityFromParam param);
}
......@@ -45,55 +45,6 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
@Autowired
SweetIntegralActivityDrawMapper sweetIntegralActivityDrawMapper;
@Override
public PageInfo<SweetIntegralActivity> list(SweetIntegralActivityListSearchParam listParam) {
PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
LambdaQueryWrapper<SweetIntegralActivity> lambdaQueryWrapper = Wrappers.lambdaQuery(SweetIntegralActivity.class);
if (!listParam.getActivityTitle().isEmpty()) {
lambdaQueryWrapper.like(SweetIntegralActivity::getActivityTitle, listParam.getActivityTitle());
}
List<SweetIntegralActivity> sweetIntegralActivities = sweetIntegralActivityMapper.selectList(lambdaQueryWrapper);
// TODO: 2021/10/20 查询奖品数量 中奖数量计算展示 返回vo
return new PageInfo(sweetIntegralActivities);
}
@Override
public Integer isOnline(String integralActivityId, Integer isOnline) {
SweetIntegralActivity aNew = SweetIntegralActivity.getNew();
aNew.setIsOnline(isOnline);
int result = sweetIntegralActivityMapper.update(
aNew,
Wrappers.lambdaUpdate(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
);
// TODO: 2021/10/20 更新缓存
return result;
}
@Override
public SweetIntegralActivityVo detail(String integralActivityId) {
SweetIntegralActivity sweetIntegralActivity = sweetIntegralActivityMapper.selectOne(
Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
);
SweetIntegralActivityVo integralActivityVo = SweetIntegralActivityVo.getNew().copy(sweetIntegralActivity);
List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
);
if (!CollectionUtils.isEmpty(sweetIntegralActivityPrizes)) {
List<SweetIntegralActivityPrizeVo> prizeVoList = SweetNewObjectUtil.getSweetIntegralActivityPrizeVoArrayList();
for (SweetIntegralActivityPrize prize : sweetIntegralActivityPrizes) {
SweetIntegralActivityPrizeVo sweetIntegralActivityPrizeVo = SweetIntegralActivityPrizeVo.getNew().copy(prize);
// 已发出
Integer winPrizeNum = sweetIntegralActivityDrawMapper.selectCount(
Wrappers.lambdaQuery(SweetIntegralActivityDraw.class).eq(SweetIntegralActivityDraw::getPrizeId, prize.getPrizeId())
);
sweetIntegralActivityPrizeVo.setWinPrizeNum(winPrizeNum);
prizeVoList.add(sweetIntegralActivityPrizeVo);
}
integralActivityVo.setPrizeList(prizeVoList);
}
return integralActivityVo;
}
@Override
public Integer createForm(SweetIntegralActivityFromParam param) {
try {
......@@ -147,4 +98,55 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
return 0;
}
}
@Override
public Integer isOnline(String integralActivityId, Integer isOnline) {
SweetIntegralActivity sweetIntegralActivity = SweetIntegralActivity.getNew();
sweetIntegralActivity.setIsOnline(isOnline);
sweetIntegralActivity.setUpdatedAt(LocalDateTime.now());
int update = sweetIntegralActivityMapper.update(
sweetIntegralActivity,
Wrappers.lambdaUpdate(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
);
// TODO: 2021/10/20 更新缓存
return update;
}
@Override
public SweetIntegralActivityVo detail(String integralActivityId) {
SweetIntegralActivity sweetIntegralActivity = sweetIntegralActivityMapper.selectOne(
Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
);
SweetIntegralActivityVo integralActivityVo = SweetIntegralActivityVo.getNew().copy(sweetIntegralActivity);
List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
);
if (!CollectionUtils.isEmpty(sweetIntegralActivityPrizes)) {
List<SweetIntegralActivityPrizeVo> prizeVoList = SweetNewObjectUtil.getSweetIntegralActivityPrizeVoArrayList();
for (SweetIntegralActivityPrize prize : sweetIntegralActivityPrizes) {
SweetIntegralActivityPrizeVo sweetIntegralActivityPrizeVo = SweetIntegralActivityPrizeVo.getNew().copy(prize);
// 已发出
Integer winPrizeNum = sweetIntegralActivityDrawMapper.selectCount(
Wrappers.lambdaQuery(SweetIntegralActivityDraw.class).eq(SweetIntegralActivityDraw::getPrizeId, prize.getPrizeId())
);
sweetIntegralActivityPrizeVo.setWinPrizeNum(winPrizeNum);
prizeVoList.add(sweetIntegralActivityPrizeVo);
}
integralActivityVo.setPrizeList(prizeVoList);
}
return integralActivityVo;
}
@Override
public PageInfo<SweetIntegralActivity> list(SweetIntegralActivityListSearchParam listParam) {
PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
LambdaQueryWrapper<SweetIntegralActivity> lambdaQueryWrapper = Wrappers.lambdaQuery(SweetIntegralActivity.class);
if (!listParam.getActivityTitle().isEmpty()) {
lambdaQueryWrapper.like(SweetIntegralActivity::getActivityTitle, listParam.getActivityTitle());
}
List<SweetIntegralActivity> sweetIntegralActivities = sweetIntegralActivityMapper.selectList(lambdaQueryWrapper);
// TODO: 2021/10/20 查询奖品数量 中奖数量计算展示 返回vo
return new PageInfo(sweetIntegralActivities);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment