diff --git a/game/src/main/java/com/ccsens/game/api/ClientController.java b/game/src/main/java/com/ccsens/game/api/ClientController.java index bc7914a7..de0ad1ca 100644 --- a/game/src/main/java/com/ccsens/game/api/ClientController.java +++ b/game/src/main/java/com/ccsens/game/api/ClientController.java @@ -1,12 +1,37 @@ package com.ccsens.game.api; +import com.ccsens.game.bean.dto.ClientDto; +import com.ccsens.game.bean.dto.ScreenDto; +import com.ccsens.game.bean.vo.ClientVo; +import com.ccsens.game.service.IClientService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; - +@Slf4j @Api(tags = "客户端相关api" , description = "ClientController") @RestController @RequestMapping("/client") public class ClientController { + @Autowired + private IClientService clientService; + @ApiOperation(value = "查看全部排行榜", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "members", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse startAgain(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查看全部排行榜:{}",params); + ClientVo.RankingAll rankingAll = clientService.getRankingAll(params); + return JsonResponse.newInstance().ok(rankingAll); + } } diff --git a/game/src/main/java/com/ccsens/game/api/ScreenController.java b/game/src/main/java/com/ccsens/game/api/ScreenController.java index a4d49fc9..fd83d544 100644 --- a/game/src/main/java/com/ccsens/game/api/ScreenController.java +++ b/game/src/main/java/com/ccsens/game/api/ScreenController.java @@ -58,10 +58,19 @@ public class ScreenController { @ApiImplicitParams({ }) @RequestMapping(value = "start", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse startGame(HttpServletRequest request, - @ApiParam @Validated @RequestBody ScreenDto.MemberRecordAndTime memberRecordAndTime) throws Exception { + public JsonResponse startGame(@ApiParam @Validated @RequestBody ScreenDto.MemberRecordAndTime memberRecordAndTime) throws Exception { log.info("开始游戏:{}",memberRecordAndTime); return JsonResponse.newInstance().ok(); } + + @ApiOperation(value = "再玩一次", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "startAgain", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse startAgain(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("开始游戏:{}",params); + String url = screenService.startAgain(params); + return JsonResponse.newInstance().ok(url); + } } diff --git a/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java b/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java index 99afb93d..2f1701c4 100644 --- a/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java +++ b/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java @@ -34,4 +34,17 @@ public class ClientDto { private String avatarurl; private String nickname; } + + @Data + @ApiModel("getRanking") + public static class GatRanking{ + @ApiModelProperty("创建的游戏记录的id") + private Long recordId; + @ApiModelProperty("页数") + private int pageNum; + @ApiModelProperty("每页多少条") + private int pageSize; + } + + } diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameUserJoin.java b/game/src/main/java/com/ccsens/game/bean/po/GameUserJoin.java index d5e26659..7b8f44d5 100644 --- a/game/src/main/java/com/ccsens/game/bean/po/GameUserJoin.java +++ b/game/src/main/java/com/ccsens/game/bean/po/GameUserJoin.java @@ -10,7 +10,7 @@ public class GameUserJoin implements Serializable { private String nickname; - private String avatarurl; + private String avatarUrl; private Long recordId; @@ -56,12 +56,12 @@ public class GameUserJoin implements Serializable { this.nickname = nickname == null ? null : nickname.trim(); } - public String getAvatarurl() { - return avatarurl; + public String getAvatarUrl() { + return avatarUrl; } - public void setAvatarurl(String avatarurl) { - this.avatarurl = avatarurl == null ? null : avatarurl.trim(); + public void setAvatarUrl(String avatarUrl) { + this.avatarUrl = avatarUrl == null ? null : avatarUrl.trim(); } public Long getRecordId() { @@ -145,7 +145,7 @@ public class GameUserJoin implements Serializable { sb.append(", id=").append(id); sb.append(", userId=").append(userId); sb.append(", nickname=").append(nickname); - sb.append(", avatarurl=").append(avatarurl); + sb.append(", avatarUrl=").append(avatarUrl); sb.append(", recordId=").append(recordId); sb.append(", times=").append(times); sb.append(", score=").append(score); diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameUserJoinExample.java b/game/src/main/java/com/ccsens/game/bean/po/GameUserJoinExample.java index f89acfed..f5fb6150 100644 --- a/game/src/main/java/com/ccsens/game/bean/po/GameUserJoinExample.java +++ b/game/src/main/java/com/ccsens/game/bean/po/GameUserJoinExample.java @@ -295,73 +295,73 @@ public class GameUserJoinExample { return (Criteria) this; } - public Criteria andAvatarurlIsNull() { - addCriterion("avatarUrl is null"); + public Criteria andAvatarUrlIsNull() { + addCriterion("avatar_url is null"); return (Criteria) this; } - public Criteria andAvatarurlIsNotNull() { - addCriterion("avatarUrl is not null"); + public Criteria andAvatarUrlIsNotNull() { + addCriterion("avatar_url is not null"); return (Criteria) this; } - public Criteria andAvatarurlEqualTo(String value) { - addCriterion("avatarUrl =", value, "avatarurl"); + public Criteria andAvatarUrlEqualTo(String value) { + addCriterion("avatar_url =", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlNotEqualTo(String value) { - addCriterion("avatarUrl <>", value, "avatarurl"); + public Criteria andAvatarUrlNotEqualTo(String value) { + addCriterion("avatar_url <>", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlGreaterThan(String value) { - addCriterion("avatarUrl >", value, "avatarurl"); + public Criteria andAvatarUrlGreaterThan(String value) { + addCriterion("avatar_url >", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlGreaterThanOrEqualTo(String value) { - addCriterion("avatarUrl >=", value, "avatarurl"); + public Criteria andAvatarUrlGreaterThanOrEqualTo(String value) { + addCriterion("avatar_url >=", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlLessThan(String value) { - addCriterion("avatarUrl <", value, "avatarurl"); + public Criteria andAvatarUrlLessThan(String value) { + addCriterion("avatar_url <", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlLessThanOrEqualTo(String value) { - addCriterion("avatarUrl <=", value, "avatarurl"); + public Criteria andAvatarUrlLessThanOrEqualTo(String value) { + addCriterion("avatar_url <=", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlLike(String value) { - addCriterion("avatarUrl like", value, "avatarurl"); + public Criteria andAvatarUrlLike(String value) { + addCriterion("avatar_url like", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlNotLike(String value) { - addCriterion("avatarUrl not like", value, "avatarurl"); + public Criteria andAvatarUrlNotLike(String value) { + addCriterion("avatar_url not like", value, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlIn(List values) { - addCriterion("avatarUrl in", values, "avatarurl"); + public Criteria andAvatarUrlIn(List values) { + addCriterion("avatar_url in", values, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlNotIn(List values) { - addCriterion("avatarUrl not in", values, "avatarurl"); + public Criteria andAvatarUrlNotIn(List values) { + addCriterion("avatar_url not in", values, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlBetween(String value1, String value2) { - addCriterion("avatarUrl between", value1, value2, "avatarurl"); + public Criteria andAvatarUrlBetween(String value1, String value2) { + addCriterion("avatar_url between", value1, value2, "avatarUrl"); return (Criteria) this; } - public Criteria andAvatarurlNotBetween(String value1, String value2) { - addCriterion("avatarUrl not between", value1, value2, "avatarurl"); + public Criteria andAvatarUrlNotBetween(String value1, String value2) { + addCriterion("avatar_url not between", value1, value2, "avatarUrl"); return (Criteria) this; } diff --git a/game/src/main/java/com/ccsens/game/bean/vo/ClientVo.java b/game/src/main/java/com/ccsens/game/bean/vo/ClientVo.java index bee1e22c..d3f6a8c2 100644 --- a/game/src/main/java/com/ccsens/game/bean/vo/ClientVo.java +++ b/game/src/main/java/com/ccsens/game/bean/vo/ClientVo.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @description: * @author: wuHuiJuan @@ -56,7 +58,7 @@ public class ClientVo { } @Data @ApiModel("ClientVoCompletedData") - public static class CompletedData{ + public static class CompletedData { @ApiModelProperty("次数") private Integer times; @ApiModelProperty("分数") @@ -66,5 +68,33 @@ public class ClientVo { @ApiModelProperty("超过百分之多少人") private Integer over; } + @Data + @ApiModel("RankingAll") + public static class RankingAll{ + @ApiModelProperty("参加总人数") + private int totalMembers; + @ApiModelProperty("是否为第一页") + private boolean isFirstPage; + @ApiModelProperty("是否为最后一页") + private boolean isLastPage; + @ApiModelProperty("用户信息(排名)") + private List memberInfoList; + } + + @Data + @ApiModel("RankingAll") + public static class MemberInfo{ + private Long id; + @ApiModelProperty("用户头像") + private String headImgUrl; + @ApiModelProperty("昵称") + private String nickname; + @ApiModelProperty("排名次序") + private int sort; + @ApiModelProperty("次数") + private int times; + @ApiModelProperty("分数") + private int score; + } } diff --git a/game/src/main/java/com/ccsens/game/persist/dao/GameUserJoinDao.java b/game/src/main/java/com/ccsens/game/persist/dao/GameUserJoinDao.java index 1f1312ba..60ca0fde 100644 --- a/game/src/main/java/com/ccsens/game/persist/dao/GameUserJoinDao.java +++ b/game/src/main/java/com/ccsens/game/persist/dao/GameUserJoinDao.java @@ -1,5 +1,6 @@ package com.ccsens.game.persist.dao; +import com.ccsens.game.bean.vo.ClientVo; import com.ccsens.game.persist.mapper.GameUserJoinMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -14,4 +15,7 @@ public interface GameUserJoinDao extends GameUserJoinMapper { * @return */ int getRanking(@Param("userId") Long userId, @Param("recordId") Long recordId); + + ClientVo.MemberInfo selectByRecordId(@Param("recordId") Long recordId); + } diff --git a/game/src/main/java/com/ccsens/game/service/ClientService.java b/game/src/main/java/com/ccsens/game/service/ClientService.java index d62897cf..bd5a8d9c 100644 --- a/game/src/main/java/com/ccsens/game/service/ClientService.java +++ b/game/src/main/java/com/ccsens/game/service/ClientService.java @@ -3,7 +3,6 @@ package com.ccsens.game.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.ccsens.cloudutil.bean.tall.vo.MemberVo; import com.ccsens.cloudutil.feign.TallFeignClient; import com.ccsens.game.bean.dto.ClientDto; @@ -18,15 +17,19 @@ import com.ccsens.util.CodeEnum; import com.ccsens.util.JsonResponse; import com.ccsens.util.RedisUtil; import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import com.ccsens.util.bean.dto.QueryDto; import java.util.List; + /** * @description: * @author: wuHuiJuan @@ -98,14 +101,14 @@ public class ClientService implements IClientService { // 获取头像和用户名 JsonResponse memberInfo = tallFeignClient.getMemberByUserId(userId, join.getProjectId()); if (memberInfo.getCode().intValue() == CodeEnum.SUCCESS.getCode() && memberInfo.getData() != null) { - userJoin.setAvatarurl(memberInfo.getData().getAvatarUrl()); + userJoin.setAvatarUrl(memberInfo.getData().getAvatarUrl()); userJoin.setNickname(memberInfo.getData().getNickname()); } gameUserJoinDao.insertSelective(userJoin); // 3.更新redis(sort set key:分数 value:头像,姓名) ClientDto.RedisUser user = new ClientDto.RedisUser(); user.setId(userJoin.getId()); - user.setAvatarurl(userJoin.getAvatarurl()); + user.setAvatarurl(userJoin.getAvatarUrl()); user.setNickname(userJoin.getNickname()); redisUtil.zsSet(GameConstant.generateGameKey(gameRecord.getId()), JSON.toJSONString(user), 0, GameConstant.REDIS_TIME); //4.根据状态延时发送消息 @@ -168,4 +171,20 @@ public class ClientService implements IClientService { joinVo.setCountMembers(count); return joinVo; } + @Override + public ClientVo.RankingAll getRankingAll(QueryDto params) { + ClientDto.GatRanking gatRanking = params.getParam(); + + GameUserJoinExample userJoinExample = new GameUserJoinExample(); + userJoinExample.createCriteria().andRecordIdEqualTo(gatRanking.getRecordId()); + List userJoinList = gameUserJoinDao.selectByExample(userJoinExample); + + + PageHelper.startPage(gatRanking.getPageNum(), gatRanking.getPageSize()); + ClientVo.MemberInfo memberInfo = gameUserJoinDao.selectByRecordId(gatRanking.getRecordId()); + log.info("查询成员信息"); + PageInfo pageInfo =new PageInfo<>(); + + return null; + } } diff --git a/game/src/main/java/com/ccsens/game/service/IClientService.java b/game/src/main/java/com/ccsens/game/service/IClientService.java index 94145cea..6a10060a 100644 --- a/game/src/main/java/com/ccsens/game/service/IClientService.java +++ b/game/src/main/java/com/ccsens/game/service/IClientService.java @@ -2,6 +2,7 @@ package com.ccsens.game.service; import com.ccsens.game.bean.dto.ClientDto; import com.ccsens.game.bean.vo.ClientVo; +import com.ccsens.util.bean.dto.QueryDto; /** * @description: @@ -17,4 +18,6 @@ public interface IClientService { * @return */ ClientVo.Join join(ClientDto.Join join, Long userId); + + ClientVo.RankingAll getRankingAll(QueryDto params); } diff --git a/game/src/main/java/com/ccsens/game/service/IScreenService.java b/game/src/main/java/com/ccsens/game/service/IScreenService.java index 8c54d043..111ee53b 100644 --- a/game/src/main/java/com/ccsens/game/service/IScreenService.java +++ b/game/src/main/java/com/ccsens/game/service/IScreenService.java @@ -10,4 +10,6 @@ public interface IScreenService { ScreenVo.GameInfoVo getGameInformation(QueryDto params); ScreenVo.GameStatusVo getGameStatusVo(QueryDto params); + + String startAgain(QueryDto params); } diff --git a/game/src/main/java/com/ccsens/game/service/ScreenService.java b/game/src/main/java/com/ccsens/game/service/ScreenService.java index 6e0e0d32..2a613e02 100644 --- a/game/src/main/java/com/ccsens/game/service/ScreenService.java +++ b/game/src/main/java/com/ccsens/game/service/ScreenService.java @@ -237,6 +237,38 @@ public class ScreenService implements IScreenService{ return gameStatusVo; } + /** + * 再玩一次 + */ + @Override + public String startAgain(QueryDto params) { + ScreenDto.MemberRecord memberRecord = params.getParam(); + GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(memberRecord.getMemberRecord()); + if(ObjectUtil.isNull(gameRecord)){ + throw new BaseException(CodeEnum.NOT_GAME_RECORD); + } + GameUserPay gameUserPay = typeMemberDao.selectByPrimaryKey(gameRecord.getUserPayId()); + if(ObjectUtil.isNull(gameUserPay)){ + throw new BaseException(CodeEnum.NOT_GAME_TYPE); + } + GameType gameType = gameTypeDao.selectByPrimaryKey(gameUserPay.getId()); + if(ObjectUtil.isNull(gameType)){ + throw new BaseException(CodeEnum.NOT_GAME_TYPE); + } + //添加一场新的游戏记录 + GameRecord gameRecordNew = new GameRecord(); + gameRecordNew.setId(snowflake.nextId()); + gameRecordNew.setUserPayId(gameUserPay.getId()); + gameRecordNew.setUrl(WebConstant.TEST_URL_GAME + gameRecordNew.getId() + File.separator + gameType.getScreenUrl()); + gameRecordNew.setQrCodeUrl(WebConstant.TEST_URL_GAME + gameRecordNew.getId() + File.separator + gameType.getClientUrl()); + gameRecordDao.insertSelective(gameRecordNew); + //修改购买的游戏的使用次数 + gameUserPay.setUsedCount(gameUserPay.getUsedCount() + 1); + typeMemberDao.updateByPrimaryKeySelective(gameUserPay); + + return gameRecordNew.getUrl(); + } + /** * 查找活动规则 */ diff --git a/game/src/main/resources/mapper_dao/GameUserJoinDao.xml b/game/src/main/resources/mapper_dao/GameUserJoinDao.xml index 6c428c76..f0a74a42 100644 --- a/game/src/main/resources/mapper_dao/GameUserJoinDao.xml +++ b/game/src/main/resources/mapper_dao/GameUserJoinDao.xml @@ -1,8 +1,28 @@ + + + + + + + - + SELECT + id as uId, + avatar_url as uHeadImgUrl, + nickname as uNickname, + times as uTimes, + score as uScore + FROM + t_game_user_join + WHERE + record_id = #{recordId} + + + @@ -110,12 +110,12 @@ insert into t_game_user_join (id, user_id, nickname, - avatarUrl, record_id, times, + avatar_url, record_id, times, score, time_difference, local_start_time, local_end_time, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{nickname,jdbcType=VARCHAR}, - #{avatarurl,jdbcType=VARCHAR}, #{recordId,jdbcType=BIGINT}, #{times,jdbcType=INTEGER}, + #{avatarUrl,jdbcType=VARCHAR}, #{recordId,jdbcType=BIGINT}, #{times,jdbcType=INTEGER}, #{score,jdbcType=INTEGER}, #{timeDifference,jdbcType=INTEGER}, #{localStartTime,jdbcType=BIGINT}, #{localEndTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -132,8 +132,8 @@ nickname, - - avatarUrl, + + avatar_url, record_id, @@ -173,8 +173,8 @@ #{nickname,jdbcType=VARCHAR}, - - #{avatarurl,jdbcType=VARCHAR}, + + #{avatarUrl,jdbcType=VARCHAR}, #{recordId,jdbcType=BIGINT}, @@ -223,8 +223,8 @@ nickname = #{record.nickname,jdbcType=VARCHAR}, - - avatarUrl = #{record.avatarurl,jdbcType=VARCHAR}, + + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, record_id = #{record.recordId,jdbcType=BIGINT}, @@ -263,7 +263,7 @@ set id = #{record.id,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT}, nickname = #{record.nickname,jdbcType=VARCHAR}, - avatarUrl = #{record.avatarurl,jdbcType=VARCHAR}, + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, record_id = #{record.recordId,jdbcType=BIGINT}, times = #{record.times,jdbcType=INTEGER}, score = #{record.score,jdbcType=INTEGER}, @@ -286,8 +286,8 @@ nickname = #{nickname,jdbcType=VARCHAR}, - - avatarUrl = #{avatarurl,jdbcType=VARCHAR}, + + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, record_id = #{recordId,jdbcType=BIGINT}, @@ -323,7 +323,7 @@ update t_game_user_join set user_id = #{userId,jdbcType=BIGINT}, nickname = #{nickname,jdbcType=VARCHAR}, - avatarUrl = #{avatarurl,jdbcType=VARCHAR}, + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, record_id = #{recordId,jdbcType=BIGINT}, times = #{times,jdbcType=INTEGER}, score = #{score,jdbcType=INTEGER}, diff --git a/ht/src/main/resources/application-test.yml b/ht/src/main/resources/application-test.yml index 776d5e90..c6847e52 100644 --- a/ht/src/main/resources/application-test.yml +++ b/ht/src/main/resources/application-test.yml @@ -35,4 +35,7 @@ file: imgDomain: https://test.tall.wiki/gateway/ht/uploads ht: project: - name: 认知功能评测云平台系统 \ No newline at end of file + name: 认知功能评测云平台系统 +eureka: + instance: + ip-address: 49.233.89.188 \ No newline at end of file diff --git a/mt/src/main/resources/application-test.yml b/mt/src/main/resources/application-test.yml index 0b1e47da..f2448086 100644 --- a/mt/src/main/resources/application-test.yml +++ b/mt/src/main/resources/application-test.yml @@ -7,22 +7,25 @@ spring: name: mt datasource: type: com.alibaba.druid.pool.DruidDataSource - rabbitmq: - host: api.ccsens.com - password: 111111 - port: 5672 - username: admin - redis: - database: 0 - host: 127.0.0.1 - jedis: - pool: - max-active: 200 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - password: '' - port: 6379 - timeout: 1000ms + rabbitmq: + host: api.ccsens.com + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms swagger: enable: true +eureka: + instance: + ip-address: 49.233.89.188 \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/MessageService.java b/tall/src/main/java/com/ccsens/tall/service/MessageService.java index d06af1eb..51b04aa2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/MessageService.java +++ b/tall/src/main/java/com/ccsens/tall/service/MessageService.java @@ -60,7 +60,8 @@ public class MessageService implements IMessageService{ SyncMessageWithStartDto message = new SyncMessageWithStartDto(projectId, sender, receivers, roleId, taskId, null, time, duration); //FixMe 发送到消息队列 - rabbitTemplate.convertAndSend(RabbitMQConfig.TALL_MESSAGE_1, + System.out.println(message); + rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME, JacksonUtil.beanToJson(message)); } } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 40409185..5e05b334 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java @@ -185,7 +185,6 @@ public class TaskSubTimeService implements ITaskSubTimeService { taskSubTime.setComplatedStatus(1); taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime); - //发送同步消息 SysProject project = sysProjectDao.selectByPrimaryKey(startTaskDto.getProjectId()); //已发布的项目才同步 diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index fb201686..7aaf8a85 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -26,3 +26,6 @@ spring: timeout: 1000ms swagger: enable: true +eureka: + instance: + ip-address: 49.233.89.188 \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java index d79c315f..da2cee2e 100644 --- a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java +++ b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java @@ -6,21 +6,21 @@ import org.springframework.context.annotation.Configuration; @Configuration public class RabbitMQConfig { + public static final String RabbitMQ_QUEUE_NAME = "Queue_Anyring"; public static final String TALL_MESSAGE_1 = "tall_message_1"; public static final String TALL_MESSAGE_2 = "tall_message_2"; - public static final String RabbitMQ_QUEUE_NAME = "Queue_Anyring"; @Bean - public Queue queue(){ - return new Queue(TALL_MESSAGE_1); + public Queue queue (){ + return new Queue(RabbitMQ_QUEUE_NAME); } @Bean public Queue queue1(){ - return new Queue(TALL_MESSAGE_2); + return new Queue(TALL_MESSAGE_1); } @Bean public Queue queue2(){ - return new Queue(RabbitMQ_QUEUE_NAME); + return new Queue(TALL_MESSAGE_2); } }