Pope/Survey
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
copper 2021-05-17 16:50:05 +08:00
parent f77f9af17a
commit 81c9ec5ddb
8 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/example/survey/controller/ProjectController.java
View File

@ -8,6 +8,7 @@ import com.example.survey.dto.project.ModifyProjectDTO;
// import com.example.survey.enumeration.RespondentStateEnum;
import com.example.survey.enumeration.ResultEnum;
import com.example.survey.service.ProjectService;
import com.example.survey.util.TokenUtil;
import com.example.survey.vo.ResultVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -27,7 +28,9 @@ public class ProjectController {
@PostMapping("/project")
public ResultVO createProject(@RequestBody CreateProjectDTO createProjectDTO) {
public ResultVO createProject(@RequestBody CreateProjectDTO createProjectDTO,
@RequestHeader("Authorization") String token) {
createProjectDTO.setPhone((String) TokenUtil.get(token + " : USER_PHONE"));
projectService.createProject(createProjectDTO);
return new ResultVO(ResultEnum.SUCCESS);
}
@ -55,7 +58,6 @@ public class ProjectController {
return new ResultVO(ResultEnum.SUCCESS);
}
@PutMapping("/record")
public ResultVO addRecord(@RequestBody AddRecordDTO addRecordDTO){
projectService.addRecord(addRecordDTO);

2
src/main/java/com/example/survey/dao/impl/RecordDaoImpl.java
View File

@ -4,7 +4,7 @@ import com.example.survey.dao.MetaDataDao;
import com.example.survey.dao.RecordDao;
import com.example.survey.entity.MetaData;
import com.example.survey.entity.Record;
import com.example.survey.entity.Respondent;
// import com.example.survey.entity.Respondent;
import com.example.survey.entity.User;
import com.example.survey.enumeration.RecordStateEnum;
import lombok.extern.log4j.Log4j2;

1
src/main/java/com/example/survey/dto/project/CreateProjectDTO.java
View File

@ -21,4 +21,5 @@ public class CreateProjectDTO {
*/
private long date;
private String phone;
}

2
src/main/java/com/example/survey/dto/project/ModifyProjectDTO.java
View File

@ -11,5 +11,5 @@ import java.util.Date;
@Data
public class ModifyProjectDTO {
private String name;
private long date;
private String phone;
}

2
src/main/java/com/example/survey/entity/Project.java
View File

@ -33,5 +33,7 @@ public class Project {
private long date;
private User user;
private long count;
}

51
src/main/java/com/example/survey/service/impl/ProjectServiceImpl.java
View File

@ -21,9 +21,12 @@ import com.example.survey.exception.RecordException;
import com.example.survey.exception.UserException;
import com.example.survey.service.ProjectService;
import com.example.survey.vo.ProjectVO;
// import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -50,13 +53,9 @@ public class ProjectServiceImpl implements ProjectService {
Project project = new Project();
project.setName(createProjectDTO.getName());
// project.setMetaData(metaData);
// project.setStartTime(createProjectDTO.getStartTime());
// project.setEndTime(createProjectDTO.getEndTime());
// project.setDetail(createProjectDTO.getDetail());
project.setDate(createProjectDTO.getDate());
// project.setState(ProjectStateEnum.IN_PROGRESS.getValue());
// project.setUser(user);
project.setDate(System.currentTimeMillis());
User user = userDao.selectUser(createProjectDTO.getPhone());
project.setUser(user);
projectDao.saveProject(project);
}
@ -67,15 +66,10 @@ public class ProjectServiceImpl implements ProjectService {
ProjectVO projectVO = new ProjectVO();
projectVO.setName(project.getName());
projectVO.setDate(project.getDate());
projectVO.setUserName(project.getUser().getUsername());
projectVO.setUserPhone(project.getUser().getPhone());
projectVO.setCount(project.getCount());
// projectVO.setDetail(project.getDetail());
// projectVO.setStartTime(project.getStartTime());
// projectVO.setEndTime(project.getEndTime());
// projectVO.setUsername(project.getUser().getUsername());
// if (project.getMetaData() != null) {
// projectVO.setMetaDataName(project.getMetaData().getName());
// }
// projectVO.setState(project.getState());
return projectVO;
}).collect(Collectors.toList());
@ -98,12 +92,9 @@ public class ProjectServiceImpl implements ProjectService {
if (!projectDao.existProject(modifyProjectDTO.getName())) {
throw new ProjectException(ResultEnum.NOT_EXIST_PROJECT);
}
// User user = userDao.selectUser(modifyProjectDTO.getUserPhone());
User user = userDao.selectUser(modifyProjectDTO.getPhone());
Project project = projectDao.selectProject(modifyProjectDTO.getName());
// project.setDetail(modifyProjectDTO.getDetail());
// project.setStartTime(modifyProjectDTO.getStartTime());
// project.setEndTime(modifyProjectDTO.getEndTime());
// project.setUser(user);
project.setUser(user);
projectDao.saveProject(project);
}
@ -127,12 +118,17 @@ public class ProjectServiceImpl implements ProjectService {
Project project = projectDao.selectProject(addRecordDTO.getName());
Record record = recordDao.getRecord(addRecordDTO.getUuid());
if(!record.getProjectList().contains(project.getName()))
List<String> t = record.getProjectList();
if(t == null) {
t = new ArrayList<>();
}
if(!t.contains(project.getName()))
{
List<String> t = record.getProjectList();
t.add(project.getName());
record.setProjectList(t);
recordDao.saveRecord(record);
project.setCount(project.getCount() + 1);
projectDao.saveProject(project);
}
}
@ -150,12 +146,19 @@ public class ProjectServiceImpl implements ProjectService {
Project project = projectDao.selectProject(deleteRecordDTO.getName());
Record record = recordDao.getRecord(deleteRecordDTO.getUuid());
if(record.getProjectList().contains(project.getName()))
List<String> t = record.getProjectList();
if(t == null) {
return;
}
if(t.contains(project.getName()))
{
List<String> t = record.getProjectList();
// List<String> t = record.getProjectList();
t.remove(project.getName());
record.setProjectList(t);
recordDao.saveRecord(record);
project.setCount(project.getCount() - 1);
projectDao.saveProject(project);
}
}

4
src/main/java/com/example/survey/vo/ProjectVO.java
View File

@ -23,5 +23,9 @@ public class ProjectVO {
private long date;
private String userPhone;
private String userName;
private long count;
}

4
src/main/resources/application-dev.yml
View File

@ -16,5 +16,5 @@ spring:
port: 6379
file:
path: E:\
url: E:\
path: ./
url: ./