ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

1231V2.0

master
zhangye 6 years ago
parent
dc96e7c60a
commit
8e9637e7ba
6 changed files with 22 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java
  2. 2
      game/src/main/java/com/ccsens/game/service/MessageService.java
  3. 5
      game/src/main/java/com/ccsens/game/service/ScreenService.java
  4. 2
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  5. 68
      tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
  6. 6
      tall/src/main/resources/mapper_dao/TaskDetailDao.xml

1
game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java
View File

@ -30,6 +30,7 @@ public class WebSocketEncoder extends MessageToByteEncoder<BaseMessageDto> {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
log.info("改变状态 {}",cause);
cause.printStackTrace();
super.exceptionCaught(ctx, cause);
}

2
game/src/main/java/com/ccsens/game/service/MessageService.java
View File

@ -109,7 +109,7 @@ public class MessageService implements IMessageService {
gameMessages.forEach(gameMessage -> {
gameMessage.setType(WebConstant.Message_Type.ChangeStatus.phase);
log.info("============ {}",gameMessage);
sendTo(gameMessage.getUserId().toString(), gameMessage.getData());
sendTo(gameMessage.getUserId().toString(), gameMessage);
});
}
}

5
game/src/main/java/com/ccsens/game/service/ScreenService.java
View File

@ -263,7 +263,6 @@ public class ScreenService implements IScreenService{
processingData.setTopMembers(tops);
gameStatusVo.setProcessingData(processingData);
break;
case 3:
ScreenVo.CompletedData completedData = new ScreenVo.CompletedData();
@ -408,7 +407,9 @@ public class ScreenService implements IScreenService{
}
/**
* 开始游戏
*/
@Override
public ScreenVo.StartGame startGame(ScreenDto.Start start) {
long current = System.currentTimeMillis();

2
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
View File

@ -622,7 +622,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
startMillisTime = timeMap.get("startMillisTime");
}
if (StrUtil.isNotEmpty(end)) {
timeMap = DateUtil.projectFormatDateTime(start);
timeMap = DateUtil.projectFormatDateTime(end);
endMillisTime = timeMap.get("endMillisTime");
}
//获取该用户关注的项目

68
tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
View File

@ -291,9 +291,6 @@ public class TaskDeliverService implements ITaskDeliverService {
@Override
public Long isTaskOrSubTime(Long id) {
Long subTimeId = null;
//获取今天的开始结束时间
Long startTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.date()).getTime();
Long endTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.tomorrow()).getTime();
//判断传入的信息是详情id还是subTimeId
ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(id);
if(ObjectUtil.isNotNull(taskSubTime)){
@ -304,6 +301,7 @@ public class TaskDeliverService implements ITaskDeliverService {
Long now = System.currentTimeMillis();
if(taskDetail.getHasGroup() == 0){
subTimeId = taskDetailDao.selectSubTimeByTaskIdAndTime(taskDetail.getId(), now);
}
else {
TaskVo.TaskIdAndSubTimeIdByParentIdAndTime taskAndSubTime = taskDetailDao.selectSubTimeByTaskParentIdAndTime(taskDetail.getId(), now);
@ -312,6 +310,15 @@ public class TaskDeliverService implements ITaskDeliverService {
}
}
}
if(ObjectUtil.isNull(subTimeId)){
ProTaskSubTimeExample taskSubTimeExample = new ProTaskSubTimeExample();
taskSubTimeExample.createCriteria().andTaskDetailIdEqualTo(taskDetail.getId());
taskSubTimeExample.setOrderByClause("begin_time");
List<ProTaskSubTime> subTimeList = taskSubTimeDao.selectByExample(taskSubTimeExample);
if(CollectionUtil.isNotEmpty(subTimeList)){
subTimeId = subTimeList.get(0).getId();
}
}
}
return subTimeId;
}
@ -346,61 +353,6 @@ public class TaskDeliverService implements ITaskDeliverService {
}
}
return deliverInfoList;
// //获取此用户在这个项目中的角色
// ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId);
// List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId());
// //查找交付物的信息
// List<DeliverVo.DeliverInfo> deliverInfoList = taskDeliverDao.selectBySubTimeId(subTimeId);
// if(CollectionUtil.isNotEmpty(deliverInfoList)){
// for(DeliverVo.DeliverInfo deliverInfo:deliverInfoList){
// if(CollectionUtil.isNotEmpty(deliverInfo.getFileList())) {
// for(DeliverVo.FilePath filePath:deliverInfo.getFileList()) {
// Boolean isChecker = false;
// //修改文件路径为可下载路径
// filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl());
// if (ObjectUtil.isNotNull(filePath.getUploaderId())) {
// //添加上传人的姓名信息
// ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(),task.getProjectId());
// if (ObjectUtil.isNotNull(member)) {
// filePath.setUploaderName(member.getNickname());
// }
// //添加上传人所属的角色
// List<DeliverVo.DRole> dRoleList = new ArrayList<>();
// List<ProRole> uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId());
// if (CollectionUtil.isNotEmpty(uploaderRoleList)) {
// for (ProRole role : uploaderRoleList) {
// DeliverVo.DRole dRole = new DeliverVo.DRole();
// dRole.setId(role.getId());
// dRole.setName(role.getName());
// dRoleList.add(dRole);
// }
// }
// filePath.setRole(dRoleList);
// }
// //添加检查人的名称信息
// if(CollectionUtil.isNotEmpty(filePath.getCheckerList())){
// for (DeliverVo.Checker checker:filePath.getCheckerList()){
// ProRole role = proRoleDao.selectByPrimaryKey(checker.getCheckerId());
// checker.setCheckerName(role.getName());
// //该用户是否是此交付物的检查人
// isChecker = false;
// if (CollectionUtil.isNotEmpty(roleList)) {
// for (ProRole proRole : roleList) {
// if (proRole.getId().longValue() == checker.getCheckerId().longValue()) {
// isChecker = true;
// break;
// }
// }
// }
// }
// }
// filePath.setIsChecker(isChecker);
// }
// }
// }
// }
// return deliverInfoList;
}
/**

6
tall/src/main/resources/mapper_dao/TaskDetailDao.xml
View File

@ -15,6 +15,7 @@
<id column="tDetailId" property="detailId" />
<id column="tSubTimeId" property="id" />
<result column="tName" property="name" />
<result column="tProjectId" property="projectId" />
<result column="tDescription" property="description" />
<result column="tExecutorRole" property="executorRole" />
<result column="tBeginTime" property="beginTime" />
@ -49,6 +50,7 @@
d.id as tDetailId,
s.id as tSubTimeId,
d.name as tName,
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
s.begin_time as tBeginTime,
@ -102,6 +104,7 @@
d.id as tDetailId,
s.id as tSubTimeId,
d.name as tName,
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
s.begin_time as tBeginTime,
@ -150,6 +153,7 @@
d.id as tDetailId,
s.id as tSubTimeId,
d.name as tName,
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
s.begin_time as tBeginTime,
@ -179,6 +183,7 @@
d.id as tDetailId,
s.id as tSubTimeId,
d.name as tName,
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
s.begin_time as tBeginTime,
@ -245,6 +250,7 @@
d.id as tDetailId,
s.id as tSubTimeId,
d.name as tName,
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
s.begin_time as tBeginTime,

Write Preview
Loading…
Cancel
Save