From a7ea9a0e5638497c795710e67b5f7981653d98ee Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Tue, 18 Jul 2023 18:17:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD-=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandsOnSimulationTasksService.java        | 129 +++++++++++++-----
 .../web/HandsOnSimulationTasksController.java |  12 ++
 2 files changed, 105 insertions(+), 36 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
index 2c8ae148..145f31ac 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.service;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -12,9 +13,15 @@ import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.HandsOnSimulationTasksDao;
 import com.ibeetl.jlw.dao.ResourcesQuestionDao;
-import com.ibeetl.jlw.entity.*;
+import com.ibeetl.jlw.entity.HandsOnSimulationTasks;
+import com.ibeetl.jlw.entity.HandsOnSimulationTasksAssessment;
+import com.ibeetl.jlw.entity.HandsOnSimulationTasksFile;
+import com.ibeetl.jlw.entity.ResourcesQuestion;
 import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
-import com.ibeetl.jlw.web.query.*;
+import com.ibeetl.jlw.web.query.HandsOnSimulationTasksAssessmentQuery;
+import com.ibeetl.jlw.web.query.HandsOnSimulationTasksFileQuery;
+import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery;
+import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -36,40 +43,45 @@ import java.util.stream.Collectors;
 
 @Service
 @Transactional
-public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimulationTasks>{
+public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimulationTasks> {
 
-    @Autowired private HandsOnSimulationTasksDao handsOnSimulationTasksDao;
-    @Autowired private HandsOnSimulationTasksFileService handsOnSimulationTasksFileService;
-    @Autowired private HandsOnSimulationTasksAssessmentService handsOnSimulationTasksAssessmentService;
-    @Autowired private ResourcesQuestionDao resourcesQuestionDao;
-    public PageQuery<HandsOnSimulationTasks>queryByCondition(PageQuery query){
+    @Autowired
+    private HandsOnSimulationTasksDao handsOnSimulationTasksDao;
+    @Autowired
+    private HandsOnSimulationTasksFileService handsOnSimulationTasksFileService;
+    @Autowired
+    private HandsOnSimulationTasksAssessmentService handsOnSimulationTasksAssessmentService;
+    @Autowired
+    private ResourcesQuestionDao resourcesQuestionDao;
+
+    public PageQuery<HandsOnSimulationTasks> queryByCondition(PageQuery query) {
         //查询任务排序
         query.setOrderBy("task_order+0, add_time");
-        PageQuery ret =  handsOnSimulationTasksDao.queryByCondition(query);
+        PageQuery ret = handsOnSimulationTasksDao.queryByCondition(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public PageQuery<HandsOnSimulationTasks>queryByConditionQuery(PageQuery query){
+    public PageQuery<HandsOnSimulationTasks> queryByConditionQuery(PageQuery query) {
         //查询任务排序
         query.setOrderBy("task_order+0, add_time");
-        PageQuery ret =  handsOnSimulationTasksDao.queryByConditionQuery(query);
+        PageQuery ret = handsOnSimulationTasksDao.queryByConditionQuery(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public void deleteByList(List list){
+    public void deleteByList(List list) {
         String ids = "";
         ToolUtils.deleteNullList(list);
-        for(int i=0;null != list && i<list.size();i++){
-            ids += list.get(i).toString()+(i==list.size()-1?"":",");
+        for (int i = 0; null != list && i < list.size(); i++) {
+            ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
         }
-        if(StringUtils.isNotBlank(ids)){
+        if (StringUtils.isNotBlank(ids)) {
             handsOnSimulationTasksDao.deleteHandsOnSimulationTasksByIds(ids);
         }
     }
 
-    public void deleteHandsOnSimulationTasks(String ids){
+    public void deleteHandsOnSimulationTasks(String ids) {
         try {
             handsOnSimulationTasksDao.deleteHandsOnSimulationTasksByIds(ids);
         } catch (Exception e) {
@@ -77,7 +89,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         }
     }
 
-    public String addAll(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public String addAll(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         String msg = "";
         List<HandsOnSimulationTasks> handsOnSimulationTasksList = new ArrayList<>();
         try {
@@ -85,11 +97,12 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         } catch (Exception e) {
             try {
                 handsOnSimulationTasksList.add(JSONObject.parseObject(handsOnSimulationTasksQuery.getHandsOnSimulationTasksJsonStr(), HandsOnSimulationTasks.class));
-            } catch (Exception e1) {}
+            } catch (Exception e1) {
+            }
         }
         ToolUtils.deleteNullList(handsOnSimulationTasksList);
-        if(null != handsOnSimulationTasksList && handsOnSimulationTasksList.size()>0){
-            for(int i=0;i<handsOnSimulationTasksList.size();i++){
+        if (null != handsOnSimulationTasksList && handsOnSimulationTasksList.size() > 0) {
+            for (int i = 0; i < handsOnSimulationTasksList.size(); i++) {
                 HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksList.get(i);
                 handsOnSimulationTasks.setUserId(handsOnSimulationTasksQuery.getUserId());
                 handsOnSimulationTasks.setOrgId(handsOnSimulationTasksQuery.getOrgId());
@@ -99,7 +112,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         return msg;
     }
 
-    public JsonResult add(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public JsonResult add(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         String msg = "";
         HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksQuery.pojo();
         Long handsOnId = handsOnSimulationTasks.getHandsOnId();
@@ -137,11 +150,11 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
                     .desc(HandsOnSimulationTasks::getAddTime).single();
             if (single == null) {
                 handsOnSimulationTasks.setTaskOrder("1");
-            }else {
+            } else {
                 String taskOrder1 = single.getTaskOrder();
                 if (!NumberUtil.isNumber(taskOrder1)) {
                     handsOnSimulationTasks.setTaskOrder("2");
-                }else {
+                } else {
                     BigDecimal bigDecimal = NumberUtil.toBigDecimal(taskOrder1);
                     handsOnSimulationTasks.setTaskOrder(bigDecimal.add(BigDecimal.ONE).toString());
                 }
@@ -180,7 +193,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         return jsonResult;
     }
 
-    public String edit(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public String edit(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         String msg = "";
         HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksQuery.pojo();
         String handsOnTaskProblemVo = handsOnSimulationTasksQuery.getHandsOnTaskProblemVo();
@@ -244,41 +257,41 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         return msg;
     }
 
-    public String updateGivenByIds(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public String updateGivenByIds(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         String msg = "";
-        if(StringUtils.isNotBlank(handsOnSimulationTasksQuery.get_given())){
+        if (StringUtils.isNotBlank(handsOnSimulationTasksQuery.get_given())) {
             boolean flag = handsOnSimulationTasksDao.updateGivenByIds(handsOnSimulationTasksQuery) > 0;
-            if(!flag){
+            if (!flag) {
                 msg = "更新指定参数失败";
             }
-        }else{
+        } else {
             msg = "指定参数为空";
         }
         return msg;
     }
 
-    public List<HandsOnSimulationTasks> getValues (Object paras){
+    public List<HandsOnSimulationTasks> getValues(Object paras) {
         return sqlManager.select(SqlId.of("jlw.handsOnSimulationTasks.getHandsOnSimulationTasksValues"), HandsOnSimulationTasks.class, paras);
     }
 
-    public List<HandsOnSimulationTasks> getValuesByQuery (HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public List<HandsOnSimulationTasks> getValuesByQuery(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         return handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery);
     }
 
-    public HandsOnSimulationTasks getInfo (Long taskId){
+    public HandsOnSimulationTasks getInfo(Long taskId) {
         HandsOnSimulationTasksQuery handsOnSimulationTasksQuery = new HandsOnSimulationTasksQuery();
         handsOnSimulationTasksQuery.setTaskId(taskId);
         List<HandsOnSimulationTasks> list = handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             return list.get(0);
-        }else{
+        } else {
             return null;
         }
     }
 
-    public HandsOnSimulationTasks getInfo(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public HandsOnSimulationTasks getInfo(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery) {
         List<HandsOnSimulationTasks> list = handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             HandsOnSimulationTasks handsOnSimulationTasks = list.get(0);
             List<HandsOnTaskProblemVO> objectiveProblem = getObjectiveProblem(handsOnSimulationTasks.getTaskList(), handsOnSimulationTasks.getTaskId());
             handsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
@@ -300,7 +313,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
             }
 
             return handsOnSimulationTasks;
-        }else{
+        } else {
             return null;
         }
     }
@@ -377,4 +390,48 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         }
         return JsonResult.success(resourcesQuestions);
     }
+
+    /**
+     * 查看实训案例 查看详情
+     *
+     * @param taskId
+     * @param coreUser
+     * @return
+     */
+    public JsonResult<List<ResourcesQuestion>> getHandsOnTaskTheoryCenterByTaskIdDetails(Long taskId, CoreUser coreUser) {
+        HandsOnSimulationTasksQuery tasksQuery = new HandsOnSimulationTasksQuery();
+        tasksQuery.setTaskId(taskId);
+        List<HandsOnSimulationTasks> tasksList = handsOnSimulationTasksDao.getValuesByQueryNotPermission(tasksQuery);
+        if (CollectionUtils.isEmpty(tasksList)) {
+            return JsonResult.fail();
+        }
+        HandsOnSimulationTasks tasks = tasksList.get(0);
+        String taskList = tasks.getTaskList();
+        ResourcesQuestionQuery questionQuery = new ResourcesQuestionQuery();
+        questionQuery.setResourcesQuestionIds(taskList);
+        questionQuery.setQuestionStatus(1);
+        List<ResourcesQuestion> resourcesQuestions = resourcesQuestionDao.getValuesByQueryNotWithPermission(questionQuery);
+        if (CollectionUtils.isEmpty(resourcesQuestions)) {
+            return JsonResult.success(resourcesQuestions);
+        }
+        resourcesQuestions.forEach(item -> {
+            if (ObjectUtil.isEmpty(tasks.getTaskList())) {
+                item.setQuestionAnswer("");
+                item.setQuestionScore(new BigDecimal(0));
+            } else {
+                if (ObjectUtil.equals(item.getQuestionType(),1)) {
+                    item.setQuestionScore(tasks.getSingleScore());
+                } else if (ObjectUtil.equals(item.getQuestionType(),2)) {
+                    item.setQuestionScore(tasks.getMultipleScore());
+                } else if (ObjectUtil.equals(item.getQuestionType(),3)) {
+                    item.setQuestionScore(tasks.getJudgeScore());
+                } else if (ObjectUtil.equals(item.getQuestionType(),4)) {
+                    item.setQuestionScore(tasks.getFillScore());
+                } else if (ObjectUtil.equals(item.getQuestionType(),5)) {
+                    item.setQuestionScore(tasks.getAnalysisScore());
+                }
+            }
+        });
+        return JsonResult.success(resourcesQuestions);
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java
index 66098c6c..b93f9371 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java
@@ -220,4 +220,16 @@ public class HandsOnSimulationTasksController{
         return handsOnSimulationTasksService.getHandsOnTaskkTheoryCenterByTaskId(taskId, coreUser);
     }
 
+    /**
+     * 理论测评题目列表-课程中心-预览-授权课 查看详情
+     *
+     * @param taskId   实操任务id
+     * @param coreUser
+     * @return 学生选项 myOptions
+     */
+    @GetMapping(API + "/getHandsOnTaskTheoryCenterByTaskIdDetails")
+    public JsonResult<List<ResourcesQuestion>> getHandsOnTaskTheoryCenterByTaskIdDetails(Long taskId, @SCoreUser CoreUser coreUser) {
+        return handsOnSimulationTasksService.getHandsOnTaskTheoryCenterByTaskIdDetails(taskId, coreUser);
+    }
+
 }