diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index ceb51ef..ed53e1c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -1,161 +1,168 @@ package org.jeecg.modules.database.controller; -import java.util.Arrays; -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.Experiment; -import org.jeecg.modules.database.service.IExperimentService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.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.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.common.system.util.JwtUtil; +import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.database.entity.ExperimentLog; +import org.jeecg.modules.database.service.IExperimentLogService; +import org.jeecg.modules.database.service.IExperimentService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; - /** +import java.util.Arrays; + +/** * @Description: 试验管理 * @Author: jeecg-boot - * @Date: 2024-08-30 + * @Date: 2024-08-30 * @Version: V1.0 */ -@Tag(name="试验管理") +@Tag(name = "试验管理") @RestController @RequestMapping("/database/experiment") @Slf4j public class ExperimentController extends JeecgController { - @Autowired - private IExperimentService experimentService; - - /** - * 分页列表查询 - * - * @param experiment - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "试验管理-分页列表查询") - @Operation(summary="试验管理-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(Experiment experiment, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param experiment - * @return - */ - @AutoLog(value = "试验管理-添加") - @Operation(summary="试验管理-添加") - @RequiresPermissions("database:experiment:add") - @PostMapping(value = "/add") - public Result add(@RequestBody Experiment experiment) { - experimentService.save(experiment); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param experiment - * @return - */ - @AutoLog(value = "试验管理-编辑") - @Operation(summary="试验管理-编辑") - @RequiresPermissions("database:experiment:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody Experiment experiment) { - experimentService.updateById(experiment); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "试验管理-通过id删除") - @Operation(summary="试验管理-通过id删除") - @RequiresPermissions("database:experiment:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - experimentService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "试验管理-批量删除") - @Operation(summary="试验管理-批量删除") - @RequiresPermissions("database:experiment:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.experimentService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "试验管理-通过id查询") - @Operation(summary="试验管理-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Experiment experiment = experimentService.getById(id); - if(experiment==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experiment); - } + @Autowired + private IExperimentService experimentService; + @Autowired + private IExperimentLogService experimentLogService; + @Autowired + private ISysUserService userService; /** - * 导出excel - * - * @param request - * @param experiment - */ + * 分页列表查询 + * + * @param experiment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验管理-分页列表查询") + @Operation(summary = "试验管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Experiment experiment, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experiment + * @return + */ + @AutoLog(value = "试验管理-添加") + @Operation(summary = "试验管理-添加") + @RequiresPermissions("database:experiment:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Experiment experiment, HttpServletRequest request) { + experimentService.save(experiment); + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experiment.getId()); + experimentLog.setLogContent("新建实验"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experiment + * @return + */ + @AutoLog(value = "试验管理-编辑") + @Operation(summary = "试验管理-编辑") + @RequiresPermissions("database:experiment:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody Experiment experiment, HttpServletRequest request) { + experimentService.updateById(experiment); + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experiment.getId()); + experimentLog.setLogContent("修改实验信息"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验管理-通过id删除") + @Operation(summary = "试验管理-通过id删除") + @RequiresPermissions("database:experiment:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + experimentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验管理-批量删除") + @Operation(summary = "试验管理-批量删除") + @RequiresPermissions("database:experiment:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.experimentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "试验管理-通过id查询") + @Operation(summary = "试验管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Experiment experiment = experimentService.getById(id); + if (experiment == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experiment); + } + + /** + * 导出excel + * + * @param request + * @param experiment + */ @RequiresPermissions("database:experiment:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, Experiment experiment) { @@ -163,12 +170,12 @@ public class ExperimentController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java index 0293043..f52bdaf 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java @@ -1,161 +1,182 @@ package org.jeecg.modules.database.controller; -import java.util.Arrays; -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.ExperimentRadiationProcess; -import org.jeecg.modules.database.service.IExperimentRadiationProcessService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.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.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.common.system.util.JwtUtil; +import org.jeecg.modules.database.entity.ExperimentLog; +import org.jeecg.modules.database.entity.ExperimentRadiationProcess; +import org.jeecg.modules.database.service.IExperimentLogService; +import org.jeecg.modules.database.service.IExperimentRadiationProcessService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; - /** +import java.util.Arrays; + +/** * @Description: 辐照过程 * @Author: jeecg-boot - * @Date: 2024-10-15 + * @Date: 2024-10-15 * @Version: V1.0 */ -@Tag(name="辐照过程") +@Tag(name = "辐照过程") @RestController @RequestMapping("/database/experimentRadiationProcess") @Slf4j public class ExperimentRadiationProcessController extends JeecgController { - @Autowired - private IExperimentRadiationProcessService experimentRadiationProcessService; - - /** - * 分页列表查询 - * - * @param experimentRadiationProcess - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "辐照过程-分页列表查询") - @Operation(summary="辐照过程-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentRadiationProcess experimentRadiationProcess, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentRadiationProcessService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param experimentRadiationProcess - * @return - */ - @AutoLog(value = "辐照过程-添加") - @Operation(summary="辐照过程-添加") - @RequiresPermissions("database:experiment_radiation_process:add") - @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentRadiationProcess experimentRadiationProcess) { - experimentRadiationProcessService.save(experimentRadiationProcess); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param experimentRadiationProcess - * @return - */ - @AutoLog(value = "辐照过程-编辑") - @Operation(summary="辐照过程-编辑") - @RequiresPermissions("database:experiment_radiation_process:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ExperimentRadiationProcess experimentRadiationProcess) { - experimentRadiationProcessService.updateById(experimentRadiationProcess); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "辐照过程-通过id删除") - @Operation(summary="辐照过程-通过id删除") - @RequiresPermissions("database:experiment_radiation_process:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - experimentRadiationProcessService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "辐照过程-批量删除") - @Operation(summary="辐照过程-批量删除") - @RequiresPermissions("database:experiment_radiation_process:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.experimentRadiationProcessService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "辐照过程-通过id查询") - @Operation(summary="辐照过程-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getById(id); - if(experimentRadiationProcess==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentRadiationProcess); - } + @Autowired + private IExperimentRadiationProcessService experimentRadiationProcessService; + + @Autowired + private IExperimentLogService experimentLogService; + @Autowired + private ISysUserService userService; /** - * 导出excel - * - * @param request - * @param experimentRadiationProcess - */ + * 分页列表查询 + * + * @param experimentRadiationProcess + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "辐照过程-分页列表查询") + @Operation(summary = "辐照过程-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentRadiationProcess experimentRadiationProcess, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentRadiationProcessService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentRadiationProcess + * @return + */ + @AutoLog(value = "辐照过程-添加") + @Operation(summary = "辐照过程-添加") + @RequiresPermissions("database:experiment_radiation_process:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentRadiationProcess experimentRadiationProcess, HttpServletRequest request) { + experimentRadiationProcessService.save(experimentRadiationProcess); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experimentRadiationProcess.getExperimentId()); + experimentLog.setLogContent("添加辐照过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentRadiationProcess + * @return + */ + @AutoLog(value = "辐照过程-编辑") + @Operation(summary = "辐照过程-编辑") + @RequiresPermissions("database:experiment_radiation_process:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ExperimentRadiationProcess experimentRadiationProcess, HttpServletRequest request) { + experimentRadiationProcessService.updateById(experimentRadiationProcess); + ExperimentRadiationProcess byId = experimentRadiationProcessService.getById(experimentRadiationProcess.getId()); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(byId.getExperimentId()); + experimentLog.setLogContent("添加辐照过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "辐照过程-通过id删除") + @Operation(summary = "辐照过程-通过id删除") + @RequiresPermissions("database:experiment_radiation_process:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) { + experimentRadiationProcessService.removeById(id); + ExperimentRadiationProcess byId = experimentRadiationProcessService.getById(id); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(byId.getExperimentId()); + experimentLog.setLogContent("删除辐照过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "辐照过程-批量删除") + @Operation(summary = "辐照过程-批量删除") + @RequiresPermissions("database:experiment_radiation_process:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.experimentRadiationProcessService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "辐照过程-通过id查询") + @Operation(summary = "辐照过程-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getById(id); + if (experimentRadiationProcess == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentRadiationProcess); + } + + /** + * 导出excel + * + * @param request + * @param experimentRadiationProcess + */ @RequiresPermissions("database:experiment_radiation_process:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ExperimentRadiationProcess experimentRadiationProcess) { @@ -163,12 +184,12 @@ public class ExperimentRadiationProcessController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java index 5994965..418401a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java @@ -1,161 +1,179 @@ package org.jeecg.modules.database.controller; -import java.util.Arrays; -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.ExperimentTestProcess; -import org.jeecg.modules.database.service.IExperimentTestProcessService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.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.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.common.system.util.JwtUtil; +import org.jeecg.modules.database.entity.ExperimentLog; +import org.jeecg.modules.database.entity.ExperimentTestProcess; +import org.jeecg.modules.database.service.IExperimentLogService; +import org.jeecg.modules.database.service.IExperimentTestProcessService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; - /** +import java.util.Arrays; + +/** * @Description: 测试过程 * @Author: jeecg-boot - * @Date: 2024-10-15 + * @Date: 2024-10-15 * @Version: V1.0 */ -@Tag(name="测试过程") +@Tag(name = "测试过程") @RestController @RequestMapping("/database/experimentTestProcess") @Slf4j public class ExperimentTestProcessController extends JeecgController { - @Autowired - private IExperimentTestProcessService experimentTestProcessService; - - /** - * 分页列表查询 - * - * @param experimentTestProcess - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "测试过程-分页列表查询") - @Operation(summary="测试过程-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentTestProcess experimentTestProcess, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentTestProcess, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentTestProcessService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param experimentTestProcess - * @return - */ - @AutoLog(value = "测试过程-添加") - @Operation(summary="测试过程-添加") - @RequiresPermissions("database:experiment_test_process:add") - @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentTestProcess experimentTestProcess) { - experimentTestProcessService.save(experimentTestProcess); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param experimentTestProcess - * @return - */ - @AutoLog(value = "测试过程-编辑") - @Operation(summary="测试过程-编辑") - @RequiresPermissions("database:experiment_test_process:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ExperimentTestProcess experimentTestProcess) { - experimentTestProcessService.updateById(experimentTestProcess); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "测试过程-通过id删除") - @Operation(summary="测试过程-通过id删除") - @RequiresPermissions("database:experiment_test_process:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - experimentTestProcessService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "测试过程-批量删除") - @Operation(summary="测试过程-批量删除") - @RequiresPermissions("database:experiment_test_process:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.experimentTestProcessService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "测试过程-通过id查询") - @Operation(summary="测试过程-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getById(id); - if(experimentTestProcess==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentTestProcess); - } + @Autowired + private IExperimentTestProcessService experimentTestProcessService; + + @Autowired + private IExperimentLogService experimentLogService; + @Autowired + private ISysUserService userService; /** - * 导出excel - * - * @param request - * @param experimentTestProcess - */ + * 分页列表查询 + * + * @param experimentTestProcess + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "测试过程-分页列表查询") + @Operation(summary = "测试过程-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentTestProcess experimentTestProcess, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentTestProcess, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentTestProcessService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentTestProcess + * @return + */ + @AutoLog(value = "测试过程-添加") + @Operation(summary = "测试过程-添加") + @RequiresPermissions("database:experiment_test_process:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentTestProcess experimentTestProcess, HttpServletRequest request) { + experimentTestProcessService.save(experimentTestProcess); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experimentTestProcess.getExperimentId()); + experimentLog.setLogContent("添加测试过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentTestProcess + * @return + */ + @AutoLog(value = "测试过程-编辑") + @Operation(summary = "测试过程-编辑") + @RequiresPermissions("database:experiment_test_process:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ExperimentTestProcess experimentTestProcess, HttpServletRequest request) { + experimentTestProcessService.updateById(experimentTestProcess); + ExperimentTestProcess byId = experimentTestProcessService.getById(experimentTestProcess.getId()); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(byId.getExperimentId()); + experimentLog.setLogContent("编辑测试过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "测试过程-通过id删除") + @Operation(summary = "测试过程-通过id删除") + @RequiresPermissions("database:experiment_test_process:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) { + experimentTestProcessService.removeById(id); + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(id); + experimentLog.setLogContent("删除测试过程"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "测试过程-批量删除") + @Operation(summary = "测试过程-批量删除") + @RequiresPermissions("database:experiment_test_process:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.experimentTestProcessService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "测试过程-通过id查询") + @Operation(summary = "测试过程-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getById(id); + if (experimentTestProcess == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentTestProcess); + } + + /** + * 导出excel + * + * @param request + * @param experimentTestProcess + */ @RequiresPermissions("database:experiment_test_process:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ExperimentTestProcess experimentTestProcess) { @@ -163,12 +181,12 @@ public class ExperimentTestProcessController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java index 2f3f5de..5769592 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java @@ -1,161 +1,179 @@ package org.jeecg.modules.database.controller; -import java.util.Arrays; -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.ExperimentUser; -import org.jeecg.modules.database.service.IExperimentUserService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.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.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.common.system.util.JwtUtil; +import org.jeecg.modules.database.entity.ExperimentLog; +import org.jeecg.modules.database.entity.ExperimentUser; +import org.jeecg.modules.database.service.IExperimentLogService; +import org.jeecg.modules.database.service.IExperimentUserService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; - /** +import java.util.Arrays; + +/** * @Description: 试验人员 * @Author: jeecg-boot - * @Date: 2024-08-30 + * @Date: 2024-08-30 * @Version: V1.0 */ -@Tag(name="试验人员") +@Tag(name = "试验人员") @RestController @RequestMapping("/database/experimentUser") @Slf4j public class ExperimentUserController extends JeecgController { - @Autowired - private IExperimentUserService experimentUserService; - - /** - * 分页列表查询 - * - * @param experimentUser - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "试验人员-分页列表查询") - @Operation(summary="试验人员-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentUser experimentUser, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentUser, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentUserService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param experimentUser - * @return - */ - @AutoLog(value = "试验人员-添加") - @Operation(summary="试验人员-添加") - @RequiresPermissions("database:experiment_user:add") - @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentUser experimentUser) { - experimentUserService.save(experimentUser); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param experimentUser - * @return - */ - @AutoLog(value = "试验人员-编辑") - @Operation(summary="试验人员-编辑") - @RequiresPermissions("database:experiment_user:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ExperimentUser experimentUser) { - experimentUserService.updateById(experimentUser); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "试验人员-通过id删除") - @Operation(summary="试验人员-通过id删除") - @RequiresPermissions("database:experiment_user:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - experimentUserService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "试验人员-批量删除") - @Operation(summary="试验人员-批量删除") - @RequiresPermissions("database:experiment_user:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.experimentUserService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "试验人员-通过id查询") - @Operation(summary="试验人员-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ExperimentUser experimentUser = experimentUserService.getById(id); - if(experimentUser==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentUser); - } + @Autowired + private IExperimentUserService experimentUserService; + + @Autowired + private IExperimentLogService experimentLogService; + @Autowired + private ISysUserService userService; /** - * 导出excel - * - * @param request - * @param experimentUser - */ + * 分页列表查询 + * + * @param experimentUser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验人员-分页列表查询") + @Operation(summary = "试验人员-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentUser experimentUser, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentUser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = experimentUserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param experimentUser + * @return + */ + @AutoLog(value = "试验人员-添加") + @Operation(summary = "试验人员-添加") + @RequiresPermissions("database:experiment_user:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ExperimentUser experimentUser, HttpServletRequest request) { + experimentUserService.save(experimentUser); + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experimentUser.getExperimentId()); + experimentLog.setLogContent("添加试验人员"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param experimentUser + * @return + */ + @AutoLog(value = "试验人员-编辑") + @Operation(summary = "试验人员-编辑") + @RequiresPermissions("database:experiment_user:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ExperimentUser experimentUser, HttpServletRequest request) { + experimentUserService.updateById(experimentUser); + ExperimentUser byId = experimentUserService.getById(experimentUser.getId()); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(byId.getExperimentId()); + experimentLog.setLogContent("编辑试验人员"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试验人员-通过id删除") + @Operation(summary = "试验人员-通过id删除") + @RequiresPermissions("database:experiment_user:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) { + experimentUserService.removeById(id); + + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(id); + experimentLog.setLogContent("删除试验人员"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试验人员-批量删除") + @Operation(summary = "试验人员-批量删除") + @RequiresPermissions("database:experiment_user:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.experimentUserService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "试验人员-通过id查询") + @Operation(summary = "试验人员-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ExperimentUser experimentUser = experimentUserService.getById(id); + if (experimentUser == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(experimentUser); + } + + /** + * 导出excel + * + * @param request + * @param experimentUser + */ @RequiresPermissions("database:experiment_user:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ExperimentUser experimentUser) { @@ -163,12 +181,12 @@ public class ExperimentUserController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) {