diff --git a/src/main/java/com/hivekion/room/bean/AbtParentTask.java b/src/main/java/com/hivekion/room/bean/AbtParentTask.java index b07ecf9..f1da22d 100644 --- a/src/main/java/com/hivekion/room/bean/AbtParentTask.java +++ b/src/main/java/com/hivekion/room/bean/AbtParentTask.java @@ -391,14 +391,14 @@ public abstract class AbtParentTask implements TaskAction { private RedisUtil redisUtil; protected EditScenarioInfo getEditScenarioInfo(String resourceId) { - String updJsonStr = (String) redisUtil.hget( - this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), + String updJsonStr = (String) SpringUtil.getBean(RedisUtil.class).hget( + this.scenarioTask.getScenarioId() + "-" + roomId + "-" + resourceId, "updScenarioInfo"); return JSON.parseObject(updJsonStr, EditScenarioInfo.class); } protected void setEditScenarioInfo(EditScenarioInfo editScenarioInfo) { - redisUtil.hset( + SpringUtil.getBean(RedisUtil.class).hset( this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(editScenarioInfo)); } diff --git a/src/main/java/com/hivekion/room/bean/MoveTask.java b/src/main/java/com/hivekion/room/bean/MoveTask.java index 63045d8..89c2aec 100644 --- a/src/main/java/com/hivekion/room/bean/MoveTask.java +++ b/src/main/java/com/hivekion/room/bean/MoveTask.java @@ -11,6 +11,7 @@ import com.hivekion.room.func.TaskAction; import com.hivekion.scenario.entity.BattleConsume; import com.hivekion.scenario.entity.ScenarioTask; import com.hivekion.scenario.service.impl.BattleConsumeServiceImpl; +import com.hivekion.statistic.bean.EditScenarioInfo; import com.hivekion.statistic.bean.ScenarioInfo; import java.time.LocalDateTime; import java.util.HashMap; @@ -41,11 +42,8 @@ public class MoveTask extends AbtParentTask implements TaskAction { /** * 消耗任务间隔 */ - private final int consumptionTaskInterval = 10; - /** - * redis 服务类 - */ - private final RedisUtil redis = SpringUtil.getBean(RedisUtil.class); + private final int consumptionTaskInterval = 5; + @@ -105,13 +103,17 @@ public class MoveTask extends AbtParentTask implements TaskAction { log.info("{}-当前消耗油料::{},当前剩余油料::{}", scenarioTask.getResourceId(), currentUseUp, currentFuel); - + //修改油料 + EditScenarioInfo editScenarioInfo = getEditScenarioInfo( + this.scenarioTask.getResourceId()); + editScenarioInfo.getJbxx().getFuel().setCurrent(editScenarioInfo.getJbxx().getFuel().getCurrent()-currentUseUp); + setEditScenarioInfo(editScenarioInfo); //插入消耗表 insertConsumption(currentUseUp); - pushStatus(scenarioTask.getResourceId()); - setCurrentFuel(currentUseUp); + setCurrentFuel(currentUseUp); + pushStatus(scenarioTask.getResourceId()); } @@ -148,13 +150,13 @@ public class MoveTask extends AbtParentTask implements TaskAction { private void setCurrentFuel(double num) { - Object statisticObj = redis.hget( + Object statisticObj = SpringUtil.getBean(RedisUtil.class).hget( scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo"); if (statisticObj != null) { ScenarioInfo scenarioInfo = JSON.parseObject(statisticObj.toString(), ScenarioInfo.class); scenarioInfo.getFuel().setCurrent(scenarioInfo.getFuel().getCurrent() - num); - redis.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), + SpringUtil.getBean(RedisUtil.class).hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSON.toJSONString(scenarioInfo)); } } diff --git a/src/main/java/com/hivekion/team/entity/Teaminfo.java b/src/main/java/com/hivekion/team/entity/Teaminfo.java index bf3673e..515ac3a 100644 --- a/src/main/java/com/hivekion/team/entity/Teaminfo.java +++ b/src/main/java/com/hivekion/team/entity/Teaminfo.java @@ -44,5 +44,7 @@ public class Teaminfo extends SearchInputVo { private String iconId; @TableField(value="team_type") private Integer teamType; + @TableField(value="role_code") + private String roleCode; } diff --git a/src/main/resources/mapper/tbl/TeaminfoMapper.xml b/src/main/resources/mapper/tbl/TeaminfoMapper.xml index 9b4c178..9ab4282 100644 --- a/src/main/resources/mapper/tbl/TeaminfoMapper.xml +++ b/src/main/resources/mapper/tbl/TeaminfoMapper.xml @@ -9,6 +9,7 @@ +