From d55956e16551ac8debcfa6587dd12279eb77aa39 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 13 十月 2023 14:47:17 +0800
Subject: [PATCH] 10.14
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 20 ++++++---
cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java | 2 +
cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java | 2 +
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 24 +++++++++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html | 8 ++--
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java | 6 ++
7 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 2dc8968..1b0a93f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -9,10 +9,7 @@
import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
import com.dsh.account.model.QueryDataFee;
import com.dsh.account.model.StudentVo;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.RechargeRecordsService;
-import com.dsh.account.service.TAppUserService;
-import com.dsh.account.service.TStudentService;
+import com.dsh.account.service.*;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
@@ -584,6 +581,16 @@
return map;
}
+
+
+ @ResponseBody
+ @PostMapping("/student/comdel")
+ public void comdel(@RequestBody Integer id) {
+ evaluateStudentService.removeById(id);
+
+ }
+
+
@ResponseBody
@PostMapping("/student/stuStores")
public HashMap<String, Object> stuStores(@RequestBody Integer id){
@@ -680,8 +687,15 @@
+ @Autowired
+ private EvaluateStudentService evaluateStudentService;
+ @ResponseBody
+ @PostMapping("/student/save")
+ public void save(@RequestBody EvaluateStudent evaluateStudent) {
+ evaluateStudent.setInsertTime(new Date());
+ evaluateStudentService.saveOrUpdate(evaluateStudent);
-
+ }
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
index 966f721..0244f7a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -61,6 +62,7 @@
/**
* 添加时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("insertTime")
private Date insertTime;
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 465bfbc..56f4884 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -24,7 +24,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java b/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java
index 3f40191..e261ec3 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -61,6 +62,7 @@
/**
* 添加时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("insertTime")
private Date insertTime;
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
index 86c20d1..79c52d1 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
@@ -2,6 +2,7 @@
import com.dsh.course.dto.CreateHistoryDto;
import com.dsh.course.dto.GetHistoryDto;
+import com.dsh.course.entity.EvaluateStudent;
import com.dsh.course.feignClient.account.model.*;
import com.dsh.course.dto.StudentSearch;
@@ -136,5 +137,8 @@
@PostMapping("/student/stuStores")
HashMap<String, Object> stuStores(@RequestBody Integer id);
-
+ @PostMapping("/student/save")
+ void save(EvaluateStudent evaluateStudent);
+ @PostMapping("/student/comdel")
+ void comdel(@RequestBody Integer id);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index dfaa276..8d2ff2a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -368,16 +368,19 @@
}
- @RequestMapping("/addcom")
+ @RequestMapping("/addcom/{id}")
@ResponseBody
- public ResultUtil addcom(String content,String image) {
+ public ResultUtil addcom(@PathVariable("id") Integer id,String content,String image) {
EvaluateStudent evaluateStudent = new EvaluateStudent();
+ evaluateStudent.setStudentId(id);
evaluateStudent.setContent(content);
evaluateStudent.setImgs(image);
- evaluateStudent.setInsertTime(new Date());
+// evaluateStudent.setInsertTime(new Date());
- evaluateStudentService.save(evaluateStudent);
+
+ appUserClient.save(evaluateStudent);
+// evaluateStudentService.save(evaluateStudent);
@@ -394,9 +397,9 @@
evaluateStudent.setId(id);
evaluateStudent.setContent(content);
evaluateStudent.setImgs(images);
- evaluateStudent.setInsertTime(new Date());
+ appUserClient.save(evaluateStudent);
- evaluateStudentService.updateById(evaluateStudent);
+// evaluateStudentService.updateById(evaluateStudent);
@@ -408,7 +411,10 @@
@ResponseBody
public ResultUtil comdel(@PathVariable("id") Integer id) {
- evaluateStudentService.removeById(id);
+
+ appUserClient.comdel(id);
+
+// evaluateStudentService.removeById(id);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html
index fd80cff..34c027f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html
@@ -104,7 +104,7 @@
"uploadType": "fileReceptor",
"imageClassName": "r w-full",
"receiver": {
- "url": "object-upload://default",
+ "url": "/mgr/uploadImgAmis",
"method": "post"
},
"id": "u:5a904d4cfcf4",
@@ -224,7 +224,7 @@
"type": "form",
"api": {
"method": "post",
- "url": "/tStudent/addcom",
+ "url": `/tStudent/addcom/+${id}`,
"messages": {},
"dataType": "form-data"
},
@@ -245,7 +245,7 @@
"uploadType": "fileReceptor",
"imageClassName": "r w-full",
"receiver": {
- "url": "/api/upload/oss",
+ "url": "/mgr/uploadImgAmis",
"method": "post"
},
"id": "u:617faa0f7046",
@@ -289,7 +289,7 @@
"type": "input-text",
"label": "id",
"name": "id",
- "hidden": false,
+ "hidden": true,
"id": "u:8fbfb3be80ce",
"value":`${id}`
}
--
Gitblit v1.7.1