Pārlūkot izejas kodu

添加用户能力值更新和分配按钮

insomniaLee 5 gadi atpakaļ
vecāks
revīzija
2668c38089

+ 12 - 0
src/main/java/com/mooctest/controller/JobController.java

@@ -73,6 +73,18 @@ public class JobController {
         return data;
     }
 
+    /**
+     * 更新能力值的接口
+     * @param jobId
+     * @return
+     */
+    @PostMapping(value="/updateAbility")
+    @ResponseBody
+    public String updateAbility(@RequestParam("jobId")String jobId){
+        if(jobId == null || jobId.length()==0) return "fail";
+        return  jobService.updateUserAbility(jobId)?"success":"fail";
+    }
+
     @GetMapping(value = "/jobs")
     public String jobs (Model model){
         JSONArray jsonArray = jobService.getJobs(); // 所有的数据

+ 10 - 0
src/main/java/com/mooctest/controller/TaskController.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
 import java.util.Map;
@@ -59,6 +60,15 @@ public class TaskController {
         return "crowdTaskDashboard";
     }
 
+    // TODO: 2020/4/1 sweager崩了没有测试
+    @GetMapping("/distribute")
+    @ResponseBody
+    public String distributePeople (@RequestParam("examId") String examId,
+                                    @RequestParam("caseId")String caseId){
+        if(caseId == null || caseId.length()==0) return "fail";
+        return taskService.distribute(caseId+examId)?"success":"fail";
+    }
+
 
     @GetMapping("/")
     public String root(Model model) {

+ 15 - 1
src/main/java/com/mooctest/service/JobService.java

@@ -27,7 +27,8 @@ public class JobService {
     @Value("${report.host}")
     String reportHost ;
     private final String HTTP = "http://";
-
+    @Value("${audit.distribute.addr}")
+    String auditDistributeUrl ;
 
 
 
@@ -96,6 +97,19 @@ public class JobService {
         return  tasksJson;
     }
 
+    public boolean updateUserAbility(String jobId){
+        RestTemplate template = new RestTemplate();
+        String url = auditDistributeUrl+"updateAbility";
+        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
+        paramMap.add("jobId",jobId);
+        template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+        HttpHeaders headers = new HttpHeaders();
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<MultiValueMap<String, Object>>(paramMap,headers);
+        ResponseEntity<String> response2 = template.postForEntity(url, httpEntity, String.class);
+        JSONArray tasksJson = JSON.parseArray(response2.getBody());
+        return  tasksJson != null;
+    }
+
 
     public JSONArray export ( String caseTakeId){
         RestTemplate template = new RestTemplate();

+ 16 - 0
src/main/java/com/mooctest/service/TaskService.java

@@ -52,6 +52,9 @@ public class TaskService {
     @Value("${task.info.addr}")
     String taskInfoAddr;
 
+    @Value("${task.distribute.url}")
+    String distributeUrl;
+
     @Value("${report.host}")
     String reportHost ;
     private final String HTTP = "http://";
@@ -184,6 +187,19 @@ public class TaskService {
 //
 //    }
 
+    public boolean distribute(String taskId){
+        RestTemplate template = new RestTemplate();
+        String url = distributeUrl+"team/dopreteam";
+        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
+        paramMap.add("id",taskId);
+        template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+        HttpHeaders headers = new HttpHeaders();
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<MultiValueMap<String, Object>>(paramMap,headers);
+        ResponseEntity<String> response2 = template.postForEntity(url, httpEntity, String.class);
+        JSONArray tasksJson = JSON.parseArray(response2.getBody());
+        return  tasksJson != null;
+    }
+
     private int [] getGradeInt(JSONObject jsonObject){
         int [] res = new int[11];
         for (int i = 0 ; i < 11 ; i++ ){

+ 20 - 0
src/main/resources/static/js/app_info.js

@@ -41,6 +41,26 @@ $(function () {
         }
     });
 
+    $('#distribute-btn').click(function () {
+        if (confirm("是否确定进行人员分配?") == true) {
+            $(this).attr('disabled', true);
+            $(this).find('span').text('处理中...');
+            // $.get('/distribute', {examId: examId, caseId: caseId}, function () {
+            //     alert("处理完成");
+            //     location.reload();
+            // });
+            $.ajax({
+                url: '/distribute?examId='+examId+'&caseId='+caseId,
+                type: 'GET',
+                success: function (result) {
+                    console.log(result);
+                    $(this).find('span').text('处理完成');
+                    $(this).attr('disabled', false);
+                }
+            });
+        }
+    });
+
     $('#blockChain-btn').click(function () {
         if (confirm("是否确定全部导入?") == true) {
             $(this).attr('disabled', true);

+ 17 - 1
src/main/resources/templates/jobDetail.html

@@ -165,7 +165,9 @@
                         <button onclick="seeDataStatistic()" class="btn btn-default pull-right" >
                             查看数据统计
                         </button>
-
+                        <button onclick="updateUserAbility()" class="btn btn-default pull-right" >
+                            更新用户能力
+                        </button>
                     </div>
                     <!-- /.box-header -->
                     <div class="box-body">
@@ -522,6 +524,20 @@
         window.location.href='/review/job?paperId='+id;
     }
     /*]]>*/
+    updateUserAbility = function () {
+        $.ajax({
+            url: '/review/updateAbility?jobId='+id,
+            type: 'POST',
+            success: function (result) {
+                console.log(result);
+                if(result == 'success'){
+                    alert("能力值更新成功")
+                }else{
+                    alert("能力值更新失败")
+                }
+            }
+        });
+    }
 
 
 </script>

+ 6 - 2
src/main/resources/templates/task_detail.html

@@ -147,10 +147,14 @@
 
         <!-- Report List Table -->
         <div class="assign-div pull-right">
-            <button  id="blockChain-btn" class="btn btn-sm btn-assign pull-right">
+            <button  id="distribute-btn" class="btn btn-sm btn-assign pull-right">
                 <i class="fa fa-coffee" style="margin-right: 3px;"></i>
-                <span>导入数据到区块链</span>
+                <span>人员分配</span>
             </button>
+<!--            <button  id="blockChain-btn" class="btn btn-sm btn-assign pull-right">-->
+<!--                <i class="fa fa-coffee" style="margin-right: 3px;"></i>-->
+<!--                <span>导入数据到区块链</span>-->
+<!--            </button>-->
             <button th:if="${!aggregated}" id="assign-btn" class="btn btn-sm btn-assign pull-right">
                 <i class="fa fa-coffee" style="margin-right: 3px;"></i>
                 <span>自动融合</span>