node相关报错

oa-app/src/main/java/com/css/oa/exam/assign/service/AdmService.java

@@ -9,7 +9,7 @@ import com.css.oa.exam.assign.repository.IAssignRepository;
import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.exam.repository.entity.Exam;
import com.css.oa.exam.exam.repository.IExamRepository;
import com.css.oa.exam.node.service.impl.NodeQueryService;
import com.css.oa.exam.node.service.impl.ExamNodeQueryService;
import com.css.oa.exam.room.repository.IRoomRepository;
import com.css.oa.exam.room.repository.entity.Room;
import com.css.oa.exam.student.repository.entity.Student;
@@ -310,10 +310,10 @@ public class AdmService extends BaseAssignService {
    IExamRepository examRepository;
    @Autowired
    NodeQueryService nodeQueryService;
    ExamNodeQueryService examNodeQueryService;
    public Map myAdm(String student_id) {
        if(nodeQueryService.printAdmissionIsClose()){
        if(examNodeQueryService.printAdmissionIsClose()){
            List<MyAdmWrap> wraps = new ArrayList<>();
            Map map = new LinkedHashMap();
            map.put("total", 0);

oa-app/src/main/java/com/css/oa/exam/enroll/controller/EnrollController.java

@@ -6,7 +6,7 @@ import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.enroll.viewobjects.*;
import com.css.oa.exam.enroll.viewobjects.MyEnrollWrap;
import com.css.oa.exam.enroll.service.impl.EnrollServiceImpl;
import com.css.oa.exam.node.service.impl.NodeQueryService;
import com.css.oa.exam.node.service.impl.ExamNodeQueryService;
import com.css.oa.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +27,7 @@ public class EnrollController extends BaseController {
    private EnrollServiceImpl mService;
    @Autowired
    private NodeQueryService nodeQuery;
    private ExamNodeQueryService nodeQuery;
    @Autowired
    private CheatSetService cheatService;

oa-app/src/main/java/com/css/oa/exam/node/controller/NodeController.java

@@ -2,9 +2,9 @@ package com.css.oa.exam.node.controller;
import com.css.oa.exam.base.BaseController;
import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.node.repository.entity.Node;
import com.css.oa.exam.node.service.impl.NodeQueryService;
import com.css.oa.exam.node.service.impl.NodeServiceImpl;
import com.css.oa.exam.node.repository.entity.ExamNode;
import com.css.oa.exam.node.service.impl.ExamNodeQueryService;
import com.css.oa.exam.node.service.impl.ExamNodeServiceImpl;
import com.css.oa.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,10 +18,10 @@ import java.util.Map;
@Api(tags = {"节点控制"})
@RestController
@RequestMapping("/node")
public class NodeController extends BaseController {
public class ExamNodeController extends BaseController {
    @Autowired
    private NodeServiceImpl mService;
    private ExamNodeServiceImpl mService;
    @ApiOperation(value = "列表")
    @GetMapping("/queryAll")
@@ -39,7 +39,7 @@ public class NodeController extends BaseController {
    @ApiOperation(value = "编辑")
    @PostMapping("/update")
    public Result update(@RequestBody Node obj) {
    public Result update(@RequestBody ExamNode obj) {
        Result<Map> result;
        try {
            if (TextUtils.isEmpty(obj.uuid)) {
@@ -60,7 +60,7 @@ public class NodeController extends BaseController {
    @ApiOperation(value = "增加节点控制")
    @PostMapping("/add")
    public Result add(@RequestBody Node obj) {
    public Result add(@RequestBody ExamNode obj) {
        Result<Map> result;
        try {
            if (TextUtils.isEmpty(obj.getName())) {
@@ -90,14 +90,14 @@ public class NodeController extends BaseController {
    }
    @Autowired
    NodeQueryService nodeQueryService;
    ExamNodeQueryService examNodeQueryService;
    @ApiOperation(value = "报名节点是否已经关闭")
    @GetMapping("/enrollIsClose")
    public Result enrollIsClose() {
        Result<Map> result;
        try {
            boolean b = nodeQueryService.enrollIsClose();
            boolean b = examNodeQueryService.enrollIsClose();
            result = setResult("" + b);
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -111,7 +111,7 @@ public class NodeController extends BaseController {
    public Result payIsClose() {
        Result<Map> result;
        try {
            boolean b = nodeQueryService.payIsClose();
            boolean b = examNodeQueryService.payIsClose();
            result = setResult("" + b);
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -125,7 +125,7 @@ public class NodeController extends BaseController {
    public Result printAdmissionIsClose() {
        Result<Map> result;
        try {
            boolean b = nodeQueryService.printAdmissionIsClose();
            boolean b = examNodeQueryService.printAdmissionIsClose();
            result = setResult("" + b);
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -139,7 +139,7 @@ public class NodeController extends BaseController {
    public Result joinExamIsClose() {
        Result<Map> result;
        try {
            boolean b = nodeQueryService.joinExamIsClose();
            boolean b = examNodeQueryService.joinExamIsClose();
            result = setResult("" + b);
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -153,7 +153,7 @@ public class NodeController extends BaseController {
    public Result queryScoreIsClose() {
        Result<Map> result;
        try {
            boolean b = nodeQueryService.queryScoreIsClose();
            boolean b = examNodeQueryService.queryScoreIsClose();
            result = setResult("" + b);
        } catch (Exception e) {
            result = setErr(e.getMessage());

oa-app/src/main/java/com/css/oa/exam/node/repository/INodeRepository.java

@@ -1,6 +1,6 @@
package com.css.oa.exam.node.repository;
import com.css.oa.exam.node.repository.entity.Node;
import com.css.oa.exam.node.repository.entity.ExamNode;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -12,12 +12,12 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Repository
public interface INodeRepository extends JpaRepository<Node, String>, JpaSpecificationExecutor<Node> {
public interface ExamNodeRepository extends JpaRepository<ExamNode, String>, JpaSpecificationExecutor<ExamNode> {
    //批量删除
    @Modifying
    @Transactional
    @Query("delete from Node n where n.uuid in :ids")
    @Query("delete from ExamNode n where n.uuid in :ids")
    void deleteRealByIds(@Param("ids") List<String> ids);
}

oa-app/src/main/java/com/css/oa/exam/node/repository/entity/Node.java

@@ -13,7 +13,7 @@ import java.util.Date;
@Data
@Entity
@Table(name = "OP_EXAM_NODE")
public class Node implements Serializable {
public class ExamNode implements Serializable {
    public static final long serialVersionUID = -2982710232836091012L;

oa-app/src/main/java/com/css/oa/exam/node/service/ExamNodeService.java

@@ -0,0 +1,18 @@
package com.css.oa.exam.node.service;
import com.css.oa.exam.node.repository.entity.ExamNode;
import java.util.List;
import java.util.Map;
public interface ExamNodeService {
    void add(ExamNode test);
    Map queryAll();
    void update(ExamNode newTest);
    void delete(List<String> ids);
}

oa-app/src/main/java/com/css/oa/exam/node/service/NodeService.java

@@ -1,18 +0,0 @@
package com.css.oa.exam.node.service;
import com.css.oa.exam.node.repository.entity.Node;
import java.util.List;
import java.util.Map;
public interface NodeService {
    void add(Node test);
    Map queryAll();
    void update(Node newTest);
    void delete(List<String> ids);
}

oa-app/src/main/java/com/css/oa/exam/node/service/impl/ExamNodeQueryService.java

@@ -0,0 +1,42 @@
package com.css.oa.exam.node.service.impl;
import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.node.repository.entity.ExamNode;
import com.css.oa.exam.node.viewobjects.NodeType;
import com.css.oa.exam.node.repository.ExamNodeRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ExamNodeQueryService implements NodeType {
    @Autowired
    ExamNodeRepository repository;
    public boolean enrollIsClose() {
        ExamNode examNode = repository.findById(ENROLL).get();
        return examNode.is_open == BoolState.NO;
    }
    public boolean payIsClose() {
        ExamNode examNode = repository.findById(PAY).get();
        return examNode.is_open == BoolState.NO;
    }
    public boolean printAdmissionIsClose() {
        ExamNode examNode = repository.findById(PRINT_ADMISSION).get();
        return examNode.is_open == BoolState.NO;
    }
    public boolean joinExamIsClose() {
        ExamNode examNode = repository.findById(JOIN_EXAM).get();
        return examNode.is_open == BoolState.NO;
    }
    public boolean queryScoreIsClose() {
        ExamNode examNode = repository.findById(QUERY_SCORE).get();
        return examNode.is_open == BoolState.NO;
    }
}

oa-app/src/main/java/com/css/oa/exam/node/service/impl/NodeServiceImpl.java

@@ -1,9 +1,9 @@
package com.css.oa.exam.node.service.impl;
import com.css.oa.exam.base.BaseService;
import com.css.oa.exam.node.repository.entity.Node;
import com.css.oa.exam.node.repository.INodeRepository;
import com.css.oa.exam.node.service.NodeService;
import com.css.oa.exam.node.repository.entity.ExamNode;
import com.css.oa.exam.node.repository.ExamNodeRepository;
import com.css.oa.exam.node.service.ExamNodeService;
import com.css.oa.exam.util.CopyObjTool;
import com.css.oa.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
@@ -14,13 +14,13 @@ import java.util.*;
@Slf4j
@Service
public class NodeServiceImpl extends BaseService implements NodeService {
public class ExamNodeServiceImpl extends BaseService implements ExamNodeService {
    @Autowired
    INodeRepository repository;
    ExamNodeRepository repository;
    @Override
    public void add(Node obj) {
    public void add(ExamNode obj) {
        System.out.println("传入的obj => " + obj.toString());
        String id = UUIDGenerator.getUUID();
        obj.setUuid(id);
@@ -37,7 +37,7 @@ public class NodeServiceImpl extends BaseService implements NodeService {
    @Override
    public Map queryAll() {
        Long count = repository.count();
        List<Node> list = repository.findAll();
        List<ExamNode> list = repository.findAll();
        Map map = new LinkedHashMap();
        map.put("total", count);
        map.put("list", list);
@@ -45,12 +45,12 @@ public class NodeServiceImpl extends BaseService implements NodeService {
    }
    @Override
    public void update(Node obj) {
    public void update(ExamNode obj) {
        if(obj.getUpdate_time() == null){
            Date newDate = new Date();
            obj.setUpdate_time(newDate);
        }
        Node old  = repository.findById(obj.getUuid()).get();
        ExamNode old  = repository.findById(obj.getUuid()).get();
        CopyObjTool.copyProperties(old, obj);
        repository.save(obj);
    }

oa-app/src/main/java/com/css/oa/exam/node/service/impl/NodeQueryService.java

@@ -1,42 +0,0 @@
package com.css.oa.exam.node.service.impl;
import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.node.viewobjects.NodeType;
import com.css.oa.exam.node.repository.INodeRepository;
import com.css.oa.exam.node.repository.entity.Node;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class NodeQueryService implements NodeType {
    @Autowired
    INodeRepository repository;
    public boolean enrollIsClose() {
        Node node = repository.findById(ENROLL).get();
        return node.is_open == BoolState.NO;
    }
    public boolean payIsClose() {
        Node node = repository.findById(PAY).get();
        return node.is_open == BoolState.NO;
    }
    public boolean printAdmissionIsClose() {
        Node node = repository.findById(PRINT_ADMISSION).get();
        return node.is_open == BoolState.NO;
    }
    public boolean joinExamIsClose() {
        Node node = repository.findById(JOIN_EXAM).get();
        return node.is_open == BoolState.NO;
    }
    public boolean queryScoreIsClose() {
        Node node = repository.findById(QUERY_SCORE).get();
        return node.is_open == BoolState.NO;
    }
}

oa-app/src/main/java/com/css/oa/exam/score/service/impl/ScoreServiceImpl.java

@@ -21,7 +21,7 @@ import com.css.oa.exam.constants.ExamConfig;
import com.css.oa.exam.constants.ExportDTO;
import com.css.oa.exam.exam.repository.entity.Exam;
import com.css.oa.exam.exam.repository.IExamRepository;
import com.css.oa.exam.node.service.impl.NodeQueryService;
import com.css.oa.exam.node.service.impl.ExamNodeQueryService;
import com.css.oa.exam.score.service.ScoreService;
import com.css.oa.exam.score.viewobjects.*;
import com.css.oa.exam.score.repository.IScoreRepository;
@@ -379,10 +379,10 @@ public class ScoreServiceImpl extends BaseVerifyService implements ScoreService
    }
    @Autowired
    NodeQueryService nodeQueryService;
    ExamNodeQueryService examNodeQueryService;
    public Map myScore(String student_id) {
        if(nodeQueryService.queryScoreIsClose()){
        if(examNodeQueryService.queryScoreIsClose()){
            List<MyAdmWrap> wraps = new ArrayList<>();
            Map map = new LinkedHashMap();
            map.put("total", 0);