From ff361322dc19350e81cf26ae4e6c542ad0f934d1 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:41:54 +0800
Subject: [PATCH] 证书推送
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/IdentificationRecord.java | 41 ++++++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/IdentificationRecordController.java | 63 ++++++++++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/IdentificationRecordQuery.java | 25 +++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/IdentificationRecordServiceImpl.java | 36 +++++++
exam-system/src/main/resources/mapper/noncoalmine/NcStaffMapper.xml | 2
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/IdentificationRecordService.java | 22 ++++
exam-system/src/main/resources/mapper/noncoalmine/IdentificationRecordMapper.xml | 31 ++++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/IdentificationRecordAddForm.java | 40 ++++++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/IdentificationRecordMapper.java | 21 ++++
ruoyi-admin/src/main/resources/application-dev.yml | 6
10 files changed, 283 insertions(+), 4 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/IdentificationRecordController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/IdentificationRecordController.java
new file mode 100644
index 0000000..222bb5a
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/IdentificationRecordController.java
@@ -0,0 +1,63 @@
+package com.gkhy.exam.noncoalmine.controller;
+
+import com.gkhy.exam.noncoalmine.entity.IdentificationRecord;
+import com.gkhy.exam.noncoalmine.model.addForm.IdentificationRecordAddForm;
+import com.gkhy.exam.noncoalmine.model.query.IdentificationRecordQuery;
+import com.gkhy.exam.noncoalmine.model.query.NcCertQuery;
+import com.gkhy.exam.noncoalmine.service.IdentificationRecordService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 13:51
+ */
+@Api(tags = "证书接口")
+@RequestMapping("/identity/record")
+@RestController
+public class IdentificationRecordController extends BaseController {
+ @Autowired
+ private IdentificationRecordService recordService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param query 查询实体
+ * @return 所有数据
+ */
+ @GetMapping("page/list")
+ @ApiOperation(value = "分页查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "pageNum", dataTypeClass = String.class,value = "页码",required = true),
+ @ApiImplicitParam(name = "pageSize", dataTypeClass = String.class,value = "页数",required = true),
+ })
+ public TableDataInfo listByPage(IdentificationRecordQuery query) {
+ startPage();
+ return getDataTable(this.recordService.getList(query));
+ }
+ /**
+ * 新增
+ *
+ * @param addForm 实体
+ * @return 所有数据
+ */
+ @PostMapping("add")
+ @ApiOperation(value = "新增")
+ public AjaxResult add(IdentificationRecordAddForm addForm) {
+ return toAjax(this.recordService.add(addForm));
+ }
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/IdentificationRecord.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/IdentificationRecord.java
new file mode 100644
index 0000000..5b70084
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/IdentificationRecord.java
@@ -0,0 +1,41 @@
+package com.gkhy.exam.noncoalmine.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 13:53
+ */
+@Data
+public class IdentificationRecord {
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ //是否是煤矿（0非，1是）
+ private Byte isCm;
+ //姓名
+ private String name;
+ //性别 0男，1女
+ private String sex;
+ //身份证
+ private String idCard;
+ //民族
+ private String nationCode;
+ //考试中心名称
+ private String centerName;
+ //考试点名称
+ private String roomName;
+ //考试科目
+ private String subject;
+ //删除标识（0未删除，2删除）
+ private Byte delFlag;
+ //推送时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime compareTime;
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/IdentificationRecordMapper.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/IdentificationRecordMapper.java
new file mode 100644
index 0000000..7a0aa86
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/IdentificationRecordMapper.java
@@ -0,0 +1,21 @@
+package com.gkhy.exam.noncoalmine.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.exam.noncoalmine.entity.IdentificationRecord;
+import com.gkhy.exam.noncoalmine.model.query.IdentificationRecordQuery;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 14:05
+ */
+@Repository
+@Mapper
+public interface IdentificationRecordMapper extends BaseMapper<IdentificationRecord> {
+ List<IdentificationRecord> getList(IdentificationRecordQuery query);
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/IdentificationRecordAddForm.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/IdentificationRecordAddForm.java
new file mode 100644
index 0000000..26e0e4a
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/IdentificationRecordAddForm.java
@@ -0,0 +1,40 @@
+package com.gkhy.exam.noncoalmine.model.addForm;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 13:53
+ */
+@ApiModel("识别记录模块")
+@Data
+public class IdentificationRecordAddForm {
+ @ApiModelProperty(value = "是否是煤矿（0非，1是）")
+ private Byte isCm;
+ @ApiModelProperty(value = "姓名")
+ @NotEmpty(message = "姓名不能为空")
+ private String name;
+ @ApiModelProperty(value = "性别")
+ private String sex;
+ @ApiModelProperty(value = "身份证")
+ @NotEmpty(message = "身份证不能为空")
+ private String idCard;
+ @ApiModelProperty(value = "民族")
+ private String nationCode;
+ @ApiModelProperty(value = "考试中心名称")
+ private String centerName;
+ @ApiModelProperty(value = "考试点名称")
+ private String roomName;
+ @ApiModelProperty(value = "考试科目")
+ private String subject;
+
+
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/IdentificationRecordQuery.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/IdentificationRecordQuery.java
new file mode 100644
index 0000000..618f9fd
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/IdentificationRecordQuery.java
@@ -0,0 +1,25 @@
+package com.gkhy.exam.noncoalmine.model.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "识别记录查询实体")
+@Data
+public class IdentificationRecordQuery {
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "是否是煤矿 1是，0非")
+ private Byte isCm;
+ /** 身份证件号 */
+ @ApiModelProperty(value = "身份证件号")
+ private String idcard;
+ @ApiModelProperty(value = "开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String startTime;
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String endTime;
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/IdentificationRecordService.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/IdentificationRecordService.java
new file mode 100644
index 0000000..783f589
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/IdentificationRecordService.java
@@ -0,0 +1,22 @@
+package com.gkhy.exam.noncoalmine.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.exam.noncoalmine.controller.IdentificationRecordController;
+import com.gkhy.exam.noncoalmine.entity.IdentificationRecord;
+import com.gkhy.exam.noncoalmine.model.addForm.IdentificationRecordAddForm;
+import com.gkhy.exam.noncoalmine.model.query.IdentificationRecordQuery;
+import com.gkhy.exam.noncoalmine.model.query.NcCertQuery;
+
+import java.util.List;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 13:53
+ */
+public interface IdentificationRecordService extends IService<IdentificationRecord> {
+ int add(IdentificationRecordAddForm addForm);
+
+ List<IdentificationRecord> getList(IdentificationRecordQuery query);
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/IdentificationRecordServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/IdentificationRecordServiceImpl.java
new file mode 100644
index 0000000..d41427b
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/IdentificationRecordServiceImpl.java
@@ -0,0 +1,36 @@
+package com.gkhy.exam.noncoalmine.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.exam.noncoalmine.entity.IdentificationRecord;
+import com.gkhy.exam.noncoalmine.mapper.IdentificationRecordMapper;
+import com.gkhy.exam.noncoalmine.model.addForm.IdentificationRecordAddForm;
+import com.gkhy.exam.noncoalmine.model.query.IdentificationRecordQuery;
+import com.gkhy.exam.noncoalmine.service.IdentificationRecordService;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/10/13
+ * @time: 14:05
+ */
+@Service
+public class IdentificationRecordServiceImpl extends ServiceImpl<IdentificationRecordMapper, IdentificationRecord> implements IdentificationRecordService {
+ @Override
+ public int add(IdentificationRecordAddForm addForm) {
+ IdentificationRecord record = new IdentificationRecord();
+ BeanUtils.copyProperties(addForm,record);
+ record.setCompareTime(LocalDateTime.now());
+ record.setDelFlag((byte)0);
+ return baseMapper.insert(record);
+ }
+
+ @Override
+ public List<IdentificationRecord> getList(IdentificationRecordQuery query) {
+ List<IdentificationRecord> list = baseMapper.getList(query);
+ return list;
+ }
+}
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/IdentificationRecordMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/IdentificationRecordMapper.xml
new file mode 100644
index 0000000..f5831e5
--- /dev/null
+++ b/exam-system/src/main/resources/mapper/noncoalmine/IdentificationRecordMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gkhy.exam.noncoalmine.mapper.IdentificationRecordMapper">
+ <select id="getList" resultType="com.gkhy.exam.noncoalmine.entity.IdentificationRecord">
+ SELECT
+ *
+ FROM
+ identification_record
+ WHERE
+ del_flag = 0
+ <if test="query.name != null and query.name != ''">
+ and name like concat('%', #{query.name}, '%')
+ </if>
+ <if test="query.idCard != null and query.idCard != ''">
+ and id_card = #{query.idCard}
+ </if>
+ <if test="query.isCm != null">
+ and is_cm = #{query.isCm}
+ </if>
+ <if test="query.startTime != null"><!-- 开始时间检索 -->
+ and date_format(compare_time,'%y-%m-%d') >= date_format(#{query.startTime},'%y-%m-%d')
+ </if>
+ <if test="query.endTime != null"><!-- 结束时间检索 -->
+ and date_format(compare_time,'%y-%m-%d') <= date_format(#{query.endTime},'%y-%m-%d')
+ </if>
+ order by compare_time desc
+
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/NcStaffMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/NcStaffMapper.xml
index d1b0468..054df32 100644
--- a/exam-system/src/main/resources/mapper/noncoalmine/NcStaffMapper.xml
+++ b/exam-system/src/main/resources/mapper/noncoalmine/NcStaffMapper.xml
@@ -14,7 +14,7 @@
and name like concat('%', #{query.name}, '%')
</if>
<if test="query.idCardNum != null and query.idCardNum != ''">
- and name = #{query.idCardNum}
+ and id_card_num = #{query.idCardNum}
</if>
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index c076ad0..bddbfcd 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -24,9 +24,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.0.52:3306/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: gkhymysql
+ url: jdbc:mysql://121.239.169.30:33306/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: gkhynew
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
--
Gitblit v1.9.2