physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-16 13:55:27 +08:00
parent 27102ea4d1
commit fd1456cb38
3 changed files with 252 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/ExperimentRatingDTO.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* Ant Group
* Copyright (c) 2004-2024 All Rights Reserved.
*/
package org.jeecg.modules.database;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author lise
* @version ExperimentRatingDTO.java, v 0.1 2024年11月16日 13:46 lise
*/
@Getter
@Setter
public class ExperimentRatingDTO {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**实验ID*/
private String experimentId;
/**评分人*/
private String rateUserId;
/**总分数*/
private Integer totalScore;
/**基础分*/
private Integer baseScore;
/**完成分*/
private Integer completionScore;
/**难度分*/
private Integer difficultyScore;
/**管理支撑分*/
private Integer managementScore;
private String experimentName;
private String experimentNo;
}

100
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java
View File

@@ -1,49 +1,37 @@
package org.jeecg.modules.database.controller; package org.jeecg.modules.database.controller;
import java.util.Arrays; import cn.hutool.core.bean.BeanUtil;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.database.entity.ExperimentRating;
import org.jeecg.modules.database.service.IExperimentRatingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.aspect.annotation.AutoLog; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.ExperimentRatingDTO;
import org.jeecg.modules.database.entity.Experiment;
import org.jeecg.modules.database.entity.ExperimentRating;
import org.jeecg.modules.database.service.IExperimentRatingService;
import org.jeecg.modules.database.service.IExperimentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/** import java.util.*;
/**
* @Description: 试验评分 * @Description: 试验评分
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-16 * @Date: 2024-11-16
* @Version: V1.0 * @Version: V1.0
*/ */
@Tag(name="试验评分") @Tag(name = "试验评分")
@RestController @RestController
@RequestMapping("/database/experimentRating") @RequestMapping("/database/experimentRating")
@Slf4j @Slf4j
@@ -51,6 +39,9 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
@Autowired @Autowired
private IExperimentRatingService experimentRatingService; private IExperimentRatingService experimentRatingService;
@Autowired
private IExperimentService experimentService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@@ -61,16 +52,31 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
//@AutoLog(value = "试验评分-分页列表查询") //@AutoLog(value = "试验评分-分页列表查询")
@Operation(summary="试验评分-分页列表查询") @Operation(summary = "试验评分-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<ExperimentRating>> queryPageList(ExperimentRating experimentRating, public Result<IPage<ExperimentRatingDTO>> queryPageList(ExperimentRating experimentRating,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<ExperimentRating> queryWrapper = QueryGenerator.initQueryWrapper(experimentRating, req.getParameterMap()); QueryWrapper<ExperimentRating> queryWrapper = QueryGenerator.initQueryWrapper(experimentRating, req.getParameterMap());
Page<ExperimentRating> page = new Page<ExperimentRating>(pageNo, pageSize); Page<ExperimentRating> page = new Page<ExperimentRating>(pageNo, pageSize);
IPage<ExperimentRating> pageList = experimentRatingService.page(page, queryWrapper); IPage<ExperimentRating> pageList = experimentRatingService.page(page, queryWrapper);
return Result.OK(pageList); List<ExperimentRatingDTO> result = new ArrayList<>();
pageList.getRecords().forEach(v -> {
Experiment experiment = experimentService.getById(v.getExperimentId());
ExperimentRatingDTO experimentRatingDTO = new ExperimentRatingDTO();
BeanUtil.copyProperties(v, experimentRatingDTO);
experimentRatingDTO.setExperimentName(experiment.getName());
experimentRatingDTO.setExperimentNo(experiment.getExperimentNo());
result.add(experimentRatingDTO);
});
IPage<ExperimentRatingDTO> pageList1 = new Page();
pageList1.setRecords(result);
pageList1.setPages(pageList.getPages());
pageList1.setTotal(pageList.getTotal());
pageList1.setSize(pageList.getSize());
pageList1.setCurrent(pageList.getCurrent());
return Result.OK(pageList1);
} }
/** /**
@@ -80,7 +86,7 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
@AutoLog(value = "试验评分-添加") @AutoLog(value = "试验评分-添加")
@Operation(summary="试验评分-添加") @Operation(summary = "试验评分-添加")
@RequiresPermissions("database:experiment_rating:add") @RequiresPermissions("database:experiment_rating:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentRating experimentRating) { public Result<String> add(@RequestBody ExperimentRating experimentRating) {
@@ -95,9 +101,9 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
@AutoLog(value = "试验评分-编辑") @AutoLog(value = "试验评分-编辑")
@Operation(summary="试验评分-编辑") @Operation(summary = "试验评分-编辑")
@RequiresPermissions("database:experiment_rating:edit") @RequiresPermissions("database:experiment_rating:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentRating experimentRating) { public Result<String> edit(@RequestBody ExperimentRating experimentRating) {
experimentRatingService.updateById(experimentRating); experimentRatingService.updateById(experimentRating);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
@@ -110,10 +116,10 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
@AutoLog(value = "试验评分-通过id删除") @AutoLog(value = "试验评分-通过id删除")
@Operation(summary="试验评分-通过id删除") @Operation(summary = "试验评分-通过id删除")
@RequiresPermissions("database:experiment_rating:delete") @RequiresPermissions("database:experiment_rating:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
experimentRatingService.removeById(id); experimentRatingService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -125,10 +131,10 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
@AutoLog(value = "试验评分-批量删除") @AutoLog(value = "试验评分-批量删除")
@Operation(summary="试验评分-批量删除") @Operation(summary = "试验评分-批量删除")
@RequiresPermissions("database:experiment_rating:deleteBatch") @RequiresPermissions("database:experiment_rating:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.experimentRatingService.removeByIds(Arrays.asList(ids.split(","))); this.experimentRatingService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@@ -140,11 +146,11 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @return * @return
*/ */
//@AutoLog(value = "试验评分-通过id查询") //@AutoLog(value = "试验评分-通过id查询")
@Operation(summary="试验评分-通过id查询") @Operation(summary = "试验评分-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<ExperimentRating> queryById(@RequestParam(name="id",required=true) String id) { public Result<ExperimentRating> queryById(@RequestParam(name = "id", required = true) String id) {
ExperimentRating experimentRating = experimentRatingService.getById(id); ExperimentRating experimentRating = experimentRatingService.getById(id);
if(experimentRating==null) { if (experimentRating == null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(experimentRating); return Result.OK(experimentRating);

83
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/enhance/RateEnhance.java
View File

@@ -1,41 +1,42 @@
/* ///*
* Ant Group // * Ant Group
* Copyright (c) 2004-2024 All Rights Reserved. // * Copyright (c) 2004-2024 All Rights Reserved.
*/ // */
package org.jeecg.modules.database.enhance; //package org.jeecg.modules.database.enhance;
//
import org.jeecg.modules.database.entity.Experiment; //import org.jeecg.modules.database.entity.Experiment;
import org.jeecg.modules.database.service.IExperimentService; //import org.jeecg.modules.database.service.IExperimentService;
import org.jeecg.modules.online.cgform.enhance.CgformEnhanceJavaListInter; //import org.jeecg.modules.online.cgform.enhance.CgformEnhanceJavaListInter;
import org.jeecg.modules.online.config.exception.BusinessException; //import org.jeecg.modules.online.config.exception.BusinessException;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
/** ///**
* @author lise // * @author lise
* @version RateEnhance.java, v 0.1 2024年11月16日 12:42 lise // * @version RateEnhance.java, v 0.1 2024年11月16日 12:42 lise
*/ // */
@Component("rateEnhance") //@Component("rateEnhance")
public class RateEnhance implements CgformEnhanceJavaListInter { //public class RateEnhance implements CgformEnhanceJavaListInter {
@Autowired // @Autowired
private IExperimentService experimentService; // private IExperimentService experimentService;
//
@Override // @Override
public void execute(String s, List<Map<String, Object>> data) throws BusinessException { // public void execute(String s, List<Map<String, Object>> data) throws BusinessException {
for (Map<String, Object> map : data) { // System.out.println("=====rateEnhance=====");
Object db = map.get("experimentId"); // for (Map<String, Object> map : data) {
if (db == null) { // Object db = map.get("experimentId");
continue; // if (db == null) {
} // continue;
Experiment experiment = experimentService.getById(db.toString()); // }
if (experiment == null) { // Experiment experiment = experimentService.getById(db.toString());
continue; // if (experiment == null) {
} // continue;
map.put("experimentName", experiment.getName()); // }
map.put("experimentNo", experiment.getExperimentNo()); // map.put("experimentName", experiment.getName());
} // map.put("experimentNo", experiment.getExperimentNo());
} // }
} // }
//}