From 88c596066581c92535e77d91e2fc02fc51799670 Mon Sep 17 00:00:00 2001 From: lijun Date: Tue, 8 Oct 2024 23:39:19 +0800 Subject: [PATCH 1/5] update code --- .../yanzhu/manage/domain/AttendanceCfg.java | 139 +++++++ .../manage/domain/AttendanceUbiDevice.java | 324 +++++++++++++++ .../manage/mapper/AttendanceCfgMapper.java | 61 +++ .../mapper/AttendanceUbiDeviceMapper.java | 61 +++ .../mapper/manage/AttendanceCfgMapper.xml | 106 +++++ .../manage/AttendanceUbiDeviceMapper.xml | 173 ++++++++ .../ProProjectInfoSubdeptsUsersMapper.xml | 83 ++-- .../controller/AttendanceCfgController.java | 99 +++++ .../AttendanceUbiDeviceController.java | 99 +++++ .../manage/service/IAttendanceCfgService.java | 61 +++ .../service/IAttendanceUbiDeviceService.java | 61 +++ .../yanzhu/manage/service/IUniService.java | 125 ++++++ .../impl/AttendanceCfgServiceImpl.java | 100 +++++ .../impl/AttendanceUbiDeviceServiceImpl.java | 100 +++++ ...roProjectInfoSubdeptsUsersServiceImpl.java | 8 + .../src/api/manage/attendancecfg.js | 44 ++ .../src/api/manage/attendanceubidevice.js | 44 ++ .../src/views/manage/attendance_cfg/index.vue | 258 ++++++++++++ .../manage/attendance_ubi_device/index.vue | 380 ++++++++++++++++++ .../proProjectInfoSubdeptsUsers/index.vue | 78 +++- 20 files changed, 2361 insertions(+), 43 deletions(-) create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiDevice.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceCfgMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDeviceMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDeviceMapper.xml create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceCfgController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDeviceController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceCfgService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDeviceService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceCfgServiceImpl.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDeviceServiceImpl.java create mode 100644 yanzhu-ui-vue3/src/api/manage/attendancecfg.js create mode 100644 yanzhu-ui-vue3/src/api/manage/attendanceubidevice.js create mode 100644 yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue create mode 100644 yanzhu-ui-vue3/src/views/manage/attendance_ubi_device/index.vue diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java new file mode 100644 index 00000000..7a9c42a0 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java @@ -0,0 +1,139 @@ +package com.yanzhu.manage.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +/** + * 考勤配置对象 attendance_cfg + * + * @author yanzhu + * @date 2024-10-08 + */ +public class AttendanceCfg extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司主键 */ + @Excel(name = "公司主键") + private Long comId; + + /** 分包单位 */ + @Excel(name = "分包单位") + private Long projectId; + + /** 厂商编号(参考字典attendance_vendors) */ + @Excel(name = " 厂商编号(参考字典attendance_vendors)") + private String vendorsCode; + + /** 厂商参数 */ + @Excel(name = "厂商参数") + private String vendorsParameter; + + /** 1-启用,0-停用 */ + @Excel(name = "1-启用,0-停用") + private Long enabled; + + /** 状态 */ + @Excel(name = "状态") + private Long state; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setVendorsCode(String vendorsCode) + { + this.vendorsCode = vendorsCode; + } + + public String getVendorsCode() + { + return vendorsCode; + } + public void setVendorsParameter(String vendorsParameter) + { + this.vendorsParameter = vendorsParameter; + } + + public String getVendorsParameter() + { + return vendorsParameter; + } + public void setEnabled(Long enabled) + { + this.enabled = enabled; + } + + public Long getEnabled() + { + return enabled; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("vendorsCode", getVendorsCode()) + .append("vendorsParameter", getVendorsParameter()) + .append("enabled", getEnabled()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiDevice.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiDevice.java new file mode 100644 index 00000000..5d471be5 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiDevice.java @@ -0,0 +1,324 @@ +package com.yanzhu.manage.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +/** + * 宇泛的设备信息对象 attendance_ubi_device + * + * @author yanzhu + * @date 2024-10-08 + */ +public class AttendanceUbiDevice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 公司主键 */ + @Excel(name = "公司主键") + private Long comId; + + /** 分包单位 */ + @Excel(name = "分包单位") + private Long projectId; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String name; + + /** 设备标签 */ + @Excel(name = "设备标签") + private String tag; + + /** 场景 Guid */ + @Excel(name = "场景 Guid") + private String sceneGuid; + + /** 设备来源,字典ubi_device_source */ + @Excel(name = "设备来源,字典ubi_device_source") + private String source; + + /** 设备序列号 */ + @Excel(name = "设备序列号") + private String deviceNo; + + /** 扩展字段（uface 设备（recType 设备的识别方式, 默认为 1） */ + @Excel(name = "扩展字段", readConverterExp = "u=face,设=备（recType,设=备的识别方式,,默=认为,1=") + private String addition; + + /** 是否绑定默认场景（场景 Guid 为空此字段生效） */ + @Excel(name = "是否绑定默认场景", readConverterExp = "场=景,G=uid,为=空此字段生效") + private Integer bindDefaultScene; + + /** 是否清空设备数据，默认为false */ + @Excel(name = "是否清空设备数据，默认为false") + private Integer forceEmptyDevice; + + /** 当forceEmptyDevice为true，传入设备密码 */ + @Excel(name = "当forceEmptyDevice为true，传入设备密码") + private String password; + + /** 设备模式 */ + @Excel(name = "设备模式") + private String deviceModel; + + /** 设备状态 */ + @Excel(name = "设备状态") + private Long deviceState; + + /** 比对模式,1:本地识别 2:云端识别 */ + @Excel(name = "比对模式,1:本地识别 2:云端识别") + private Long recType; + + /** 在线状态 */ + @Excel(name = "在线状态") + private Long onlineState; + + /** 版本号 */ + @Excel(name = "版本号") + private String versionNo; + + /** 最后激活时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后激活时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastActiveTime; + + /** 是否已注册 */ + @Excel(name = "是否已注册") + private Long hasRegister; + + /** 状态 */ + @Excel(name = "状态") + private Long state; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setTag(String tag) + { + this.tag = tag; + } + + public String getTag() + { + return tag; + } + public void setSceneGuid(String sceneGuid) + { + this.sceneGuid = sceneGuid; + } + + public String getSceneGuid() + { + return sceneGuid; + } + public void setSource(String source) + { + this.source = source; + } + + public String getSource() + { + return source; + } + public void setDeviceNo(String deviceNo) + { + this.deviceNo = deviceNo; + } + + public String getDeviceNo() + { + return deviceNo; + } + public void setAddition(String addition) + { + this.addition = addition; + } + + public String getAddition() + { + return addition; + } + public void setBindDefaultScene(Integer bindDefaultScene) + { + this.bindDefaultScene = bindDefaultScene; + } + + public Integer getBindDefaultScene() + { + return bindDefaultScene; + } + public void setForceEmptyDevice(Integer forceEmptyDevice) + { + this.forceEmptyDevice = forceEmptyDevice; + } + + public Integer getForceEmptyDevice() + { + return forceEmptyDevice; + } + public void setPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + public void setDeviceModel(String deviceModel) + { + this.deviceModel = deviceModel; + } + + public String getDeviceModel() + { + return deviceModel; + } + public void setDeviceState(Long deviceState) + { + this.deviceState = deviceState; + } + + public Long getDeviceState() + { + return deviceState; + } + public void setRecType(Long recType) + { + this.recType = recType; + } + + public Long getRecType() + { + return recType; + } + public void setOnlineState(Long onlineState) + { + this.onlineState = onlineState; + } + + public Long getOnlineState() + { + return onlineState; + } + public void setVersionNo(String versionNo) + { + this.versionNo = versionNo; + } + + public String getVersionNo() + { + return versionNo; + } + public void setLastActiveTime(Date lastActiveTime) + { + this.lastActiveTime = lastActiveTime; + } + + public Date getLastActiveTime() + { + return lastActiveTime; + } + public void setHasRegister(Long hasRegister) + { + this.hasRegister = hasRegister; + } + + public Long getHasRegister() + { + return hasRegister; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("name", getName()) + .append("tag", getTag()) + .append("sceneGuid", getSceneGuid()) + .append("source", getSource()) + .append("deviceNo", getDeviceNo()) + .append("addition", getAddition()) + .append("bindDefaultScene", getBindDefaultScene()) + .append("forceEmptyDevice", getForceEmptyDevice()) + .append("password", getPassword()) + .append("deviceModel", getDeviceModel()) + .append("deviceState", getDeviceState()) + .append("recType", getRecType()) + .append("onlineState", getOnlineState()) + .append("versionNo", getVersionNo()) + .append("lastActiveTime", getLastActiveTime()) + .append("hasRegister", getHasRegister()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceCfgMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceCfgMapper.java new file mode 100644 index 00000000..b257d4f0 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceCfgMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.AttendanceCfg; + +/** + * 考勤配置Mapper接口 + * + * @author yanzhu + * @date 2024-10-08 + */ +public interface AttendanceCfgMapper +{ + /** + * 查询考勤配置 + * + * @param id 考勤配置主键 + * @return 考勤配置 + */ + public AttendanceCfg selectAttendanceCfgById(Long id); + + /** + * 查询考勤配置列表 + * + * @param attendanceCfg 考勤配置 + * @return 考勤配置集合 + */ + public List selectAttendanceCfgList(AttendanceCfg attendanceCfg); + + /** + * 新增考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + public int insertAttendanceCfg(AttendanceCfg attendanceCfg); + + /** + * 修改考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + public int updateAttendanceCfg(AttendanceCfg attendanceCfg); + + /** + * 删除考勤配置 + * + * @param id 考勤配置主键 + * @return 结果 + */ + public int deleteAttendanceCfgById(Long id); + + /** + * 批量删除考勤配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAttendanceCfgByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDeviceMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDeviceMapper.java new file mode 100644 index 00000000..747bcfd9 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDeviceMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.AttendanceUbiDevice; + +/** + * 宇泛的设备信息Mapper接口 + * + * @author yanzhu + * @date 2024-10-08 + */ +public interface AttendanceUbiDeviceMapper +{ + /** + * 查询宇泛的设备信息 + * + * @param id 宇泛的设备信息主键 + * @return 宇泛的设备信息 + */ + public AttendanceUbiDevice selectAttendanceUbiDeviceById(Long id); + + /** + * 查询宇泛的设备信息列表 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 宇泛的设备信息集合 + */ + public List selectAttendanceUbiDeviceList(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 新增宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + public int insertAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 修改宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + public int updateAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 删除宇泛的设备信息 + * + * @param id 宇泛的设备信息主键 + * @return 结果 + */ + public int deleteAttendanceUbiDeviceById(Long id); + + /** + * 批量删除宇泛的设备信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAttendanceUbiDeviceByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml new file mode 100644 index 00000000..348a4390 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + select id, com_id, project_id, vendors_code, vendors_parameter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time from attendance_cfg + + + + + + + + insert into attendance_cfg + + com_id, + project_id, + vendors_code, + vendors_parameter, + enabled, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{comId}, + #{projectId}, + #{vendorsCode}, + #{vendorsParameter}, + #{enabled}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update attendance_cfg + + com_id = #{comId}, + project_id = #{projectId}, + vendors_code = #{vendorsCode}, + vendors_parameter = #{vendorsParameter}, + enabled = #{enabled}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from attendance_cfg where id = #{id} + + + + delete from attendance_cfg where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDeviceMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDeviceMapper.xml new file mode 100644 index 00000000..3ac56223 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDeviceMapper.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, com_id, project_id, name, tag, scene_guid, source, device_no, addition, bind_default_scene, force_empty_device, password, device_model, device_state, rec_type, online_state, version_no, last_active_time, has_register, state, remark, is_del, create_by, create_time, update_by, update_time from attendance_ubi_device + + + + + + + + insert into attendance_ubi_device + + id, + com_id, + project_id, + name, + tag, + scene_guid, + source, + device_no, + addition, + bind_default_scene, + force_empty_device, + password, + device_model, + device_state, + rec_type, + online_state, + version_no, + last_active_time, + has_register, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{comId}, + #{projectId}, + #{name}, + #{tag}, + #{sceneGuid}, + #{source}, + #{deviceNo}, + #{addition}, + #{bindDefaultScene}, + #{forceEmptyDevice}, + #{password}, + #{deviceModel}, + #{deviceState}, + #{recType}, + #{onlineState}, + #{versionNo}, + #{lastActiveTime}, + #{hasRegister}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update attendance_ubi_device + + com_id = #{comId}, + project_id = #{projectId}, + name = #{name}, + tag = #{tag}, + scene_guid = #{sceneGuid}, + source = #{source}, + device_no = #{deviceNo}, + addition = #{addition}, + bind_default_scene = #{bindDefaultScene}, + force_empty_device = #{forceEmptyDevice}, + password = #{password}, + device_model = #{deviceModel}, + device_state = #{deviceState}, + rec_type = #{recType}, + online_state = #{onlineState}, + version_no = #{versionNo}, + last_active_time = #{lastActiveTime}, + has_register = #{hasRegister}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from attendance_ubi_device where id = #{id} + + + + delete from attendance_ubi_device where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index c232bc2a..d9bc292f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -32,50 +32,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + - - select pi.project_name, - psu.id, psu.com_id, psu.project_id, psu.sub_dept_id, psu.sub_dept_type, psu.sub_dept_name, psu.user_id, - psu.sub_dept_group, psu.sub_dept_group_name, psu.craft_type, psu.craft_post, psu.edu_status, - psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status, - psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark - from pro_project_info_subdepts_users psu - left join pro_project_info pi on pi.id = psu.project_id - left join sys_dept sd on sd.dept_id = pi.com_id + SELECT pi.project_name, psu.id, psu.com_id, psu.project_id, psu.sub_dept_id, psu.sub_dept_type, psu.sub_dept_name, psu.user_id, psu.sub_dept_group, + psu.sub_dept_group_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, + psu.use_status, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, + psu.remark,su.`user_name`,su.`nick_name`,su.`user_type`,su.`card_type`,su.`card_code`, + su.`user_picture`, su.`card_img_inv`,su.`card_img_pos`,su.`user_infos`,su.`email`,su.`phonenumber`,su.`sex`,su.`avatar`,su.`login_ip`,su.`login_date` + FROM pro_project_info_subdepts_users psu + LEFT JOIN sys_user su ON psu.user_id=su.user_id + LEFT JOIN pro_project_info PI ON pi.id = psu.project_id + LEFT JOIN sys_dept sd ON sd.dept_id = pi.com_id + diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceCfgController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceCfgController.java new file mode 100644 index 00000000..c5b25644 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceCfgController.java @@ -0,0 +1,99 @@ +package com.yanzhu.manage.controller; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.AttendanceCfg; +import com.yanzhu.manage.domain.BusExamInfo; +import com.yanzhu.manage.service.IAttendanceCfgService; +import com.yanzhu.manage.service.IBusExamInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +/** + * 考勤配置Controller + * + * @author yanzhu + * @date 2024-10-08 + */ +@RestController +@RequestMapping("/attendance_cfg") +public class AttendanceCfgController extends BaseController +{ + @Autowired + private IAttendanceCfgService attendanceCfgService; + + /** + * 查询考勤配置列表 + */ + @RequiresPermissions("manage:attendance_cfg:list") + @GetMapping("/list") + public TableDataInfo list(AttendanceCfg attendanceCfg) + { + startPage(); + List list = attendanceCfgService.selectAttendanceCfgList(attendanceCfg); + return getDataTable(list); + } + + /** + * 导出考勤配置列表 + */ + @RequiresPermissions("manage:attendance_cfg:export") + @Log(title = "考勤配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AttendanceCfg attendanceCfg) + { + List list = attendanceCfgService.selectAttendanceCfgList(attendanceCfg); + ExcelUtil util = new ExcelUtil(AttendanceCfg.class); + util.exportExcel(response, list, "考勤配置数据"); + } + + /** + * 获取考勤配置详细信息 + */ + @RequiresPermissions("manage:attendance_cfg:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(attendanceCfgService.selectAttendanceCfgById(id)); + } + + /** + * 新增考勤配置 + */ + @RequiresPermissions("manage:attendance_cfg:add") + @Log(title = "考勤配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AttendanceCfg attendanceCfg) + { + return toAjax(attendanceCfgService.insertAttendanceCfg(attendanceCfg)); + } + + /** + * 修改考勤配置 + */ + @RequiresPermissions("manage:attendance_cfg:edit") + @Log(title = "考勤配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttendanceCfg attendanceCfg) + { + return toAjax(attendanceCfgService.updateAttendanceCfg(attendanceCfg)); + } + + /** + * 删除考勤配置 + */ + @RequiresPermissions("manage:attendance_cfg:remove") + @Log(title = "考勤配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(attendanceCfgService.deleteAttendanceCfgByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDeviceController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDeviceController.java new file mode 100644 index 00000000..53cbc63f --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDeviceController.java @@ -0,0 +1,99 @@ +package com.yanzhu.manage.controller; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.AttendanceUbiDevice; +import com.yanzhu.manage.domain.BusExamInfo; +import com.yanzhu.manage.service.IAttendanceUbiDeviceService; +import com.yanzhu.manage.service.IBusExamInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +/** + * 宇泛的设备信息Controller + * + * @author yanzhu + * @date 2024-10-08 + */ +@RestController +@RequestMapping("/attendance_ubi_device") +public class AttendanceUbiDeviceController extends BaseController +{ + @Autowired + private IAttendanceUbiDeviceService attendanceUbiDeviceService; + + /** + * 查询宇泛的设备信息列表 + */ + @RequiresPermissions("manage:attendance_ubi_device:list") + @GetMapping("/list") + public TableDataInfo list(AttendanceUbiDevice attendanceUbiDevice) + { + startPage(); + List list = attendanceUbiDeviceService.selectAttendanceUbiDeviceList(attendanceUbiDevice); + return getDataTable(list); + } + + /** + * 导出宇泛的设备信息列表 + */ + @RequiresPermissions("manage:attendance_ubi_device:export") + @Log(title = "宇泛的设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AttendanceUbiDevice attendanceUbiDevice) + { + List list = attendanceUbiDeviceService.selectAttendanceUbiDeviceList(attendanceUbiDevice); + ExcelUtil util = new ExcelUtil(AttendanceUbiDevice.class); + util.exportExcel(response, list, "宇泛的设备信息数据"); + } + + /** + * 获取宇泛的设备信息详细信息 + */ + @RequiresPermissions("manage:attendance_ubi_device:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(attendanceUbiDeviceService.selectAttendanceUbiDeviceById(id)); + } + + /** + * 新增宇泛的设备信息 + */ + @RequiresPermissions("manage:attendance_ubi_device:add") + @Log(title = "宇泛的设备信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AttendanceUbiDevice attendanceUbiDevice) + { + return toAjax(attendanceUbiDeviceService.insertAttendanceUbiDevice(attendanceUbiDevice)); + } + + /** + * 修改宇泛的设备信息 + */ + @RequiresPermissions("manage:attendance_ubi_device:edit") + @Log(title = "宇泛的设备信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttendanceUbiDevice attendanceUbiDevice) + { + return toAjax(attendanceUbiDeviceService.updateAttendanceUbiDevice(attendanceUbiDevice)); + } + + /** + * 删除宇泛的设备信息 + */ + @RequiresPermissions("manage:attendance_ubi_device:remove") + @Log(title = "宇泛的设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(attendanceUbiDeviceService.deleteAttendanceUbiDeviceByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceCfgService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceCfgService.java new file mode 100644 index 00000000..29d1e01e --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceCfgService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.AttendanceCfg; + +/** + * 考勤配置Service接口 + * + * @author yanzhu + * @date 2024-10-08 + */ +public interface IAttendanceCfgService +{ + /** + * 查询考勤配置 + * + * @param id 考勤配置主键 + * @return 考勤配置 + */ + public AttendanceCfg selectAttendanceCfgById(Long id); + + /** + * 查询考勤配置列表 + * + * @param attendanceCfg 考勤配置 + * @return 考勤配置集合 + */ + public List selectAttendanceCfgList(AttendanceCfg attendanceCfg); + + /** + * 新增考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + public int insertAttendanceCfg(AttendanceCfg attendanceCfg); + + /** + * 修改考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + public int updateAttendanceCfg(AttendanceCfg attendanceCfg); + + /** + * 批量删除考勤配置 + * + * @param ids 需要删除的考勤配置主键集合 + * @return 结果 + */ + public int deleteAttendanceCfgByIds(Long[] ids); + + /** + * 删除考勤配置信息 + * + * @param id 考勤配置主键 + * @return 结果 + */ + public int deleteAttendanceCfgById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDeviceService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDeviceService.java new file mode 100644 index 00000000..97deed3c --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDeviceService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.AttendanceUbiDevice; + +/** + * 宇泛的设备信息Service接口 + * + * @author yanzhu + * @date 2024-10-08 + */ +public interface IAttendanceUbiDeviceService +{ + /** + * 查询宇泛的设备信息 + * + * @param id 宇泛的设备信息主键 + * @return 宇泛的设备信息 + */ + public AttendanceUbiDevice selectAttendanceUbiDeviceById(Long id); + + /** + * 查询宇泛的设备信息列表 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 宇泛的设备信息集合 + */ + public List selectAttendanceUbiDeviceList(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 新增宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + public int insertAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 修改宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + public int updateAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice); + + /** + * 批量删除宇泛的设备信息 + * + * @param ids 需要删除的宇泛的设备信息主键集合 + * @return 结果 + */ + public int deleteAttendanceUbiDeviceByIds(Long[] ids); + + /** + * 删除宇泛的设备信息信息 + * + * @param id 宇泛的设备信息主键 + * @return 结果 + */ + public int deleteAttendanceUbiDeviceById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java new file mode 100644 index 00000000..a7043a11 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java @@ -0,0 +1,125 @@ +package com.yanzhu.manage.service; + +import com.alibaba.fastjson.JSON; + +/** + * 宇泛服务封装 + */ +public interface IUniService { + /** + * 鉴权接口 + * @param data + * @return + */ + public String auth(JSON data); + + /** + * 人员接口-识别主体创建 + * @param data + * @return + */ + public JSON admitCreate(JSON data); + + /** + * 人员接口-识别主体更新 + * @param data + * @return + */ + public JSON admitUpdate(JSON data); + + /** + * 人员接口-识别主体删除 + * @param data + * @return + */ + public JSON admitDeletee(JSON data); + + /** + * 人员接口-查询识别主体详情 + * @param data + * @return + */ + public JSON admitDetail(JSON data); + + /** + * 人员接口-识别主体列表 + * @param data + * @return + */ + public JSON admitPage(JSON data); + + + /** + * 人员接口-人像注册 + * @param data + * @return + */ + public JSON faceRegister(JSON data); + + + + /** + * 人员接口-人像删除 + * @param data + * @return + */ + public JSON faceDelete(JSON data); + + /** + * 人员接口-人员照片信息查询 + * @param data + * @return + */ + public JSON faceDetail(JSON data); + + /** + * 设备接口-设备添加 + * @param data + * @return + */ + public JSON deviceCreate(JSON data); + + /** + * 设备接口-设备更新 + * @param data + * @return + */ + public JSON deviceUpdate(JSON data); + + /** + * 设备接口-设备删除 + * @param data + * @return + */ + public JSON deviceDelete(JSON data); + + /** + * 设备接口-设备详情 + * @param data + * @return + */ + public JSON deviceDetail(JSON data); + + /** + * 授权接口-设备授权识别主体 + * @param data + * @return + */ + public JSON authDevice(JSON data); + + /** + * 授权接口-设备修改识别主体权限 + * @param data + * @return + */ + public JSON authDeviceUpdate(JSON data); + + + /** + * 授权接口-设备销权识别主体 + * @param data + * @return + */ + public JSON authDeviceRevoke(JSON data); + +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceCfgServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceCfgServiceImpl.java new file mode 100644 index 00000000..27deda5c --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceCfgServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.AttendanceCfgMapper; +import com.yanzhu.manage.domain.AttendanceCfg; +import com.yanzhu.manage.service.IAttendanceCfgService; + +/** + * 考勤配置Service业务层处理 + * + * @author yanzhu + * @date 2024-10-08 + */ +@Service +public class AttendanceCfgServiceImpl implements IAttendanceCfgService +{ + @Autowired + private AttendanceCfgMapper attendanceCfgMapper; + + /** + * 查询考勤配置 + * + * @param id 考勤配置主键 + * @return 考勤配置 + */ + @Override + public AttendanceCfg selectAttendanceCfgById(Long id) + { + return attendanceCfgMapper.selectAttendanceCfgById(id); + } + + /** + * 查询考勤配置列表 + * + * @param attendanceCfg 考勤配置 + * @return 考勤配置 + */ + @Override + public List selectAttendanceCfgList(AttendanceCfg attendanceCfg) + { + return attendanceCfgMapper.selectAttendanceCfgList(attendanceCfg); + } + + /** + * 新增考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + @Override + public int insertAttendanceCfg(AttendanceCfg attendanceCfg) + { + attendanceCfg.setCreateBy(SecurityContextHolder.getUserName()); + attendanceCfg.setCreateTime(DateUtils.getNowDate()); + return attendanceCfgMapper.insertAttendanceCfg(attendanceCfg); + } + + /** + * 修改考勤配置 + * + * @param attendanceCfg 考勤配置 + * @return 结果 + */ + @Override + public int updateAttendanceCfg(AttendanceCfg attendanceCfg) + { + attendanceCfg.setUpdateBy(SecurityContextHolder.getUserName()); + attendanceCfg.setUpdateTime(DateUtils.getNowDate()); + return attendanceCfgMapper.updateAttendanceCfg(attendanceCfg); + } + + /** + * 批量删除考勤配置 + * + * @param ids 需要删除的考勤配置主键 + * @return 结果 + */ + @Override + public int deleteAttendanceCfgByIds(Long[] ids) + { + return attendanceCfgMapper.deleteAttendanceCfgByIds(ids); + } + + /** + * 删除考勤配置信息 + * + * @param id 考勤配置主键 + * @return 结果 + */ + @Override + public int deleteAttendanceCfgById(Long id) + { + return attendanceCfgMapper.deleteAttendanceCfgById(id); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDeviceServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDeviceServiceImpl.java new file mode 100644 index 00000000..c8cb6a99 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDeviceServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.AttendanceUbiDeviceMapper; +import com.yanzhu.manage.domain.AttendanceUbiDevice; +import com.yanzhu.manage.service.IAttendanceUbiDeviceService; + +/** + * 宇泛的设备信息Service业务层处理 + * + * @author yanzhu + * @date 2024-10-08 + */ +@Service +public class AttendanceUbiDeviceServiceImpl implements IAttendanceUbiDeviceService +{ + @Autowired + private AttendanceUbiDeviceMapper attendanceUbiDeviceMapper; + + /** + * 查询宇泛的设备信息 + * + * @param id 宇泛的设备信息主键 + * @return 宇泛的设备信息 + */ + @Override + public AttendanceUbiDevice selectAttendanceUbiDeviceById(Long id) + { + return attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(id); + } + + /** + * 查询宇泛的设备信息列表 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 宇泛的设备信息 + */ + @Override + public List selectAttendanceUbiDeviceList(AttendanceUbiDevice attendanceUbiDevice) + { + return attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(attendanceUbiDevice); + } + + /** + * 新增宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + @Override + public int insertAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice) + { + attendanceUbiDevice.setCreateBy(SecurityContextHolder.getUserName()); + attendanceUbiDevice.setCreateTime(DateUtils.getNowDate()); + return attendanceUbiDeviceMapper.insertAttendanceUbiDevice(attendanceUbiDevice); + } + + /** + * 修改宇泛的设备信息 + * + * @param attendanceUbiDevice 宇泛的设备信息 + * @return 结果 + */ + @Override + public int updateAttendanceUbiDevice(AttendanceUbiDevice attendanceUbiDevice) + { + attendanceUbiDevice.setUpdateBy(SecurityContextHolder.getUserName()); + attendanceUbiDevice.setUpdateTime(DateUtils.getNowDate()); + return attendanceUbiDeviceMapper.updateAttendanceUbiDevice(attendanceUbiDevice); + } + + /** + * 批量删除宇泛的设备信息 + * + * @param ids 需要删除的宇泛的设备信息主键 + * @return 结果 + */ + @Override + public int deleteAttendanceUbiDeviceByIds(Long[] ids) + { + return attendanceUbiDeviceMapper.deleteAttendanceUbiDeviceByIds(ids); + } + + /** + * 删除宇泛的设备信息信息 + * + * @param id 宇泛的设备信息主键 + * @return 结果 + */ + @Override + public int deleteAttendanceUbiDeviceById(Long id) + { + return attendanceUbiDeviceMapper.deleteAttendanceUbiDeviceById(id); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index d7943c20..f1f1251d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -85,6 +85,14 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu { proProjectInfoSubdeptsUsers.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setUpdateBy(SecurityContextHolder.getUserName()); + SysUser user=proProjectInfoSubdeptsUsers.getUser(); + if(user.getUserId()==null||user.getUserId().intValue()==0){ + Long userId= remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData(); + user.setUserId(userId); + proProjectInfoSubdeptsUsers.setUserId(userId); + }else{ + remoteUserService.updateUserInfo(user,SecurityConstants.INNER).getData(); + } return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } diff --git a/yanzhu-ui-vue3/src/api/manage/attendancecfg.js b/yanzhu-ui-vue3/src/api/manage/attendancecfg.js new file mode 100644 index 00000000..2b2c6af9 --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/attendancecfg.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询考勤配置列表 +export function listAttendance_cfg(query) { + return request({ + url: '/manage/attendance_cfg/list', + method: 'get', + params: query + }) +} + +// 查询考勤配置详细 +export function getAttendance_cfg(id) { + return request({ + url: '/manage/attendance_cfg/' + id, + method: 'get' + }) +} + +// 新增考勤配置 +export function addAttendance_cfg(data) { + return request({ + url: '/manage/attendance_cfg', + method: 'post', + data: data + }) +} + +// 修改考勤配置 +export function updateAttendance_cfg(data) { + return request({ + url: '/manage/attendance_cfg', + method: 'put', + data: data + }) +} + +// 删除考勤配置 +export function delAttendance_cfg(id) { + return request({ + url: '/manage/attendance_cfg/' + id, + method: 'delete' + }) +} diff --git a/yanzhu-ui-vue3/src/api/manage/attendanceubidevice.js b/yanzhu-ui-vue3/src/api/manage/attendanceubidevice.js new file mode 100644 index 00000000..5f63c733 --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/attendanceubidevice.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询宇泛的设备信息列表 +export function listAttendance_ubi_device(query) { + return request({ + url: '/manage/attendance_ubi_device/list', + method: 'get', + params: query + }) +} + +// 查询宇泛的设备信息详细 +export function getAttendance_ubi_device(id) { + return request({ + url: '/manage/attendance_ubi_device/' + id, + method: 'get' + }) +} + +// 新增宇泛的设备信息 +export function addAttendance_ubi_device(data) { + return request({ + url: '/manage/attendance_ubi_device', + method: 'post', + data: data + }) +} + +// 修改宇泛的设备信息 +export function updateAttendance_ubi_device(data) { + return request({ + url: '/manage/attendance_ubi_device', + method: 'put', + data: data + }) +} + +// 删除宇泛的设备信息 +export function delAttendance_ubi_device(id) { + return request({ + url: '/manage/attendance_ubi_device/' + id, + method: 'delete' + }) +} diff --git a/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue b/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue new file mode 100644 index 00000000..df492e99 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue @@ -0,0 +1,258 @@ + + + diff --git a/yanzhu-ui-vue3/src/views/manage/attendance_ubi_device/index.vue b/yanzhu-ui-vue3/src/views/manage/attendance_ubi_device/index.vue new file mode 100644 index 00000000..aa9b4110 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/attendance_ubi_device/index.vue @@ -0,0 +1,380 @@ + + + diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue index b592e0db..da636dfe 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue @@ -59,8 +59,8 @@ - - + + - - - - - + + + + +