@@ -217,6 +223,23 @@
}
}
},
+ idNumber:{
+ required:true,
+ isIdentity18:true,
+ remote: {
+ url: prefix + "system/user/checkIdNumberUnique",
+ type: "post",
+ dataType: "json",
+ data: {
+ "userId": function() {
+ return $("#userId").val();
+ },
+ "idNumber": function () {
+ return $.common.trim($("#idNumber").val());
+ }
+ }
+ }
+ },
},
messages: {
"userName": {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Check.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Check.java
deleted file mode 100644
index 6485b90..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Check.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.ruoyi.system.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.xss.Xss;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.ibatis.annotations.Param;
-
-import javax.validation.constraints.Size;
-
-/**
- * 个人打卡对象 check
- *
- * @author zlx
- * @date 2023-04-22
- */
-public class Check extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 打卡id */
- private Long checkId;
-
- /** 打卡人姓名 */
- @Excel(name = "打卡人姓名")
- private String checkName;
-
- /** 体温 */
- @Excel(name = "体温")
- private String temperature;
-
- /** 健康状况 */
- @Excel(name = "健康状况")
- private String state;
-
- /** 是否去过高风险地区 */
- @Excel(name = "是否去过高风险地区")
- private Integer isHigh;
-
- /** 是否接触过密接人员 */
- @Excel(name = "是否接触过密接人员")
- private Integer isTouch;
-
- /** 个人状况描述 */
- @Excel(name = "个人状况描述")
- private String description;
-
- /** 当前时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "当前时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date checkDatetime;
-
- /** 打卡位置 */
- @Excel(name = "打卡位置")
- private String currentPosition;
-
- public void setCheckId(Long checkId)
- {
- this.checkId = checkId;
- }
-
- public Long getCheckId()
- {
- return checkId;
- }
- public void setCheckName(String checkName)
- {
- this.checkName = checkName;
- }
- @Xss(message = "用户昵称不能包含脚本字符")
- @Size(min = 2, max = 30, message = "不能为空，用户昵称长度不能超过30个字符")
- public String getCheckName()
- {
- return checkName;
- }
- public void setTemperature(String temperature)
- {
- this.temperature = temperature;
- }
-
- @Size(min = 2, message = "体温只能为数字")
- public String getTemperature()
- {
- return temperature;
- }
- public void setState(String state)
- {
- this.state = state;
- }
-
- public String getState()
- {
- return state;
- }
- public void setIsHigh(Integer isHigh)
- {
- this.isHigh = isHigh;
- }
-
- public Integer getIsHigh()
- {
- return isHigh;
- }
- public void setIsTouch(Integer isTouch)
- {
- this.isTouch = isTouch;
- }
-
- public Integer getIsTouch()
- {
- return isTouch;
- }
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
- public void setCheckDatetime(Date checkDatetime)
- {
- this.checkDatetime = checkDatetime;
- }
- public Date getCheckDatetime()
- {
- return checkDatetime;
- }
- public void setCurrentPosition(String currentPosition)
- {
- this.currentPosition = currentPosition;
- }
-
- public String getCurrentPosition()
- {
- return currentPosition;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("checkId", getCheckId())
- .append("checkName", getCheckName())
- .append("temperature", getTemperature())
- .append("state", getState())
- .append("isHigh", getIsHigh())
- .append("isTouch", getIsTouch())
- .append("description", getDescription())
- .append("checkDatetime", getCheckDatetime())
- .append("currentPosition", getCurrentPosition())
- .toString();
- }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
index fc933e0..ef24edc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
@@ -1,10 +1,15 @@
package com.ruoyi.system.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
/**
* 打卡管理对象 check_manage
*
@@ -22,170 +27,142 @@ public class CheckManage extends BaseEntity
@Excel(name = "打卡人姓名")
private String checkName;
- /** 打卡人年龄 */
- @Excel(name = "打卡人年龄")
- private String checkAge;
-
- /** 打卡人性别 */
- @Excel(name = "打卡人性别")
- private Integer checkSex;
-
- /** 身份证 */
- @Excel(name = "身份证")
- private String patientIdCard;
+ /** 体温 */
+ @Excel(name = "体温")
+ private String temperature;
- /** 确诊状态 */
- @Excel(name = "确诊状态")
- private Integer isDiagnosed;
+ /** 健康状况 */
+ @Excel(name = "健康状况")
+ private String healthState;
- /** 治愈状态 */
- @Excel(name = "治愈状态")
- private Integer isCure;
+ /** 是否去过高风险地区 */
+ @Excel(name = "是否去过高风险地区")
+ private Integer isHigh;
- /** 密接状态 */
- @Excel(name = "密接状态")
+ /** 是否接触过密接人员 */
+ @Excel(name = "是否接触过密接人员")
private Integer isTouch;
- /** 死亡状态 */
- @Excel(name = "死亡状态")
- private Integer isDead;
-
/** 备注 */
@Excel(name = "备注")
private String description;
- /** 最近接触地区 */
- @Excel(name = "最近接触地区")
- private String checkPostition;
+ /** 当前时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "当前时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date checkDatetime;
- /** 体温 */
- @Excel(name = "体温")
- private String temperature;
+ /** 打卡位置 */
+ @Excel(name = "打卡位置")
+ private String currentPosition;
- public void setCheckManageId(Long checkManageId)
- {
- this.checkManageId = checkManageId;
- }
+ /** 当前使用电话 */
+ @Excel(name = "当前使用电话")
+ private String checkPhonenumber;
- public Long getCheckManageId()
- {
+ public Long getCheckManageId() {
return checkManageId;
}
- public void setCheckName(String checkName)
- {
- this.checkName = checkName;
- }
- public String getCheckName()
- {
- return checkName;
- }
- public void setCheckAge(String checkAge)
- {
- this.checkAge = checkAge;
+ public void setCheckManageId(Long checkManageId) {
+ this.checkManageId = checkManageId;
}
- public String getCheckAge()
+ public void setCheckName(String checkName)
{
- return checkAge;
- }
- public void setCheckSex(Integer checkSex)
- {
- this.checkSex = checkSex;
+ this.checkName = checkName;
}
-
- public Integer getCheckSex()
+ @Xss(message = "用户昵称不能包含脚本字符")
+ @Size(min = 2, max = 30, message = "不能为空，用户昵称长度不能超过30个字符")
+ public String getCheckName()
{
- return checkSex;
+ return checkName;
}
- public void setPatientIdCard(String patientIdCard)
+ public void setTemperature(String temperature)
{
- this.patientIdCard = patientIdCard;
+ this.temperature = temperature;
}
- public String getPatientIdCard()
+ @Size(min = 2, message = "体温只能为数字")
+ public String getTemperature()
{
- return patientIdCard;
+ return temperature;
}
- public void setIsDiagnosed(Integer isDiagnosed)
+ public void setHealthState(String healthState)
{
- this.isDiagnosed = isDiagnosed;
+ this.healthState = healthState;
}
- public Integer getIsDiagnosed()
+ public String getHealthState()
{
- return isDiagnosed;
+ return healthState;
}
- public void setIsCure(Integer isCure)
+ public void setIsHigh(Integer isHigh)
{
- this.isCure = isCure;
+ this.isHigh = isHigh;
}
- public Integer getIsCure()
+ public Integer getIsHigh()
{
- return isCure;
+ return isHigh;
}
- public void setIsTouch(Integer isTouch)
+ public void setIsTouch(Integer isTouch)
{
this.isTouch = isTouch;
}
- public Integer getIsTouch()
+ public Integer getIsTouch()
{
return isTouch;
}
- public void setIsDead(Integer isDead)
+ public void setDescription(String description)
{
- this.isDead = isDead;
+ this.description = description;
}
- public Integer getIsDead()
+ public String getDescription()
{
- return isDead;
+ return description;
}
- public void setDescription(String description)
+ public void setCheckDatetime(Date checkDatetime)
{
- this.description = description;
+ this.checkDatetime = checkDatetime;
}
-
- public String getDescription()
+ public Date getCheckDatetime()
{
- return description;
+ return checkDatetime;
}
- public void setCheckPostition(String checkPostition)
+ public void setCurrentPosition(String currentPosition)
{
- this.checkPostition = checkPostition;
+ this.currentPosition = currentPosition;
}
- public String getCheckPostition()
+ public String getCurrentPosition()
{
- return checkPostition;
+ return currentPosition;
}
- public void setTemperature(String temperature)
- {
- this.temperature = temperature;
+
+ public String getCheckPhonenumber() {
+ return checkPhonenumber;
}
- public String getTemperature()
- {
- return temperature;
+ public void setCheckPhonenumber(String checkPhonenumber) {
+ this.checkPhonenumber = checkPhonenumber;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("checkManageId", getCheckManageId())
- .append("checkName", getCheckName())
- .append("checkAge", getCheckAge())
- .append("checkSex", getCheckSex())
- .append("patientIdCard", getPatientIdCard())
- .append("isDiagnosed", getIsDiagnosed())
- .append("isCure", getIsCure())
- .append("isTouch", getIsTouch())
- .append("isDead", getIsDead())
- .append("description", getDescription())
- .append("checkPostition", getCheckPostition())
- .append("temperature", getTemperature())
- .toString();
+ .append("checkMangeId", getCheckManageId())
+ .append("checkName", getCheckName())
+ .append("temperature", getTemperature())
+ .append("healthState", getHealthState())
+ .append("isHigh", getIsHigh())
+ .append("isTouch", getIsTouch())
+ .append("description", getDescription())
+ .append("checkDatetime", getCheckDatetime())
+ .append("currentPosition", getCurrentPosition())
+ .append("checkPhonenumber", getCheckPhonenumber())
+ .toString();
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckManageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckManageMapper.java
index 40ed2a6..e86a177 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckManageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckManageMapper.java
@@ -65,5 +65,5 @@ public interface CheckManageMapper
* @param patientIdCard 身份证
* @return 患者信息
*/
- public CheckManage selectCheckByPatientIdCard(String patientIdCard);
+ public CheckManage selectCheckByPhonenumber(String patientIdCard);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckMapper.java
deleted file mode 100644
index b890705..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CheckMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import java.util.List;
-import com.ruoyi.system.domain.Check;
-
-/**
- * 个人打卡Mapper接口
- *
- * @author zlx
- * @date 2023-04-22
- */
-public interface CheckMapper
-{
-
- /**
- * 新增个人打卡
- *
- * @param check 个人打卡
- * @return 结果
- */
- public int insertCheck(Check check);
-
-
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ICheckService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ICheckService.java
deleted file mode 100644
index f9cee86..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ICheckService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.Check;
-
-/**
- * 个人打卡Service接口
- *
- * @author zlx
- * @date 2023-04-22
- */
-public interface ICheckService
-{
-
- /**
- * 新增个人打卡
- *
- * @param check 个人打卡
- * @return 结果
- */
- public int insertCheck(Check check);
-
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
index dedd996..d6bd2ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
@@ -117,13 +117,13 @@ public class CheckManageServiceImpl implements ICheckManageService
try
{
// 验证是否存在这个患者
- CheckManage p = checkManageMapper.selectCheckByPatientIdCard(checkManage.getPatientIdCard());
+ CheckManage p = checkManageMapper.selectCheckByPhonenumber(checkManage.getCheckPhonenumber());
if (StringUtils.isNull(p))
{
BeanValidators.validateWithException(validator, checkManage);
this.insertCheckManage(checkManage);
successNum++;
- successMsg.append("
" + successNum + "、身份证： " + checkManage.getPatientIdCard() + " 导入成功");
+ successMsg.append("
" + successNum + "、电话为： " + checkManage.getCheckPhonenumber() + " 的打卡信息导入成功");
}
else if (isUpdateSupport)
{
@@ -131,18 +131,18 @@ public class CheckManageServiceImpl implements ICheckManageService
checkManage.setCheckManageId(p.getCheckManageId());
this.updateCheckManage(checkManage);
successNum++;
- successMsg.append("
" + successNum + "、身份证： " + checkManage.getPatientIdCard() + " 的打卡信息更新成功");
+ successMsg.append("
" + successNum + "、电话为 " + checkManage.getCheckName() + " 的打卡信息更新成功");
}
else
{
failureNum++;
- failureMsg.append("
" + failureNum + "、身份证 " + checkManage.getPatientIdCard() + " 已存在");
+ failureMsg.append("
" + failureNum + "、电话为 " + checkManage.getCheckPhonenumber() + " 已存在");
}
}
catch (Exception e)
{
failureNum++;
- String msg = "
" + failureNum + "、身份证 " + checkManage.getPatientIdCard() + " 导入失败：";
+ String msg = "
" + failureNum + "、电话为 " + checkManage.getCheckPhonenumber() + " 导入失败：";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckServiceImpl.java
deleted file mode 100644
index 2997ae9..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.CheckMapper;
-import com.ruoyi.system.domain.Check;
-import com.ruoyi.system.service.ICheckService;
-
-
-/**
- * 个人打卡Service业务层处理
- *
- * @author zlx
- * @date 2023-04-22
- */
-@Service
-public class CheckServiceImpl implements ICheckService {
- @Autowired
- private CheckMapper checkMapper;
-
- /**
- * 新增个人打卡
- *
- * @param check 个人打卡
- * @return 结果
- */
- @Override
- public int insertCheck(Check check) {
- return checkMapper.insertCheck(check);
- }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ad26f5d..34cc538 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -31,7 +31,6 @@ import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.ISysUserService;
/**
* 用户 业务层处理
diff --git a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
index b48c93e..5277558 100644
--- a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
@@ -7,37 +7,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
+
+
+
+
+
-
-
-
+
- select check_manage_id, check_name, check_sex, patient_id_card, is_diagnosed, is_cure, is_touch, is_dead, description, check_postition, temperature from check_manage
+ select check_manage_id, check_name, temperature, health_state, is_high, is_touch, description, check_datetime, current_position, check_phonenumber
+ from check_manage
-