任务相关
This commit is contained in:
李玉东
parent
5d0a37b49a
commit
96abc0ddef
|
|
@ -12,6 +12,7 @@ import com.hivekion.common.entity.TreeNode;
|
|||
import com.hivekion.common.enums.OperationTypeEnum;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
|
|
@ -88,4 +89,9 @@ public class TblEntityController extends TreeController {
|
|||
service.updateById(entity);
|
||||
return ResponseData.success(true);
|
||||
}
|
||||
//为了响应一个需求，增加一个DBTOOL_TABLECODE中tableName字段，各个表的数量和
|
||||
@GetMapping("/getCount")
|
||||
public ResponseData<Long> getAllTableCount() throws SQLException {
|
||||
return ResponseData.success(service.getAllTableCount());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import com.hivekion.baseData.domain.TblEntityVo.TblEntityModelVo;
|
|||
import com.hivekion.baseData.domain.TblEntityVo.TblEntityUpdateNameVo;
|
||||
import com.hivekion.baseData.domain.TblEntityVo.TblEntityUpdateRemarkVo;
|
||||
import com.hivekion.common.entity.TreeNode;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -30,4 +31,5 @@ public interface ITblEntityService extends IService<TblEntity> {
|
|||
|
||||
List<TblEntity> selectAllChild(Integer id);
|
||||
Map<Integer,TblEntity> entityMap();
|
||||
Long getAllTableCount() throws SQLException;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,12 +19,18 @@ import com.hivekion.common.core.SystemConstant;
|
|||
import com.hivekion.common.entity.TreeNode;
|
||||
import com.hivekion.common.exception.BusinessException;
|
||||
import com.hivekion.common.redis.RedisUtil;
|
||||
import java.sql.Connection;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.sql.DataSource;
|
||||
import org.mybatis.spring.SqlSessionTemplate;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -38,6 +44,8 @@ public class TblEntityServiceImpl extends ServiceImpl<TblEntityMapper, TblEntity
|
|||
|
||||
@Autowired
|
||||
private ITblAircraftService aircraftService;
|
||||
@Autowired
|
||||
private DataSource dataSource;
|
||||
|
||||
@Override
|
||||
public boolean remove(Integer id) {
|
||||
|
|
@ -60,19 +68,19 @@ public class TblEntityServiceImpl extends ServiceImpl<TblEntityMapper, TblEntity
|
|||
Long s = System.currentTimeMillis();
|
||||
Date date = new Date(s);
|
||||
entity.setCreateTime(date);
|
||||
if(vo.getParentId() != -1) {
|
||||
if (vo.getParentId() != -1) {
|
||||
entity.setEntityType(getParentID(vo.getParentId()));
|
||||
}else{
|
||||
} else {
|
||||
entity.setEntityType(vo.getEntityType());
|
||||
}
|
||||
if (checkNameUnique(String.valueOf(entity.getId()), entity.getEntityName(), vo.getParentId())) {
|
||||
throw new BusinessException(500, "该名称已存在");
|
||||
} else {
|
||||
if(entity.getId() != null) {
|
||||
if (entity.getId() != null) {
|
||||
LambdaUpdateWrapper<TblEntity> tWrapper = new LambdaUpdateWrapper<TblEntity>()
|
||||
.eq(TblEntity::getId, entity.getId());
|
||||
.eq(TblEntity::getId, entity.getId());
|
||||
return this.saveOrUpdate(entity);
|
||||
}else{
|
||||
} else {
|
||||
return this.save(entity);
|
||||
}
|
||||
}
|
||||
|
|
@ -297,4 +305,31 @@ public class TblEntityServiceImpl extends ServiceImpl<TblEntityMapper, TblEntity
|
|||
return this.list().stream().collect(Collectors.toMap(TblEntity::getId, x -> x));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long getAllTableCount() throws SQLException {
|
||||
|
||||
String sql = "SELECT COUNT(*) AS total_count\n"
|
||||
+ "FROM (\n"
|
||||
+ " SELECT 1 FROM TBL_SHIP\n"
|
||||
+ " UNION ALL\n"
|
||||
+ " SELECT 1 FROM TBL_AIRCRAFT\n"
|
||||
+ " UNION ALL\n"
|
||||
+ " SELECT 1 FROM TBL_FACILITY\n"
|
||||
+ ") t;";
|
||||
|
||||
|
||||
// 3. 查询总数
|
||||
long total = 0;
|
||||
try (
|
||||
Connection connection = dataSource.getConnection();
|
||||
Statement statement = connection.createStatement();
|
||||
ResultSet rs = statement.executeQuery(sql)
|
||||
) {
|
||||
if (rs.next()) {
|
||||
total = rs.getLong(1);
|
||||
}
|
||||
}
|
||||
return total;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.hivekion.common;
|
|||
import com.hivekion.common.exception.BusinessException;
|
||||
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import net.sourceforge.pinyin4j.PinyinHelper;
|
||||
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
|
||||
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
|
||||
|
|
@ -99,9 +100,10 @@ public class utils {
|
|||
long hours = duration.toHours();
|
||||
long minutes = duration.minusHours(hours).toMinutes();
|
||||
long seconds = duration.minusHours(hours).minusMinutes(minutes).getSeconds();
|
||||
return MessageFormat.format("{0}小时{1}分钟{2}秒", hours, minutes, seconds);
|
||||
return String.format("%d:%02d:%02d", hours, minutes, seconds);
|
||||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(utils.formatSeconds(3601));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ import com.hivekion.supplier.entity.SupplierRequest;
|
|||
import com.hivekion.supplier.service.impl.SupplierRequestServiceImpl;
|
||||
import com.hivekion.team.entity.Teaminfo;
|
||||
import com.hivekion.team.service.impl.TeaminfoServiceImpl;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -427,8 +429,26 @@ public abstract class AbtParentTask implements TaskAction {
|
|||
String updJsonStr = (String) redisUtil.hget(
|
||||
this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo");
|
||||
EditScenarioInfo editScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
//设置食品
|
||||
editScenarioInfo.getJbxx().getFood().setCurrent(new BigDecimal( editScenarioInfo.getJbxx().getFood().getCurrent()).setScale(3,
|
||||
RoundingMode.HALF_UP).doubleValue());
|
||||
//设置油
|
||||
editScenarioInfo.getJbxx().getFuel().setCurrent(new BigDecimal( editScenarioInfo.getJbxx().getFuel().getCurrent()).setScale(3,
|
||||
RoundingMode.HALF_UP).doubleValue());
|
||||
//设置弹药
|
||||
editScenarioInfo.getJbxx().getAmmunition().setCurrent(new BigDecimal( editScenarioInfo.getJbxx().getAmmunition().getCurrent()).setScale(3,
|
||||
RoundingMode.HALF_UP).doubleValue());
|
||||
//设置药材
|
||||
editScenarioInfo.getJbxx().getMedical().setCurrent(new BigDecimal( editScenarioInfo.getJbxx().getMedical().getCurrent()).setScale(3,
|
||||
RoundingMode.HALF_UP).doubleValue());
|
||||
//设置水
|
||||
editScenarioInfo.getJbxx().getWater().setCurrent(new BigDecimal( editScenarioInfo.getJbxx().getWater().getCurrent()).setScale(3,
|
||||
RoundingMode.HALF_UP).doubleValue());
|
||||
|
||||
|
||||
ResponseCmdInfo<String> respUpdObj = new ResponseCmdInfo<>();
|
||||
respUpdObj.setData(updJsonStr);
|
||||
respUpdObj.setData(JSON.toJSONString(editScenarioInfo));
|
||||
respUpdObj.setRoom(roomId);
|
||||
respUpdObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
respUpdObj.setCmdType("updScenarioInfo");
|
||||
|
|
|
|||
|
|
@ -57,12 +57,12 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
private IBattleConsumeService battleConsumeService;
|
||||
|
||||
private ScenarioInfo scenarioInfo;
|
||||
private ScenarioInfo scenarioInfoTmp;
|
||||
|
||||
private static final Double FOOD_SPREED = 0.3D;
|
||||
private static final Double WATER_SPREED = 0.1D;
|
||||
private static final Double FOOD_SPREED = 0.03D;
|
||||
private static final Double WATER_SPREED = 0.01D;
|
||||
// private static final Double FUEL_SPREED = 3.6D;
|
||||
private static final Double MEDICAL_SPREED = 0.2D;
|
||||
private static final Double MEDICAL_SPREED = 0.02D;
|
||||
|
||||
private final AtomicBoolean isAlreadyProduceTask = new AtomicBoolean(false);
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(initDuringTime));
|
||||
String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
ScenarioInfo scenarioInfo =JSONObject.parseObject(jsonStr,ScenarioInfo.class);
|
||||
this.scenarioInfo = scenarioInfo;
|
||||
this.scenarioInfoTmp = scenarioInfo;
|
||||
log.info("===============================初始化本次战斗任务各种资源数====================================");
|
||||
double suppleAmount =scenarioInfo.getAmmunition().getTotal();
|
||||
int suppleDeath =scenarioInfo.getPerson().getDeath();
|
||||
|
|
@ -147,10 +147,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
}
|
||||
while(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() < 0);
|
||||
|
||||
ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble());
|
||||
foodConsume = FOOD_SPREED;
|
||||
waterConsume = WATER_SPREED;
|
||||
medicalConsume = MEDICAL_SPREED;
|
||||
|
||||
scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(death + deathConsume).intValue());
|
||||
scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue());
|
||||
if(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <=0){
|
||||
|
|
@ -170,14 +167,17 @@ public class BattleRootTask extends AbtParentTask {
|
|||
scenarioInfoOnTime.getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath());
|
||||
updScenarioInfo.getJbxx().getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
ammunitionConsume = intervalDuringTime/2 * (RandomUtil.getSecureRandom().nextDouble()*0.1);
|
||||
foodConsume = intervalDuringTime/2 *FOOD_SPREED;
|
||||
waterConsume = intervalDuringTime/2 *WATER_SPREED;
|
||||
medicalConsume = intervalDuringTime/2 *MEDICAL_SPREED;
|
||||
if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) {
|
||||
scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume));
|
||||
}else{
|
||||
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
|
||||
}
|
||||
|
||||
if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(foodConsume)> 0) {
|
||||
scenarioInfoOnTime.getFood().setCurrent(Double.valueOf(food - foodConsume));
|
||||
}else{
|
||||
|
|
@ -214,15 +214,31 @@ public class BattleRootTask extends AbtParentTask {
|
|||
}else{
|
||||
updScenarioInfo.getJbxx().getWater().setCurrent(0D);
|
||||
}
|
||||
|
||||
if(SpringUtil.getBean(RedisUtil.class).hasKey(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo-ammunition")) {
|
||||
String supplierAmmunition = (String) SpringUtil.getBean(RedisUtil.class).hget(
|
||||
scenarioTask.getScenarioId() + "-" + roomId + "-"
|
||||
+ scenarioTask.getResourceId(),
|
||||
"updScenarioInfo-ammunition");
|
||||
if (Double.valueOf(supplierAmmunition) > 0D) {
|
||||
scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(supplierAmmunition));
|
||||
updScenarioInfo.getJbxx().getAmmunition()
|
||||
.setCurrent(Double.valueOf(supplierAmmunition));
|
||||
SpringUtil.getBean(RedisUtil.class).hset(
|
||||
scenarioTask.getScenarioId() + "-" + roomId + "-"
|
||||
+ scenarioTask.getResourceId(),
|
||||
"updScenarioInfo-ammunition", "0");
|
||||
}
|
||||
}
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
|
||||
ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
respObj.setData(JSON.toJSONString(updScenarioInfo));
|
||||
respObj.setRoom(roomId);
|
||||
respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
respObj.setCmdType("updScenarioInfo");
|
||||
Global.sendCmdInfoQueue.add(respObj);
|
||||
// ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
// respObj.setData(JSON.toJSONString(updScenarioInfo));
|
||||
// respObj.setRoom(roomId);
|
||||
// respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
// respObj.setCmdType("updScenarioInfo");
|
||||
// Global.sendCmdInfoQueue.add(respObj);
|
||||
pushStatus(scenarioTask.getResourceId());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "duringTime", String.valueOf(duringTime));
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
|
||||
|
||||
|
|
@ -252,10 +268,10 @@ public class BattleRootTask extends AbtParentTask {
|
|||
battleConsumeStr += currentDateTime.toString() + " 战斗消耗 [";
|
||||
battleConsumeStr += "死亡人数:" + deathConsume;
|
||||
battleConsumeStr += "受伤人数:" + injuredConsume;
|
||||
battleConsumeStr += "弹药消耗:" + ammunitionConsume;
|
||||
battleConsumeStr += "食品消耗:" + foodConsume;
|
||||
battleConsumeStr += "用水消耗:" + waterConsume;
|
||||
battleConsumeStr += "药材消耗:" + medicalConsume + "]";
|
||||
battleConsumeStr += "弹药消耗:" + String.format("%.3f",ammunitionConsume) ;
|
||||
battleConsumeStr += "食品消耗:" + String.format("%.3f",foodConsume);
|
||||
battleConsumeStr += "用水消耗:" + String.format("%.3f",waterConsume);
|
||||
battleConsumeStr += "药材消耗:" + String.format("%.3f",medicalConsume) + "]";
|
||||
jsonObject.put("teamLat",teamLat);
|
||||
jsonObject.put("teamLng",teamLng);
|
||||
jsonObject.put("resourceId", scenarioTask.getResourceId());
|
||||
|
|
@ -317,12 +333,27 @@ public class BattleRootTask extends AbtParentTask {
|
|||
supplierRequest.setLat(jsonObject.get("teamLat").toString());
|
||||
supplierRequest.setLng(jsonObject.get("teamLng").toString());
|
||||
supplierRequestService.save(supplierRequest);
|
||||
ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
respObj.setRoom(roomId);
|
||||
respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
respObj.setCmdType("ammunitionRequest");
|
||||
Global.sendCmdInfoQueue.add(respObj);
|
||||
// ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
// respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
// respObj.setRoom(roomId);
|
||||
// respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
// respObj.setCmdType("ammunitionRequest");
|
||||
// Global.sendCmdInfoQueue.add(respObj);
|
||||
scenarioInfoOnTime.getSupplierRequests().add(supplierRequest);
|
||||
updScenarioInfo.getSupplierRequests().add(supplierRequest);
|
||||
log.info("================================begin ammunition Supplier Task=====================================");
|
||||
produceTask(scenarioInfoOnTime.getAmmunition().getTotal());
|
||||
// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
|
||||
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
|
||||
// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
|
||||
// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
// updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getDeath());
|
||||
// updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
|
||||
log.info("================================end ammunition Supplier Task=====================================");
|
||||
suppleFlagMap.put("ammunition", true);
|
||||
}
|
||||
Long restDeath = Long.valueOf(scenarioInfo.getPerson().getDeath());
|
||||
|
|
@ -330,30 +361,34 @@ public class BattleRootTask extends AbtParentTask {
|
|||
if (scenarioInfo.getPerson().getTotal() != 0) {
|
||||
deathConsumeRate = restDeath * 100 / scenarioInfoOnTime.getPerson().getTotal();
|
||||
}
|
||||
if (deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false) {
|
||||
if (deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false && scenarioInfoOnTime.getPerson().getDeath() != 0) {
|
||||
SupplierRequest supplierRequest = new SupplierRequest();
|
||||
supplierRequest.setId(IdUtils.simpleUUID());
|
||||
supplierRequest.setFromResourceId(scenarioTask.getResourceId());
|
||||
supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal()));
|
||||
supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getDeath()));
|
||||
supplierRequest.setSupplierType("death");
|
||||
supplierRequest.setGeneralTime(currentDateTime);
|
||||
supplierRequest.setLat(jsonObject.get("teamLat").toString());
|
||||
supplierRequest.setLng(jsonObject.get("teamLng").toString());
|
||||
supplierRequestService.save(supplierRequest);
|
||||
ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
respObj.setRoom(roomId);
|
||||
respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
respObj.setCmdType("deathRequest");
|
||||
Global.sendCmdInfoQueue.add(respObj);
|
||||
scenarioInfoOnTime.getSupplierRequests().add(supplierRequest);
|
||||
updScenarioInfo.getSupplierRequests().add(supplierRequest);
|
||||
// ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
// respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
// respObj.setRoom(roomId);
|
||||
// respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
// respObj.setCmdType("deathRequest");
|
||||
// Global.sendCmdInfoQueue.add(respObj);
|
||||
log.info("================================begin death Supplier Task=====================================");
|
||||
produceTask(scenarioInfoOnTime.getPerson().getDeath());
|
||||
String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
|
||||
scenarioInfoInjured.getPerson().setDeath(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured));
|
||||
updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
|
||||
updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
|
||||
scenarioInfoOnTime.getPerson().setTotal(scenarioInfoOnTime.getPerson().getTotal()-scenarioInfoOnTime.getPerson().getDeath());
|
||||
scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
|
||||
// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
|
||||
// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getDeath());
|
||||
updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
|
||||
|
|
@ -362,30 +397,34 @@ public class BattleRootTask extends AbtParentTask {
|
|||
}
|
||||
Long restInjured = Long.valueOf(scenarioInfoOnTime.getPerson().getInjured());
|
||||
Long injuredConsumeRate = restInjured * 100 / scenarioInfoOnTime.getPerson().getTotal();
|
||||
if (Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false) {
|
||||
if (Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false && scenarioInfoOnTime.getPerson().getInjured() != 0) {
|
||||
SupplierRequest supplierRequest = new SupplierRequest();
|
||||
supplierRequest.setId(IdUtils.simpleUUID());
|
||||
supplierRequest.setFromResourceId(scenarioTask.getResourceId());
|
||||
supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal()));
|
||||
supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getInjured()));
|
||||
supplierRequest.setSupplierType("injured");
|
||||
supplierRequest.setGeneralTime(currentDateTime);
|
||||
supplierRequest.setLat(jsonObject.get("teamLat").toString());
|
||||
supplierRequest.setLng(jsonObject.get("teamLng").toString());
|
||||
supplierRequestService.save(supplierRequest);
|
||||
ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
respObj.setRoom(roomId);
|
||||
respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
respObj.setCmdType("injuredRequest");
|
||||
Global.sendCmdInfoQueue.add(respObj);
|
||||
// ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
|
||||
// respObj.setData(JSON.toJSONString(supplierRequest));
|
||||
// respObj.setRoom(roomId);
|
||||
// respObj.setScenarioId(scenarioTask.getScenarioId());
|
||||
// respObj.setCmdType("injuredRequest");
|
||||
// Global.sendCmdInfoQueue.add(respObj);
|
||||
scenarioInfoOnTime.getSupplierRequests().add(supplierRequest);
|
||||
updScenarioInfo.getSupplierRequests().add(supplierRequest);
|
||||
log.info("================================begin injured Supplier Task=====================================");
|
||||
produceTask(scenarioInfoOnTime.getPerson().getInjured());
|
||||
String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
|
||||
scenarioInfoInjured.getPerson().setInjured(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured));
|
||||
updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
|
||||
updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
|
||||
scenarioInfoOnTime.getPerson().setTotal(scenarioInfoOnTime.getPerson().getTotal()-scenarioInfoOnTime.getPerson().getInjured());
|
||||
scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
|
||||
// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
|
||||
// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
|
||||
updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getInjured());
|
||||
updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(0).intValue());
|
||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
|
||||
|
|
@ -423,24 +462,72 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId());
|
||||
|
||||
if ("HOSPITAL".equals(teaminfo.getRoleCode())) {
|
||||
if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) {
|
||||
supplierResource = resource;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (supplierResource == null) {
|
||||
log.error("找不到对应的医院分队");
|
||||
log.error("找不到对应的医疗保障分队");
|
||||
return;
|
||||
}
|
||||
//找出医院
|
||||
List<ScenarioResource> resources = SpringUtil.getBean(ScenarioResourceServiceImpl.class)
|
||||
.selectResourceByRoleCode(scenarioTask.getScenarioId(), "HOSPITAL");
|
||||
if (resources.isEmpty()) {
|
||||
log.error("找不到医院仓库");
|
||||
log.error("找不到医院");
|
||||
return;
|
||||
}
|
||||
|
||||
produceMoveTask(supplierResource, resources.get(0), this.coordinateReference.get(), injured);
|
||||
produceMoveTask(supplierResource, resources.get(0), injured);
|
||||
|
||||
|
||||
} else {
|
||||
log.error("{}-没有保障分队可以选择", scenarioTask.getResourceId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("produceTask exception", e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void produceTask(Double ammunition) {
|
||||
try {
|
||||
Map<Integer, Teaminfo> teamInfoMap = SpringUtil.getBean(TeaminfoServiceImpl.class)
|
||||
.teamInfoMap();
|
||||
|
||||
log.info("{}-产生自动保障任务", this.scenarioTask.getResourceId());
|
||||
List<ScenarioResource> resourceList = SpringUtil.getBean(BattleSupplierServiceImpl.class)
|
||||
.selectSupplierResource(scenarioTask.getResourceId());
|
||||
log.info("{}-可选保障分队长度{}", scenarioTask.getResourceId(), resourceList.size());
|
||||
if (!resourceList.isEmpty()) {
|
||||
ScenarioResource supplierResource = null;
|
||||
// 找出油料保障分队
|
||||
for (ScenarioResource resource : resourceList) {
|
||||
|
||||
|
||||
Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId());
|
||||
|
||||
if ("SUPPLIER_AMMUNITION".equals(teaminfo.getRoleCode())) {
|
||||
supplierResource = resource;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (supplierResource == null) {
|
||||
log.error("找不到对应的弹药保障分队");
|
||||
return;
|
||||
}
|
||||
//找出医院
|
||||
List<ScenarioResource> resources = SpringUtil.getBean(ScenarioResourceServiceImpl.class)
|
||||
.selectResourceByRoleCode(scenarioTask.getScenarioId(), "AMMUNITION_WARE");
|
||||
if (resources.isEmpty()) {
|
||||
log.error("找不到弹药仓库");
|
||||
return;
|
||||
}
|
||||
|
||||
produceMoveTaskAmmunition(supplierResource, resources.get(0), ammunition);
|
||||
|
||||
|
||||
} else {
|
||||
|
|
@ -453,7 +540,60 @@ public class BattleRootTask extends AbtParentTask {
|
|||
}
|
||||
|
||||
private void produceMoveTask(ScenarioResource supplierResource, ScenarioResource fuelResource,
|
||||
Coordinate coordinate, Integer injured) {
|
||||
Integer injured) {
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
task.setResourceId(supplierResource.getId());
|
||||
task.setTaskType("1");
|
||||
|
||||
task.setFromLat(supplierResource.getLat());
|
||||
task.setFromLng(supplierResource.getLng());
|
||||
task.setToLat(scenarioTask.getToLat());
|
||||
task.setToLng(scenarioTask.getToLng());
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromSource("general");
|
||||
log.info("承担保障任务的resourceId::{}", supplierResource.getId());
|
||||
SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task);
|
||||
MoveTask moveTask = new MoveTask(task, this.roomId, new TaskAction() {
|
||||
@Override
|
||||
public void doSomeThing() {
|
||||
//创建一个保障任务
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
task.setResourceId(supplierResource.getId());
|
||||
task.setTaskType("3");
|
||||
task.setInsureResourceId(scenarioTask.getResourceId());
|
||||
task.setSupplierNum(injured);
|
||||
task.setToLat(fuelResource.getLat());
|
||||
task.setToLng(fuelResource.getLng() + "");
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromLat(scenarioTask.getToLat());
|
||||
task.setFromLng(scenarioTask.getToLng());
|
||||
task.setFromSource("general");
|
||||
SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task);
|
||||
SupplierTask supplierTask = new SupplierTask(task, roomId);
|
||||
RoomManager.addAction(roomId, 0, supplierTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
return "";
|
||||
}
|
||||
});
|
||||
//立即执行
|
||||
RoomManager.addAction(roomId, 0, moveTask);
|
||||
}
|
||||
|
||||
|
||||
private void produceMoveTaskAmmunition(ScenarioResource supplierResource, ScenarioResource fuelResource,
|
||||
Double ammunition) {
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
|
|
@ -463,7 +603,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
task.setFromLat(supplierResource.getLat());
|
||||
task.setFromLng(supplierResource.getLng());
|
||||
task.setToLat(fuelResource.getLat());
|
||||
task.setToLng(fuelResource.getLng());
|
||||
task.setToLng(fuelResource.getLng() + "");
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromSource("general");
|
||||
log.info("承担保障任务的resourceId::{}", supplierResource.getId());
|
||||
|
|
@ -472,19 +612,18 @@ public class BattleRootTask extends AbtParentTask {
|
|||
@Override
|
||||
public void doSomeThing() {
|
||||
//创建一个保障任务
|
||||
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
task.setResourceId(supplierResource.getId());
|
||||
task.setTaskType("3");
|
||||
task.setTaskType("4");
|
||||
task.setInsureResourceId(scenarioTask.getResourceId());
|
||||
task.setSupplierNum(injured);
|
||||
task.setToLat(coordinate.getLat() + "");
|
||||
task.setToLng(coordinate.getLng() + "");
|
||||
task.setSupplierNum(ammunition);
|
||||
task.setToLat(scenarioTask.getToLat());
|
||||
task.setToLng(scenarioTask.getToLng());
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromLat(fuelResource.getLat());
|
||||
task.setFromLng(fuelResource.getLng());
|
||||
task.setFromLng(fuelResource.getLng() + "");
|
||||
task.setFromSource("general");
|
||||
SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task);
|
||||
SupplierTask supplierTask = new SupplierTask(task, roomId);
|
||||
|
|
@ -507,5 +646,4 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ 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.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
|
@ -107,7 +109,7 @@ public class MoveTask extends AbtParentTask implements TaskAction {
|
|||
//修改油料
|
||||
EditScenarioInfo editScenarioInfo = getEditScenarioInfo(
|
||||
this.scenarioTask.getResourceId());
|
||||
|
||||
;
|
||||
editScenarioInfo.getJbxx().getFuel().setCurrent(editScenarioInfo.getJbxx().getFuel().getCurrent()-currentUseUp);
|
||||
setEditScenarioInfo(editScenarioInfo,scenarioTask.getResourceId());
|
||||
|
||||
|
|
|
|||
|
|
@ -232,6 +232,7 @@ public class Room implements AutoCloseable {
|
|||
private void sendRemainTime(long remainTime) {
|
||||
log.info("remain_time{}", remainTime);
|
||||
Map<String, Object> timeMap = new HashMap<>();
|
||||
timeMap.put("scenario_time", df.format(scenario.getStartTime()));
|
||||
timeMap.put("update_time_str", utils.formatSeconds(remainTime));
|
||||
timeMap.put("remain_time", remainTime);
|
||||
timeMap.put("during_time", duringTime.get());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.hivekion.room.bean;
|
||||
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.hivekion.common.redis.RedisUtil;
|
||||
import com.hivekion.room.func.TaskAction;
|
||||
import com.hivekion.scenario.entity.ScenarioTask;
|
||||
import com.hivekion.statistic.bean.EditScenarioInfo;
|
||||
|
|
@ -50,8 +53,10 @@ public class SupplierTask extends AbtParentTask implements TaskAction {
|
|||
break;
|
||||
}
|
||||
//推送最新状态信息
|
||||
log.info("===========begin=====pushStatus supplierAmmunition======={}====={}=================",scenarioTask.getResourceId(),scenarioTask.getInsureResourceId());
|
||||
pushStatus(scenarioTask.getResourceId());
|
||||
pushStatus(scenarioTask.getInsureResourceId());
|
||||
log.info("============end====pushStatus supplierAmmunition=========={}===={}===============",scenarioTask.getResourceId(),scenarioTask.getInsureResourceId());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -107,13 +112,24 @@ public class SupplierTask extends AbtParentTask implements TaskAction {
|
|||
if (supplierInfo != null && insuranceInfo != null) {
|
||||
double insuranceCurrent = insuranceInfo.getJbxx().getAmmunition().getCurrent();
|
||||
|
||||
supplierInfo.getJbxx().getAmmunition().setCurrent(
|
||||
supplierInfo.getJbxx().getAmmunition().getCurrent() - insuranceCurrent < 0 ? 0
|
||||
: (supplierInfo.getJbxx().getAmmunition().getCurrent() - insuranceCurrent));
|
||||
supplierInfo.getJbxx().getAmmunition().setCurrent((supplierInfo.getJbxx().getAmmunition().getTotal()));
|
||||
|
||||
insuranceInfo.getJbxx().getAmmunition()
|
||||
.setCurrent(insuranceInfo.getJbxx().getAmmunition().getTotal());
|
||||
|
||||
SpringUtil.getBean(RedisUtil.class).hset(
|
||||
this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getInsureResourceId(),
|
||||
"updScenarioInfo", JSONObject.toJSONString(insuranceInfo));
|
||||
SpringUtil.getBean(RedisUtil.class).hset(
|
||||
this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getInsureResourceId(),
|
||||
"updScenarioInfo-ammunition", String.valueOf(insuranceInfo.getJbxx().getAmmunition().getTotal()));
|
||||
SpringUtil.getBean(RedisUtil.class).hset(
|
||||
this.scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
|
||||
"updScenarioInfo",JSONObject.toJSONString(supplierInfo));
|
||||
log.info("===============supplierAmmunition end==========={}====={}=======",scenarioTask.getResourceId(),scenarioTask.getInsureResourceId());
|
||||
log.info("===============supplierAmmunition end==========={}====={}=======",insuranceInfo.getJbxx().getAmmunition().getCurrent(),supplierInfo.getJbxx().getAmmunition().getCurrent());
|
||||
}else{
|
||||
log.info("===============supplierAmmunition null==========={}====={}=======",scenarioTask.getResourceId(),scenarioTask.getInsureResourceId());
|
||||
// log.info("===============supplierAmmunition null==========={}====={}=======",insuranceInfo.getJbxx().getAmmunition().getCurrent(),supplierInfo.getJbxx().getAmmunition().getCurrent());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
injured.warn = 20
|
||||
death.warn = 2
|
||||
ammunition.warn = 3
|
||||
food.warn = 3
|
||||
water.warn = 3
|
||||
injured.warn = 19
|
||||
death.warn = 5
|
||||
ammunition.warn = 70
|
||||
food.warn = 8
|
||||
water.warn = 9
|
||||
fuel.warn = 55.80
|
||||
medical.warn = 1
|
||||
death.spreed = 3
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user