diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildSuperAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperAdminController.java similarity index 97% rename from accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildSuperAdminController.java rename to accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperAdminController.java index b15f4b125..f0ae4a4bc 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildSuperAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperAdminController.java @@ -1,10 +1,11 @@ -package com.accompany.admin.controller.guild; +package com.accompany.admin.controller.guildsuper; import cn.hutool.core.util.StrUtil; import com.accompany.admin.base.Pagination; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.NameplateDto; import com.accompany.admin.service.UserCheckAdminService; +import com.accompany.admin.service.firstpage.SecondPageBannerAdminService; import com.accompany.admin.service.guild.GuildSuperAdminService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.service.system.AdminUserService; @@ -15,6 +16,7 @@ import com.accompany.admin.vo.guild.GuildApplyAuditVo; import com.accompany.admin.vo.vip.VipSendRecordVo; import com.accompany.business.model.CarGoods; import com.accompany.business.param.BasePageParams; +import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.family.FamilyIncomeAdminVo; import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo; import com.accompany.common.result.BusiResult; @@ -55,6 +57,10 @@ public class GuildSuperAdminController extends BaseController { private RegionInfoService regionInfoService; @Autowired private AdminUserService adminUserService; + @Autowired + private SecondPageBannerAdminService secondPageBannerAdminService; + @Autowired + private RoomService roomService; @ApiOperation(value = "创建公会,对应前端页面GuildInfo，修改家族用已有接口：/admin/family/manage/update", httpMethod = "POST") @ApiImplicitParams({ diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperDynamicAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperDynamicAdminController.java new file mode 100644 index 000000000..c5d913da2 --- /dev/null +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperDynamicAdminController.java @@ -0,0 +1,63 @@ +package com.accompany.admin.controller.guildsuper; + +import com.accompany.admin.controller.BaseController; +import com.accompany.admin.dto.community.DynamicVerifyDto; +import com.accompany.admin.service.system.AdminUserService; +import com.accompany.admin.service.world.community.DynamicVerifyAdminService; +import com.accompany.admin.vo.AdminUserVo; +import com.accompany.admin.vo.community.DynamicVerifyVo; +import com.accompany.community.constant.DynamicStatusEnum; +import com.accompany.core.util.StringUtils; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "超管中心") +@RestController +@RequestMapping("/admin/superCenter") +public class GuildSuperDynamicAdminController extends BaseController { + @Autowired + private AdminUserService adminUserService; + @Autowired + private DynamicVerifyAdminService dynamicVerifyAdminService; + + @RequestMapping("/dynamicList") + public void list(DynamicVerifyDto dto){ + AdminUserVo adminUserVo = adminUserService.getByAdminId(getAdminId()); + dto.setPartitionId(adminUserVo.getPartitionIds().get(0)); + dto.setStatus(0); + PageInfo voPageInfo = dynamicVerifyAdminService.getPageList(dto); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("total", voPageInfo.getTotal()); + jsonObject.put("rows", voPageInfo.getList()); + writeJson(jsonObject.toJSONString()); + } + + @RequestMapping("/dynamicChangeStatus") + public void changeStatus(Long dynamicId, Integer status, String reason){ + if(dynamicId == null || dynamicId == 0 || status == null) { + writeJson(false, "参数有误"); + return; + } + if (status.equals(DynamicStatusEnum.NOT_PASS.getValue()) || status.equals(DynamicStatusEnum.UNSHELVE.getValue())){ + if (StringUtils.isEmpty(reason)){ + writeJson(false, "参数有误"); + return; + } + } + try { + int result = dynamicVerifyAdminService.changeStatus(dynamicId, status, reason, getAdminId()); + if(result>0) { + writeJson(true,String.valueOf(result)); + return; + } + } catch (Exception e) { + logger.error("Failed to change dynamic status, Cause by {}", e.getCause().getMessage()); + writeJson(false, e.getMessage()); + } + writeJson(false, "操作失败"); + } +} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperSecondBannerAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperSecondBannerAdminController.java new file mode 100644 index 000000000..ced18a8aa --- /dev/null +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsuper/GuildSuperSecondBannerAdminController.java @@ -0,0 +1,78 @@ +package com.accompany.admin.controller.guildsuper; + +import com.accompany.admin.base.Pagination; +import com.accompany.admin.controller.BaseController; +import com.accompany.admin.service.firstpage.SecondPageBannerAdminService; +import com.accompany.admin.service.system.AdminLogService; +import com.accompany.admin.service.system.AdminUserService; +import com.accompany.admin.vo.AdminUserVo; +import com.accompany.admin.vo.SecondPageBannerAdminVo; +import com.accompany.business.model.firstpage.SecondPageBanner; +import com.accompany.business.service.fillstrategy.strategy.FillConstant; +import com.accompany.business.service.room.RoomService; +import com.accompany.common.result.BusiResult; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.AdminServiceException; +import com.accompany.core.model.Room; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "超管中心-banner") +@RestController +@RequestMapping("/admin/superCenter") +public class GuildSuperSecondBannerAdminController extends BaseController { + @Autowired + private AdminLogService adminLogService; + @Autowired + private AdminUserService adminUserService; + @Autowired + private SecondPageBannerAdminService secondPageBannerAdminService; + @Autowired + private RoomService roomService; + + @ApiOperation(value = "新增/修改banner", httpMethod = "POST") + @PostMapping(value = "/secondBannerSave") + public BusiResult saveOrUpdateSecondPageBanner(SecondPageBanner firstPageBanner) { + int adminId = getAdminId(); + AdminUserVo adminUserVo = adminUserService.getByAdminId(adminId); + firstPageBanner.setOperator(adminUserVo.getUsername()); + firstPageBanner.setPartitionIds(adminUserVo.getPartitionIds()); + firstPageBanner.setPlatform("all"); + firstPageBanner.setBannerType(1); + firstPageBanner.setBannerStatus(1); + if (firstPageBanner.getSkipType() == FillConstant.SkipType.room) { + if (com.accompany.common.utils.StringUtils.isEmpty(firstPageBanner.getSkipUri())) { + throw new AdminServiceException("请输入RoomID"); + } + firstPageBanner.setSkipUri(firstPageBanner.getSkipUri().trim()); + Room roomByUid = roomService.getRoomByUid(Long.valueOf(firstPageBanner.getSkipUri())); + if (roomByUid == null || !adminUserVo.getPartitionIds().contains(roomByUid.getPartitionId())) { + throw new AdminServiceException("请输入正确的RoomID"); + } + } else if (firstPageBanner.getSkipType() != 100) { + throw new AdminServiceException("config error"); + } + + Boolean result = secondPageBannerAdminService.saveOrUpdateSecondPageBanner(firstPageBanner); + if(result) { + adminLogService.insertLog(adminId, getClass().getCanonicalName(), "superGuild.saveOrUpdateSecondPageBanner", "params===>>" + firstPageBanner.toString()); + } + return new BusiResult<>(BusiStatus.SUCCESS); + } + + + @ApiOperation("获取banner列表") + @GetMapping(value = "/bannelList") + public Pagination getSecondPageBannerList(@RequestParam(defaultValue = "0") Byte bannerStatus, + @RequestParam(defaultValue = "0") Integer timeStatus, + @RequestParam(defaultValue = "1") Integer pageNo, + @RequestParam(defaultValue = "20") Integer pageSize) { + AdminUserVo adminUserById = adminUserService.getByAdminId(getAdminId()); + IPage pageInfo = secondPageBannerAdminService.getSecondPageBannerList(pageNo, pageSize, + (byte)0, bannerStatus, (byte)1, timeStatus,null, adminUserById.getPartitionIds().get(0), null, null); + return new Pagination<>(pageInfo); + } +}