Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-13 df4c32cf8120816790ea89157094849003876827

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

 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);


    }




 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;


 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.*;


 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;


 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);
}

 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);




 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}`
                }