diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java index cdc8dc4a..4b1835ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java @@ -157,7 +157,7 @@ public class CompetitionResultController extends BaseController if(UtilTool.isNull(competitionId)){ throw new InvalidParameterException("赛会id不能为"); } - List honorResponseList = null; + List honorResponseList = new ArrayList<>(); //查询赛会得分数据 List membersScoreList = competitionMembersScoreService.getHonorList(competitionId,null); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TeamMembersController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TeamMembersController.java index d9e92bb6..f3f5f474 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TeamMembersController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TeamMembersController.java @@ -1,15 +1,18 @@ package com.ruoyi.system.controller; +import java.security.InvalidParameterException; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.exception.CheckedException; import com.ruoyi.common.swagger.apiConstants.ApiTerminal; import com.ruoyi.system.domain.vo.TeamMembersResponse; import com.ruoyi.system.domain.vo.TeamMembersVo; import io.seata.core.model.Result; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; @@ -108,4 +111,32 @@ public class TeamMembersController extends BaseController List list = teamMembersService.getTeamMembersByTeamId(teamId); return getDataTable(list); } + + /** + * 删除球队人员 + */ + @ApiOperation(ApiTerminal.wxMiniProgram+"移除球队中的人员") + @Log(title = "移除球队人员", businessType = BusinessType.DELETE) + @DeleteMapping("/removeTeamMember/{id}") + public AjaxResult removeTeamMember(@PathVariable Long id) + { + return toAjax(teamMembersService.deleteTeamMembersById(id)); + } + @ApiOperation(ApiTerminal.wxMiniProgram+"新增球队人员") + @Log(title = "新增球队人员", businessType = BusinessType.INSERT) + @PostMapping("/addTeamMember") + @ResponseBody + public AjaxResult addTeamMember(@RequestBody TeamMembers entity) throws Exception { + if (StringUtils.isEmpty(entity)) { + throw new CheckedException("参数异常，非法操作！"); + } + if (StringUtils.isEmpty(entity.getTeamId())) { + throw new CheckedException("teamId不能为空！"); + } + if (StringUtils.isEmpty(entity.getUserId())) { + throw new CheckedException("userId不能为空！"); + } + entity.setStatus(0); + return AjaxResult.success(teamMembersService.addToTeamMember(entity)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBasketballTeamController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBasketballTeamController.java index 212903d8..37d51078 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBasketballTeamController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBasketballTeamController.java @@ -105,9 +105,16 @@ public class WxBasketballTeamController extends BaseController @ResponseBody @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取我的球队列表") public TableDataInfo getMyBasketBallTeam(@RequestBody WxBasketballTeam entity){ + startPage(); LoginUser user = SecurityUtils.getLoginUser(); entity.setCreatedId(user.getUserid()); List list =wxBasketballTeamService.getMyBasketBallTeam(entity); return getDataTable(list); } + @ApiOperation(value = ApiTerminal.wxMiniProgram+"我的球队详情") + @GetMapping(value = "/detail/{id}") + public AjaxResult getDetail(@PathVariable("id") Long id) + { + return AjaxResult.success(wxBasketballTeamService.selectWxBasketballTeamById(id)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java index 88e57436..f55f97e3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java @@ -58,7 +58,7 @@ public class TeamMembers extends BaseEntity /** 删除1 */ @Excel(name = "删除1") - private Long isDeleted; + private Integer isDeleted; /** 最后更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoResponse.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoResponse.java index ba0244a4..cd3f0f16 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoResponse.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoResponse.java @@ -81,7 +81,7 @@ public class BuildingInfoResponse extends BuildingInfoDetail { * 球馆状态 */ @ApiModelProperty(value="球馆状态",required=false) - private Long status; + private Integer status; /** * 拒绝原因 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java index ce846efe..61f5e8ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java @@ -64,4 +64,6 @@ public interface ITeamMembersService List getTeamMembersByTeamId(Long teamId); TeamMembers getOneByTeamIdAndRoleCode(Long teamId, String roleCode); + + Boolean addToTeamMember(TeamMembers entity); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java index 265127da..8c708eb5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java @@ -27,12 +27,12 @@ import com.ruoyi.system.domain.vo.*; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.*; import com.ruoyi.system.utils.UtilTool; +import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFCell; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +46,7 @@ import javax.annotation.Resource; * @author ruoyi * @date 2022-11-02 */ +@Log4j2 @Service public class CompetitionServiceImpl implements ICompetitionService { @@ -74,6 +75,8 @@ public class CompetitionServiceImpl implements ICompetitionService @Resource private IMessageService messageService; @Resource + private ISysConfigService configService; + @Resource private RedisService redisService; @Resource private SmsService smsService; @@ -649,8 +652,9 @@ public class CompetitionServiceImpl implements ICompetitionService //membersVo.setAvatar(domainName+datePath+newFileName); //保存图片 PictureData pictureData2 = maplist.get(i + "_0"); + log.info(membersVo.getRealName()+" 开始导入，图片位置"+i + "_0"); if (pictureData2 == null) { - + throw new CheckedException(membersVo.getRealName()+" 的头像插入方式错误,请先选中单元格然后插入图片"); } byte[] data2 = pictureData2.getData(); String newFileName2 = UUID.randomUUID() + "_0.jpg"; @@ -677,13 +681,15 @@ public class CompetitionServiceImpl implements ICompetitionService msg.append(teamName); msg.append("]申请出战,请尽快审批处理！"); sms.setMs(msg.toString()); - WxUser userInfo = wxUserMapper.selectWxUserById(12L); - sms.setMobile(userInfo.getTelephone()); - sms.setMb(userInfo.getTelephone()); - SmsResponse smsResponse = smsService.sendSms(sms); - if (smsResponse.getStatus() == 0) { - //保存到缓存 - // redisUtil.set(Constant.ESTABLISH_COMPETITION_SMS_CAPTCHA+sms.getMb(), randomNums,Constant.SMS_PAOPAO_EXPIRES); + String adminTelephone = configService.selectConfigByKey("sys.admin.telephone"); + sms.setMobile(adminTelephone); + sms.setMb(adminTelephone); + if(ObjectUtil.isNotNull(adminTelephone)) { + SmsResponse smsResponse = smsService.sendSms(sms); + if (smsResponse.getStatus() == 0) { + //保存到缓存 + // redisUtil.set(Constant.ESTABLISH_COMPETITION_SMS_CAPTCHA+sms.getMb(), randomNums,Constant.SMS_PAOPAO_EXPIRES); + } } return excleVo; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java index 341c7039..22853254 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java @@ -2,8 +2,12 @@ package com.ruoyi.system.service.impl; import java.util.List; +import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.domain.vo.TeamMembersResponse; import com.ruoyi.system.domain.vo.TeamMembersVo; +import com.ruoyi.system.utils.LoginUserUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.TeamMembersMapper; @@ -103,4 +107,20 @@ public class TeamMembersServiceImpl implements ITeamMembersService public TeamMembers getOneByTeamIdAndRoleCode(Long guestTeamId, String code) { return teamMembersMapper.getOneByTeamIdAndRoleCode(guestTeamId,code); } + + @Override + public Boolean addToTeamMember(TeamMembers entity) { + //判断是否存在，已存在就直接不执行 + TeamMembersVo vo = new TeamMembersVo(); + vo.setTeamId(entity.getTeamId()); + vo.setUserId(entity.getUserId()); + vo.setIsDeleted(0); + List existList = teamMembersMapper.selectTeamMembersList(vo); + if(existList.size()==0){ + LoginUser user = SecurityUtils.getLoginUser(); + entity.setCreatedBy( ObjectUtil.isNotNull(user.getUserid()) ? String.valueOf(user.getUserid()):"1"); + teamMembersMapper.insertTeamMembers(entity); + } + return Boolean.TRUE; + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java index a126848a..c09b5a22 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java @@ -129,6 +129,7 @@ public class WxBuildingInfoServiceImpl implements IWxBuildingInfoService //查询场馆信息 WxBuildingInfo info=wxBuildingInfoMapper.selectWxBuildingInfoById(id); BeanUtils.copyProperties(info,response); + response.setStatus(info.getStatus()); //查询场馆详情 BuildingInfoDetail detail=buildingInfoDetailMapper.selectOneByBuildingId(id); if(!ObjectUtils.isEmpty(detail)){ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/UtilTool.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/UtilTool.java index 33ae1aae..30b6c110 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/UtilTool.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/UtilTool.java @@ -1531,7 +1531,7 @@ public class UtilTool { public static String getFileUploadPath(String linuxLocation){ Date date = new Date(); String time = new SimpleDateFormat("yyyy-MM-dd").format(date); - System.out.println("获取到精确到日的时间格式为"+time); + //System.out.println("获取到精确到日的时间格式为"+time); String[] str = time.split("-");//根据‘-’进行拆分字符串 拆分出来的日期有，年，日，月，根据年日月创建文件夹 String datePath="/"+str[0]+"/"+str[1]+"/"+str[2]+"/"; return linuxLocation+datePath; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml index 94fbe3a8..7c4d7f39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml @@ -41,7 +41,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml index df3c7176..67684ad9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml @@ -98,8 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND created_id=#{createdId} - + SELECT * FROM building_info where 1=1 AND status=#{status}