QHSE证书人员

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java

@@ -48,7 +48,9 @@ public class FileController {
         MultipartFile file = uploadReqVO.getFile();
         long size = file.getSize();
         String path = uploadReqVO.getPath();
-        return success(ImmutableMap.of("path",fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())),"size",size));
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String format = ZonedDateTime.now().format(formatter);
+        return success(ImmutableMap.of("path",fileService.createFile(format + file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())),"size",size));
     }
 
     @PostMapping("/upload/path")
@@ -56,7 +58,9 @@ public class FileController {
     public CommonResult<String> uploadFilePath(FileUploadReqVO uploadReqVO) throws Exception {
         MultipartFile file = uploadReqVO.getFile();
         String path = uploadReqVO.getPath();
-        return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String format = ZonedDateTime.now().format(formatter);
+        return success(fileService.createFile(format + file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
     }
 
     @PostMapping("/upload/qhse/path")
@@ -69,6 +73,11 @@ public class FileController {
         return success(fileService.createFile(format + file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
     }
 
+    public static void main(String[] args) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
+        String format = ZonedDateTime.now().format(formatter);
+        System.out.println(format);
+    }
     @GetMapping("/presigned-url")
     @Operation(summary = "获取文件预签名地址", description = "模式二：前端上传文件：用于前端直接上传七牛、阿里云 OSS 等文件存储器")
     public CommonResult<FilePresignedUrlRespVO> getFilePresignedUrl(@RequestParam("path") String path) throws Exception {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/QhseCertPersonController.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
+import cn.iocoder.yudao.module.pms.service.qhse.cert.QhseCertPersonService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - QHSE-证书人员")
+@RestController
+@RequestMapping("/rq/qhse-cert-person")
+@Validated
+public class QhseCertPersonController {
+
+    @Resource
+    private QhseCertPersonService qhseCertPersonService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建QHSE-证书人员")
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:create')")
+    public CommonResult<Long> createQhseCertPerson(@Valid @RequestBody QhseCertPersonSaveReqVO createReqVO) {
+        return success(qhseCertPersonService.createQhseCertPerson(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新QHSE-证书人员")
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:update')")
+    public CommonResult<Boolean> updateQhseCertPerson(@Valid @RequestBody QhseCertPersonSaveReqVO updateReqVO) {
+        qhseCertPersonService.updateQhseCertPerson(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除QHSE-证书人员")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:delete')")
+    public CommonResult<Boolean> deleteQhseCertPerson(@RequestParam("id") Long id) {
+        qhseCertPersonService.deleteQhseCertPerson(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得QHSE-证书人员")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:query')")
+    public CommonResult<QhseCertPersonRespVO> getQhseCertPerson(@RequestParam("id") Long id) {
+        QhseCertPersonDO qhseCertPerson = qhseCertPersonService.getQhseCertPerson(id);
+        return success(BeanUtils.toBean(qhseCertPerson, QhseCertPersonRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得QHSE-证书人员分页")
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:query')")
+    public CommonResult<PageResult<QhseCertPersonRespVO>> getQhseCertPersonPage(@Valid QhseCertPersonPageReqVO pageReqVO) {
+        PageResult<QhseCertPersonDO> pageResult = qhseCertPersonService.getQhseCertPersonPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, QhseCertPersonRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出QHSE-证书人员 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:qhse-cert-person:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportQhseCertPersonExcel(@Valid QhseCertPersonPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<QhseCertPersonDO> list = qhseCertPersonService.getQhseCertPersonPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "QHSE-证书人员.xls", "数据", QhseCertPersonRespVO.class,
+                        BeanUtils.toBean(list, QhseCertPersonRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/QhseCertPersonPageReqVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - QHSE-证书人员分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class QhseCertPersonPageReqVO extends PageParam {
+
+    @Schema(description = "部门id", example = "30654")
+    private Long deptId;
+
+    @Schema(description = "人员名称", example = "芋艿")
+    private String username;
+
+    @Schema(description = "人员姓名", example = "赵六")
+    private String nickname;
+
+    @Schema(description = "岗位名称", example = "赵六")
+    private String postName;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门名称", example = "张三")
+    private String deptName;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/QhseCertPersonRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - QHSE-证书人员 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class QhseCertPersonRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13087")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "部门id", example = "30654")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "人员名称", example = "芋艿")
+    @ExcelProperty("人员名称")
+    private String username;
+
+    @Schema(description = "人员姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("人员姓名")
+    private String nickname;
+
+    @Schema(description = "岗位名称", example = "赵六")
+    @ExcelProperty("岗位名称")
+    private String postName;
+
+    @Schema(description = "手机号")
+    @ExcelProperty("手机号")
+    private String mobile;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门名称", example = "张三")
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/QhseCertPersonSaveReqVO.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - QHSE-证书人员新增/修改 Request VO")
+@Data
+public class QhseCertPersonSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13087")
+    private Long id;
+
+    @Schema(description = "部门id", example = "30654")
+    private Long deptId;
+
+    @Schema(description = "人员名称", example = "芋艿")
+    private String username;
+
+    @Schema(description = "人员姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "人员姓名不能为空")
+    private String nickname;
+
+    @Schema(description = "岗位名称", example = "赵六")
+    private String postName;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "部门名称", example = "张三")
+    private String deptName;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/cert/QhseCertPersonDO.java

@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * QHSE-证书人员 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_qhse_cert_person")
+@KeySequence("rq_qhse_cert_person_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class QhseCertPersonDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 人员名称
+     */
+    private String username;
+    /**
+     * 人员姓名
+     */
+    private String nickname;
+    /**
+     * 岗位名称
+     */
+    private String postName;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/cert/QhseCertPersonMapper.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.qhse.cert;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * QHSE-证书人员 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface QhseCertPersonMapper extends BaseMapperX<QhseCertPersonDO> {
+
+    default PageResult<QhseCertPersonDO> selectPage(QhseCertPersonPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<QhseCertPersonDO>()
+                .eqIfPresent(QhseCertPersonDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(QhseCertPersonDO::getUsername, reqVO.getUsername())
+                .likeIfPresent(QhseCertPersonDO::getNickname, reqVO.getNickname())
+                .likeIfPresent(QhseCertPersonDO::getPostName, reqVO.getPostName())
+                .eqIfPresent(QhseCertPersonDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(QhseCertPersonDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(QhseCertPersonDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(QhseCertPersonDO::getDeptName, reqVO.getDeptName())
+                .orderByDesc(QhseCertPersonDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/QhseCertPersonService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.qhse.cert;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
+
+import javax.validation.Valid;
+
+/**
+ * QHSE-证书人员 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface QhseCertPersonService {
+
+    /**
+     * 创建QHSE-证书人员
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createQhseCertPerson(@Valid QhseCertPersonSaveReqVO createReqVO);
+
+    /**
+     * 更新QHSE-证书人员
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateQhseCertPerson(@Valid QhseCertPersonSaveReqVO updateReqVO);
+
+    /**
+     * 删除QHSE-证书人员
+     *
+     * @param id 编号
+     */
+    void deleteQhseCertPerson(Long id);
+
+    /**
+     * 获得QHSE-证书人员
+     *
+     * @param id 编号
+     * @return QHSE-证书人员
+     */
+    QhseCertPersonDO getQhseCertPerson(Long id);
+
+    /**
+     * 获得QHSE-证书人员分页
+     *
+     * @param pageReqVO 分页查询
+     * @return QHSE-证书人员分页
+     */
+    PageResult<QhseCertPersonDO> getQhseCertPersonPage(QhseCertPersonPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/QhseCertPersonServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.pms.service.qhse.cert;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.cert.QhseCertPersonMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * QHSE-证书人员 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class QhseCertPersonServiceImpl implements QhseCertPersonService {
+
+    @Resource
+    private QhseCertPersonMapper qhseCertPersonMapper;
+
+    @Override
+    public Long createQhseCertPerson(QhseCertPersonSaveReqVO createReqVO) {
+        // 插入
+        QhseCertPersonDO qhseCertPerson = BeanUtils.toBean(createReqVO, QhseCertPersonDO.class);
+        qhseCertPerson.setDeleted(false);
+        qhseCertPersonMapper.insert(qhseCertPerson);
+        // 返回
+        return qhseCertPerson.getId();
+    }
+
+    @Override
+    public void updateQhseCertPerson(QhseCertPersonSaveReqVO updateReqVO) {
+        // 校验存在
+        validateQhseCertPersonExists(updateReqVO.getId());
+        // 更新
+        QhseCertPersonDO updateObj = BeanUtils.toBean(updateReqVO, QhseCertPersonDO.class);
+        qhseCertPersonMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteQhseCertPerson(Long id) {
+        // 校验存在
+        validateQhseCertPersonExists(id);
+        // 删除
+        qhseCertPersonMapper.deleteById(id);
+    }
+
+    private void validateQhseCertPersonExists(Long id) {
+        if (qhseCertPersonMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(3,"不存在"));
+        }
+    }
+
+    @Override
+    public QhseCertPersonDO getQhseCertPerson(Long id) {
+        return qhseCertPersonMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<QhseCertPersonDO> getQhseCertPersonPage(QhseCertPersonPageReqVO pageReqVO) {
+        return qhseCertPersonMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/jsa/QhseJsaServiceImpl.java

@@ -54,7 +54,12 @@ public class QhseJsaServiceImpl implements QhseJsaService {
         // 插入
         QhseJsaDO qhseJsa = BeanUtils.toBean(createReqVO, QhseJsaDO.class);
         qhseJsa.setDeleted(false);
-        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long loginUserDeptId;
+        if (createReqVO.getDeptId() != null) {
+            loginUserDeptId = createReqVO.getDeptId();
+        }else {
+            loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        }
         if (Objects.nonNull(loginUserDeptId)) {
             DeptRespDTO dept = deptApi.getDept(loginUserDeptId);
             if (Objects.nonNull(dept)) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/ptw/QhsePtwServiceImpl.java

@@ -49,7 +49,12 @@ public class QhsePtwServiceImpl implements QhsePtwService {
         QhsePtwDO qhsePtw = BeanUtils.toBean(createReqVO, QhsePtwDO.class);
         qhsePtw.setDeleted(false);
 
-        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long loginUserDeptId;
+        if (createReqVO.getDeptId() != null) {
+            loginUserDeptId = createReqVO.getDeptId();
+        }else {
+            loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        }
         if (Objects.nonNull(loginUserDeptId)) {
             DeptRespDTO dept = deptApi.getDept(loginUserDeptId);
             if (Objects.nonNull(dept)) {