From 7a838ed69de1d9593fe6b37f9b5caafb5f8d0cbf Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 10 三月 2025 14:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 202 insertions(+), 0 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
new file mode 100644
index 0000000..015621a
--- /dev/null
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
@@ -0,0 +1,202 @@
+package com.ruoyi.personnel.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.dto.DepartmentDto;
+import com.ruoyi.common.core.dto.UserPageDto;
+import com.ruoyi.common.utils.FileSaveUtil;
+import com.ruoyi.common.utils.JackSonUtil;
+import com.ruoyi.personnel.dto.PersonBasicInfoDetailsDto;
+import com.ruoyi.personnel.dto.PersonBasicInfoDto;
+import com.ruoyi.personnel.pojo.Annex;
+import com.ruoyi.personnel.service.AnnexService;
+import com.ruoyi.personnel.service.PersonBasicInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-08-30 09:19:57
+ */
+@Api(tags = "浜哄憳-浜哄憳鍩烘湰淇℃伅")
+@RestController
+@RequestMapping("/personBasicInfo")
+public class PersonBasicInfoController {
+
+ @Resource
+ private PersonBasicInfoService personBasicInfoService;
+
+ @Resource
+ private AnnexService annexService;
+
+ @ApiOperation(value = "鏌ヨCNAS浜哄憳渚ц竟鏍�")
+ @GetMapping("/selectCNSAPersonTree")
+ public Result<List<DepartmentDto>> selectCNSAPersonTree() {
+ return Result.success(personBasicInfoService.selectCNSAPersonTree());
+ }
+
+ @ApiOperation(value = "鑾峰彇CNAS浜哄憳鍩烘湰淇℃伅")
+ @GetMapping("/getCNASPersonnelInfo")
+ public Result getCNASPersonnelInfo(Integer userId) {
+ return Result.success(personBasicInfoService.getCNASPersonnelInfo(userId));
+ }
+
+ @ApiOperation(value = "淇濆瓨CNAS浜哄憳鍩烘湰淇℃伅")
+ @PostMapping("/saveCNASPersonnelInfo")
+ public Result saveCNASPersonnelInfo(@RequestBody PersonBasicInfoDto personBasicInfoDto) {
+ personBasicInfoService.saveCNASPersonnelInfo(personBasicInfoDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
+ @GetMapping("basicInformationOfPersonnelSelectPage")
+ public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
+ return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
+ }
+
+ // 涓婁紶鏂囦欢鎺ュ彛
+ @ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
+ @PostMapping("/saveCNASFile")
+ public Result saveFile(@RequestPart("file") MultipartFile file) {
+ String s = FileSaveUtil.uploadWordFile(file);
+ return Result.success(s);
+ }
+
+ /**
+ * 璁惧鏍″噯 闄勪欢涓婁紶
+ * @param file
+ * @param suffix
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鏍″噯 涓婁紶鏂囦欢鎺ュ彛")
+ @PostMapping("/saveDeviceCalibrationFile")
+ public Result saveDeviceCalibrationFile(@RequestParam("file") MultipartFile file,@RequestParam("suffix")String suffix,@RequestParam("id") Integer id) {
+ personBasicInfoService.saveDeviceCalibrationFile(file,suffix,id);
+ return Result.success();
+ }
+
+ /**
+ * 鏌ョ湅璁惧鏍″噯闄勪欢
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鏍″噯 闄勪欢鏌ョ湅")
+ @GetMapping("/getDeviceCalibrationFile")
+ public Result getDeviceCalibrationFile(Integer id) {
+ return Result.success(personBasicInfoService.getDeviceCalibrationFile(id));
+ }
+
+ /**
+ * 鍒犻櫎璁惧鏍″噯闄勪欢
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鏍″噯 闄勪欢鍒犻櫎")
+ @DeleteMapping("/delDeviceCalibrationFile")
+ public Result delDeviceCalibrationFile(Integer id) {
+ personBasicInfoService.delDeviceCalibrationFile(id);
+ return Result.success();
+ }
+
+ /**
+ * 涓嬭浇璁惧鏍￠獙闄勪欢涓嬭浇
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鏍￠獙闄勪欢涓嬭浇")
+ @GetMapping("/downLoadDeviceCalibrationFile")
+ public Result downLoadDeviceCalibrationFile(Integer id,HttpServletResponse response) {
+ personBasicInfoService.downLoadDeviceCalibrationFile(id,response);
+ return Result.success();
+ }
+
+
+ @GetMapping("/getAnnexByUserId")
+ public Result<List<Annex>> getAnnexByUserId(Integer userId) {
+ List<Annex> list = annexService.list(new LambdaQueryWrapper<Annex>().eq(Annex::getUserId, userId));
+ return Result.success(list);
+ }
+
+ // 鍒犻櫎鏂囦欢
+ @DeleteMapping("/deleteCNASFile")
+ public Result saveFile(String fileName) {
+ String[] split = fileName.split(",");
+ for (String s : split) {
+ FileSaveUtil.DeleteFile(s);
+ }
+ return Result.success();
+
+ }
+
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢鏂板
+ */
+ @PostMapping("/addAnnex")
+ public Result addAnnex(@RequestBody Annex annex) {
+ annexService.save(annex);
+ return Result.success();
+ }
+
+ @GetMapping("/getAnnex")
+ public Result<Annex> getAnnex(Integer id) {
+ return Result.success(annexService.getById(id));
+ }
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
+ */
+ @DeleteMapping("/deleteAnnex/{id}")
+ public Result deleteAnnex(@PathVariable("id") Integer id) {
+ annexService.removeById(id);
+ return Result.success();
+ }
+
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢淇敼
+ *
+ */
+ @PostMapping("/updateAnnex")
+ public Result updateAnnex(@RequestBody Annex annex) {
+ annexService.updateById(annex);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "瀵煎嚭浜哄憳鍩烘湰淇℃伅")
+ @GetMapping("/exportPersonBasicInfo")
+ public void exportPersonBasicInfo(UserPageDto userPageDto, HttpServletResponse response) throws Exception {
+ personBasicInfoService.exportPersonBasicInfo(userPageDto,response);
+ }
+
+ @ApiOperation(value = "涓嬭浇浜哄憳妗ｆ鍗�")
+ @GetMapping("/exportPersonBasicInfoById")
+ public Result exportPersonBasicInfoById(Integer id, HttpServletResponse response) {
+ return Result.success(personBasicInfoService.exportPersonBasicInfoById(id,response));
+ }
+
+ @GetMapping("/getEmployees")
+ @ApiOperation(value = "瀵规帴浜哄憳骞冲彴 鑾峰彇鎵�鏈変汉鍛樹俊鎭�")
+ public Result getEmployees(Integer departId) {
+ personBasicInfoService.getEmployees(departId);
+ return Result.success();
+ }
+
+ @GetMapping("/getEmployee")
+ @ApiOperation(value = "瀵规帴浜哄憳骞冲彴 鏍规嵁宸ュ彿鑾峰彇浜哄憳淇℃伅")
+ public Result getEmployee(Integer userId) {
+ personBasicInfoService.getEmployee(userId);
+ return Result.success();
+ }
+}
--
Gitblit v1.9.3