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-12-24 16:35:09 +08:00
parent d3b5631c9e
commit 39ca9def31
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
*/
@AutoLog(value = "试验文件-添加")
@Operation(summary = "试验文件-添加")
@RequiresPermissions("database:experiment_file:add")
@RequiresPermissions("database:experiment:edit")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentFile experimentFile) {
experimentFileService.save(experimentFile);
@@ -91,7 +91,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
*/
@AutoLog(value = "试验文件-编辑")
@Operation(summary = "试验文件-编辑")
@RequiresPermissions("database:experiment_file:edit")
@RequiresPermissions("database:experiment:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentFile experimentFile) {
experimentFileService.updateById(experimentFile);
@@ -106,7 +106,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
*/
@AutoLog(value = "试验文件-通过id删除")
@Operation(summary = "试验文件-通过id删除")
@RequiresPermissions("database:experiment_file:delete")
@RequiresPermissions("database:experiment:edit")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
experimentFileService.removeById(id);
@@ -121,7 +121,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
*/
@AutoLog(value = "试验文件-批量删除")
@Operation(summary = "试验文件-批量删除")
@RequiresPermissions("database:experiment_file:deleteBatch")
@RequiresPermissions("database:experiment:edit")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.experimentFileService.removeByIds(Arrays.asList(ids.split(",")));
@@ -151,7 +151,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
* @param request
* @param experimentFile
*/
@RequiresPermissions("database:experiment_file:exportXls")
@RequiresPermissions("database:experiment:edit")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentFile experimentFile) {
return super.exportXls(request, experimentFile, ExperimentFile.class, "试验文件");
@@ -164,7 +164,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
* @param response
* @return
*/
@RequiresPermissions("database:experiment_file:importExcel")
@RequiresPermissions("database:experiment:edit")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentFile.class);

10
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentRatingUserDTO.java
View File

@@ -26,25 +26,25 @@ public class ExperimentRatingUserDTO {
* 总分数
*/
@Schema(description = "总分数")
private Integer totalScore;
private String totalScore;
/**
* 基础分
*/
@Schema(description = "基础分")
private Integer baseScore;
private String baseScore;
/**
* 完成分
*/
@Schema(description = "完成分")
private Integer completionScore;
private String completionScore;
/**
* 难度分
*/
@Schema(description = "难度分")
private Integer difficultyScore;
private String difficultyScore;
/**
* 管理支撑分
*/
@Schema(description = "管理支撑分")
private Integer managementScore;
private String managementScore;
}

10
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRating.java
View File

@@ -80,31 +80,31 @@ public class ExperimentRating implements Serializable {
*/
@Excel(name = "总分数", width = 15)
@Schema(description = "总分数")
private Integer totalScore;
private String totalScore;
/**
* 基础分
*/
@Excel(name = "基础分", width = 15)
@Schema(description = "基础分")
private Integer baseScore;
private String baseScore;
/**
* 完成分
*/
@Excel(name = "完成分", width = 15)
@Schema(description = "完成分")
private Integer completionScore;
private String completionScore;
/**
* 难度分
*/
@Excel(name = "难度分", width = 15)
@Schema(description = "难度分")
private Integer difficultyScore;
private String difficultyScore;
/**
* 管理支撑分
*/
@Excel(name = "管理支撑分", width = 15)
@Schema(description = "管理支撑分")
private Integer managementScore;
private String managementScore;
@TableField(exist = false)
private String experimentName;