提交代码
姜玉琦
parent
d1d003e7f4
commit
8c578aa707
|
|
@ -121,6 +121,9 @@ public class ProProjectInfoSubdepts extends BaseEntity
|
|||
/** 委托人学历信息 */
|
||||
private String leaderDegreeGrade;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
*/
|
||||
|
|
@ -367,6 +370,14 @@ public class ProProjectInfoSubdepts extends BaseEntity
|
|||
this.leaderUserInfos = leaderUserInfos;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
|
|
|||
|
|
@ -103,6 +103,9 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
|
|||
@Excel(name = "删除标识")
|
||||
private Long isDel;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
/** 班组长半身照片 */
|
||||
private String groupLeaderUserPicture;
|
||||
/** 班组长委托代理书 */
|
||||
|
|
@ -347,6 +350,14 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
|
|||
this.subDeptTypeName = subDeptTypeName;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
|
|
|||
|
|
@ -190,6 +190,9 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
|
|||
@Excel(name = "数据状态")
|
||||
private Long isDel;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
|
@ -534,6 +537,14 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
|
|||
this.sortBy = sortBy;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProProjectInfoSubdeptsUsers{" +
|
||||
|
|
|
|||
|
|
@ -33,10 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectProProjectInfoSubdeptsGroupVo">
|
||||
select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg
|
||||
select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
|
||||
from pro_project_info_subdepts_group psg
|
||||
left join pro_project_info pi on pi.id = psg.project_id
|
||||
left join sys_dept sd on sd.dept_id = psg.com_id
|
||||
left join sys_dict_data dic0 on psg.`sub_dept_type`=dic0.`dict_value` and dic0.`dict_type`='sub_dept_type'
|
||||
|
|
@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">#{comId},</if>
|
||||
|
|
@ -142,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -170,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
|
|||
|
|
@ -33,10 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectProProjectInfoSubdeptsVo">
|
||||
select ps.id, ps.com_id, sd.dept_name as com_name, ps.project_id, pi.project_name, ps.sub_dept_type, sdd.dict_label as sub_dept_type_name, ps.sub_dept_name, ps.sub_dept_code, ps.sub_dept_leader_id, ps.sub_dept_leader_name, ps.sub_dept_leader_code, ps.sub_dept_leader_phone, ps.business_license_path, ps.sub_dept_infos, ps.contract_infos, ps.use_dates, ps.start_work_dates, ps.end_work_dates, ps.use_status, ps.approve_status, ps.qr_code, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark from pro_project_info_subdepts ps
|
||||
select ps.id, ps.com_id, sd.dept_name as com_name, ps.project_id, pi.project_name, ps.sub_dept_type, sdd.dict_label as sub_dept_type_name, ps.sub_dept_name, ps.sub_dept_code, ps.sub_dept_leader_id, ps.sub_dept_leader_name, ps.sub_dept_leader_code, ps.sub_dept_leader_phone, ps.business_license_path, ps.sub_dept_infos, ps.contract_infos, ps.use_dates, ps.start_work_dates, ps.end_work_dates, ps.use_status, ps.approve_status, ps.qr_code, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark, ps.source
|
||||
from pro_project_info_subdepts ps
|
||||
left join pro_project_info pi on pi.id = ps.project_id
|
||||
left join sys_dept sd on sd.dept_id = ps.com_id
|
||||
left join sys_dict_data sdd on sdd.dict_value = ps.sub_dept_type and sdd.dict_type = 'sub_dept_type'
|
||||
|
|
@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">#{comId},</if>
|
||||
|
|
@ -138,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -168,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
|
|||
|
|
@ -52,13 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectProProjectInfoSubdeptsUsersVo">
|
||||
select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, pdept.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group,
|
||||
psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status,
|
||||
psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, 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,psu.face_guid,sd.dept_name com_name,psu.work_type
|
||||
psu.remark, psu.source, psu.face_guid,sd.dept_name com_name,psu.work_type
|
||||
from pro_project_info_subdepts_users psu
|
||||
left join pro_project_info pi on pi.id = psu.project_id
|
||||
left join pro_project_info_subdepts pdept on psu.sub_dept_id=pdept.id
|
||||
|
|
@ -193,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="parId != null">#{parId},</if>
|
||||
|
|
@ -235,6 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -282,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
|||
* @author yanzhu
|
||||
* @date 2025-04-04
|
||||
*/
|
||||
public class DevIotConfigPoint extends BaseEntity
|
||||
public class QuartzDevIotConfigPoint extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
|||
* @author yanzhu
|
||||
* @date 2025-04-04
|
||||
*/
|
||||
public class DevIotDatas extends BaseEntity
|
||||
public class QuartzDevIotDatas extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
|||
* @author yanzhu
|
||||
* @date 2025-04-04
|
||||
*/
|
||||
public class DevIotWarning extends BaseEntity
|
||||
public class QuartzDevIotWarning extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -0,0 +1,410 @@
|
|||
package com.yanzhu.job.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yanzhu.common.core.annotation.Excel;
|
||||
import com.yanzhu.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 分包单位对象 pro_project_info_subdepts
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public class QuartzProSubdepts extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long id;
|
||||
|
||||
/** 公司主键 */
|
||||
private Long comId;
|
||||
|
||||
/** 公司名称 */
|
||||
@Excel(name = "公司名称")
|
||||
private String comName;
|
||||
|
||||
/** 项目主键 */
|
||||
private Long projectId;
|
||||
|
||||
/** 项目名称 */
|
||||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 分包单位类型 */
|
||||
@Excel(name = "分包单位类型")
|
||||
private String subDeptType;
|
||||
|
||||
/** 分包单位类型 */
|
||||
private String subDeptTypeName;
|
||||
|
||||
/** 分包单位名称 */
|
||||
@Excel(name = "分包单位名称")
|
||||
private String subDeptName;
|
||||
|
||||
/** 分包单位编号 */
|
||||
@Excel(name = "分包单位编号")
|
||||
private String subDeptCode;
|
||||
|
||||
/** 负责人主键 */
|
||||
@Excel(name = "负责人主键")
|
||||
private Long subDeptLeaderId;
|
||||
|
||||
/** 负责人姓名 */
|
||||
@Excel(name = "负责人姓名")
|
||||
private String subDeptLeaderName;
|
||||
|
||||
/** 负责人证件号码 */
|
||||
@Excel(name = "负责人证件号码")
|
||||
private String subDeptLeaderCode;
|
||||
|
||||
/** 负责人电话 */
|
||||
@Excel(name = "负责人电话")
|
||||
private String subDeptLeaderPhone;
|
||||
|
||||
/** 委托书 */
|
||||
@Excel(name = "委托书")
|
||||
private String subDeptLeaderPowerPath;
|
||||
|
||||
/** 营业执照 */
|
||||
@Excel(name = "营业执照")
|
||||
private String businessLicensePath;
|
||||
|
||||
/** 单位详情 */
|
||||
private String subDeptInfos;
|
||||
|
||||
/** 合同承包内容 */
|
||||
@Excel(name = "合同承包内容")
|
||||
private String contractInfos;
|
||||
|
||||
/** 进入场地时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "进入场地时间")
|
||||
private Date useDates;
|
||||
|
||||
/** 计划开工时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "计划开工时间")
|
||||
private Date startWorkDates;
|
||||
|
||||
/** 计划完工时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "计划完工时间")
|
||||
private Date endWorkDates;
|
||||
|
||||
/** 进场状态 */
|
||||
@Excel(name = "进场状态")
|
||||
private String useStatus;
|
||||
|
||||
/** 审批状态 */
|
||||
@Excel(name = "审批状态")
|
||||
private Long approveStatus;
|
||||
|
||||
/** 二维码 */
|
||||
@Excel(name = "二维码")
|
||||
private String qrCode;
|
||||
|
||||
/** 删除标识 */
|
||||
@Excel(name = "删除标识")
|
||||
private Long isDel;
|
||||
|
||||
/** 委托人进场照片 */
|
||||
private String leaderUserPicture;
|
||||
|
||||
/** 委托人详细信息 */
|
||||
private String leaderUserInfos;
|
||||
|
||||
/** 委托人学历信息 */
|
||||
private String leaderDegreeGrade;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
*/
|
||||
private QuartzProSubdeptsUsers proProjectInfoSubdeptsUsers;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public Long getComId() {
|
||||
return comId;
|
||||
}
|
||||
|
||||
public void setComId(Long comId) {
|
||||
this.comId = comId;
|
||||
}
|
||||
|
||||
public void setProjectId(Long projectId)
|
||||
{
|
||||
this.projectId = projectId;
|
||||
}
|
||||
|
||||
public Long getProjectId()
|
||||
{
|
||||
return projectId;
|
||||
}
|
||||
|
||||
public void setSubDeptType(String subDeptType)
|
||||
{
|
||||
this.subDeptType = subDeptType;
|
||||
}
|
||||
|
||||
public String getSubDeptType()
|
||||
{
|
||||
return subDeptType;
|
||||
}
|
||||
public void setSubDeptName(String subDeptName)
|
||||
{
|
||||
this.subDeptName = subDeptName;
|
||||
}
|
||||
|
||||
public String getSubDeptName()
|
||||
{
|
||||
return subDeptName;
|
||||
}
|
||||
public void setSubDeptCode(String subDeptCode)
|
||||
{
|
||||
this.subDeptCode = subDeptCode;
|
||||
}
|
||||
|
||||
public String getSubDeptCode()
|
||||
{
|
||||
return subDeptCode;
|
||||
}
|
||||
public void setSubDeptLeaderId(Long subDeptLeaderId)
|
||||
{
|
||||
this.subDeptLeaderId = subDeptLeaderId;
|
||||
}
|
||||
|
||||
public Long getSubDeptLeaderId()
|
||||
{
|
||||
return subDeptLeaderId;
|
||||
}
|
||||
public void setSubDeptLeaderName(String subDeptLeaderName)
|
||||
{
|
||||
this.subDeptLeaderName = subDeptLeaderName;
|
||||
}
|
||||
|
||||
public String getSubDeptLeaderName()
|
||||
{
|
||||
return subDeptLeaderName;
|
||||
}
|
||||
public void setSubDeptLeaderCode(String subDeptLeaderCode)
|
||||
{
|
||||
this.subDeptLeaderCode = subDeptLeaderCode;
|
||||
}
|
||||
|
||||
public String getSubDeptLeaderCode()
|
||||
{
|
||||
return subDeptLeaderCode;
|
||||
}
|
||||
public void setSubDeptLeaderPhone(String subDeptLeaderPhone)
|
||||
{
|
||||
this.subDeptLeaderPhone = subDeptLeaderPhone;
|
||||
}
|
||||
|
||||
public String getSubDeptLeaderPhone()
|
||||
{
|
||||
return subDeptLeaderPhone;
|
||||
}
|
||||
|
||||
public String getSubDeptLeaderPowerPath() {
|
||||
return subDeptLeaderPowerPath;
|
||||
}
|
||||
|
||||
public void setSubDeptLeaderPowerPath(String subDeptLeaderPowerPath) {
|
||||
this.subDeptLeaderPowerPath = subDeptLeaderPowerPath;
|
||||
}
|
||||
|
||||
public String getBusinessLicensePath() {
|
||||
return businessLicensePath;
|
||||
}
|
||||
|
||||
public void setBusinessLicensePath(String businessLicensePath) {
|
||||
this.businessLicensePath = businessLicensePath;
|
||||
}
|
||||
|
||||
public String getSubDeptInfos() {
|
||||
return subDeptInfos;
|
||||
}
|
||||
|
||||
public void setSubDeptInfos(String subDeptInfos) {
|
||||
this.subDeptInfos = subDeptInfos;
|
||||
}
|
||||
|
||||
public String getContractInfos() {
|
||||
return contractInfos;
|
||||
}
|
||||
|
||||
public void setContractInfos(String contractInfos) {
|
||||
this.contractInfos = contractInfos;
|
||||
}
|
||||
|
||||
public Date getUseDates() {
|
||||
return useDates;
|
||||
}
|
||||
|
||||
public void setUseDates(Date useDates) {
|
||||
this.useDates = useDates;
|
||||
}
|
||||
|
||||
public void setUseStatus(String useStatus)
|
||||
{
|
||||
this.useStatus = useStatus;
|
||||
}
|
||||
|
||||
public String getUseStatus()
|
||||
{
|
||||
return useStatus;
|
||||
}
|
||||
public void setApproveStatus(Long approveStatus)
|
||||
{
|
||||
this.approveStatus = approveStatus;
|
||||
}
|
||||
|
||||
public Long getApproveStatus()
|
||||
{
|
||||
return approveStatus;
|
||||
}
|
||||
public void setQrCode(String qrCode)
|
||||
{
|
||||
this.qrCode = qrCode;
|
||||
}
|
||||
|
||||
public String getQrCode()
|
||||
{
|
||||
return qrCode;
|
||||
}
|
||||
public void setIsDel(Long isDel)
|
||||
{
|
||||
this.isDel = isDel;
|
||||
}
|
||||
|
||||
public Long getIsDel()
|
||||
{
|
||||
return isDel;
|
||||
}
|
||||
|
||||
public String getComName() {
|
||||
return comName;
|
||||
}
|
||||
|
||||
public void setComName(String comName) {
|
||||
this.comName = comName;
|
||||
}
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public void setProjectName(String projectName) {
|
||||
this.projectName = projectName;
|
||||
}
|
||||
|
||||
public String getLeaderUserPicture() {
|
||||
return leaderUserPicture;
|
||||
}
|
||||
|
||||
public void setLeaderUserPicture(String leaderUserPicture) {
|
||||
this.leaderUserPicture = leaderUserPicture;
|
||||
}
|
||||
|
||||
public Date getStartWorkDates() {
|
||||
return startWorkDates;
|
||||
}
|
||||
|
||||
public void setStartWorkDates(Date startWorkDates) {
|
||||
this.startWorkDates = startWorkDates;
|
||||
}
|
||||
|
||||
public Date getEndWorkDates() {
|
||||
return endWorkDates;
|
||||
}
|
||||
|
||||
public void setEndWorkDates(Date endWorkDates) {
|
||||
this.endWorkDates = endWorkDates;
|
||||
}
|
||||
|
||||
public QuartzProSubdeptsUsers getProProjectInfoSubdeptsUsers() {
|
||||
return proProjectInfoSubdeptsUsers;
|
||||
}
|
||||
|
||||
public void setProProjectInfoSubdeptsUsers(QuartzProSubdeptsUsers proProjectInfoSubdeptsUsers) {
|
||||
this.proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsers;
|
||||
}
|
||||
|
||||
public String getLeaderDegreeGrade() {
|
||||
return leaderDegreeGrade;
|
||||
}
|
||||
|
||||
public void setLeaderDegreeGrade(String leaderDegreeGrade) {
|
||||
this.leaderDegreeGrade = leaderDegreeGrade;
|
||||
}
|
||||
|
||||
public String getSubDeptTypeName() {
|
||||
return subDeptTypeName;
|
||||
}
|
||||
|
||||
public void setSubDeptTypeName(String subDeptTypeName) {
|
||||
this.subDeptTypeName = subDeptTypeName;
|
||||
}
|
||||
|
||||
public String getLeaderUserInfos() {
|
||||
return leaderUserInfos;
|
||||
}
|
||||
|
||||
public void setLeaderUserInfos(String leaderUserInfos) {
|
||||
this.leaderUserInfos = leaderUserInfos;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("comId", getComId())
|
||||
.append("projectId", getProjectId())
|
||||
.append("subDeptType", getSubDeptType())
|
||||
.append("subDeptName", getSubDeptName())
|
||||
.append("subDeptCode", getSubDeptCode())
|
||||
.append("subDeptLeaderId", getSubDeptLeaderId())
|
||||
.append("subDeptLeaderName", getSubDeptLeaderName())
|
||||
.append("subDeptLeaderCode", getSubDeptLeaderCode())
|
||||
.append("subDeptLeaderPhone", getSubDeptLeaderPhone())
|
||||
.append("subDeptLeaderPowerPath", getSubDeptLeaderPowerPath())
|
||||
.append("businessLicensePath", getBusinessLicensePath())
|
||||
.append("subDeptInfos", getSubDeptInfos())
|
||||
.append("contractInfos", getContractInfos())
|
||||
.append("useDates", getUseDates())
|
||||
.append("useStatus", getUseStatus())
|
||||
.append("approveStatus", getApproveStatus())
|
||||
.append("qrCode", getQrCode())
|
||||
.append("isDel", getIsDel())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("remark", getRemark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,389 @@
|
|||
package com.yanzhu.job.domain;
|
||||
|
||||
import com.yanzhu.common.core.annotation.Excel;
|
||||
import com.yanzhu.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 分包单位班组对象 pro_project_info_subdepts_group
|
||||
*
|
||||
* @author JiangYuqi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public class QuartzProSubdeptsGroup extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long id;
|
||||
|
||||
/** 公司主键 */
|
||||
private Long comId;
|
||||
|
||||
/** 公司名称 */
|
||||
@Excel(name = "公司名称")
|
||||
private String comName;
|
||||
|
||||
/** 项目主键 */
|
||||
private Long projectId;
|
||||
|
||||
/** 项目名称 */
|
||||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 分包单位 */
|
||||
@Excel(name = "分包单位")
|
||||
private Long subDeptId;
|
||||
|
||||
/** 单位类型 */
|
||||
private String subDeptType;
|
||||
|
||||
/** 单位类型 */
|
||||
@Excel(name = "单位类型")
|
||||
private String subDeptTypeName;
|
||||
|
||||
/** 分包单位名称 */
|
||||
@Excel(name = "分包单位名称")
|
||||
private String subDeptName;
|
||||
|
||||
/** 分包单位编号 */
|
||||
@Excel(name = "分包单位编号")
|
||||
private String subDeptCode;
|
||||
|
||||
/** 班组名称 */
|
||||
@Excel(name = "班组名称")
|
||||
private String groupName;
|
||||
|
||||
/** 班组编号 */
|
||||
@Excel(name = "班组编号")
|
||||
private String groupCode;
|
||||
|
||||
/** 工种类型 */
|
||||
@Excel(name = "工种类型")
|
||||
private String craftType;
|
||||
|
||||
/** 工种类型 */
|
||||
@Excel(name = "工种类型")
|
||||
private String craftTypeName;
|
||||
|
||||
/** 工种岗位 */
|
||||
@Excel(name = "工种岗位")
|
||||
private String craftPost;
|
||||
|
||||
/** 工种岗位 */
|
||||
@Excel(name = "工种岗位")
|
||||
private String craftPostName;
|
||||
|
||||
/** 负责人姓名 */
|
||||
@Excel(name = "负责人姓名")
|
||||
private String groupLeaderName;
|
||||
|
||||
/** 负责人证件号码 */
|
||||
@Excel(name = "负责人证件号码")
|
||||
private String groupLeaderCode;
|
||||
|
||||
/** 负责人电话 */
|
||||
@Excel(name = "负责人电话")
|
||||
private String groupLeaderPhone;
|
||||
|
||||
/** 进场状态 */
|
||||
@Excel(name = "进场状态")
|
||||
private String useStatus;
|
||||
|
||||
/** 审批状态 */
|
||||
@Excel(name = "审批状态")
|
||||
private Long approveStatus;
|
||||
|
||||
/** 二维码 */
|
||||
@Excel(name = "二维码")
|
||||
private String qrCode;
|
||||
|
||||
/** 删除标识 */
|
||||
@Excel(name = "删除标识")
|
||||
private Long isDel;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
/** 班组长半身照片 */
|
||||
private String groupLeaderUserPicture;
|
||||
/** 班组长委托代理书 */
|
||||
private String groupLeaderSubPowerPath;
|
||||
/** 班组长学历信息 */
|
||||
private String groupLeaderDegreeGrade;
|
||||
/** 班组长人员信息 */
|
||||
private String groupLeaderUserInfos;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public Long getComId() {
|
||||
return comId;
|
||||
}
|
||||
|
||||
public void setComId(Long comId) {
|
||||
this.comId = comId;
|
||||
}
|
||||
|
||||
public void setProjectId(Long projectId)
|
||||
{
|
||||
this.projectId = projectId;
|
||||
}
|
||||
|
||||
public Long getProjectId()
|
||||
{
|
||||
return projectId;
|
||||
}
|
||||
public void setSubDeptId(Long subDeptId)
|
||||
{
|
||||
this.subDeptId = subDeptId;
|
||||
}
|
||||
|
||||
public Long getSubDeptId()
|
||||
{
|
||||
return subDeptId;
|
||||
}
|
||||
public void setSubDeptType(String subDeptType)
|
||||
{
|
||||
this.subDeptType = subDeptType;
|
||||
}
|
||||
|
||||
public String getSubDeptType()
|
||||
{
|
||||
return subDeptType;
|
||||
}
|
||||
public void setSubDeptName(String subDeptName)
|
||||
{
|
||||
this.subDeptName = subDeptName;
|
||||
}
|
||||
|
||||
public String getSubDeptName()
|
||||
{
|
||||
return subDeptName;
|
||||
}
|
||||
public void setSubDeptCode(String subDeptCode)
|
||||
{
|
||||
this.subDeptCode = subDeptCode;
|
||||
}
|
||||
|
||||
public String getSubDeptCode()
|
||||
{
|
||||
return subDeptCode;
|
||||
}
|
||||
public void setGroupName(String groupName)
|
||||
{
|
||||
this.groupName = groupName;
|
||||
}
|
||||
|
||||
public String getGroupName()
|
||||
{
|
||||
return groupName;
|
||||
}
|
||||
public void setGroupCode(String groupCode)
|
||||
{
|
||||
this.groupCode = groupCode;
|
||||
}
|
||||
|
||||
public String getGroupCode()
|
||||
{
|
||||
return groupCode;
|
||||
}
|
||||
public void setCraftType(String craftType)
|
||||
{
|
||||
this.craftType = craftType;
|
||||
}
|
||||
|
||||
public String getCraftType()
|
||||
{
|
||||
return craftType;
|
||||
}
|
||||
public void setCraftPost(String craftPost)
|
||||
{
|
||||
this.craftPost = craftPost;
|
||||
}
|
||||
|
||||
public String getCraftPost()
|
||||
{
|
||||
return craftPost;
|
||||
}
|
||||
public void setGroupLeaderName(String groupLeaderName)
|
||||
{
|
||||
this.groupLeaderName = groupLeaderName;
|
||||
}
|
||||
|
||||
public String getGroupLeaderName()
|
||||
{
|
||||
return groupLeaderName;
|
||||
}
|
||||
public void setGroupLeaderCode(String groupLeaderCode)
|
||||
{
|
||||
this.groupLeaderCode = groupLeaderCode;
|
||||
}
|
||||
|
||||
public String getGroupLeaderCode()
|
||||
{
|
||||
return groupLeaderCode;
|
||||
}
|
||||
public void setGroupLeaderPhone(String groupLeaderPhone)
|
||||
{
|
||||
this.groupLeaderPhone = groupLeaderPhone;
|
||||
}
|
||||
|
||||
public String getGroupLeaderPhone()
|
||||
{
|
||||
return groupLeaderPhone;
|
||||
}
|
||||
public void setUseStatus(String useStatus)
|
||||
{
|
||||
this.useStatus = useStatus;
|
||||
}
|
||||
|
||||
public String getUseStatus()
|
||||
{
|
||||
return useStatus;
|
||||
}
|
||||
public void setApproveStatus(Long approveStatus)
|
||||
{
|
||||
this.approveStatus = approveStatus;
|
||||
}
|
||||
|
||||
public Long getApproveStatus()
|
||||
{
|
||||
return approveStatus;
|
||||
}
|
||||
public void setQrCode(String qrCode)
|
||||
{
|
||||
this.qrCode = qrCode;
|
||||
}
|
||||
|
||||
public String getQrCode()
|
||||
{
|
||||
return qrCode;
|
||||
}
|
||||
public void setIsDel(Long isDel)
|
||||
{
|
||||
this.isDel = isDel;
|
||||
}
|
||||
|
||||
public Long getIsDel()
|
||||
{
|
||||
return isDel;
|
||||
}
|
||||
|
||||
public String getComName() {
|
||||
return comName;
|
||||
}
|
||||
|
||||
public void setComName(String comName) {
|
||||
this.comName = comName;
|
||||
}
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public void setProjectName(String projectName) {
|
||||
this.projectName = projectName;
|
||||
}
|
||||
|
||||
public String getGroupLeaderUserPicture() {
|
||||
return groupLeaderUserPicture;
|
||||
}
|
||||
|
||||
public void setGroupLeaderUserPicture(String groupLeaderUserPicture) {
|
||||
this.groupLeaderUserPicture = groupLeaderUserPicture;
|
||||
}
|
||||
|
||||
public String getGroupLeaderSubPowerPath() {
|
||||
return groupLeaderSubPowerPath;
|
||||
}
|
||||
|
||||
public void setGroupLeaderSubPowerPath(String groupLeaderSubPowerPath) {
|
||||
this.groupLeaderSubPowerPath = groupLeaderSubPowerPath;
|
||||
}
|
||||
|
||||
public String getGroupLeaderDegreeGrade() {
|
||||
return groupLeaderDegreeGrade;
|
||||
}
|
||||
|
||||
public void setGroupLeaderDegreeGrade(String groupLeaderDegreeGrade) {
|
||||
this.groupLeaderDegreeGrade = groupLeaderDegreeGrade;
|
||||
}
|
||||
|
||||
public String getGroupLeaderUserInfos() {
|
||||
return groupLeaderUserInfos;
|
||||
}
|
||||
|
||||
public void setGroupLeaderUserInfos(String groupLeaderUserInfos) {
|
||||
this.groupLeaderUserInfos = groupLeaderUserInfos;
|
||||
}
|
||||
|
||||
public String getCraftTypeName() {
|
||||
return craftTypeName;
|
||||
}
|
||||
|
||||
public void setCraftTypeName(String craftTypeName) {
|
||||
this.craftTypeName = craftTypeName;
|
||||
}
|
||||
|
||||
public String getCraftPostName() {
|
||||
return craftPostName;
|
||||
}
|
||||
|
||||
public void setCraftPostName(String craftPostName) {
|
||||
this.craftPostName = craftPostName;
|
||||
}
|
||||
|
||||
public String getSubDeptTypeName() {
|
||||
return subDeptTypeName;
|
||||
}
|
||||
|
||||
public void setSubDeptTypeName(String subDeptTypeName) {
|
||||
this.subDeptTypeName = subDeptTypeName;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("comId", getComId())
|
||||
.append("projectId", getProjectId())
|
||||
.append("subDeptId", getSubDeptId())
|
||||
.append("subDeptType", getSubDeptType())
|
||||
.append("subDeptName", getSubDeptName())
|
||||
.append("subDeptCode", getSubDeptCode())
|
||||
.append("groupName", getGroupName())
|
||||
.append("groupCode", getGroupCode())
|
||||
.append("craftType", getCraftType())
|
||||
.append("craftPost", getCraftPost())
|
||||
.append("groupLeaderName", getGroupLeaderName())
|
||||
.append("groupLeaderCode", getGroupLeaderCode())
|
||||
.append("groupLeaderPhone", getGroupLeaderPhone())
|
||||
.append("useStatus", getUseStatus())
|
||||
.append("approveStatus", getApproveStatus())
|
||||
.append("qrCode", getQrCode())
|
||||
.append("isDel", getIsDel())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("remark", getRemark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,593 @@
|
|||
package com.yanzhu.job.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yanzhu.common.core.annotation.Excel;
|
||||
import com.yanzhu.common.core.web.domain.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 花名册人员 对象pro_project_info_subdepts_users
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public class QuartzProSubdeptsUsers extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long id;
|
||||
|
||||
/** 上级主键 */
|
||||
private Long parId;
|
||||
|
||||
/** 公司主键 */
|
||||
private Long comId;
|
||||
|
||||
@Excel(name = "所属单位")
|
||||
private String comName;
|
||||
|
||||
/** 项目主键 */
|
||||
private Long projectId;
|
||||
|
||||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 分包单位 */
|
||||
private Long subDeptId;
|
||||
|
||||
/** 分包单位名称 */
|
||||
private String subDeptName;
|
||||
|
||||
/** 单位类型 */
|
||||
private String subDeptType;
|
||||
|
||||
@Excel(name = "单位类型")
|
||||
private String subDeptTypeName;
|
||||
|
||||
private Long workType;
|
||||
|
||||
public Long getWorkType() {
|
||||
return workType;
|
||||
}
|
||||
|
||||
public void setWorkType(Long workType) {
|
||||
this.workType = workType;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户岗位&&判断用户权限---
|
||||
*/
|
||||
@Excel(name = "用户岗位")
|
||||
private String userPost;
|
||||
|
||||
/** 班组编号(外键） */
|
||||
private Long subDeptGroup;
|
||||
|
||||
/** 班组名称 */
|
||||
@Excel(name = "班组名称")
|
||||
private String subDeptGroupName;
|
||||
|
||||
/** 委托书 */
|
||||
private String subDeptPowerPath;
|
||||
|
||||
/** 用户主键 */
|
||||
private Long userId;
|
||||
|
||||
/** 人员姓名 */
|
||||
@Excel(name = "人员姓名")
|
||||
private String userName;
|
||||
|
||||
/** 证件类型 */
|
||||
@Excel(name = "证件类型")
|
||||
private String cardType;
|
||||
|
||||
/** 证件号码 */
|
||||
@Excel(name = "证件号码")
|
||||
private String cardCode;
|
||||
|
||||
/** 人员性别 */
|
||||
@Excel(name = "人员性别")
|
||||
private String userSex;
|
||||
|
||||
/** 人员年龄 **/
|
||||
@Excel(name = "人员年龄")
|
||||
private int userAge;
|
||||
|
||||
/** 所属民族 **/
|
||||
@Excel(name = "所属民族")
|
||||
private String userNation;
|
||||
|
||||
/** 用户肖像 */
|
||||
@Excel(name = "入场照片")
|
||||
private String userPicture;
|
||||
|
||||
/** 手机号码 */
|
||||
@Excel(name = "联系电话")
|
||||
private String userPhone;
|
||||
|
||||
/** 劳务人员学历 */
|
||||
private String degreeGrade;
|
||||
|
||||
/** 劳务人员学历 */
|
||||
@Excel(name = "学历类型")
|
||||
private String degreeGradeName;
|
||||
|
||||
/** 用户详情 */
|
||||
private String userInfos;
|
||||
|
||||
/** 工种类型 */
|
||||
private String craftType;
|
||||
|
||||
@Excel(name = "工种类型")
|
||||
private String craftTypeName;
|
||||
|
||||
/** 工种岗位 */
|
||||
private String craftPost;
|
||||
|
||||
@Excel(name = "工种岗位")
|
||||
private String craftPostName;
|
||||
|
||||
/** 学习状态 */
|
||||
@Excel(name = "安全教育状态")
|
||||
private String eduStatus;
|
||||
|
||||
/** 学习文件地址 */
|
||||
private String eduFilePath;
|
||||
|
||||
/** 学习时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "学习时间",dateFormat = "yyyy-MM-dd")
|
||||
private Date eduDate;
|
||||
|
||||
/** 审批状态 */
|
||||
@Excel(name = "审批状态")
|
||||
private Long approveStatus;
|
||||
|
||||
/** 进场时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "进场时间",dateFormat = "yyyy-MM-dd")
|
||||
private Date useDate;
|
||||
|
||||
/** 进场状态 */
|
||||
@Excel(name = "进场状态")
|
||||
private String useStatus;
|
||||
|
||||
/** 进场状态 */
|
||||
@Excel(name = "进场唯一代码")
|
||||
private String admitGuid;
|
||||
|
||||
private String faceGuid;
|
||||
|
||||
public String getFaceGuid() {
|
||||
return faceGuid;
|
||||
}
|
||||
|
||||
public void setFaceGuid(String faceGuid) {
|
||||
this.faceGuid = faceGuid;
|
||||
}
|
||||
|
||||
/** 二维码 */
|
||||
private String qrCode;
|
||||
|
||||
/** 疾病状态 */
|
||||
@Excel(name = "疾病状态")
|
||||
private Long illnessStatus;
|
||||
|
||||
/** 严重疾病状态 */
|
||||
@Excel(name = "严重疾病状态")
|
||||
private Long supIllnessStatus;
|
||||
|
||||
/** 进行步骤 */
|
||||
private Long subStep;
|
||||
|
||||
/** 排序规则 */
|
||||
private Long sortBy;
|
||||
|
||||
/** 删除标识 */
|
||||
@Excel(name = "数据状态")
|
||||
private Long isDel;
|
||||
|
||||
/** 数据来源 */
|
||||
private String source;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getParId() {
|
||||
return parId;
|
||||
}
|
||||
|
||||
public void setParId(Long parId) {
|
||||
this.parId = parId;
|
||||
}
|
||||
|
||||
public Long getComId() {
|
||||
return comId;
|
||||
}
|
||||
|
||||
public void setComId(Long comId) {
|
||||
this.comId = comId;
|
||||
}
|
||||
|
||||
public String getComName() {
|
||||
return comName;
|
||||
}
|
||||
|
||||
public void setComName(String comName) {
|
||||
this.comName = comName;
|
||||
}
|
||||
|
||||
public Long getProjectId() {
|
||||
return projectId;
|
||||
}
|
||||
|
||||
public void setProjectId(Long projectId) {
|
||||
this.projectId = projectId;
|
||||
}
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public void setProjectName(String projectName) {
|
||||
this.projectName = projectName;
|
||||
}
|
||||
|
||||
public Long getSubDeptId() {
|
||||
return subDeptId;
|
||||
}
|
||||
|
||||
public void setSubDeptId(Long subDeptId) {
|
||||
this.subDeptId = subDeptId;
|
||||
}
|
||||
|
||||
public String getSubDeptName() {
|
||||
return subDeptName;
|
||||
}
|
||||
|
||||
public void setSubDeptName(String subDeptName) {
|
||||
this.subDeptName = subDeptName;
|
||||
}
|
||||
|
||||
public String getSubDeptType() {
|
||||
return subDeptType;
|
||||
}
|
||||
|
||||
public void setSubDeptType(String subDeptType) {
|
||||
this.subDeptType = subDeptType;
|
||||
}
|
||||
|
||||
public String getSubDeptTypeName() {
|
||||
return subDeptTypeName;
|
||||
}
|
||||
|
||||
public void setSubDeptTypeName(String subDeptTypeName) {
|
||||
this.subDeptTypeName = subDeptTypeName;
|
||||
}
|
||||
|
||||
public String getUserPost() {
|
||||
return userPost;
|
||||
}
|
||||
|
||||
public void setUserPost(String userPost) {
|
||||
this.userPost = userPost;
|
||||
}
|
||||
|
||||
public Long getSubDeptGroup() {
|
||||
return subDeptGroup;
|
||||
}
|
||||
|
||||
public void setSubDeptGroup(Long subDeptGroup) {
|
||||
this.subDeptGroup = subDeptGroup;
|
||||
}
|
||||
|
||||
public String getSubDeptGroupName() {
|
||||
return subDeptGroupName;
|
||||
}
|
||||
|
||||
public void setSubDeptGroupName(String subDeptGroupName) {
|
||||
this.subDeptGroupName = subDeptGroupName;
|
||||
}
|
||||
|
||||
public String getSubDeptPowerPath() {
|
||||
return subDeptPowerPath;
|
||||
}
|
||||
|
||||
public void setSubDeptPowerPath(String subDeptPowerPath) {
|
||||
this.subDeptPowerPath = subDeptPowerPath;
|
||||
}
|
||||
|
||||
public Long getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Long userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public String getCardType() {
|
||||
return cardType;
|
||||
}
|
||||
|
||||
public void setCardType(String cardType) {
|
||||
this.cardType = cardType;
|
||||
}
|
||||
|
||||
public String getCardCode() {
|
||||
return cardCode;
|
||||
}
|
||||
|
||||
public void setCardCode(String cardCode) {
|
||||
this.cardCode = cardCode;
|
||||
}
|
||||
|
||||
public String getUserSex() {
|
||||
return userSex;
|
||||
}
|
||||
|
||||
public void setUserSex(String userSex) {
|
||||
this.userSex = userSex;
|
||||
}
|
||||
|
||||
public String getUserPicture() {
|
||||
return userPicture;
|
||||
}
|
||||
|
||||
public void setUserPicture(String userPicture) {
|
||||
this.userPicture = userPicture;
|
||||
}
|
||||
|
||||
public String getUserPhone() {
|
||||
return userPhone;
|
||||
}
|
||||
|
||||
public void setUserPhone(String userPhone) {
|
||||
this.userPhone = userPhone;
|
||||
}
|
||||
|
||||
public String getDegreeGrade() {
|
||||
return degreeGrade;
|
||||
}
|
||||
|
||||
public void setDegreeGrade(String degreeGrade) {
|
||||
this.degreeGrade = degreeGrade;
|
||||
}
|
||||
|
||||
public String getDegreeGradeName() {
|
||||
return degreeGradeName;
|
||||
}
|
||||
|
||||
public void setDegreeGradeName(String degreeGradeName) {
|
||||
this.degreeGradeName = degreeGradeName;
|
||||
}
|
||||
|
||||
public String getUserInfos() {
|
||||
return userInfos;
|
||||
}
|
||||
|
||||
public void setUserInfos(String userInfos) {
|
||||
this.userInfos = userInfos;
|
||||
}
|
||||
|
||||
public String getCraftType() {
|
||||
return craftType;
|
||||
}
|
||||
|
||||
public void setCraftType(String craftType) {
|
||||
this.craftType = craftType;
|
||||
}
|
||||
|
||||
public String getCraftTypeName() {
|
||||
return craftTypeName;
|
||||
}
|
||||
|
||||
public void setCraftTypeName(String craftTypeName) {
|
||||
this.craftTypeName = craftTypeName;
|
||||
}
|
||||
|
||||
public String getCraftPost() {
|
||||
return craftPost;
|
||||
}
|
||||
|
||||
public void setCraftPost(String craftPost) {
|
||||
this.craftPost = craftPost;
|
||||
}
|
||||
|
||||
public String getCraftPostName() {
|
||||
return craftPostName;
|
||||
}
|
||||
|
||||
public void setCraftPostName(String craftPostName) {
|
||||
this.craftPostName = craftPostName;
|
||||
}
|
||||
|
||||
public String getEduFilePath() {
|
||||
return eduFilePath;
|
||||
}
|
||||
|
||||
public void setEduFilePath(String eduFilePath) {
|
||||
this.eduFilePath = eduFilePath;
|
||||
}
|
||||
|
||||
public int getUserAge() {
|
||||
return userAge;
|
||||
}
|
||||
|
||||
public void setUserAge(int userAge) {
|
||||
this.userAge = userAge;
|
||||
}
|
||||
|
||||
public String getEduStatus() {
|
||||
return eduStatus;
|
||||
}
|
||||
|
||||
public void setEduStatus(String eduStatus) {
|
||||
this.eduStatus = eduStatus;
|
||||
}
|
||||
|
||||
public Date getEduDate() {
|
||||
return eduDate;
|
||||
}
|
||||
|
||||
public void setEduDate(Date eduDate) {
|
||||
this.eduDate = eduDate;
|
||||
}
|
||||
|
||||
public Long getApproveStatus() {
|
||||
return approveStatus;
|
||||
}
|
||||
|
||||
public void setApproveStatus(Long approveStatus) {
|
||||
this.approveStatus = approveStatus;
|
||||
}
|
||||
|
||||
public Date getUseDate() {
|
||||
return useDate;
|
||||
}
|
||||
|
||||
public void setUseDate(Date useDate) {
|
||||
this.useDate = useDate;
|
||||
}
|
||||
|
||||
public String getUseStatus() {
|
||||
return useStatus;
|
||||
}
|
||||
|
||||
public void setUseStatus(String useStatus) {
|
||||
this.useStatus = useStatus;
|
||||
}
|
||||
|
||||
public String getAdmitGuid() {
|
||||
return admitGuid;
|
||||
}
|
||||
|
||||
public void setAdmitGuid(String admitGuid) {
|
||||
this.admitGuid = admitGuid;
|
||||
}
|
||||
|
||||
public String getQrCode() {
|
||||
return qrCode;
|
||||
}
|
||||
|
||||
public void setQrCode(String qrCode) {
|
||||
this.qrCode = qrCode;
|
||||
}
|
||||
|
||||
public Long getIllnessStatus() {
|
||||
return illnessStatus;
|
||||
}
|
||||
|
||||
public void setIllnessStatus(Long illnessStatus) {
|
||||
this.illnessStatus = illnessStatus;
|
||||
}
|
||||
|
||||
public Long getSupIllnessStatus() {
|
||||
return supIllnessStatus;
|
||||
}
|
||||
|
||||
public void setSupIllnessStatus(Long supIllnessStatus) {
|
||||
this.supIllnessStatus = supIllnessStatus;
|
||||
}
|
||||
|
||||
public Long getSubStep() {
|
||||
return subStep;
|
||||
}
|
||||
|
||||
public void setSubStep(Long subStep) {
|
||||
this.subStep = subStep;
|
||||
}
|
||||
|
||||
public Long getIsDel() {
|
||||
return isDel;
|
||||
}
|
||||
|
||||
public void setIsDel(Long isDel) {
|
||||
this.isDel = isDel;
|
||||
}
|
||||
|
||||
public String getUserNation() {
|
||||
return userNation;
|
||||
}
|
||||
|
||||
public void setUserNation(String userNation) {
|
||||
this.userNation = userNation;
|
||||
}
|
||||
|
||||
public Long getSortBy() {
|
||||
return sortBy;
|
||||
}
|
||||
|
||||
public void setSortBy(Long sortBy) {
|
||||
this.sortBy = sortBy;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProProjectInfoSubdeptsUsers{" +
|
||||
"id=" + id +
|
||||
", parId=" + parId +
|
||||
", comId=" + comId +
|
||||
", comName='" + comName + '\'' +
|
||||
", projectId=" + projectId +
|
||||
", projectName='" + projectName + '\'' +
|
||||
", subDeptId=" + subDeptId +
|
||||
", subDeptName='" + subDeptName + '\'' +
|
||||
", subDeptType='" + subDeptType + '\'' +
|
||||
", subDeptTypeName='" + subDeptTypeName + '\'' +
|
||||
", userPost='" + userPost + '\'' +
|
||||
", subDeptGroup=" + subDeptGroup +
|
||||
", subDeptGroupName='" + subDeptGroupName + '\'' +
|
||||
", subDeptPowerPath='" + subDeptPowerPath + '\'' +
|
||||
", userId=" + userId +
|
||||
", userName='" + userName + '\'' +
|
||||
", cardType='" + cardType + '\'' +
|
||||
", cardCode='" + cardCode + '\'' +
|
||||
", userSex='" + userSex + '\'' +
|
||||
", userAge=" + userAge +
|
||||
", userPicture='" + userPicture + '\'' +
|
||||
", userPhone='" + userPhone + '\'' +
|
||||
", degreeGrade='" + degreeGrade + '\'' +
|
||||
", degreeGradeName='" + degreeGradeName + '\'' +
|
||||
", userInfos='" + userInfos + '\'' +
|
||||
", craftType='" + craftType + '\'' +
|
||||
", craftTypeName='" + craftTypeName + '\'' +
|
||||
", craftPost='" + craftPost + '\'' +
|
||||
", craftPostName='" + craftPostName + '\'' +
|
||||
", eduStatus='" + eduStatus + '\'' +
|
||||
", eduFilePath='" + eduFilePath + '\'' +
|
||||
", eduDate=" + eduDate +
|
||||
", approveStatus=" + approveStatus +
|
||||
", useDate=" + useDate +
|
||||
", useStatus='" + useStatus + '\'' +
|
||||
", admitGuid='" + admitGuid + '\'' +
|
||||
", qrCode='" + qrCode + '\'' +
|
||||
", illnessStatus=" + illnessStatus +
|
||||
", supIllnessStatus=" + supIllnessStatus +
|
||||
", subStep=" + subStep +
|
||||
", isDel=" + isDel +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,22 @@
|
|||
package com.yanzhu.job.domain;
|
||||
|
||||
import com.yanzhu.common.core.annotation.Excel;
|
||||
import com.yanzhu.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 籍贯映射
|
||||
*/
|
||||
public class SysNative extends BaseEntity {
|
||||
|
||||
/** 编号 */
|
||||
private Long id;
|
||||
/** 地址 */
|
||||
private String address;
|
||||
/** 省份 */
|
||||
private String provinces;
|
||||
|
||||
/** 城市 */
|
||||
private String citiy;
|
||||
/** 区域 */
|
||||
private String areas;
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
|
@ -49,7 +57,4 @@ public class SysNative extends BaseEntity {
|
|||
this.areas = areas;
|
||||
}
|
||||
|
||||
private String citiy;
|
||||
private String areas;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package com.yanzhu.job.mapper;
|
||||
|
||||
import com.yanzhu.job.domain.DevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.DevIotDatas;
|
||||
import com.yanzhu.job.domain.DevIotWarning;
|
||||
import com.yanzhu.job.domain.QuartzDevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.QuartzDevIotDatas;
|
||||
import com.yanzhu.job.domain.QuartzDevIotWarning;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -10,7 +10,7 @@ import java.util.Map;
|
|||
/**
|
||||
* 萨达配电箱数据
|
||||
*/
|
||||
public interface DevIotMapper {
|
||||
public interface QuartzDevIotMapper {
|
||||
|
||||
/**
|
||||
* 获取配电箱配置信息
|
||||
|
|
@ -23,7 +23,7 @@ public interface DevIotMapper {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 配电箱配置集合
|
||||
*/
|
||||
public List<DevIotConfigPoint> selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint);
|
||||
public List<QuartzDevIotConfigPoint> selectDevIotConfigPointList(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 新增配电箱配置
|
||||
|
|
@ -31,7 +31,7 @@ public interface DevIotMapper {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint);
|
||||
public int insertDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 修改配电箱配置
|
||||
|
|
@ -39,7 +39,7 @@ public interface DevIotMapper {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint);
|
||||
public int updateDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 新增配电箱数据
|
||||
|
|
@ -47,7 +47,7 @@ public interface DevIotMapper {
|
|||
* @param devIotDatas 配电箱数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotDatas(DevIotDatas devIotDatas);
|
||||
public int insertDevIotDatas(QuartzDevIotDatas devIotDatas);
|
||||
|
||||
/**
|
||||
* 新增配电箱预警
|
||||
|
|
@ -55,6 +55,6 @@ public interface DevIotMapper {
|
|||
* @param devIotWarning 配电箱预警
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotWarning(DevIotWarning devIotWarning);
|
||||
public int insertDevIotWarning(QuartzDevIotWarning devIotWarning);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
package com.yanzhu.job.mapper;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsGroup;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位班组Mapper接口
|
||||
*
|
||||
* @author JiangYuqi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface QuartzProSubdeptsGroupMapper
|
||||
{
|
||||
/**
|
||||
* 查询分包单位班组
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 分包单位班组
|
||||
*/
|
||||
public QuartzProSubdeptsGroup selectQuartzProSubdeptsGroupById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位班组列表
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 分包单位班组集合
|
||||
*/
|
||||
public List<QuartzProSubdeptsGroup> selectQuartzProSubdeptsGroupList(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 新增分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 修改分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 删除分包单位班组
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsGroupById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位班组
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsGroupByIds(Long[] ids);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
package com.yanzhu.job.mapper;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdepts;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位Mapper接口
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface QuartzProSubdeptsMapper {
|
||||
/**
|
||||
* 查询分包单位
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 分包单位
|
||||
*/
|
||||
public QuartzProSubdepts selectQuartzProSubdeptsById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位列表
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 分包单位集合
|
||||
*/
|
||||
public List<QuartzProSubdepts> selectQuartzProSubdeptsList(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 新增分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 修改分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 删除分包单位
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsByIds(Long[] ids);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
package com.yanzhu.job.mapper;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsUsers;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位工人Mapper接口
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface QuartzProSubdeptsUsersMapper
|
||||
{
|
||||
/**
|
||||
* 查询分包单位工人
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 分包单位工人
|
||||
*/
|
||||
public QuartzProSubdeptsUsers selectQuartzProSubdeptsUsersById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位工人
|
||||
*
|
||||
* @param proId 项目主键
|
||||
* @param userId 工人主键
|
||||
* @return 分包单位工人
|
||||
*/
|
||||
public QuartzProSubdeptsUsers selectQuartzProSubdeptsUsersByParamId(@Param("proId")Long proId, @Param("userId")Long userId);
|
||||
|
||||
/**
|
||||
* 查询分包单位工人列表
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 分包单位工人集合
|
||||
*/
|
||||
public List<QuartzProSubdeptsUsers> selectQuartzProSubdeptsUsersList(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 新增分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 修改分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 删除分包单位工人
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsUsersById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位工人
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsUsersByIds(Long[] ids);
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
package com.yanzhu.job.mapper;
|
||||
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProjectAttendanceCfg;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -13,6 +12,14 @@ import java.util.List;
|
|||
*/
|
||||
public interface QuartzProjectAttendanceCfgMapper
|
||||
{
|
||||
|
||||
/**
|
||||
* 查询项目考勤配置信息
|
||||
* @param cfgId 项目考勤主键
|
||||
* @return
|
||||
*/
|
||||
public QuartzProjectAttendanceCfg selectSurProjectAttendanceCfgByCfgId(Long cfgId);
|
||||
|
||||
/**
|
||||
* 查询项目考勤配置列表
|
||||
*
|
||||
|
|
@ -21,5 +28,4 @@ public interface QuartzProjectAttendanceCfgMapper
|
|||
*/
|
||||
public List<QuartzProjectAttendanceCfg> selectSurProjectAttendanceCfgList(QuartzProjectAttendanceCfg quartzProjectAttendanceCfg);
|
||||
|
||||
public List<QuartzProjectAttendanceCfg> selectSurProjectAttendanceCfgListForAllInfo(QuartzProjectAttendanceCfg where);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,15 @@ import com.yanzhu.job.domain.SysNative;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 籍贯映射Mapper
|
||||
*/
|
||||
public interface SysNativeMapper {
|
||||
|
||||
/**
|
||||
* 根据编号查询籍贯
|
||||
* @param id 籍贯编号
|
||||
* @return
|
||||
*/
|
||||
public List<SysNative> selectSysNativeListById(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package com.yanzhu.job.service;
|
||||
|
||||
import com.yanzhu.job.domain.DevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.DevIotDatas;
|
||||
import com.yanzhu.job.domain.DevIotWarning;
|
||||
import com.yanzhu.job.domain.QuartzDevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.QuartzDevIotDatas;
|
||||
import com.yanzhu.job.domain.QuartzDevIotWarning;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -10,7 +10,7 @@ import java.util.Map;
|
|||
/**
|
||||
* 萨达配电箱数据
|
||||
*/
|
||||
public interface IDevIotService {
|
||||
public interface IQuartzDevIotService {
|
||||
|
||||
/**
|
||||
* 获取配电箱配置信息
|
||||
|
|
@ -23,7 +23,7 @@ public interface IDevIotService {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 配电箱配置集合
|
||||
*/
|
||||
public List<DevIotConfigPoint> selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint);
|
||||
public List<QuartzDevIotConfigPoint> selectDevIotConfigPointList(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 新增配电箱配置
|
||||
|
|
@ -31,7 +31,7 @@ public interface IDevIotService {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint);
|
||||
public int insertDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 修改配电箱配置
|
||||
|
|
@ -39,7 +39,7 @@ public interface IDevIotService {
|
|||
* @param devIotConfigPoint 配电箱配置
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint);
|
||||
public int updateDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint);
|
||||
|
||||
/**
|
||||
* 新增配电箱数据
|
||||
|
|
@ -47,7 +47,7 @@ public interface IDevIotService {
|
|||
* @param devIotDatas 配电箱数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotDatas(DevIotDatas devIotDatas);
|
||||
public int insertDevIotDatas(QuartzDevIotDatas devIotDatas);
|
||||
|
||||
/**
|
||||
* 新增配电箱预警
|
||||
|
|
@ -55,5 +55,5 @@ public interface IDevIotService {
|
|||
* @param devIotWarning 配电箱预警
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDevIotWarning(DevIotWarning devIotWarning);
|
||||
public int insertDevIotWarning(QuartzDevIotWarning devIotWarning);
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
package com.yanzhu.job.service;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsGroup;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位班组Service接口
|
||||
*
|
||||
* @author JiangYuqi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface IQuartzProSubdeptsGroupService
|
||||
{
|
||||
/**
|
||||
* 查询分包单位班组
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 分包单位班组
|
||||
*/
|
||||
public QuartzProSubdeptsGroup selectQuartzProSubdeptsGroupById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位班组列表
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 分包单位班组集合
|
||||
*/
|
||||
public List<QuartzProSubdeptsGroup> selectQuartzProSubdeptsGroupList(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 修改分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 修改分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位班组
|
||||
*
|
||||
* @param ids 需要删除的分包单位班组主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsGroupByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除分包单位班组信息
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsGroupById(Long id);
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package com.yanzhu.job.service;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdepts;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位Service接口
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface IQuartzProSubdeptsService
|
||||
{
|
||||
|
||||
/**
|
||||
* 查询分包单位
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 分包单位
|
||||
*/
|
||||
public QuartzProSubdepts selectQuartzProSubdeptsById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位列表
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 分包单位集合
|
||||
*/
|
||||
public List<QuartzProSubdepts> selectQuartzProSubdeptsList(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 新增分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 修改分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位
|
||||
*
|
||||
* @param ids 需要删除的分包单位主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除分包单位信息
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsById(Long id);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
package com.yanzhu.job.service;
|
||||
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsUsers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位工人Service接口
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
public interface IQuartzProSubdeptsUsersService
|
||||
{
|
||||
|
||||
/**
|
||||
* 查询分包单位工人
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 分包单位工人
|
||||
*/
|
||||
public QuartzProSubdeptsUsers selectQuartzProSubdeptsUsersById(Long id);
|
||||
|
||||
/**
|
||||
* 查询分包单位工人列表
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 分包单位工人集合
|
||||
*/
|
||||
public List<QuartzProSubdeptsUsers> selectQuartzProSubdeptsUsersList(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 新增分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 修改分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers);
|
||||
|
||||
/**
|
||||
* 批量删除分包单位工人
|
||||
*
|
||||
* @param ids 需要删除的分包单位工人主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsUsersByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除分包单位工人信息
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQuartzProSubdeptsUsersById(Long id);
|
||||
}
|
||||
|
|
@ -21,5 +21,4 @@ public interface IQuartzProjectAttendanceCfgService
|
|||
*/
|
||||
public List<QuartzProjectAttendanceCfg> selectSurProjectAttendanceCfgList(QuartzProjectAttendanceCfg quartzProjectAttendanceCfg);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
package com.yanzhu.job.service;
|
||||
|
||||
|
||||
|
||||
import com.yanzhu.job.domain.SysNative;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 籍贯映射Service
|
||||
*/
|
||||
public interface ISysNativeService {
|
||||
|
||||
/**
|
||||
* 根据编号查询籍贯
|
||||
* @param id 籍贯编号
|
||||
* @return
|
||||
*/
|
||||
public List<SysNative> selectSysNativeListById(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
package com.yanzhu.job.service;
|
||||
package com.yanzhu.job.service.impl;
|
||||
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.job.domain.DevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.DevIotDatas;
|
||||
import com.yanzhu.job.domain.DevIotWarning;
|
||||
import com.yanzhu.job.mapper.DevIotMapper;
|
||||
import com.yanzhu.job.domain.QuartzDevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.QuartzDevIotDatas;
|
||||
import com.yanzhu.job.domain.QuartzDevIotWarning;
|
||||
import com.yanzhu.job.mapper.QuartzDevIotMapper;
|
||||
import com.yanzhu.job.service.IQuartzDevIotService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
@ -15,10 +16,10 @@ import java.util.Map;
|
|||
* 萨达配电箱数据
|
||||
*/
|
||||
@Service
|
||||
public class DevIotServiceImpl implements IDevIotService{
|
||||
public class QuartzDevIotServiceImpl implements IQuartzDevIotService {
|
||||
|
||||
@Autowired
|
||||
private DevIotMapper devIotMapper;
|
||||
private QuartzDevIotMapper devIotMapper;
|
||||
|
||||
/**
|
||||
* 获取配电箱配置信息
|
||||
|
|
@ -35,7 +36,7 @@ public class DevIotServiceImpl implements IDevIotService{
|
|||
* @return 配电箱配置集合
|
||||
*/
|
||||
@Override
|
||||
public List<DevIotConfigPoint> selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint){
|
||||
public List<QuartzDevIotConfigPoint> selectDevIotConfigPointList(QuartzDevIotConfigPoint devIotConfigPoint){
|
||||
return devIotMapper.selectDevIotConfigPointList(devIotConfigPoint);
|
||||
}
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ public class DevIotServiceImpl implements IDevIotService{
|
|||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint)
|
||||
public int insertDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint)
|
||||
{
|
||||
devIotConfigPoint.setCreateTime(DateUtils.getNowDate());
|
||||
return devIotMapper.insertDevIotConfigPoint(devIotConfigPoint);
|
||||
|
|
@ -59,7 +60,7 @@ public class DevIotServiceImpl implements IDevIotService{
|
|||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateDevIotConfigPoint(DevIotConfigPoint devIotConfigPoint)
|
||||
public int updateDevIotConfigPoint(QuartzDevIotConfigPoint devIotConfigPoint)
|
||||
{
|
||||
devIotConfigPoint.setUpdateTime(DateUtils.getNowDate());
|
||||
return devIotMapper.updateDevIotConfigPoint(devIotConfigPoint);
|
||||
|
|
@ -72,7 +73,7 @@ public class DevIotServiceImpl implements IDevIotService{
|
|||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertDevIotDatas(DevIotDatas devIotDatas)
|
||||
public int insertDevIotDatas(QuartzDevIotDatas devIotDatas)
|
||||
{
|
||||
devIotDatas.setCreateTime(DateUtils.getNowDate());
|
||||
return devIotMapper.insertDevIotDatas(devIotDatas);
|
||||
|
|
@ -85,7 +86,7 @@ public class DevIotServiceImpl implements IDevIotService{
|
|||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertDevIotWarning(DevIotWarning devIotWarning)
|
||||
public int insertDevIotWarning(QuartzDevIotWarning devIotWarning)
|
||||
{
|
||||
devIotWarning.setCreateTime(DateUtils.getNowDate());
|
||||
return devIotMapper.insertDevIotWarning(devIotWarning);
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
package com.yanzhu.job.service.impl;
|
||||
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsGroup;
|
||||
import com.yanzhu.job.mapper.QuartzProSubdeptsGroupMapper;
|
||||
import com.yanzhu.job.service.IQuartzProSubdeptsGroupService;
|
||||
import com.yanzhu.system.api.RemoteUserService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位班组Service业务层处理
|
||||
*
|
||||
* @author JiangYuqi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
@Service
|
||||
public class QuartzProSubdeptsGroupServiceImpl implements IQuartzProSubdeptsGroupService
|
||||
{
|
||||
|
||||
@Autowired
|
||||
private RemoteUserService remoteUserService;
|
||||
|
||||
@Autowired
|
||||
private QuartzProSubdeptsGroupMapper quartzProSubdeptsGroupMapper;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(QuartzProSubdeptsGroupServiceImpl.class);
|
||||
|
||||
/**
|
||||
* 查询分包单位班组
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 分包单位班组
|
||||
*/
|
||||
@Override
|
||||
public QuartzProSubdeptsGroup selectQuartzProSubdeptsGroupById(Long id)
|
||||
{
|
||||
return quartzProSubdeptsGroupMapper.selectQuartzProSubdeptsGroupById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询分包单位班组列表
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 分包单位班组
|
||||
*/
|
||||
@Override
|
||||
public List<QuartzProSubdeptsGroup> selectQuartzProSubdeptsGroupList(QuartzProSubdeptsGroup quartzProSubdeptsGroup)
|
||||
{
|
||||
return quartzProSubdeptsGroupMapper.selectQuartzProSubdeptsGroupList(quartzProSubdeptsGroup);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public int insertQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup)
|
||||
{
|
||||
quartzProSubdeptsGroup.setCreateTime(DateUtils.getNowDate());
|
||||
return quartzProSubdeptsGroupMapper.insertQuartzProSubdeptsGroup(quartzProSubdeptsGroup);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改分包单位班组
|
||||
*
|
||||
* @param quartzProSubdeptsGroup 分包单位班组
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public int updateQuartzProSubdeptsGroup(QuartzProSubdeptsGroup quartzProSubdeptsGroup)
|
||||
{
|
||||
quartzProSubdeptsGroup.setUpdateTime(DateUtils.getNowDate());
|
||||
return quartzProSubdeptsGroupMapper.updateQuartzProSubdeptsGroup(quartzProSubdeptsGroup);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除分包单位班组
|
||||
*
|
||||
* @param ids 需要删除的分包单位班组主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsGroupByIds(Long[] ids)
|
||||
{
|
||||
return quartzProSubdeptsGroupMapper.deleteQuartzProSubdeptsGroupByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除分包单位班组信息
|
||||
*
|
||||
* @param id 分包单位班组主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsGroupById(Long id)
|
||||
{
|
||||
return quartzProSubdeptsGroupMapper.deleteQuartzProSubdeptsGroupById(id);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
package com.yanzhu.job.service.impl;
|
||||
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.job.domain.QuartzProSubdepts;
|
||||
import com.yanzhu.job.mapper.QuartzProSubdeptsMapper;
|
||||
import com.yanzhu.job.service.IQuartzProSubdeptsService;
|
||||
import com.yanzhu.system.api.RemoteUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分包单位Service业务层处理
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
@Service
|
||||
public class QuartzProSubdeptsServiceImpl implements IQuartzProSubdeptsService
|
||||
{
|
||||
|
||||
@Autowired
|
||||
private RemoteUserService remoteUserService;
|
||||
|
||||
@Autowired
|
||||
private QuartzProSubdeptsMapper quartzProSubdeptsMapper;
|
||||
|
||||
/**
|
||||
* 查询分包单位
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 分包单位
|
||||
*/
|
||||
@Override
|
||||
public QuartzProSubdepts selectQuartzProSubdeptsById(Long id)
|
||||
{
|
||||
QuartzProSubdepts quartzProSubdepts = quartzProSubdeptsMapper.selectQuartzProSubdeptsById(id);
|
||||
return quartzProSubdepts;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询分包单位列表
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 分包单位
|
||||
*/
|
||||
@Override
|
||||
public List<QuartzProSubdepts> selectQuartzProSubdeptsList(QuartzProSubdepts quartzProSubdepts)
|
||||
{
|
||||
return quartzProSubdeptsMapper.selectQuartzProSubdeptsList(quartzProSubdepts);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public int insertQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts)
|
||||
{
|
||||
quartzProSubdepts.setCreateBy("TASK");
|
||||
quartzProSubdepts.setCreateTime(DateUtils.getNowDate());
|
||||
return quartzProSubdeptsMapper.insertQuartzProSubdepts(quartzProSubdepts);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改分包单位
|
||||
*
|
||||
* @param quartzProSubdepts 分包单位
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public int updateQuartzProSubdepts(QuartzProSubdepts quartzProSubdepts)
|
||||
{
|
||||
quartzProSubdepts.setUpdateBy("TASK");
|
||||
quartzProSubdepts.setUpdateTime(DateUtils.getNowDate());
|
||||
return quartzProSubdeptsMapper.updateQuartzProSubdepts(quartzProSubdepts);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除分包单位
|
||||
*
|
||||
* @param ids 需要删除的分包单位主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsByIds(Long[] ids)
|
||||
{
|
||||
return quartzProSubdeptsMapper.deleteQuartzProSubdeptsByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除分包单位信息
|
||||
*
|
||||
* @param id 分包单位主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsById(Long id)
|
||||
{
|
||||
return quartzProSubdeptsMapper.deleteQuartzProSubdeptsById(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,332 @@
|
|||
package com.yanzhu.job.service.impl;
|
||||
|
||||
import com.yanzhu.common.core.constant.SecurityConstants;
|
||||
import com.yanzhu.common.core.enums.ApproveStatus;
|
||||
import com.yanzhu.common.core.enums.UseStateEnums;
|
||||
import com.yanzhu.common.core.enums.UserTypeEnums;
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.common.core.utils.StringUtils;
|
||||
import com.yanzhu.common.security.utils.SecurityUtils;
|
||||
import com.yanzhu.job.domain.QuartzProSubdeptsUsers;
|
||||
import com.yanzhu.job.mapper.QuartzProSubdeptsUsersMapper;
|
||||
import com.yanzhu.job.service.IQuartzProSubdeptsUsersService;
|
||||
import com.yanzhu.system.api.RemoteUserService;
|
||||
import com.yanzhu.system.api.domain.SysUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 分包单位工人Service业务层处理
|
||||
*
|
||||
* @author JiangYuQi
|
||||
* @date 2024-08-25
|
||||
*/
|
||||
@Service
|
||||
public class QuartzProSubdeptsUsersServiceImpl implements IQuartzProSubdeptsUsersService {
|
||||
|
||||
@Autowired
|
||||
private RemoteUserService remoteUserService;
|
||||
|
||||
@Autowired
|
||||
private QuartzProSubdeptsUsersMapper quartzProSubdeptsUsersMapper;
|
||||
|
||||
/**
|
||||
* 查询分包单位工人
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 分包单位工人
|
||||
*/
|
||||
@Override
|
||||
public QuartzProSubdeptsUsers selectQuartzProSubdeptsUsersById(Long id) {
|
||||
return quartzProSubdeptsUsersMapper.selectQuartzProSubdeptsUsersById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询分包单位工人列表
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 分包单位工人
|
||||
*/
|
||||
@Override
|
||||
public List<QuartzProSubdeptsUsers> selectQuartzProSubdeptsUsersList(QuartzProSubdeptsUsers quartzProSubdeptsUsers) {
|
||||
return quartzProSubdeptsUsersMapper.selectQuartzProSubdeptsUsersList(quartzProSubdeptsUsers);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers) {
|
||||
// if (StringUtils.isEmpty(quartzProSubdeptsUsers.getCardType())) {
|
||||
// quartzProSubdeptsUsers.setCardType("1");
|
||||
// }
|
||||
// if (StringUtils.isEmpty(quartzProSubdeptsUsers.getUserSex())) {
|
||||
// quartzProSubdeptsUsers.setUserSex(StringUtils.judgeGender(quartzProSubdeptsUsers.getCardCode()));
|
||||
// }
|
||||
// quartzProSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode());
|
||||
// quartzProSubdeptsUsers.setUseDate(DateUtils.getNowDate());
|
||||
// quartzProSubdeptsUsers.setCreateBy(SecurityUtils.getUsername());
|
||||
// quartzProSubdeptsUsers.setCreateTime(DateUtils.getNowDate());
|
||||
// quartzProSubdeptsUsers.setSubStep(2L);
|
||||
// quartzProSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode());
|
||||
//
|
||||
// // 参建单位信息
|
||||
// ProProjectInfoSubdepts subDepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(quartzProSubdeptsUsers.getSubDeptId());
|
||||
// if (quartzProSubdeptsUsers.getComId() == null) {
|
||||
// quartzProSubdeptsUsers.setComId(subDepts.getComId());
|
||||
// }
|
||||
// quartzProSubdeptsUsers.setSubDeptType(subDepts.getSubDeptType());
|
||||
//
|
||||
// SysUser sysUser = new SysUser();
|
||||
// sysUser.setComId(subDepts.getComId());
|
||||
// sysUser.setDeptId(subDepts.getProjectId());
|
||||
// sysUser.setUserName(quartzProSubdeptsUsers.getUserPhone());
|
||||
// sysUser.setNickName(quartzProSubdeptsUsers.getUserName());
|
||||
// sysUser.setPhonenumber(quartzProSubdeptsUsers.getUserPhone());
|
||||
// sysUser.setUpdateBy(SecurityUtils.getUsername());
|
||||
// sysUser.setUpdateTime(DateUtils.getNowDate());
|
||||
// sysUser.setUserInfos(quartzProSubdeptsUsers.getUserInfos());
|
||||
//
|
||||
// String subDeptType = quartzProSubdeptsUsers.getSubDeptType();
|
||||
// // 判断单位类型
|
||||
// if (Objects.nonNull(subDeptType)) {
|
||||
// if (Objects.equals(SubDeptsEnums.JSDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.JSDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.JLDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.JLDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.JLDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.SGDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.SGDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.SGDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.ZYFB.getCode(), subDeptType) || Objects.equals(SubDeptsEnums.LWFB.getCode(), subDeptType)) {
|
||||
// //判断工种岗位设置用户岗位...PC需要单独设置
|
||||
// if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.WTDL.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBWTDL.getCode());
|
||||
// quartzProSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.WTDL.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.XMJL.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
|
||||
// quartzProSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.AQZY.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
|
||||
// quartzProSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.AQRY.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.CLZY.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
|
||||
// quartzProSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.CLRY.getCode());
|
||||
// } else {
|
||||
// sysUser.setUserType(UserTypeEnums.FBLWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.LWGR.getCode());
|
||||
// }
|
||||
// } else if (Objects.equals(SubDeptsEnums.CLFB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.CLFBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.CLFBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.HQFB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.HQFBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.HQFBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.TSSB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.TSSBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.TSSBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.KTDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.KTDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.KTDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.SJDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.SJDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.SJDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.QTDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.OTHERS.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.QTDWGL.getCode());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// sysUser.setActiveProjectId(quartzProSubdeptsUsers.getProjectId());
|
||||
// Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
|
||||
// quartzProSubdeptsUsers.setUserId(userId);
|
||||
// int res = quartzProSubdeptsUsersMapper.insertQuartzProSubdeptsUsers(quartzProSubdeptsUsers);
|
||||
// String userPost = quartzProSubdeptsUsers.getUserPost();
|
||||
// if (res > 0 && (Objects.equals(UserPostEnums.WTDL.getCode(), userPost) || Objects.equals(UserPostEnums.XMJL.getCode(), userPost) || Objects.equals(UserPostEnums.BZZ.getCode(), userPost))) {
|
||||
// // 生成二维码
|
||||
// try {
|
||||
// String accessToken = wxMaService.getAccessToken();
|
||||
// String filePath = DateUtils.datePath() + "/" + System.currentTimeMillis() + ".png";
|
||||
// String savePath = ProfileConfig.profilePath + "/" + filePath;
|
||||
// String profilePath = ProfileConfig.profile + "/" + filePath;
|
||||
// log.info("accessToken...{}", accessToken);
|
||||
// // 生成二维码
|
||||
// if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// }
|
||||
// quartzProSubdeptsUsers.setQrCode(profilePath);
|
||||
// quartzProSubdeptsUsersMapper.updateQuartzProSubdeptsUsers(quartzProSubdeptsUsers);
|
||||
// } catch (Exception e) {
|
||||
// log.error(e.getMessage());
|
||||
// }
|
||||
// }
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改分包单位工人
|
||||
*
|
||||
* @param quartzProSubdeptsUsers 分包单位工人
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateQuartzProSubdeptsUsers(QuartzProSubdeptsUsers quartzProSubdeptsUsers) {
|
||||
// 参建单位信息
|
||||
// ProProjectInfoSubdepts subDepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(quartzProSubdeptsUsers.getSubDeptId());
|
||||
// quartzProSubdeptsUsers.setSubDeptType(subDepts.getSubDeptType());
|
||||
//
|
||||
// SysUser sysUser = new SysUser();
|
||||
// sysUser.setComId(subDepts.getComId());
|
||||
// sysUser.setDeptId(subDepts.getProjectId());
|
||||
// sysUser.setUserName(quartzProSubdeptsUsers.getUserPhone());
|
||||
// sysUser.setNickName(quartzProSubdeptsUsers.getUserName());
|
||||
// sysUser.setPhonenumber(quartzProSubdeptsUsers.getUserPhone());
|
||||
// sysUser.setUpdateBy(SecurityUtils.getUsername());
|
||||
// sysUser.setUpdateTime(DateUtils.getNowDate());
|
||||
// sysUser.setUserInfos(quartzProSubdeptsUsers.getUserInfos());
|
||||
//
|
||||
// String subDeptType = quartzProSubdeptsUsers.getSubDeptType();
|
||||
// // 判断单位类型
|
||||
// if (Objects.nonNull(subDeptType)) {
|
||||
// if (Objects.equals(SubDeptsEnums.JSDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.JSDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.JLDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.JLDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.JLDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.SGDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.SGDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.SGDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.ZYFB.getCode(), subDeptType) || Objects.equals(SubDeptsEnums.LWFB.getCode(), subDeptType)) {
|
||||
// //判断工种岗位设置用户岗位...PC需要单独设置
|
||||
// if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.WTDL.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBWTDL.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.WTDL.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.XMJL.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.AQZY.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.AQRY.getCode());
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getCraftPost(), CraftPostEnums.CLZY.getCode())) {
|
||||
// sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.CLRY.getCode());
|
||||
// } else {
|
||||
// sysUser.setUserType(UserTypeEnums.FBLWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.LWGR.getCode());
|
||||
// }
|
||||
// } else if (Objects.equals(SubDeptsEnums.CLFB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.CLFBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.CLFBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.HQFB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.HQFBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.HQFBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.TSSB.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.TSSBRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.TSSBGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.KTDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.KTDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.KTDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.SJDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.SJDWRY.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.SJDWGL.getCode());
|
||||
// } else if (Objects.equals(SubDeptsEnums.QTDW.getCode(), subDeptType)) {
|
||||
// sysUser.setUserType(UserTypeEnums.OTHERS.getCode());
|
||||
// quartzProSubdeptsUsers.setUserPost(UserPostEnums.QTDWGL.getCode());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// sysUser.setActiveProjectId(quartzProSubdeptsUsers.getProjectId());
|
||||
// remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
|
||||
//
|
||||
// QuartzProSubdeptsUsers old = quartzProSubdeptsUsersMapper.selectQuartzProSubdeptsUsersById(quartzProSubdeptsUsers.getId());
|
||||
// quartzProSubdeptsUsers.setUserId(old.getUserId());
|
||||
// quartzProSubdeptsUsers.setQrCode(old.getQrCode());
|
||||
// quartzProSubdeptsUsers.setAdmitGuid(old.getAdmitGuid());
|
||||
// quartzProSubdeptsUsers.setFaceGuid(old.getFaceGuid());
|
||||
// quartzProSubdeptsUsers.setUpdateBy(SecurityUtils.getUsername());
|
||||
// quartzProSubdeptsUsers.setUpdateTime(DateUtils.getNowDate());
|
||||
//
|
||||
// /**
|
||||
// * 考勤需要信息改变时推送信息...
|
||||
// */
|
||||
// if (!Objects.equals(quartzProSubdeptsUsers.getUserName(), old.getUserName()) || !Objects.equals(quartzProSubdeptsUsers.getCardCode(), old.getCardCode()) ||
|
||||
// !Objects.equals(quartzProSubdeptsUsers.getUserPhone(), old.getUserPhone()) || !Objects.equals(quartzProSubdeptsUsers.getUserPicture(), old.getUserPicture())) {
|
||||
// uniService.syncUniUser(quartzProSubdeptsUsers, false);
|
||||
// }
|
||||
//
|
||||
// if (!Objects.equals(old.getUserPost(), quartzProSubdeptsUsers.getUserPost())) {
|
||||
// String userPost = quartzProSubdeptsUsers.getUserPost();
|
||||
// if (Objects.equals(UserPostEnums.WTDL.getCode(), userPost) || Objects.equals(UserPostEnums.XMJL.getCode(), userPost) || Objects.equals(UserPostEnums.BZZ.getCode(), userPost)) {
|
||||
// if (!Objects.equals(quartzProSubdeptsUsers.getUserPost(), old.getUserPost()) || StringUtils.isEmpty(quartzProSubdeptsUsers.getQrCode())) {
|
||||
// // 生成二维码
|
||||
// try {
|
||||
// String accessToken = wxMaService.getAccessToken();
|
||||
// String filePath = DateUtils.datePath() + "/" + System.currentTimeMillis() + ".png";
|
||||
// String savePath = ProfileConfig.profilePath + "/" + filePath;
|
||||
// String profilePath = ProfileConfig.profile + "/" + filePath;
|
||||
// log.info("accessToken...{}", accessToken);
|
||||
// // 生成二维码
|
||||
// if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// } else if (Objects.equals(quartzProSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())) {
|
||||
// File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID=" + quartzProSubdeptsUsers.getProjectId() + "&PARID=" + quartzProSubdeptsUsers.getId(), 280);
|
||||
// FileUtil.copyFile(file, new File(savePath));
|
||||
// }
|
||||
// quartzProSubdeptsUsers.setQrCode(profilePath);
|
||||
// return quartzProSubdeptsUsersMapper.updateQuartzProSubdeptsUsers(quartzProSubdeptsUsers);
|
||||
// } catch (Exception e) {
|
||||
// log.error(e.getMessage());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
return quartzProSubdeptsUsersMapper.updateQuartzProSubdeptsUsers(quartzProSubdeptsUsers);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除分包单位工人
|
||||
*
|
||||
* @param ids 需要删除的分包单位工人主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsUsersByIds(Long[] ids) {
|
||||
return quartzProSubdeptsUsersMapper.deleteQuartzProSubdeptsUsersByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除分包单位工人信息
|
||||
*
|
||||
* @param id 分包单位工人主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQuartzProSubdeptsUsersById(Long id) {
|
||||
return quartzProSubdeptsUsersMapper.deleteQuartzProSubdeptsUsersById(id);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +1,12 @@
|
|||
package com.yanzhu.job.service.impl;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.yanzhu.common.core.enums.ApplyCfgTypeEnum;
|
||||
import com.yanzhu.common.core.enums.ShiFouEnum;
|
||||
import com.yanzhu.common.core.enums.VendorsCodeEnum;
|
||||
import com.yanzhu.common.core.utils.DateUtils;
|
||||
import com.yanzhu.common.security.utils.SecurityUtils;
|
||||
import com.yanzhu.job.domain.QuartzProjectAttendanceCfg;
|
||||
import com.yanzhu.job.domain.SysApplyConfig;
|
||||
import com.yanzhu.job.mapper.QuartzProjectAttendanceCfgMapper;
|
||||
import com.yanzhu.job.service.IQuartzProjectAttendanceCfgService;
|
||||
import com.yanzhu.job.service.ISysApplyConfigService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -36,7 +27,7 @@ public class QuartzProjectAttendanceCfgServiceImpl implements IQuartzProjectAtte
|
|||
|
||||
/**
|
||||
* 查询项目考勤配置列表
|
||||
*
|
||||
* R
|
||||
* @param quartzProjectAttendanceCfg 项目考勤配置
|
||||
* @return 项目考勤配置
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -226,13 +226,7 @@ public class QuartzProjectAttendanceDataServiceImpl implements IQuartzProjectAtt
|
|||
sdata.setGroupName(group.getTeamName());
|
||||
}
|
||||
//查询项目部门信息
|
||||
QuartzProjectAttendanceCfg cfgWhere=new QuartzProjectAttendanceCfg();
|
||||
cfgWhere.setId(sdata.getCfgid());
|
||||
List<QuartzProjectAttendanceCfg> cfgList= quartzProjectAttendanceCfgMapper.selectSurProjectAttendanceCfgListForAllInfo(cfgWhere);
|
||||
if(cfgList.size()==0){
|
||||
return;
|
||||
}
|
||||
QuartzProjectAttendanceCfg cfg=cfgList.get(0);
|
||||
QuartzProjectAttendanceCfg cfg = quartzProjectAttendanceCfgMapper.selectSurProjectAttendanceCfgByCfgId(sdata.getCfgid());
|
||||
sdata.setProjectId(cfg.getProjectId());
|
||||
sdata.setDeptId(cfg.getDeptId());
|
||||
sdata.setProjectName(cfg.getProjectName());
|
||||
|
|
@ -443,13 +437,7 @@ public class QuartzProjectAttendanceDataServiceImpl implements IQuartzProjectAtt
|
|||
sdata.setGroupName(group.getTeamName());
|
||||
}
|
||||
//查询项目部门信息
|
||||
QuartzProjectAttendanceCfg cfgWhere=new QuartzProjectAttendanceCfg();
|
||||
cfgWhere.setId(sdata.getCfgid());
|
||||
List<QuartzProjectAttendanceCfg> cfgList= quartzProjectAttendanceCfgMapper.selectSurProjectAttendanceCfgListForAllInfo(cfgWhere);
|
||||
if(cfgList.size()==0){
|
||||
return;
|
||||
}
|
||||
QuartzProjectAttendanceCfg cfg=cfgList.get(0);
|
||||
QuartzProjectAttendanceCfg cfg = quartzProjectAttendanceCfgMapper.selectSurProjectAttendanceCfgByCfgId(sdata.getCfgid());
|
||||
sdata.setProjectId(cfg.getProjectId());
|
||||
sdata.setDeptId(cfg.getDeptId());
|
||||
sdata.setProjectName(cfg.getProjectName());
|
||||
|
|
|
|||
|
|
@ -8,12 +8,20 @@ import org.springframework.stereotype.Service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 籍贯映射ServiceImpl
|
||||
*/
|
||||
@Service
|
||||
public class SysNativeServiceImpl implements ISysNativeService {
|
||||
|
||||
@Autowired
|
||||
SysNativeMapper sysNativeMapper;
|
||||
|
||||
/**
|
||||
* 根据编号查询籍贯
|
||||
* @param id 籍贯编号
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<SysNative> selectSysNativeListById(Long id) {
|
||||
return sysNativeMapper.selectSysNativeListById(id);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -129,7 +129,7 @@ public class AttendanceTask {
|
|||
Request request = new Request.Builder()
|
||||
.url(urlBuilder.build())
|
||||
.build();
|
||||
String data=getResult(request);
|
||||
String data = getResult(request);
|
||||
JSONObject jo= JSON.parseObject(data);
|
||||
JSONArray arr=jo.getJSONArray("data");
|
||||
if(arr!=null && arr.size()>0) {
|
||||
|
|
@ -162,7 +162,7 @@ public class AttendanceTask {
|
|||
Request request = new Request.Builder()
|
||||
.url(urlBuilder.build())
|
||||
.build();
|
||||
String data=getResult(request);
|
||||
String data = getResult(request);
|
||||
JSONObject jo= JSON.parseObject(data);
|
||||
JSONArray arr=jo.getJSONArray("data");
|
||||
if(arr!=null && arr.size()>0){
|
||||
|
|
@ -234,7 +234,7 @@ public class AttendanceTask {
|
|||
Request request = new Request.Builder()
|
||||
.url(urlBuilder.build())
|
||||
.build();
|
||||
String data=getResult(request);
|
||||
String data = getResult(request);
|
||||
JSONObject jo= JSON.parseObject(data);
|
||||
JSONArray arr=jo.getJSONArray("data");
|
||||
String lastId= "0";
|
||||
|
|
@ -278,7 +278,7 @@ public class AttendanceTask {
|
|||
Request request = new Request.Builder()
|
||||
.url(urlBuilder.build())
|
||||
.build();
|
||||
String data=getResult(request);
|
||||
String data = getResult(request);
|
||||
//System.out.println("data:"+data);
|
||||
JSONObject jo= JSON.parseObject(data);
|
||||
JSONArray jsonArray=jo.getJSONArray("data");
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ import com.yanzhu.common.core.constant.ApiConstants;
|
|||
import com.yanzhu.common.core.text.Convert;
|
||||
import com.yanzhu.common.core.utils.StringUtils;
|
||||
import com.yanzhu.common.core.utils.http.HttpUtils;
|
||||
import com.yanzhu.job.domain.DevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.DevIotDatas;
|
||||
import com.yanzhu.job.domain.DevIotWarning;
|
||||
import com.yanzhu.job.service.IDevIotService;
|
||||
import com.yanzhu.job.domain.QuartzDevIotConfigPoint;
|
||||
import com.yanzhu.job.domain.QuartzDevIotDatas;
|
||||
import com.yanzhu.job.domain.QuartzDevIotWarning;
|
||||
import com.yanzhu.job.service.IQuartzDevIotService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -30,7 +30,7 @@ import java.util.stream.Collectors;
|
|||
public class SadaHzDataTask {
|
||||
|
||||
@Autowired
|
||||
private IDevIotService devIotService;
|
||||
private IQuartzDevIotService devIotService;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(SadaHzDataTask.class);
|
||||
|
||||
|
|
@ -60,11 +60,11 @@ public class SadaHzDataTask {
|
|||
* 获取配电箱数据/预警
|
||||
*/
|
||||
public void getIotPowerDatas() {
|
||||
DevIotConfigPoint pointQuery = new DevIotConfigPoint();
|
||||
QuartzDevIotConfigPoint pointQuery = new QuartzDevIotConfigPoint();
|
||||
pointQuery.setIsDel("0");
|
||||
List<DevIotConfigPoint> configPoints = devIotService.selectDevIotConfigPointList(pointQuery);
|
||||
List<QuartzDevIotConfigPoint> configPoints = devIotService.selectDevIotConfigPointList(pointQuery);
|
||||
if(configPoints.size()>0){
|
||||
for(DevIotConfigPoint configPoint:configPoints){
|
||||
for(QuartzDevIotConfigPoint configPoint:configPoints){
|
||||
// 判断是萨达设备
|
||||
if(StringUtils.eqObj(configPoint.getFactoryName(),"SD")){
|
||||
if(StringUtils.isNotEmpty(configPoint.getDeviceSn())){
|
||||
|
|
@ -80,7 +80,7 @@ public class SadaHzDataTask {
|
|||
JSONArray leakages = result.getJSONArray("leakages");
|
||||
// 智能报警数据
|
||||
JSONObject ticketStatus = result.getJSONObject("ticketStatus");
|
||||
DevIotDatas devIotDatas = new DevIotDatas();
|
||||
QuartzDevIotDatas devIotDatas = new QuartzDevIotDatas();
|
||||
devIotDatas.setCfgId(configPoint.getCfgId());
|
||||
devIotDatas.setPointId(configPoint.getId());
|
||||
devIotDatas.setComId(configPoint.getComId());
|
||||
|
|
@ -124,7 +124,7 @@ public class SadaHzDataTask {
|
|||
devIotService.insertDevIotDatas(devIotDatas);
|
||||
|
||||
// 智能预警数据
|
||||
DevIotWarning devIotWarning = new DevIotWarning();
|
||||
QuartzDevIotWarning devIotWarning = new QuartzDevIotWarning();
|
||||
devIotWarning.setCfgId(configPoint.getCfgId());
|
||||
devIotWarning.setPointId(configPoint.getId());
|
||||
devIotWarning.setComId(configPoint.getComId());
|
||||
|
|
@ -171,9 +171,9 @@ public class SadaHzDataTask {
|
|||
|
||||
/**
|
||||
* 获取项目配置HashIds
|
||||
* @param signalName
|
||||
* @param signalCode
|
||||
* @param proName
|
||||
* @param signalName 通信账号
|
||||
* @param signalCode 通信密码
|
||||
* @param proName 项目名称
|
||||
* @return
|
||||
*/
|
||||
private static String getSaDaProjectHashIds(String signalName, String signalCode, String proName){
|
||||
|
|
@ -209,8 +209,8 @@ public class SadaHzDataTask {
|
|||
|
||||
/**
|
||||
* 获取项目设备
|
||||
* @param devIotConfig
|
||||
* @param proHashId
|
||||
* @param configMap 配置信息
|
||||
* @param proHashId 点位编号
|
||||
*/
|
||||
private void findSaDaBoxByProjectHashId(Map<String,Object> configMap, String proHashId){
|
||||
try {
|
||||
|
|
@ -218,14 +218,14 @@ public class SadaHzDataTask {
|
|||
String resStr = HttpUtils.sendGet(ApiConstants.IOT_SD_HOST+"/box/project/"+proHashId);
|
||||
JSONArray result = JSONObject.parseObject(resStr).getJSONArray("result");
|
||||
if(result.size()>0){
|
||||
DevIotConfigPoint pointQuery = new DevIotConfigPoint();
|
||||
QuartzDevIotConfigPoint pointQuery = new QuartzDevIotConfigPoint();
|
||||
pointQuery.setCfgId(cfgId);
|
||||
List<DevIotConfigPoint> pointList = devIotService.selectDevIotConfigPointList(pointQuery);
|
||||
List<QuartzDevIotConfigPoint> pointList = devIotService.selectDevIotConfigPointList(pointQuery);
|
||||
result.forEach(item -> {
|
||||
JSONObject obj = (JSONObject) item;
|
||||
List<DevIotConfigPoint> pointItems = pointList.stream().filter(point -> StringUtils.eqObj(point.getDeviceSn(),obj.getString("hashId"))).collect(Collectors.toList());
|
||||
List<QuartzDevIotConfigPoint> pointItems = pointList.stream().filter(point -> StringUtils.eqObj(point.getDeviceSn(),obj.getString("hashId"))).collect(Collectors.toList());
|
||||
if(pointItems.size()>0){
|
||||
DevIotConfigPoint devIotConfigPoint = pointItems.get(0);
|
||||
QuartzDevIotConfigPoint devIotConfigPoint = pointItems.get(0);
|
||||
devIotConfigPoint.setDeviceName(obj.getString("name"));
|
||||
devIotConfigPoint.setFactoryName(Convert.toStr(configMap.get("factory_name")));
|
||||
devIotConfigPoint.setLevels(obj.getString("level"));
|
||||
|
|
@ -237,7 +237,7 @@ public class SadaHzDataTask {
|
|||
devIotConfigPoint.setOnlineStatus(obj.getJSONObject("device").getString("onlineStatus"));
|
||||
devIotService.updateDevIotConfigPoint(devIotConfigPoint);
|
||||
}else{
|
||||
DevIotConfigPoint devIotConfigPoint = new DevIotConfigPoint();
|
||||
QuartzDevIotConfigPoint devIotConfigPoint = new QuartzDevIotConfigPoint();
|
||||
devIotConfigPoint.setCfgId(cfgId);
|
||||
devIotConfigPoint.setComId(Convert.toLong(configMap.get("com_id")));
|
||||
devIotConfigPoint.setProjectId(Convert.toLong(configMap.get("project_id")));
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yanzhu.job.mapper.DevIotMapper">
|
||||
<mapper namespace="com.yanzhu.job.mapper.QuartzDevIotMapper">
|
||||
|
||||
<resultMap type="DevIotConfigPoint" id="DevIotConfigPointResult">
|
||||
<resultMap type="QuartzDevIotConfigPoint" id="DevIotConfigPointResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="cfgId" column="cfg_id" />
|
||||
<result property="comId" column="com_id" />
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
select id, cfg_id, com_id, project_id, device_sn, device_name, factory_name, contact_person, contact_person_phone, levels, leakage_current, rated_temperature, short_circuit_current, rated_current, rated_voltage, online_status, is_del, create_by, create_time, update_by, update_time, remark from dev_iot_config_point
|
||||
</sql>
|
||||
|
||||
<select id="selectDevIotConfigPointList" parameterType="DevIotConfigPoint" resultMap="DevIotConfigPointResult">
|
||||
<select id="selectDevIotConfigPointList" parameterType="QuartzDevIotConfigPoint" resultMap="DevIotConfigPointResult">
|
||||
<include refid="selectDevIotConfigPointVo"/>
|
||||
<where>
|
||||
<if test="cfgId != null "> and cfg_id = #{cfgId}</if>
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<insert id="insertDevIotConfigPoint" parameterType="DevIotConfigPoint" useGeneratedKeys="true" keyProperty="id">
|
||||
<insert id="insertDevIotConfigPoint" parameterType="QuartzDevIotConfigPoint" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into dev_iot_config_point
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="cfgId != null">cfg_id,</if>
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateDevIotConfigPoint" parameterType="DevIotConfigPoint">
|
||||
<update id="updateDevIotConfigPoint" parameterType="QuartzDevIotConfigPoint">
|
||||
update dev_iot_config_point
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
where dic.is_del = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertDevIotDatas" parameterType="DevIotDatas" useGeneratedKeys="true" keyProperty="id">
|
||||
<insert id="insertDevIotDatas" parameterType="QuartzDevIotDatas" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into dev_iot_datas
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="cfgId != null">cfg_id,</if>
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
</trim>
|
||||
</insert>
|
||||
|
||||
<insert id="insertDevIotWarning" parameterType="DevIotWarning" useGeneratedKeys="true" keyProperty="id">
|
||||
<insert id="insertDevIotWarning" parameterType="QuartzDevIotWarning" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into dev_iot_warning
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="cfgId != null">cfg_id,</if>
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
<?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.yanzhu.job.mapper.QuartzProSubdeptsGroupMapper">
|
||||
|
||||
<resultMap type="QuartzProSubdeptsGroup" id="QuartzProSubdeptsGroupResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="projectId" column="project_id" />
|
||||
<result property="projectName" column="project_name" />
|
||||
<result property="subDeptId" column="sub_dept_id" />
|
||||
<result property="subDeptType" column="sub_dept_type" />
|
||||
<result property="subDeptTypeName" column="sub_dept_type_name" />
|
||||
<result property="subDeptName" column="sub_dept_name" />
|
||||
<result property="subDeptCode" column="sub_dept_code" />
|
||||
<result property="groupName" column="group_name" />
|
||||
<result property="groupCode" column="group_code" />
|
||||
<result property="craftType" column="craft_type" />
|
||||
<result property="craftTypeName" column="craft_type_name" />
|
||||
<result property="craftPost" column="craft_post" />
|
||||
<result property="craftPostName" column="craft_post_name" />
|
||||
<result property="groupLeaderName" column="group_leader_name" />
|
||||
<result property="groupLeaderCode" column="group_leader_code" />
|
||||
<result property="groupLeaderPhone" column="group_leader_phone" />
|
||||
<result property="useStatus" column="use_status" />
|
||||
<result property="approveStatus" column="approve_status" />
|
||||
<result property="qrCode" column="qr_code" />
|
||||
<result property="isDel" column="is_del" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectQuartzProSubdeptsGroupVo">
|
||||
select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
|
||||
from pro_project_info_subdepts_group psg
|
||||
left join pro_project_info pi on pi.id = psg.project_id
|
||||
left join sys_dept sd on sd.dept_id = psg.com_id
|
||||
left join sys_dict_data dic0 on psg.`sub_dept_type`=dic0.`dict_value` and dic0.`dict_type`='sub_dept_type'
|
||||
left join sys_dict_data dic1 on psg.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type'
|
||||
left join sys_dict_data dic2 on psg.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post'
|
||||
</sql>
|
||||
|
||||
<select id="selectQuartzProSubdeptsGroupList" parameterType="QuartzProSubdeptsGroup" resultMap="QuartzProSubdeptsGroupResult">
|
||||
<include refid="selectQuartzProSubdeptsGroupVo"/>
|
||||
<where>
|
||||
<if test="comId != null "> and psg.com_id = #{comId}</if>
|
||||
<if test="projectId != null "> and psg.project_id = #{projectId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and pi.project_name = #{projectName}</if>
|
||||
<if test="subDeptId != null "> and psg.sub_dept_id = #{subDeptId}</if>
|
||||
<if test="subDeptType != null and subDeptType != ''"> and psg.sub_dept_type = #{subDeptType}</if>
|
||||
and psg.is_del != 2
|
||||
</where>
|
||||
order by psg.id desc
|
||||
</select>
|
||||
|
||||
<select id="selectQuartzProSubdeptsGroupById" parameterType="Long" resultMap="QuartzProSubdeptsGroupResult">
|
||||
<include refid="selectQuartzProSubdeptsGroupVo"/>
|
||||
where psg.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertQuartzProSubdeptsGroup" parameterType="QuartzProSubdeptsGroup" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into pro_project_info_subdepts_group
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="subDeptId != null">sub_dept_id,</if>
|
||||
<if test="subDeptType != null">sub_dept_type,</if>
|
||||
<if test="subDeptName != null">sub_dept_name,</if>
|
||||
<if test="subDeptCode != null">sub_dept_code,</if>
|
||||
<if test="groupName != null">group_name,</if>
|
||||
<if test="groupCode != null">group_code,</if>
|
||||
<if test="craftType != null">craft_type,</if>
|
||||
<if test="craftPost != null">craft_post,</if>
|
||||
<if test="groupLeaderName != null">group_leader_name,</if>
|
||||
<if test="groupLeaderCode != null">group_leader_code,</if>
|
||||
<if test="groupLeaderPhone != null">group_leader_phone,</if>
|
||||
<if test="useStatus != null">use_status,</if>
|
||||
<if test="approveStatus != null">approve_status,</if>
|
||||
<if test="qrCode != null">qr_code,</if>
|
||||
<if test="isDel != null">is_del,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="subDeptId != null">#{subDeptId},</if>
|
||||
<if test="subDeptType != null">#{subDeptType},</if>
|
||||
<if test="subDeptName != null">#{subDeptName},</if>
|
||||
<if test="subDeptCode != null">#{subDeptCode},</if>
|
||||
<if test="groupName != null">#{groupName},</if>
|
||||
<if test="groupCode != null">#{groupCode},</if>
|
||||
<if test="craftType != null">#{craftType},</if>
|
||||
<if test="craftPost != null">#{craftPost},</if>
|
||||
<if test="groupLeaderName != null">#{groupLeaderName},</if>
|
||||
<if test="groupLeaderCode != null">#{groupLeaderCode},</if>
|
||||
<if test="groupLeaderPhone != null">#{groupLeaderPhone},</if>
|
||||
<if test="useStatus != null">#{useStatus},</if>
|
||||
<if test="approveStatus != null">#{approveStatus},</if>
|
||||
<if test="qrCode != null">#{qrCode},</if>
|
||||
<if test="isDel != null">#{isDel},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQuartzProSubdeptsGroup" parameterType="QuartzProSubdeptsGroup">
|
||||
update pro_project_info_subdepts_group
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
|
||||
<if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>
|
||||
<if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>
|
||||
<if test="subDeptCode != null">sub_dept_code = #{subDeptCode},</if>
|
||||
<if test="groupName != null">group_name = #{groupName},</if>
|
||||
<if test="groupCode != null">group_code = #{groupCode},</if>
|
||||
<if test="craftType != null">craft_type = #{craftType},</if>
|
||||
<if test="craftPost != null">craft_post = #{craftPost},</if>
|
||||
<if test="groupLeaderName != null">group_leader_name = #{groupLeaderName},</if>
|
||||
<if test="groupLeaderCode != null">group_leader_code = #{groupLeaderCode},</if>
|
||||
<if test="groupLeaderPhone != null">group_leader_phone = #{groupLeaderPhone},</if>
|
||||
<if test="useStatus != null">use_status = #{useStatus},</if>
|
||||
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
|
||||
<if test="qrCode != null">qr_code = #{qrCode},</if>
|
||||
<if test="isDel != null">is_del = #{isDel},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsGroupById" parameterType="Long">
|
||||
update pro_project_info_subdepts_group set is_del = 2 where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsGroupByIds" parameterType="String">
|
||||
update pro_project_info_subdepts_group set is_del = 2 where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,167 @@
|
|||
<?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.yanzhu.job.mapper.QuartzProSubdeptsMapper">
|
||||
|
||||
<resultMap type="QuartzProSubdepts" id="QuartzProSubdeptsResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="projectId" column="project_id" />
|
||||
<result property="projectName" column="project_name" />
|
||||
<result property="subDeptType" column="sub_dept_type" />
|
||||
<result property="subDeptTypeName" column="sub_dept_type_name" />
|
||||
<result property="subDeptName" column="sub_dept_name" />
|
||||
<result property="subDeptCode" column="sub_dept_code" />
|
||||
<result property="subDeptLeaderId" column="sub_dept_leader_id" />
|
||||
<result property="subDeptLeaderName" column="sub_dept_leader_name" />
|
||||
<result property="subDeptLeaderCode" column="sub_dept_leader_code" />
|
||||
<result property="subDeptLeaderPhone" column="sub_dept_leader_phone" />
|
||||
<result property="businessLicensePath" column="business_license_path" />
|
||||
<result property="subDeptInfos" column="sub_dept_infos" />
|
||||
<result property="contractInfos" column="contract_infos" />
|
||||
<result property="useDates" column="use_dates" />
|
||||
<result property="startWorkDates" column="start_work_dates" />
|
||||
<result property="endWorkDates" column="end_work_dates" />
|
||||
<result property="useStatus" column="use_status" />
|
||||
<result property="approveStatus" column="approve_status" />
|
||||
<result property="qrCode" column="qr_code" />
|
||||
<result property="isDel" column="is_del" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectQuartzProSubdeptsVo">
|
||||
select ps.id, ps.com_id, sd.dept_name as com_name, ps.project_id, pi.project_name, ps.sub_dept_type, sdd.dict_label as sub_dept_type_name, ps.sub_dept_name, ps.sub_dept_code, ps.sub_dept_leader_id, ps.sub_dept_leader_name, ps.sub_dept_leader_code, ps.sub_dept_leader_phone, ps.business_license_path, ps.sub_dept_infos, ps.contract_infos, ps.use_dates, ps.start_work_dates, ps.end_work_dates, ps.use_status, ps.approve_status, ps.qr_code, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark, ps.source
|
||||
from pro_project_info_subdepts ps
|
||||
left join pro_project_info pi on pi.id = ps.project_id
|
||||
left join sys_dept sd on sd.dept_id = ps.com_id
|
||||
left join sys_dict_data sdd on sdd.dict_value = ps.sub_dept_type and sdd.dict_type = 'sub_dept_type'
|
||||
</sql>
|
||||
|
||||
<select id="selectQuartzProSubdeptsList" parameterType="QuartzProSubdepts" resultMap="QuartzProSubdeptsResult">
|
||||
<include refid="selectQuartzProSubdeptsVo"/>
|
||||
<where>
|
||||
<if test="comId != null "> and ps.com_id = #{comId}</if>
|
||||
<if test="projectId != null "> and ps.project_id = #{projectId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and pi.project_name = #{projectName}</if>
|
||||
<if test="subDeptType != null and subDeptType != ''"> and ps.sub_dept_type = #{subDeptType}</if>
|
||||
<if test="subDeptName != null and subDeptName != ''"> and ps.sub_dept_name like concat('%', #{subDeptName}, '%')</if>
|
||||
<if test="subDeptCode != null and subDeptCode != ''"> and ps.sub_dept_code = #{subDeptCode}</if>
|
||||
and ps.is_del = 0
|
||||
</where>
|
||||
order by ps.id desc
|
||||
</select>
|
||||
|
||||
<select id="selectQuartzProSubdeptsById" parameterType="Long" resultMap="QuartzProSubdeptsResult">
|
||||
<include refid="selectQuartzProSubdeptsVo"/>
|
||||
where ps.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertQuartzProSubdepts" parameterType="QuartzProSubdepts" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into pro_project_info_subdepts
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="subDeptType != null">sub_dept_type,</if>
|
||||
<if test="subDeptName != null">sub_dept_name,</if>
|
||||
<if test="subDeptCode != null">sub_dept_code,</if>
|
||||
<if test="subDeptLeaderId != null">sub_dept_leader_id,</if>
|
||||
<if test="subDeptLeaderName != null">sub_dept_leader_name,</if>
|
||||
<if test="subDeptLeaderCode != null">sub_dept_leader_code,</if>
|
||||
<if test="subDeptLeaderPhone != null">sub_dept_leader_phone,</if>
|
||||
<if test="businessLicensePath != null">business_license_path,</if>
|
||||
<if test="subDeptInfos != null">sub_dept_infos,</if>
|
||||
<if test="contractInfos != null">contract_infos,</if>
|
||||
<if test="useDates != null">use_dates,</if>
|
||||
<if test="startWorkDates != null">start_work_dates,</if>
|
||||
<if test="endWorkDates != null">end_work_dates,</if>
|
||||
<if test="useStatus != null">use_status,</if>
|
||||
<if test="approveStatus != null">approve_status,</if>
|
||||
<if test="qrCode != null">qr_code,</if>
|
||||
<if test="isDel != null">is_del,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="subDeptType != null">#{subDeptType},</if>
|
||||
<if test="subDeptName != null">#{subDeptName},</if>
|
||||
<if test="subDeptCode != null">#{subDeptCode},</if>
|
||||
<if test="subDeptLeaderId != null">#{subDeptLeaderId},</if>
|
||||
<if test="subDeptLeaderName != null">#{subDeptLeaderName},</if>
|
||||
<if test="subDeptLeaderCode != null">#{subDeptLeaderCode},</if>
|
||||
<if test="subDeptLeaderPhone != null">#{subDeptLeaderPhone},</if>
|
||||
<if test="businessLicensePath != null">#{businessLicensePath},</if>
|
||||
<if test="subDeptInfos != null">#{subDeptInfos},</if>
|
||||
<if test="contractInfos != null">#{contractInfos},</if>
|
||||
<if test="useDates != null">#{useDates},</if>
|
||||
<if test="startWorkDates != null">#{startWorkDates},</if>
|
||||
<if test="endWorkDates != null">#{endWorkDates},</if>
|
||||
<if test="useStatus != null">#{useStatus},</if>
|
||||
<if test="approveStatus != null">#{approveStatus},</if>
|
||||
<if test="qrCode != null">#{qrCode},</if>
|
||||
<if test="isDel != null">#{isDel},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQuartzProSubdepts" parameterType="QuartzProSubdepts">
|
||||
update pro_project_info_subdepts
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>
|
||||
<if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>
|
||||
<if test="subDeptCode != null">sub_dept_code = #{subDeptCode},</if>
|
||||
<if test="subDeptLeaderId != null">sub_dept_leader_id = #{subDeptLeaderId},</if>
|
||||
<if test="subDeptLeaderName != null">sub_dept_leader_name = #{subDeptLeaderName},</if>
|
||||
<if test="subDeptLeaderCode != null">sub_dept_leader_code = #{subDeptLeaderCode},</if>
|
||||
<if test="subDeptLeaderPhone != null">sub_dept_leader_phone = #{subDeptLeaderPhone},</if>
|
||||
<if test="businessLicensePath != null">business_license_path = #{businessLicensePath},</if>
|
||||
<if test="subDeptInfos != null">sub_dept_infos = #{subDeptInfos},</if>
|
||||
<if test="contractInfos != null">contract_infos = #{contractInfos},</if>
|
||||
<if test="useDates != null">use_dates = #{useDates},</if>
|
||||
<if test="startWorkDates != null">start_work_dates = #{startWorkDates},</if>
|
||||
<if test="endWorkDates != null">end_work_dates = #{endWorkDates},</if>
|
||||
<if test="useStatus != null">use_status = #{useStatus},</if>
|
||||
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
|
||||
<if test="qrCode != null">qr_code = #{qrCode},</if>
|
||||
<if test="isDel != null">is_del = #{isDel},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsById" parameterType="Long">
|
||||
update pro_project_info_subdepts set is_del=1 where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsByIds" parameterType="String">
|
||||
update pro_project_info_subdepts set is_del=1 where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -26,34 +26,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectAttendanceCfgVo">
|
||||
SELECT ac.id, ac.com_id, ac.project_id, ac.vendors_code, ac.vendors_parameter, ac.enabled, ac.state, ac.remark, ac.is_del, ac.create_by, ac.create_time, ac.update_by
|
||||
, ac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name,sd.sub_dept_name dept_name,ac.dept_id
|
||||
FROM attendance_cfg ac
|
||||
LEFT JOIN sys_dept dp ON ac.`com_id`=dp.`dept_id`
|
||||
LEFT JOIN pro_project_info pp ON ac.`project_id`=pp.`id`
|
||||
left join pro_project_info_subdepts sd on ac.dept_id=sd.id
|
||||
LEFT JOIN sys_dict_data dic ON ac.`vendors_code`=dic.`dict_value` AND dic.`dict_type`='attendance_vendors'
|
||||
select pac.id, pac.com_id, pac.project_id, pac.vendors_code, pac.vendors_parameter, pac.enabled, pac.state, pac.remark, pac.is_del, pac.create_by, pac.create_time, pac.update_by
|
||||
, pac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name,sd.sub_dept_name dept_name,pac.dept_id
|
||||
from attendance_cfg pac
|
||||
left join sys_dept dp on pac.`com_id` = dp.`dept_id`
|
||||
left join pro_project_info pp on pac.`project_id` = pp.`id`
|
||||
left join pro_project_info_subdepts sd on pac.dept_id = sd.id
|
||||
left join sys_dict_data dic on pac.`vendors_code` = dic.`dict_value` and dic.`dict_type`='attendance_vendors'
|
||||
</sql>
|
||||
|
||||
<select id="selectSurProjectAttendanceCfgList" parameterType="QuartzProjectAttendanceCfg" resultMap="AttendanceCfgResult">
|
||||
<include refid="selectAttendanceCfgVo"/>
|
||||
<where>
|
||||
<if test="comId != null "> and ac.com_id = #{comId}</if>
|
||||
<if test="projectId != null "> and ac.project_id = #{projectId}</if>
|
||||
<if test="vendorsCode != null and vendorsCode != ''"> and ac.vendors_code = #{vendorsCode}</if>
|
||||
<if test="vendorsParameter != null and vendorsParameter != ''"> and ac.vendors_parameter = #{vendorsParameter}</if>
|
||||
<if test="enabled != null "> and ac.enabled = #{enabled}</if>
|
||||
<if test="state != null "> and ac.state = #{state}</if>
|
||||
<if test="isDel != null "> and ac.is_del = #{isDel}</if>
|
||||
<if test="comId != null "> and pac.com_id = #{comId}</if>
|
||||
<if test="projectId != null "> and pac.project_id = #{projectId}</if>
|
||||
<if test="vendorsCode != null and vendorsCode != ''"> and pac.vendors_code = #{vendorsCode}</if>
|
||||
<if test="enabled != null "> and pac.enabled = #{enabled}</if>
|
||||
<if test="state != null "> and pac.state = #{state}</if>
|
||||
<if test="isDel != null "> and pac.is_del = #{isDel}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSurProjectAttendanceCfgListForAllInfo" parameterType="QuartzProjectAttendanceCfg" resultMap="AttendanceCfgResult">
|
||||
<select id="selectSurProjectAttendanceCfgListForAllInfo" parameterType="Long" resultMap="AttendanceCfgResult">
|
||||
<include refid="selectAttendanceCfgVo"/>
|
||||
<where>
|
||||
<if test="id != null "> and ac.id = #{id}</if>
|
||||
</where>
|
||||
where pac.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,265 @@
|
|||
<?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.yanzhu.job.mapper.QuartzProSubdeptsUsersMapper">
|
||||
|
||||
<resultMap type="QuartzProSubdeptsUsers" id="QuartzProSubdeptsUsersResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="parId" column="par_id" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name"/>
|
||||
<result property="projectId" column="project_id" />
|
||||
<result property="projectName" column="project_name" />
|
||||
<result property="subDeptId" column="sub_dept_id" />
|
||||
<result property="subDeptType" column="sub_dept_type" />
|
||||
<result property="subDeptTypeName" column="sub_dept_type_name" />
|
||||
<result property="subDeptName" column="sub_dept_name" />
|
||||
<result property="subDeptPowerPath" column="sub_dept_power_path" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="userPost" column="user_post" />
|
||||
<result property="subDeptGroup" column="sub_dept_group" />
|
||||
<result property="subDeptGroupName" column="sub_dept_group_name" />
|
||||
<result property="userName" column="user_name" />
|
||||
<result property="cardType" column="card_type" />
|
||||
<result property="workType" column="work_type" />
|
||||
<result property="cardCode" column="card_code" />
|
||||
<result property="userSex" column="user_sex" />
|
||||
<result property="userPicture" column="user_picture" />
|
||||
<result property="userPhone" column="user_phone" />
|
||||
<result property="degreeGrade" column="degree_grade" />
|
||||
<result property="degreeGradeName" column="degree_grade_name" />
|
||||
<result property="userInfos" column="user_infos" />
|
||||
<result property="craftType" column="craft_type" />
|
||||
<result property="craftTypeName" column="craft_type_name" />
|
||||
<result property="craftPost" column="craft_post" />
|
||||
<result property="craftPostName" column="craft_post_name" />
|
||||
<result property="eduStatus" column="edu_status" />
|
||||
<result property="eduFilePath" column="edu_file_path" />
|
||||
<result property="eduDate" column="edu_date" />
|
||||
<result property="approveStatus" column="approve_status" />
|
||||
<result property="useDate" column="use_date" />
|
||||
<result property="useStatus" column="use_status" />
|
||||
<result property="admitGuid" column="admit_guid" />
|
||||
<result property="faceGuid" column="face_guid" />
|
||||
<result property="qrCode" column="qr_code" />
|
||||
<result property="subStep" column="sub_step" />
|
||||
<result property="illnessStatus" column="illness_status" />
|
||||
<result property="supIllnessStatus" column="sup_illness_status" />
|
||||
<result property="isDel" column="is_del" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="source" column="source" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectQuartzProSubdeptsUsersVo">
|
||||
select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, pdept.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group,
|
||||
psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status,
|
||||
psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, 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, psu.face_guid, psu.source, sd.dept_name com_name,psu.work_type
|
||||
from pro_project_info_subdepts_users psu
|
||||
left join pro_project_info pi on pi.id = psu.project_id
|
||||
left join pro_project_info_subdepts pdept on psu.sub_dept_id=pdept.id
|
||||
left join sys_dept sd on sd.dept_id = psu.com_id
|
||||
left join sys_dict_data dic1 on psu.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type'
|
||||
left join sys_dict_data dic2 on psu.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post'
|
||||
left join sys_dict_data dic3 on psu.`sub_dept_type`=dic3.`dict_value` and dic3.`dict_type`='sub_dept_type'
|
||||
left join sys_dict_data dic4 on psu.`degree_grade`=dic4.`dict_value` and dic4.`dict_type`='educational_type'
|
||||
</sql>
|
||||
|
||||
<select id="selectQuartzProSubdeptsUsersList" parameterType="QuartzProSubdeptsUsers" resultMap="QuartzProSubdeptsUsersResult">
|
||||
<include refid="selectQuartzProSubdeptsUsersVo"/>
|
||||
<where>
|
||||
<if test="comId != null "> and psu.com_id = #{comId}</if>
|
||||
<if test="parId != null "> and psu.par_id = #{parId}</if>
|
||||
<if test="projectId != null "> and psu.project_id = #{projectId}</if>
|
||||
<if test="subDeptId != null "> and psu.sub_dept_id = #{subDeptId}</if>
|
||||
<if test="subDeptType != null and subDeptType != ''"> and psu.sub_dept_type = #{subDeptType}</if>
|
||||
<if test="subDeptName != null and subDeptName != ''"> and psu.sub_dept_name like concat('%', #{subDeptName}, '%')</if>
|
||||
<if test="userId != null "> and psu.user_id = #{userId}</if>
|
||||
<if test="userPost != null "> and psu.user_post = #{userPost}</if>
|
||||
<if test="subDeptGroup != null "> and psu.sub_dept_group = #{subDeptGroup}</if>
|
||||
<if test="subDeptGroupName != null and subDeptGroupName != ''"> and psu.sub_dept_group_name like concat('%', #{subDeptGroupName}, '%')</if>
|
||||
<if test="workType != null and workType != 0"> and psu.work_type = #{workType}</if>
|
||||
<if test="craftType != null and craftType != ''"> and psu.craft_type = #{craftType}</if>
|
||||
<if test="craftPost != null and craftPost != ''"> and psu.craft_post = #{craftPost}</if>
|
||||
<if test="eduStatus != null and eduStatus != ''"> and psu.edu_status = #{eduStatus}</if>
|
||||
<if test="eduDate != null "> and psu.edu_date = #{eduDate}</if>
|
||||
<if test="approveStatus != null "> and psu.approve_status = #{approveStatus}</if>
|
||||
<if test="useStatus != null and useStatus != ''"> and psu.use_status = #{useStatus}</if>
|
||||
<if test="admitGuid!=null and admitGuid!=''">and psu.admit_guid = #{admitGuid}</if>
|
||||
<if test="faceGuid!=null and faceGuid!=''">and psu.face_guid = #{faceGuid}</if>
|
||||
<if test="illnessStatus != null "> and psu.illness_status = #{illnessStatus}</if>
|
||||
<if test="supIllnessStatus != null "> and psu.sup_illness_status = #{supIllnessStatus}</if>
|
||||
<if test="userPhone != null and userPhone != ''"> and psu.user_phone = #{userPhone}</if>
|
||||
<if test='activeTags == "finished"'> and psu.approve_status <![CDATA[ >= ]]> 100 </if>
|
||||
<if test="isDel != null "> and psu.is_del = #{isDel}</if>
|
||||
and psu.is_del != 2
|
||||
</where>
|
||||
order by psu.id desc
|
||||
</select>
|
||||
|
||||
<select id="selectQuartzProSubdeptsUsersById" parameterType="Long" resultMap="QuartzProSubdeptsUsersResult">
|
||||
<include refid="selectQuartzProSubdeptsUsersVo"/>
|
||||
where psu.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectQuartzProSubdeptsUsersByParamId" resultMap="QuartzProSubdeptsUsersResult">
|
||||
<include refid="selectQuartzProSubdeptsUsersVo"/>
|
||||
where psu.project_id = #{proId} and psu.user_id = #{userId}
|
||||
</select>
|
||||
|
||||
<insert id="insertQuartzProSubdeptsUsers" parameterType="QuartzProSubdeptsUsers" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into pro_project_info_subdepts_users
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="parId != null">par_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="subDeptId != null">sub_dept_id,</if>
|
||||
<if test="subDeptType != null">sub_dept_type,</if>
|
||||
<if test="subDeptName != null">sub_dept_name,</if>
|
||||
<if test="subDeptPowerPath != null">sub_dept_power_path,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="userPost != null">user_post,</if>
|
||||
<if test="subDeptGroup != null">sub_dept_group,</if>
|
||||
<if test="subDeptGroupName != null">sub_dept_group_name,</if>
|
||||
<if test="userName != null">user_name,</if>
|
||||
<if test="cardType != null">card_type,</if>
|
||||
<if test="workType != null">work_type,</if>
|
||||
<if test="cardCode != null">card_code,</if>
|
||||
<if test="userSex != null">user_sex,</if>
|
||||
<if test="userPicture != null">user_picture,</if>
|
||||
<if test="userPhone != null">user_phone,</if>
|
||||
<if test="degreeGrade != null">degree_grade,</if>
|
||||
<if test="userInfos != null">user_infos,</if>
|
||||
<if test="craftType != null">craft_type,</if>
|
||||
<if test="craftPost != null">craft_post,</if>
|
||||
<if test="eduStatus != null">edu_status,</if>
|
||||
<if test="eduFilePath != null">edu_file_path,</if>
|
||||
<if test="eduDate != null">edu_date,</if>
|
||||
<if test="approveStatus != null">approve_status,</if>
|
||||
<if test="useDate != null">use_date,</if>
|
||||
<if test="useStatus != null">use_status,</if>
|
||||
<if test="admitGuid != null">admit_guid,</if>
|
||||
<if test="faceGuid != null">face_guid,</if>
|
||||
<if test="qrCode != null">qr_code,</if>
|
||||
<if test="subStep != null">sub_step,</if>
|
||||
<if test="illnessStatus != null">illness_status,</if>
|
||||
<if test="supIllnessStatus != null">sup_illness_status,</if>
|
||||
<if test="isDel != null">is_del,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="source != null">source,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="parId != null">#{parId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="subDeptId != null">#{subDeptId},</if>
|
||||
<if test="subDeptType != null">#{subDeptType},</if>
|
||||
<if test="subDeptName != null">#{subDeptName},</if>
|
||||
<if test="subDeptPowerPath != null">#{subDeptPowerPath},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="userPost != null">#{userPost},</if>
|
||||
<if test="subDeptGroup != null">#{subDeptGroup},</if>
|
||||
<if test="subDeptGroupName != null">#{subDeptGroupName},</if>
|
||||
<if test="userName != null">#{userName},</if>
|
||||
<if test="cardType != null">#{cardType},</if>
|
||||
<if test="workType != null">#{workType},</if>
|
||||
<if test="cardCode != null">#{cardCode},</if>
|
||||
<if test="userSex != null">#{userSex},</if>
|
||||
<if test="userPicture != null">#{userPicture},</if>
|
||||
<if test="userPhone != null">#{userPhone},</if>
|
||||
<if test="degreeGrade != null">#{degreeGrade},</if>
|
||||
<if test="userInfos != null">#{userInfos},</if>
|
||||
<if test="craftType != null">#{craftType},</if>
|
||||
<if test="craftPost != null">#{craftPost},</if>
|
||||
<if test="eduStatus != null">#{eduStatus},</if>
|
||||
<if test="eduFilePath != null">#{eduFilePath},</if>
|
||||
<if test="eduDate != null">#{eduDate},</if>
|
||||
<if test="approveStatus != null">#{approveStatus},</if>
|
||||
<if test="useDate != null">#{useDate},</if>
|
||||
<if test="useStatus != null">#{useStatus},</if>
|
||||
<if test="admitGuid != null">#{admitGuid},</if>
|
||||
<if test="faceGuid != null">#{faceGuid},</if>
|
||||
<if test="qrCode != null">#{qrCode},</if>
|
||||
<if test="subStep != null">#{subStep},</if>
|
||||
<if test="illnessStatus != null">#{illnessStatus},</if>
|
||||
<if test="supIllnessStatus != null">#{supIllnessStatus},</if>
|
||||
<if test="isDel != null">#{isDel},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="source != null">#{source},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQuartzProSubdeptsUsers" parameterType="QuartzProSubdeptsUsers">
|
||||
update pro_project_info_subdepts_users
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="parId != null">par_id = #{parId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
|
||||
<if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>
|
||||
<if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>
|
||||
<if test="subDeptPowerPath != null">sub_dept_power_path = #{subDeptPowerPath},</if>
|
||||
<if test="userId != null">user_id = #{userId},</if>
|
||||
<if test="userPost != null">user_post = #{userPost},</if>
|
||||
<if test="subDeptGroup != null">sub_dept_group = #{subDeptGroup},</if>
|
||||
<if test="subDeptGroupName != null">sub_dept_group_name = #{subDeptGroupName},</if>
|
||||
<if test="userName != null">user_name = #{userName},</if>
|
||||
<if test="cardType != null">card_type = #{cardType},</if>
|
||||
<if test="workType != null">work_type = #{workType},</if>
|
||||
<if test="cardCode != null">card_code = #{cardCode},</if>
|
||||
<if test="userSex != null">user_sex = #{userSex},</if>
|
||||
<if test="userPicture != null">user_picture = #{userPicture},</if>
|
||||
<if test="userPhone != null">user_phone = #{userPhone},</if>
|
||||
<if test="degreeGrade != null">degree_grade = #{degreeGrade},</if>
|
||||
<if test="userInfos != null">user_infos = #{userInfos},</if>
|
||||
<if test="craftType != null">craft_type = #{craftType},</if>
|
||||
<if test="craftPost != null">craft_post = #{craftPost},</if>
|
||||
<if test="eduStatus != null">edu_status = #{eduStatus},</if>
|
||||
<if test="eduFilePath != null">edu_file_path = #{eduFilePath},</if>
|
||||
<if test="eduDate != null">edu_date = #{eduDate},</if>
|
||||
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
|
||||
<if test="useDate != null">use_date = #{useDate},</if>
|
||||
<if test="useStatus != null">use_status = #{useStatus},</if>
|
||||
<if test="admitGuid != null">admit_guid = #{admitGuid},</if>
|
||||
<if test="faceGuid != null">face_guid = #{faceGuid},</if>
|
||||
<if test="qrCode != null">qr_code = #{qrCode},</if>
|
||||
<if test="subStep != null">sub_step = #{subStep},</if>
|
||||
<if test="illnessStatus != null">illness_status = #{illnessStatus},</if>
|
||||
<if test="supIllnessStatus != null">sup_illness_status = #{supIllnessStatus},</if>
|
||||
<if test="sortBy != null">sort_by = #{sortBy},</if>
|
||||
<if test="isDel != null">is_del = #{isDel},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="source != null">source = #{source},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsUsersById" parameterType="Long">
|
||||
update pro_project_info_subdepts_users set is_del = 2 where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="deleteQuartzProSubdeptsUsersByIds" parameterType="String">
|
||||
update pro_project_info_subdepts_users set is_del = 2 where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -396,14 +396,14 @@ public class TowerCraneApiController {
|
|||
devTowerDataRun.setComId(config.getComId());
|
||||
devTowerDataRun.setDeviceKey(config.getDeviceSn());
|
||||
devTowerDataRun.setHeight(Convert.toStr(req.getHeight()));
|
||||
devTowerDataRun.setRange(Convert.toStr(req.getAmplitude()));
|
||||
devTowerDataRun.setRotation(Convert.toStr(req.getRound()));
|
||||
devTowerDataRun.setLoad(Convert.toStr(req.getWeight()));
|
||||
devTowerDataRun.setRange(Convert.toStr(req.getRange()));
|
||||
devTowerDataRun.setRotation(Convert.toStr(req.getRotation_angle()));
|
||||
devTowerDataRun.setLoad(Convert.toStr(req.getLifting_weight()));
|
||||
devTowerDataRun.setWindSpeed(Convert.toStr(req.getWind_speed()));
|
||||
devTowerDataRun.setLeanAngleX(Convert.toStr(req.getAngle_x()));
|
||||
devTowerDataRun.setLeanAngleY(Convert.toStr(req.getAngle_y()));
|
||||
devTowerDataRun.setMomentPercent(Convert.toStr(req.getMoment_percent()));
|
||||
devTowerDataRun.setRate(Convert.toStr(req.getOverride()));
|
||||
devTowerDataRun.setLeanAngleX(Convert.toStr(req.getAnteversion_x()));
|
||||
devTowerDataRun.setLeanAngleY(Convert.toStr(req.getAnteversion_y()));
|
||||
devTowerDataRun.setMomentPercent(Convert.toStr(req.getForce_distance()));
|
||||
devTowerDataRun.setRate(Convert.toStr(req.getMagnification()));
|
||||
devTowerDataRunService.insertDevTowerDataRun(devTowerDataRun);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
|
@ -470,7 +470,9 @@ public class TowerCraneApiController {
|
|||
devTowerDataWarning.setProjectId(config.getProjectId());
|
||||
devTowerDataWarning.setComId(config.getComId());
|
||||
devTowerDataWarning.setDeviceKey(config.getDeviceSn());
|
||||
devTowerDataWarning.setWarnType(Convert.toLong(req.getAlarm_type()));
|
||||
String warningType = convertTyTowerWarningType(req.getType_id().toString());
|
||||
devTowerDataWarning.setWarnType(Convert.toLong(warningType));
|
||||
devTowerDataWarning.setWarnNote(req.getType());
|
||||
devTowerDataWarningService.insertDevTowerDataWarning(devTowerDataWarning);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
|
@ -482,6 +484,123 @@ public class TowerCraneApiController {
|
|||
* @return
|
||||
*/
|
||||
private String convertTyTowerWarningType(String warningType) {
|
||||
String warningTypeEs;
|
||||
switch (warningType) {
|
||||
case "1":
|
||||
warningTypeEs = "5";
|
||||
break;
|
||||
case "2":
|
||||
warningTypeEs = "6";
|
||||
break;
|
||||
case "3":
|
||||
case "43":
|
||||
warningTypeEs = "1";
|
||||
break;
|
||||
case "4":
|
||||
warningTypeEs = "2";
|
||||
break;
|
||||
case "5":
|
||||
warningTypeEs = "3";
|
||||
break;
|
||||
case "6":
|
||||
warningTypeEs = "4";
|
||||
break;
|
||||
case "7":
|
||||
warningTypeEs = "10";
|
||||
break;
|
||||
case "8":
|
||||
warningTypeEs = "13";
|
||||
break;
|
||||
case "9":
|
||||
case "30":
|
||||
case "36":
|
||||
case "48":
|
||||
warningTypeEs = "104";
|
||||
break;
|
||||
case "10":
|
||||
case "29":
|
||||
case "49":
|
||||
warningTypeEs = "105";
|
||||
break;
|
||||
case "11":
|
||||
case "12":
|
||||
warningTypeEs = "101";
|
||||
break;
|
||||
case "13":
|
||||
warningTypeEs = "102";
|
||||
break;
|
||||
case "14":
|
||||
warningTypeEs = "103";
|
||||
break;
|
||||
case "15":
|
||||
case "44":
|
||||
warningTypeEs = "107";
|
||||
break;
|
||||
case "16":
|
||||
warningTypeEs = "108";
|
||||
break;
|
||||
case "21":
|
||||
warningTypeEs = "88";
|
||||
break;
|
||||
case "27":
|
||||
case "33":
|
||||
warningTypeEs = "188";
|
||||
break;
|
||||
case "17":
|
||||
case "18":
|
||||
case "19":
|
||||
case "20":
|
||||
case "23":
|
||||
case "24":
|
||||
case "45":
|
||||
warningTypeEs = "15";
|
||||
break;
|
||||
case "25":
|
||||
warningTypeEs = "89";
|
||||
break;
|
||||
case "26":
|
||||
warningTypeEs = "90";
|
||||
break;
|
||||
case "31":
|
||||
case "37":
|
||||
warningTypeEs = "189";
|
||||
break;
|
||||
case "32":
|
||||
case "38":
|
||||
warningTypeEs = "190";
|
||||
break;
|
||||
case "40":
|
||||
case "50":
|
||||
warningTypeEs = "106";
|
||||
break;
|
||||
case "41":
|
||||
case "42":
|
||||
case "47":
|
||||
warningTypeEs = "109";
|
||||
break;
|
||||
case "46":
|
||||
warningTypeEs = "108";
|
||||
break;
|
||||
case "51":
|
||||
case "52":
|
||||
case "53":
|
||||
case "54":
|
||||
warningTypeEs = "14";
|
||||
break;
|
||||
default:
|
||||
warningTypeEs = warningType;
|
||||
break;
|
||||
}
|
||||
return warningTypeEs;
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换预警类型【Linux】
|
||||
*
|
||||
* @param warningType
|
||||
* @return
|
||||
*/
|
||||
private String convertTyTowerLinuxWarningType(String warningType) {
|
||||
String warningTypeEs;
|
||||
switch (warningType) {
|
||||
case "1":
|
||||
|
|
@ -544,4 +663,5 @@ public class TowerCraneApiController {
|
|||
}
|
||||
return warningTypeEs;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
package com.yanzhu.manage.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-循环数据【Linux】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerLinuxRoundReqVO {
|
||||
|
||||
/** 设备ID */
|
||||
@NotNull
|
||||
private Integer eid;
|
||||
/** 开始高度 */
|
||||
private Float start_height;
|
||||
/** 开始幅度 */
|
||||
private Float start_range;
|
||||
/** 开始回转角度 */
|
||||
private Float start_rotation_angle;
|
||||
/** 结束高度 */
|
||||
private Float end_height;
|
||||
/** 结束幅度 */
|
||||
private Float end_range;
|
||||
/** 结束回转角度 */
|
||||
private Float end_rotation_angle;
|
||||
/** 重量 */
|
||||
private Float weight;
|
||||
/** 力矩百分比 */
|
||||
private Float moment_percent;
|
||||
/** 开始时间 */
|
||||
private String start_time;
|
||||
/** 结束时间 */
|
||||
private String end_time;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
package com.yanzhu.manage.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-实时数据【Linux】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerLinuxRunReqVO {
|
||||
|
||||
/** 设备ID */
|
||||
@NotNull
|
||||
private Integer eid;
|
||||
/** 高度(米) */
|
||||
private Float height;
|
||||
/** 重量(kg) */
|
||||
private Float weight;
|
||||
/** 回转(°) */
|
||||
private Float round;
|
||||
/** 幅度(°) */
|
||||
private Float amplitude;
|
||||
/** 风速(米/秒) */
|
||||
private Float wind_speed;
|
||||
/** 力矩 */
|
||||
private Float moment;
|
||||
/** 力矩百分比(%) */
|
||||
private Float moment_percent;
|
||||
/** 倍率(正整数) */
|
||||
private Integer override;
|
||||
/** 倾角X(°) */
|
||||
private Float angle_x;
|
||||
/** 倾角Y(°) */
|
||||
private Float angle_y;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.yanzhu.manage.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-报警数据【Linux】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerLinuxWarningReqVO {
|
||||
|
||||
/** 设备ID */
|
||||
@NotNull
|
||||
private Integer eid;
|
||||
/** 高度 */
|
||||
private Float height;
|
||||
/** 重量 */
|
||||
private Float weight;
|
||||
/** 回转 */
|
||||
private Float round;
|
||||
/** 幅度 */
|
||||
private Float amplitude;
|
||||
/** 风速 */
|
||||
private Float wind_speed;
|
||||
/** 力矩 */
|
||||
private Float moment;
|
||||
/** 力矩百分比 */
|
||||
private Float moment_percent;
|
||||
/** 倍率 */
|
||||
private Integer override;
|
||||
/** 倾角X */
|
||||
private Float angle_x;
|
||||
/** 倾角Y */
|
||||
private Float angle_y;
|
||||
/** 报警type,报警内容由报警编号决定 */
|
||||
private Integer alarm_type;
|
||||
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
|||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-循环数据
|
||||
* 山东探越塔机请求-循环数据【Android】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerRoundReqVO {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
|||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-实时数据
|
||||
* 山东探越塔机请求-实时数据【Android】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerRunReqVO {
|
||||
|
|
@ -13,24 +13,24 @@ public class TyTowerRunReqVO {
|
|||
/** 设备ID */
|
||||
@NotNull
|
||||
private Integer eid;
|
||||
/** 高度(米) */
|
||||
/** 高度 */
|
||||
private Float height;
|
||||
/** 重量(kg) */
|
||||
private Float weight;
|
||||
/** 回转(°) */
|
||||
private Float round;
|
||||
/** 幅度(°) */
|
||||
private Float amplitude;
|
||||
/** 风速(米/秒) */
|
||||
/** 幅度 */
|
||||
private Float range;
|
||||
/** 回转角度 */
|
||||
private Float rotation_angle;
|
||||
/** 吊重 */
|
||||
private Float lifting_weight;
|
||||
/** 力距 */
|
||||
private Float force;
|
||||
/** 力距百分比 */
|
||||
private Float force_distance;
|
||||
/** 风速 */
|
||||
private Float wind_speed;
|
||||
/** 力矩 */
|
||||
private Float moment;
|
||||
/** 力矩百分比(%) */
|
||||
private Float moment_percent;
|
||||
/** 倍率(正整数) */
|
||||
private Integer override;
|
||||
/** 倾角X(°) */
|
||||
private Float angle_x;
|
||||
/** 倾角Y(°) */
|
||||
private Float angle_y;
|
||||
/** 倍率 */
|
||||
private String magnification;
|
||||
/** 倾角X */
|
||||
private Float anteversion_x;
|
||||
/** 倾角Y */
|
||||
private Float anteversion_y;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
|||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 山东探越塔机请求-报警数据
|
||||
* 山东探越塔机请求-报警数据【Android】
|
||||
*/
|
||||
@Data
|
||||
public class TyTowerWarningReqVO {
|
||||
|
|
@ -13,27 +13,28 @@ public class TyTowerWarningReqVO {
|
|||
/** 设备ID */
|
||||
@NotNull
|
||||
private Integer eid;
|
||||
/** 报警内容 */
|
||||
private String type;
|
||||
/** 报警编号 */
|
||||
private Integer type_id;
|
||||
/** 高度 */
|
||||
private Float height;
|
||||
/** 重量 */
|
||||
private Float weight;
|
||||
/** 回转 */
|
||||
private Float round;
|
||||
/** 幅度 */
|
||||
private Float amplitude;
|
||||
private Float range;
|
||||
/** 回转角度 */
|
||||
private Float rotation;
|
||||
/** 吊重 */
|
||||
private Float lifting_weight;
|
||||
/** 力距 */
|
||||
private Float force;
|
||||
/** 力距百分比 */
|
||||
private Float force_distance;
|
||||
/** 风速 */
|
||||
private Float wind_speed;
|
||||
/** 力矩 */
|
||||
private Float moment;
|
||||
/** 力矩百分比 */
|
||||
private Float moment_percent;
|
||||
/** 倍率 */
|
||||
private Integer override;
|
||||
private String magnification;
|
||||
/** 倾角X */
|
||||
private Float angle_x;
|
||||
private Float anteversion_x;
|
||||
/** 倾角Y */
|
||||
private Float angle_y;
|
||||
/** 报警type,报警内容由报警编号决定 */
|
||||
private Integer alarm_type;
|
||||
|
||||
private Float anteversion_y;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
import {
|
||||
getToken
|
||||
} from '../../../utils/auth'
|
||||
import {
|
||||
getYsToken
|
||||
} from '../../../api/project'
|
||||
const app = getApp()
|
||||
Page({
|
||||
|
||||
|
|
@ -13,6 +10,7 @@ Page({
|
|||
data: {
|
||||
ysToken: '',
|
||||
palyUrl: '',
|
||||
channelNo: 0,
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
@ -21,12 +19,16 @@ Page({
|
|||
onLoad(options) {
|
||||
if (!getToken()) {
|
||||
wx.redirectTo({
|
||||
url: '../../../pages/login/login',
|
||||
url: '/pages/login/login',
|
||||
})
|
||||
}
|
||||
this.findYsToken(options.id);
|
||||
let _dat = options.url.replace("ezopen://open.ys7.com/","").split("/");
|
||||
let _cha = _dat[1].split(".")[0];
|
||||
let _url = "rtmp://open.ys7.com/"+_dat[0]+"/"+_cha+"/live";
|
||||
this.setData({
|
||||
palyUrl: options.url
|
||||
ysToken: options.token,
|
||||
palyUrl: _url,
|
||||
channelNo: _cha
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
accessToken="{{ysToken}}"
|
||||
url="{{palyUrl}}"
|
||||
plugins="talk,voice,capture"
|
||||
recPlayTime=""
|
||||
width="360"
|
||||
height="300"
|
||||
watermark="shuiyin"
|
||||
themeData="{'poster':'','controls':{fullScreenBtn:false,hdBtn:true}}"
|
||||
channelNo="{{channelNo}}"
|
||||
bind:handleError="handleError"
|
||||
/>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -56,10 +56,11 @@ Page({
|
|||
videoPlay(e) {
|
||||
let {
|
||||
id,
|
||||
url
|
||||
url,
|
||||
secret
|
||||
} = e.currentTarget.dataset.set
|
||||
wx.redirectTo({
|
||||
url: `../info/index?id=${id}&url=${url}`,
|
||||
url: `../info/index?id=${id}&url=${url}&token=${secret}`,
|
||||
})
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -122,8 +122,8 @@ Component({
|
|||
loginOut().then(res => {
|
||||
removeToken();
|
||||
wx.clearStorageSync();
|
||||
wx.redirectTo({
|
||||
url: '../login/login'
|
||||
wx.navigateTo({
|
||||
url: '/pages/login/login'
|
||||
})
|
||||
});
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue