diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java index 10c377b8..7ae39aae 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java @@ -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) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java index beb7c864..ac58c276 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java @@ -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) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java index de42b6af..0048a0ce 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java @@ -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{" + diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml index fdc118b5..5e54ebac 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml @@ -33,10 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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" update_by, update_time, remark, + source, #{comId}, @@ -142,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{source}, @@ -170,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + source = #{source}, where id = #{id} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml index fa7cae27..02212306 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml @@ -33,10 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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" update_by, update_time, remark, + source, #{comId}, @@ -138,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{source}, @@ -168,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + source = #{source}, where id = #{id} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index bf45ba6f..849e31e2 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -52,13 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + 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" update_by, update_time, remark, + source, #{parId}, @@ -235,6 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{source}, @@ -282,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + source = #{source}, where id = #{id} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotConfigPoint.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotConfigPoint.java similarity index 99% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotConfigPoint.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotConfigPoint.java index fe998a78..3dcd2be2 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotConfigPoint.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotConfigPoint.java @@ -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; diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotDatas.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotDatas.java similarity index 99% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotDatas.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotDatas.java index 5615fc95..6c85ac88 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotDatas.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotDatas.java @@ -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; diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotWarning.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotWarning.java similarity index 98% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotWarning.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotWarning.java index f1b5f070..49b6ea62 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/DevIotWarning.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzDevIotWarning.java @@ -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; diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdepts.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdepts.java new file mode 100644 index 00000000..0ec40e44 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdepts.java @@ -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(); + } +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsGroup.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsGroup.java new file mode 100644 index 00000000..36241e27 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsGroup.java @@ -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(); + } +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsUsers.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsUsers.java new file mode 100644 index 00000000..e584ace2 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProSubdeptsUsers.java @@ -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 + + '}'; + } +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysNative.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysNative.java index d91a418e..ef1da1bf 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysNative.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysNative.java @@ -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; - } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/DevIotMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzDevIotMapper.java similarity index 58% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/DevIotMapper.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzDevIotMapper.java index bc7d3545..879e2e53 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/DevIotMapper.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzDevIotMapper.java @@ -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 selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint); + public List 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); } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsGroupMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsGroupMapper.java new file mode 100644 index 00000000..abdf0556 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsGroupMapper.java @@ -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 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); + +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsMapper.java new file mode 100644 index 00000000..d9357df7 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsMapper.java @@ -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 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); + +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsUsersMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsUsersMapper.java new file mode 100644 index 00000000..f77b602b --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProSubdeptsUsersMapper.java @@ -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 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); + +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProjectAttendanceCfgMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProjectAttendanceCfgMapper.java index 2cd1c037..77ec6228 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProjectAttendanceCfgMapper.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/QuartzProjectAttendanceCfgMapper.java @@ -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 selectSurProjectAttendanceCfgList(QuartzProjectAttendanceCfg quartzProjectAttendanceCfg); - public List selectSurProjectAttendanceCfgListForAllInfo(QuartzProjectAttendanceCfg where); } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysNativeMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysNativeMapper.java index e71a7ec9..d215d691 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysNativeMapper.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysNativeMapper.java @@ -4,7 +4,15 @@ import com.yanzhu.job.domain.SysNative; import java.util.List; +/** + * 籍贯映射Mapper + */ public interface SysNativeMapper { + /** + * 根据编号查询籍贯 + * @param id 籍贯编号 + * @return + */ public List selectSysNativeListById(Long id); } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IDevIotService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzDevIotService.java similarity index 58% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IDevIotService.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzDevIotService.java index f8e34196..48aa2dd0 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IDevIotService.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzDevIotService.java @@ -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 selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint); + public List 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); } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsGroupService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsGroupService.java new file mode 100644 index 00000000..b394d522 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsGroupService.java @@ -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 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); +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsService.java new file mode 100644 index 00000000..46d48ed7 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsService.java @@ -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 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); + +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsUsersService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsUsersService.java new file mode 100644 index 00000000..4a3a7589 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProSubdeptsUsersService.java @@ -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 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); +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProjectAttendanceCfgService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProjectAttendanceCfgService.java index bd98b00e..bbea4371 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProjectAttendanceCfgService.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/IQuartzProjectAttendanceCfgService.java @@ -21,5 +21,4 @@ public interface IQuartzProjectAttendanceCfgService */ public List selectSurProjectAttendanceCfgList(QuartzProjectAttendanceCfg quartzProjectAttendanceCfg); - } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysNativeService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysNativeService.java index 31406458..dd765dca 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysNativeService.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysNativeService.java @@ -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 selectSysNativeListById(Long id); } diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/DevIotServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzDevIotServiceImpl.java similarity index 68% rename from yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/DevIotServiceImpl.java rename to yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzDevIotServiceImpl.java index cb6f0927..9b0ee893 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/DevIotServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzDevIotServiceImpl.java @@ -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 selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint){ + public List 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); diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsGroupServiceImpl.java new file mode 100644 index 00000000..ec8deef0 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsGroupServiceImpl.java @@ -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 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); + } +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsServiceImpl.java new file mode 100644 index 00000000..013fa3e6 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsServiceImpl.java @@ -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 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); + } + +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsUsersServiceImpl.java new file mode 100644 index 00000000..f1ee6083 --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProSubdeptsUsersServiceImpl.java @@ -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 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); + } +} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceCfgServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceCfgServiceImpl.java index 1639c86c..e4e1427e 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceCfgServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceCfgServiceImpl.java @@ -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 项目考勤配置 */ diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java index bff94b6a..a2ce9aae 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java @@ -226,13 +226,7 @@ public class QuartzProjectAttendanceDataServiceImpl implements IQuartzProjectAtt sdata.setGroupName(group.getTeamName()); } //查询项目部门信息 - QuartzProjectAttendanceCfg cfgWhere=new QuartzProjectAttendanceCfg(); - cfgWhere.setId(sdata.getCfgid()); - List 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 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()); diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysNativeServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysNativeServiceImpl.java index 72f3d473..f9209c74 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysNativeServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysNativeServiceImpl.java @@ -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 selectSysNativeListById(Long id) { return sysNativeMapper.selectSysNativeListById(id); diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java index eb32c096..1aaea9db 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java @@ -1,1187 +1,1333 @@ -package com.yanzhu.job.task; - -import cn.hutool.core.codec.Base64; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import com.yanzhu.common.core.utils.Md5Utils; -import com.yanzhu.common.core.utils.file.FileUtils; -import com.yanzhu.common.redis.service.RedisService; -import com.yanzhu.job.config.ResourcesConfig; -import com.yanzhu.job.domain.*; -import com.yanzhu.job.service.*; -import okhttp3.FormBody; -import okhttp3.Request; -import okhttp3.RequestBody; -import org.apache.logging.log4j.util.Strings; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.File; -import java.util.*; -import java.util.concurrent.TimeUnit; - -@Component("attendanceJgwTask") -public class AttendanceJgwTask { - - @Autowired - private RedisService redisService; - - @Autowired - private ISysNativeService sysNativeService; - - @Autowired - IQuartzProjectAttendanceUserService attendanceUserService; - - @Autowired - IQuartzProjectAttendanceCfgService attendanceCfgService; - - @Autowired - IQuartzProjectAttendanceDataService attendanceDataService; - - @Autowired - IQuartzProjectAttendanceGroupService attendanceGroupService; - - @Autowired - private ResourcesConfig resourcesConfig; - - private String getNative(long id){ - String ckey="attendance_jgw_native_"+id; - Object obj=redisService.getCacheObject(ckey); - String tmp=""; - if(obj!=null){ - tmp=obj.toString(); - if(StrUtil.isNotEmpty(tmp)){ - return tmp; - } - } - List list=sysNativeService.selectSysNativeListById(id); - if(list.size()==0){ - id=id/100*100; - list=sysNativeService.selectSysNativeListById(id); - if(list.size()==0){ - id=id/10000*10000; - list=sysNativeService.selectSysNativeListById(id); - } - } - if(list.size()==0){ - tmp=""; - }else{ - tmp= list.get(0).getAddress(); - } - redisService.setCacheObject(ckey, tmp, 1L, TimeUnit.DAYS); - return tmp; - } - private String getWorkTypeName(String appid,String token,String type,String key){ - String ckey="attendance_jgw_work_type_"+type; - Object obj=redisService.getCacheObject(ckey); - HashMap map=null; - if(obj==null){ - map=getJobTypeData(appid,token,type); - if(map!=null){ - redisService.setCacheObject(ckey, map, 1L, TimeUnit.DAYS); - }else{ - return "未知"; - } - }else{ - map=(HashMap)obj; - } - if(map.containsKey(key)){ - return map.get(key); - } - return "未知"; - } - static String host="http://api.gongyoumishu.com:80/gomeetapi/"; - - - //sign/photo/20240101/E24E76-C9A5CB-0000FF/1741751233297383424_8848.JPG - public static String getToken(String appid,String secret){ - String grantType="client_credential"; - String path="/webapi/credential"; - Map params = new HashMap<>(); - params.put("appId",appid); - params.put("secret",secret); - params.put("grantType",grantType); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject jo= JSON.parseObject(data); - JSONObject joData= jo.getJSONObject("data"); - if(joData!=null){ - return joData.getString("token"); - - } - return null; - } - private static RequestBody toFormBody(Map params ){ - FormBody.Builder builder=new FormBody.Builder(); - for(String key :params.keySet()){ - builder.add(key,params.get(key).toString()); - } - return builder.build(); - } - public void clearAlllPhoto(){ - String filePath= resourcesConfig.getUploadPath(); - String path=filePath+"/jgw"; - long endTime=DateUtil.current(); - for(int i=365;i>=0;i--) { - Date dt = DateUtil.date(endTime - 3600l * 1000 * 24 * i); - String clearPath=path +"/" + DateUtil.format(dt, "YYYY/MM/dd"); - String url="/jgw/"+DateUtil.format(dt, "YYYY/MM/dd"); - clearDatePhone(clearPath,url); - } - } - public void clear3DayPhoto(){ - String filePath= resourcesConfig.getUploadPath(); - String path=filePath+"/jgw"; - long endTime=DateUtil.current(); - for(int i=3;i>=0;i--) { - Date dt = DateUtil.date(endTime - 3600l * 1000 * 24 * i); - String clearPath=path +"/" + DateUtil.format(dt, "YYYY/MM/dd"); - String url="/jgw/"+DateUtil.format(dt, "YYYY/MM/dd"); - clearDatePhone(clearPath,url); - } - } - - public void clearToDayPhoto(){ - String filePath= resourcesConfig.getUploadPath(); - String path=filePath+"/jgw"; - long endTime=DateUtil.current(); - Date dt = new Date(); - String clearPath=path +"/" + DateUtil.format(dt, "YYYY/MM/dd"); - String url="/jgw/"+DateUtil.format(dt, "YYYY/MM/dd"); - clearDatePhone(clearPath,url); - - } - private void clearDatePhone(String path,String url){ - File file=new File(path); - if(file.isDirectory()){ - QuartzProjectAttendanceData where=new QuartzProjectAttendanceData(); - where.setScanPhoto(url); - List list=attendanceDataService.selectSurProjectAttendanceDataList(where); - List names=new ArrayList<>(); - for(QuartzProjectAttendanceData it:list){ - names.add(it.getScanPhoto()); - } - for(String f : file.list()){ - try{ - String name= FileUtils.getName(f); - if(!findInNames(names,name)){ - FileUtil.del(path+"/"+f); - } - }catch (Exception ex){ - } - - } - } - } - - private boolean findInNames(List names, String name) { - for(String it :names){ - if(it.indexOf(name)>=0){ - return true; - } - } - return false; - } - - public static void main(String[] args){ - Date d1= DateUtil.date(-86169600000L); - String d="sxyzxx2024suc"; - //System.out.println(Base64.encode(d)); - //System.out.println(DateTime.now().year()); - - String appid="6a6f24fe35b04ee0bcf31cfb46ed1051"; - String secret="c3h5enh4MjAyNHN1Yw=="; - //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";// - //String prjId="cace2f676371427e8f6da20d2924f64e";//泾河新城荟锦坊二期 - String prjId="209aa0c01d8248b6a56a0921d1b88c83";//泾河新城锦樾坊项目 - String phone="15619028761"; - String token= getToken(appid,secret); - if(token==null || token.length()==0){ - return; - } - //System.out.println(token); - //System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); - String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone); - String leaderTeamId="b3774a8cd04c418dabf36bffbf276661"; - //System.out.println(subcontractorId); - - - //findWorkerByLeader(appid,token,leaderTeamId); - findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0); - //queryProject(appid,token,phone,0);; - //findAddWorkerByProject(appid,token,prjId,0); - //findUpdateWorkerByProject(appid,token,prjId,0); - //findAttendanceByProject(appid,token,prjId,"0"); - //findTeamByProjectId(appid,token,prjId); - //findProContractorByProjectId(appid,token,prjId); - //getJobTypeData(appid,token,"0"); - //findDirectlyUnderTeam(appid,token,prjId); - } - public static void findDirectlyUnderTeam(String appId,String token,String projectId,String subcontractorId,int rowId){ - String path="/webapi/project/findDirectlyUnderTeam"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - //System.out.println(url); - String tokenSign = Md5Utils.hash(url); - //System.out.println(tokenSign); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("subcontractorId",subcontractorId); - params.put("rowId",rowId); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - //System.out.println(data); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("teamList"); - if(arr.size()>0){ - for(int i=0;i"+jo.getString("teamName")); - } - - } - } - public static void queryProject(String appId,String token,String phone,int rowId){ - - String path="/webapi/project/queryProject"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - //System.out.println(url); - String tokenSign = Md5Utils.hash(url); - //System.out.println(tokenSign); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("account",phone); - params.put("rowId",rowId); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - //System.out.println(data); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("projectList"); - if(arr.size()>0){ - JSONObject jo=arr.getJSONObject(0); - - } - } - public String getSubcontractor(String appId,String token,String phone){ - String ckey = "attendance_jgw_Subcontractor_" + phone; - if(redisService!=null) { - Object obj = redisService.getCacheObject(ckey); - if(obj!=null){ - String str=(String)obj; - if(StrUtil.isNotEmpty(str)){ - return str; - } - } - } - - String path="/webapi/project/querySubcontractorByPhone"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - //System.out.println(url); - String tokenSign = Md5Utils.hash(url); - //System.out.println(tokenSign); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("phone",phone); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - //System.out.println(data); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("subcontractorList"); - if(arr.size()>0){ - JSONObject jo=arr.getJSONObject(0); - String tmp=jo.getString("subcontractorId"); - if(StrUtil.isNotEmpty(tmp) && redisService!=null){ - redisService.setCacheObject(ckey, tmp, 1L, TimeUnit.DAYS); - return tmp; - }else{ - return tmp; - } - } - return ""; - } - public static HashMap getJobTypeData(String appId,String token,String type){ - String path="/webapi/dictInfo/getJobTypeData"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - //System.out.println(url); - String tokenSign = Md5Utils.hash(url); - //System.out.println(tokenSign); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("type",type); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - //System.out.println(data); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("jobTypes"); - HashMap map=new HashMap<>(); - for(int i=0;i0){ - for(int i=0;i"+sdata.getRemark()); - } - //sdata.setScanPhoto(photoUrl); - } - findAttendanceByProject(appId,token,projectId,endId); - } - - } - - private String getPhoto(String appId,String token, String photo) { - String path="/webapi/dictInfo/getPhoyoAllPaths"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - String tokenSign = Md5Utils.hash(url); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("filePath",photo); - - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - String purl=joData.getString("result"); - byte[] buffer= HttpUtil.downloadBytes(purl); - String filePath= resourcesConfig.getUploadPath(); - try { - String name=FileUtil.getName(photo); - return "/jgw/"+FileUtils.writeBytes(buffer, filePath+"/jgw",name); - }catch (Exception ex){ - return ""; - } - } - - - - - public static void findWorkerByLeader(String appId,String token,String leaderTeamId){ - String path="/webapi/project/findWorkerByLeader"; - String time = System.currentTimeMillis() + ""; - String startId="0"; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("leaderTeamId",leaderTeamId); - url=host+path; - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("recordList"); - for(int i=0;i0){ - for(int i=0;i"+json.getString("teamName")); - } - } - } - public static void findTeamByProjectId(String appId,String token,String projectId){ - String path="webapi/project/findTeamByProjectId"; - String time = System.currentTimeMillis() + ""; - String startId="0"; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("rowId",startId); - url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&projectId="+projectId+"×tamp="+time+"&rowId="+startId; - Request request = new Request.Builder() - .url(url) - .get() - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - JSONArray arr=joData.getJSONArray("teamList"); - if(arr.size()>0){ - for(int i=0;i params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("phone",phone); - url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&phone="+phone+"×tamp="+time; - Request request = new Request.Builder() - .url(url) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - JSONArray arr=joData.getJSONArray("teamList"); - if(arr.size()>0){ - for(int i=0;i0){ - for(int i=0;i0) { - int cnt=0; - for(int i=0;i0) { - int cnt=0; - for(int i=0;i list=attendanceCfgService.selectSurProjectAttendanceCfgList(where); - for(QuartzProjectAttendanceCfg it :list){ - String param= it.getVendorsParameter(); - if(Strings.isNotEmpty(param)){ - try{ - JSONObject jo=JSON.parseObject(param); - String appId=jo.getString("appId"); - String secret=jo.getString("secret"); - secret=Base64.encode(secret); - jo.put("secret",secret); - String token= getToken(appId,secret); - jo.put("token",token); - doSyncWorker(jo,0l,it); - }catch (Exception ex){ - ex.printStackTrace(); - } - } - } - syncWorkerByLeader(); - } - - /** - * 同步群组和人的关系 - */ - public void syncWorkerByLeader(){ - QuartzProjectAttendanceCfg where =new QuartzProjectAttendanceCfg(); - where.setEnabled(1l); - where.setIsDel(0l); - where.setVendorsCode("jgw"); - List list=attendanceCfgService.selectSurProjectAttendanceCfgList(where); - for(QuartzProjectAttendanceCfg it :list){ - String param= it.getVendorsParameter(); - if(Strings.isNotEmpty(param)){ - try{ - JSONObject jo=JSON.parseObject(param); - String appId=jo.getString("appId"); - String secret=jo.getString("secret"); - secret=Base64.encode(secret); - jo.put("secret",secret); - String token= getToken(appId,secret); - jo.put("token",token); - QuartzProjectAttendanceGroup groupWhere=new QuartzProjectAttendanceGroup(); - groupWhere.setCfgid(it.getId()); - groupWhere.setLeaderPhone("directly"); - List groupList=attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere); - for(QuartzProjectAttendanceGroup g:groupList) { - if(StrUtil.isNotEmpty(g.getLeaderName()) && StrUtil.isNotEmpty(g.getCompanyId())) { - jo.put("subcontractorId", g.getLeaderName()); - jo.put("leaderTeamId", g.getCompanyId()); - jo.put("companyName", g.getCompanyName()); - dosyncWorkerByLeader(jo, 0l, it); - } - } - }catch (Exception ex){ - ex.printStackTrace(); - } - } - } - } - - private void dosyncWorkerByLeader(JSONObject jo, long startId, QuartzProjectAttendanceCfg it){ - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String path="/webapi/project/findWorkerByLeader"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - String leaderTeamId=jo.getString("leaderTeamId"); - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("leaderTeamId",leaderTeamId); - params.put("subcontractorId",jo.getString("subcontractorId")); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject jd=j.getJSONObject("data"); - JSONArray arr=jd.getJSONArray("recordList"); - if(arr!=null && arr.size()>0){ - for(int i=0;i userList=attendanceUserService.selectSurProjectAttendanceUserList(userWhere); - if(userList.size()>0){ - QuartzProjectAttendanceUser upUser=userList.get(0); - upUser.setCompanyId(json.getString("leaderTeamId")); - upUser.setWorkTypeName(json.getString("jobType")); - upUser.setCompanyName(jo.getString("companyName")); - attendanceUserService.updateSurProjectAttendanceUser(upUser); - } - } - } - } - private void doSyncWorker(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String projectId=jo.getString("appProjectId"); - String path="/webapi/project/findAddWorkerByProject"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("startId",startId); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - long endId= joData.getLong("endId"); - JSONArray arr=joData.getJSONArray("workerList"); - if(arr.size()>0) { - for(int i=0;i6){ - try { - long idStr = Long.parseLong(idNumber.substring(0, 6)); - String natstr=getNative(idStr); - if(StrUtil.isNotEmpty(natstr)){ - user.setNativePlace(natstr); - } - }catch (Exception ex){ - - } - } - attendanceUserService.add(user); - } - doSyncWorker(jo,endId,it); - } - } - - /** - * 同步群组信息 - */ - public void syncGroup(){ - QuartzProjectAttendanceCfg where =new QuartzProjectAttendanceCfg(); - where.setEnabled(1l); - where.setIsDel(0l); - where.setVendorsCode("jgw"); - List list=attendanceCfgService.selectSurProjectAttendanceCfgList(where); - for(QuartzProjectAttendanceCfg it :list){ - String param= it.getVendorsParameter(); - if(Strings.isNotEmpty(param)){ - try{ - JSONObject jo=JSON.parseObject(param); - String appId=jo.getString("appId"); - String secret=jo.getString("secret"); - secret=Base64.encode(secret); - jo.put("secret",secret); - String token= getToken(appId,secret); - jo.put("token",token); - //doSyncGroup(jo,0l,it); - doSyncDirectlyUnderGroup(jo,0l,it); - doSyncProContractor(jo,0l,it); - }catch (Exception ex){ - ex.printStackTrace(); - } - } - } - } - - /** - * 查询参建单位 - * @param jo - * @param startId - * @param it - */ - private void doSyncProContractor(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String projectId=jo.getString("appProjectId"); - String path="/webapi/project/findProContractorByProjectId"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("rowId",startId); - url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&projectId="+projectId+"×tamp="+time+"&rowId="+startId; - Request request = new Request.Builder() - .url(url) - .get() - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - JSONArray arr=joData.getJSONArray("proContractorList"); - if(arr.size()>0){ - long rowId=0; - for(int i=0;i0){ - doSyncProContractor(jo,rowId+1,it); - } - } - } - - /** - * 查询班组直隶 - * @param jo - * @param startId - * @param it - */ - private void doSyncDirectlyUnderGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String projectId=jo.getString("appProjectId"); - String phone=jo.getString("phone"); - String subcontractorId=getSubcontractor(appId,token,phone); - String path="/webapi/project/findDirectlyUnderTeam"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("subcontractorId",subcontractorId); - params.put("rowId",startId); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - JSONArray arr=joData.getJSONArray("teamList"); - if(arr.size()>0){ - long rowId=0; - for(int i=0;i list=attendanceGroupService.selectSurProjectAttendanceGroupList(where); - if(list.size()==0){ - attendanceGroupService.add(group); - }else{ - group.setId(list.get(0).getId()); - group.setCompanyTypeId(list.get(0).getCompanyTypeId()); - attendanceGroupService.updateSurProjectAttendanceGroup(group); - } - } - if(rowId>0){ - doSyncDirectlyUnderGroup(jo,rowId+1,it); - } - } - } - - /** - * 查询班组 - * @param jo - * @param startId - * @param it - */ - private void doSyncGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String projectId=jo.getString("appProjectId"); - String path="/webapi/project/findTeamByProjectId"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("rowId",startId); - url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&projectId="+projectId+"×tamp="+time+"&rowId="+startId; - Request request = new Request.Builder() - .url(url) - .get() - .build(); - String data=AttendanceTask.getResult(request); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - JSONArray arr=joData.getJSONArray("teamList"); - if(arr.size()>0){ - long rowId=0; - for(int i=0;i list=attendanceGroupService.selectSurProjectAttendanceGroupList(where); - if(list.size()==0){ - attendanceGroupService.add(group); - } - } - if(rowId>0){ - doSyncGroup(jo,rowId+1,it); - } - } - } - - /** - * 同步当天数据 - */ - public void syncAttendanceData(){ - String dtStart=DateUtil.format(DateTime.now(),"yyyy-MM-dd"); - String dtEnd=dtStart; - syncAttendanceData(dtStart,dtEnd); - clearToDayPhoto(); - } - - /** - * 同步7天之内数据 - */ - public void syncLastWeekAttendanceData(){ - String dtEnd=DateUtil.format(DateTime.now(),"yyyy-MM-dd"); - String dtStart=DateUtil.format(DateUtil.offsetDay(DateTime.now(),-7),"yyyy-MM-dd"); - syncAttendanceData(dtStart,dtEnd); - } - - /** - * 同步30天内数据 - */ - public void syncLast30DayAttendanceData(){ - String dtEnd=DateUtil.format(DateTime.now(),"yyyy-MM-dd"); - String dtStart=DateUtil.format(DateUtil.offsetDay(DateTime.now(),-30),"yyyy-MM-dd"); - syncAttendanceData(dtStart,dtEnd); - } - - - private void syncAttendanceData(String dtStart,String dtEnd){ - QuartzProjectAttendanceCfg where =new QuartzProjectAttendanceCfg(); - where.setEnabled(1l); - where.setIsDel(0l); - where.setVendorsCode("jgw"); - List list=attendanceCfgService.selectSurProjectAttendanceCfgList(where); - for(QuartzProjectAttendanceCfg it :list){ - String param= it.getVendorsParameter(); - if(Strings.isNotEmpty(param)){ - try{ - JSONObject jo=JSON.parseObject(param); - String appId=jo.getString("appId"); - String secret=jo.getString("secret"); - secret=Base64.encode(secret); - jo.put("secret",secret); - String token= getToken(appId,secret); - jo.put("token",token); - jo.put("startTime",dtStart); - jo.put("endTime",dtEnd); - doSyncAttendanceData(jo,"0",it); - }catch (Exception ex){ - ex.printStackTrace(); - } - } - } - } - - private void doSyncAttendanceData(JSONObject jo, String startId, QuartzProjectAttendanceCfg it) { - String appId=jo.getString("appId"); - String token=jo.getString("token"); - String projectId=jo.getString("appProjectId"); - String startTime=jo.getString("startTime"); - String endTime=jo.getString("endTime"); - String path="/webapi/project/findAttendanceByProject"; - String time = System.currentTimeMillis() + ""; - String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; - - String tokenSign = Md5Utils.hash(url); - Map params = new HashMap<>(); - params.put("appId",appId); - params.put("timestamp",time); - params.put("tokenSign",tokenSign); - params.put("projectId",projectId); - params.put("startId",startId); - params.put("startTime",startTime); - params.put("endTime",endTime); - Request request = new Request.Builder() - .url(host+path) - .post(toFormBody(params)) - .build(); - String data=AttendanceTask.getResult(request); - //System.out.println(data); - JSONObject j= JSON.parseObject(data); - JSONObject joData= j.getJSONObject("data"); - String endId= joData.getString("endId"); - JSONArray arr=joData.getJSONArray("workerAttList"); - //List addList=new ArrayList<>(); - if(arr!=null && arr.size()>0){ - for(int i=0;i"+sdata.getRemark()); - } - sdata.setVendorsCode(it.getVendorsCode()); - attendanceDataService.add(sdata); - //addList.add(sdata); - } - //attendanceDataService.addList(addList); - doSyncAttendanceData(jo,endId,it); - } - } - - -} +//package com.yanzhu.job.task; +// +//import cn.hutool.core.codec.Base64; +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.date.DateUtil; +//import cn.hutool.core.io.FileUtil; +//import cn.hutool.core.util.StrUtil; +//import cn.hutool.http.HttpUtil; +//import com.alibaba.fastjson2.JSON; +//import com.alibaba.fastjson2.JSONArray; +//import com.alibaba.fastjson2.JSONObject; +//import com.yanzhu.common.core.enums.ApproveStatus; +//import com.yanzhu.common.core.enums.ShiFouEnums; +//import com.yanzhu.common.core.enums.UseStateEnums; +//import com.yanzhu.common.core.utils.DateUtils; +//import com.yanzhu.common.core.utils.Md5Utils; +//import com.yanzhu.common.core.utils.StringUtils; +//import com.yanzhu.common.core.utils.file.FileUtils; +//import com.yanzhu.common.redis.service.RedisService; +//import com.yanzhu.job.config.ResourcesConfig; +//import com.yanzhu.job.domain.*; +//import com.yanzhu.job.service.*; +//import okhttp3.*; +//import org.apache.logging.log4j.util.Strings; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +//import java.io.File; +//import java.io.IOException; +//import java.util.*; +//import java.util.concurrent.TimeUnit; +// +///** +// * @Description: 济公网数据定时任务 +// * @Title: AttendanceJgwTask +// * @Package com.yanzhu.job.task +// * @Author: JiangYuQi +// * @CreateTime: 2024/10/26 17:05 +// */ +//@Component("attendanceJgwTask") +//public class AttendanceJgwTask { +// +// @Autowired +// private RedisService redisService; +// +// @Autowired +// private ISysNativeService sysNativeService; +// +// @Autowired +// private IQuartzProSubdeptsService quartzProSubdeptsService; +// +// @Autowired +// private IQuartzProSubdeptsGroupService quartzProSubdeptsGroupService; +// +// @Autowired +// IQuartzProjectAttendanceUserService attendanceUserService; +// +// @Autowired +// IQuartzProjectAttendanceCfgService attendanceCfgService; +// +// @Autowired +// IQuartzProjectAttendanceDataService attendanceDataService; +// +// @Autowired +// IQuartzProjectAttendanceGroupService attendanceGroupService; +// +// @Autowired +// private ResourcesConfig resourcesConfig; +// +// private final String code = "jgw"; +// private final String host = "http://api.gongyoumishu.com:80/gomeetapi/"; +// +// /** +// * 获取访问令牌 +// * +// * @param appid 应用编号 +// * @param secret 应用密钥 +// * @return +// */ +// public String getToken(String appid, String secret) { +// String grantType = "client_credential"; +// String path = "/webapi/credential"; +// Map params = new HashMap<>(); +// params.put("appId", appid); +// params.put("secret", secret); +// params.put("grantType", grantType); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject jo = JSON.parseObject(data); +// JSONObject joData = jo.getJSONObject("data"); +// if (joData != null) { +// return joData.getString("token"); +// +// } +// return null; +// } +// +// /** +// * 同步群组信息 +// */ +// public void syncGroupData() { +// QuartzProjectAttendanceCfg where = new QuartzProjectAttendanceCfg(); +// where.setEnabled(ShiFouEnums.SHI.getCode()); +// where.setIsDel(ShiFouEnums.FOU.getCode()); +// where.setVendorsCode(code); +// List list = attendanceCfgService.selectSurProjectAttendanceCfgList(where); +// for (QuartzProjectAttendanceCfg item : list) { +// String param = item.getVendorsParameter(); +// if (Strings.isNotEmpty(param)) { +// try { +// JSONObject jo = JSON.parseObject(param); +// String appId = jo.getString("appId"); +// String secret = jo.getString("secret"); +// secret = Base64.encode(secret); +// jo.put("secret", secret); +// String token = getToken(appId, secret); +// jo.put("token", token); +// doSyncProContractor(jo, 0l, item); +// doSyncDirectlyUnderGroup(jo, 0l, item); +// } catch (Exception ex) { +// ex.printStackTrace(); +// } +// } +// } +// } +// +// /** +// * 查询参建单位 +// * +// * @param jo 请求参数 +// * @param startId 开始编号 +// * @param it 配置信息 +// */ +// private void doSyncProContractor(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String projectId = jo.getString("appProjectId"); +// String path = "/webapi/project/findProContractorByProjectId"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("rowId", startId); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&projectId=" + projectId + "×tamp=" + time + "&rowId=" + startId; +// Request request = new Request.Builder() +// .url(url) +// .get() +// .build(); +// String data = getResult(request); +// JSONObject reData = JSON.parseObject(data); +// JSONObject joData = reData.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("proContractorList"); +// if (arr.size() > 0) { +// long rowId = 0; +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String subDeptType = convertSubDeptType(json.getString("corpType")); +// if(!"1".equals(subDeptType)){ +// rowId = json.getLong("id"); +// QuartzProSubdepts quartzProSubdeptsQuery = new QuartzProSubdepts(); +// quartzProSubdeptsQuery.setComId(it.getComId()); +// quartzProSubdeptsQuery.setProjectId(it.getProjectId()); +// quartzProSubdeptsQuery.setSubDeptCode(json.getString("corpCode")); +// List list = quartzProSubdeptsService.selectQuartzProSubdeptsList(quartzProSubdeptsQuery); +// if(StringUtils.isNotEmpty(list)){ +// QuartzProSubdepts quartzProSubdepts = list.get(0); +// quartzProSubdepts.setSubDeptName(json.getString("corpName")); +// quartzProSubdepts.setSubDeptCode(json.getString("corpCode")); +// quartzProSubdepts.setSubDeptLeaderName(json.getString("pmName")); +// quartzProSubdepts.setSubDeptLeaderPhone(json.getString("pmPhone")); +// Map subDeptInfos = new HashMap<>(); +// subDeptInfos.put("busScope",""); +// subDeptInfos.put("signDate",json.getString("registeredTime")); +// subDeptInfos.put("address",json.getString("address")); +// subDeptInfos.put("addressCode",json.getString("addressCode")); +// subDeptInfos.put("postalCode",json.getString("postalCode")); +// subDeptInfos.put("registeredCapital",json.getString("registeredCapital")); +// subDeptInfos.put("paidInCapital",json.getString("paidInCapital")); +// subDeptInfos.put("businessAddress",json.getString("businessAddress")); +// subDeptInfos.put("officePhone",json.getString("officePhone")); +// quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos)); +// quartzProSubdeptsService.updateQuartzProSubdepts(quartzProSubdepts); +// }else{ +// QuartzProSubdepts quartzProSubdepts = new QuartzProSubdepts(); +// quartzProSubdepts.setComId(it.getComId()); +// quartzProSubdepts.setProjectId(it.getProjectId()); +// quartzProSubdepts.setSubDeptType(subDeptType); +// quartzProSubdepts.setSubDeptName(json.getString("corpName")); +// quartzProSubdepts.setSubDeptCode(json.getString("corpCode")); +// quartzProSubdepts.setSubDeptLeaderName(json.getString("pmName")); +// quartzProSubdepts.setSubDeptLeaderPhone(json.getString("pmPhone")); +// Map subDeptInfos = new HashMap<>(); +// subDeptInfos.put("busScope",""); +// subDeptInfos.put("signDate",json.getString("registeredTime")); +// subDeptInfos.put("address",json.getString("address")); +// subDeptInfos.put("addressCode",json.getString("addressCode")); +// subDeptInfos.put("postalCode",json.getString("postalCode")); +// subDeptInfos.put("registeredCapital",json.getString("registeredCapital")); +// subDeptInfos.put("paidInCapital",json.getString("paidInCapital")); +// subDeptInfos.put("businessAddress",json.getString("businessAddress")); +// subDeptInfos.put("officePhone",json.getString("officePhone")); +// quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos)); +// quartzProSubdepts.setUseStatus(UseStateEnums.IN.getCode()); +// quartzProSubdepts.setApproveStatus(ApproveStatus.passed.getCode()); +// quartzProSubdepts.setSource(code); +// quartzProSubdeptsService.insertQuartzProSubdepts(quartzProSubdepts); +// } +// } +// } +// if (arr.size()>=10 && rowId > 0) { +// doSyncProContractor(jo, rowId + 1, it); +// } +// } +// } +// +// /** +// * 转换单位类型 +// * @param corpType +// * @return +// */ +// private String convertSubDeptType(String corpType){ +// String subDeptType; +// switch (corpType){ +// case "001" : subDeptType = "5"; break; +// case "002" : subDeptType = "11"; break; +// case "003" : subDeptType = "6"; break; +// case "004" : subDeptType = "7"; break; +// case "005" : subDeptType = "8"; break; +// case "006" : subDeptType = "4"; break; +// case "007" : subDeptType = "2"; break; +// case "008" : subDeptType = "3"; break; +// case "009" : subDeptType = "1"; break; +// case "010" : subDeptType = "9"; break; +// case "011" : subDeptType = "10"; break; +// default : subDeptType = "99"; break; +// } +// return subDeptType; +// } +// +// /** +// * 查询班组直隶 +// * +// * @param jo 请求参数 +// * @param startId 开始编号 +// * @param it 配置信息 +// */ +// private void doSyncDirectlyUnderGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String projectId = jo.getString("appProjectId"); +// String phone = jo.getString("phone"); +// String subcontractorId = getSubcontractor(appId, token, phone); +// String path = "/webapi/project/findDirectlyUnderTeam"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("subcontractorId", subcontractorId); +// params.put("rowId", startId); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("teamList"); +// if (arr.size() > 0) { +// long rowId = 0; +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProSubdeptsGroup quartzProSubdeptsGroupQuery = new QuartzProSubdeptsGroup(); +// quartzProSubdeptsGroupQuery.setComId(it.getComId()); +// quartzProSubdeptsGroupQuery.setProjectId(it.getProjectId()); +// quartzProSubdeptsGroupQuery.setGroupName(json.getString("teamName")); +// List list = quartzProSubdeptsGroupService.selectQuartzProSubdeptsGroupList(quartzProSubdeptsGroupQuery); +// if(StringUtils.isNotEmpty(list)){ +// +// }else{ +// +// } +// QuartzProjectAttendanceGroup group = QuartzProjectAttendanceGroup.createJgw(json, true); +// group.setCfgid(it.getId()); +// group.setAppId(appId); +// rowId = json.getLong("id"); +// QuartzProjectAttendanceGroup where = new QuartzProjectAttendanceGroup(); +// where.setCompanyId(group.getCompanyId()); +// where.setCfgid(group.getCfgid()); +// //List list = attendanceGroupService.selectSurProjectAttendanceGroupList(where); +// if (list.size() == 0) { +// attendanceGroupService.add(group); +// } else { +// group.setId(list.get(0).getId()); +// //group.setCompanyTypeId(list.get(0).getCompanyTypeId()); +// attendanceGroupService.updateSurProjectAttendanceGroup(group); +// } +// } +// if (rowId > 0) { +// doSyncDirectlyUnderGroup(jo, rowId + 1, it); +// } +// } +// } +// +// private String getWorkTypeName(String appid, String token, String type, String key) { +// String ckey = "attendance_jgw_work_type_" + type; +// Object obj = redisService.getCacheObject(ckey); +// HashMap map = null; +// if (obj == null) { +// map = getJobTypeData(appid, token, type); +// if (map != null) { +// redisService.setCacheObject(ckey, map, 1L, TimeUnit.DAYS); +// } else { +// return "未知"; +// } +// } else { +// map = (HashMap) obj; +// } +// if (map.containsKey(key)) { +// return map.get(key); +// } +// return "未知"; +// } +// +// /** +// * 参数组装 +// * +// * @param params +// * @return +// */ +// private static RequestBody toFormBody(Map params) { +// FormBody.Builder builder = new FormBody.Builder(); +// for (String key : params.keySet()) { +// builder.add(key, params.get(key).toString()); +// } +// return builder.build(); +// } +// +// public void clearAlllPhoto() { +// String filePath = resourcesConfig.getUploadPath(); +// String path = filePath + "/jgw"; +// long endTime = DateUtil.current(); +// for (int i = 365; i >= 0; i--) { +// Date dt = DateUtil.date(endTime - 3600l * 1000 * 24 * i); +// String clearPath = path + "/" + DateUtil.format(dt, "YYYY/MM/dd"); +// String url = "/jgw/" + DateUtil.format(dt, "YYYY/MM/dd"); +// clearDatePhone(clearPath, url); +// } +// } +// +// public void clear3DayPhoto() { +// String filePath = resourcesConfig.getUploadPath(); +// String path = filePath + "/jgw"; +// long endTime = DateUtil.current(); +// for (int i = 3; i >= 0; i--) { +// Date dt = DateUtil.date(endTime - 3600l * 1000 * 24 * i); +// String clearPath = path + "/" + DateUtil.format(dt, "YYYY/MM/dd"); +// String url = "/jgw/" + DateUtil.format(dt, "YYYY/MM/dd"); +// clearDatePhone(clearPath, url); +// } +// } +// +// public void clearToDayPhoto() { +// String filePath = resourcesConfig.getUploadPath(); +// String path = filePath + "/jgw"; +// long endTime = DateUtil.current(); +// Date dt = new Date(); +// String clearPath = path + "/" + DateUtil.format(dt, "YYYY/MM/dd"); +// String url = "/jgw/" + DateUtil.format(dt, "YYYY/MM/dd"); +// clearDatePhone(clearPath, url); +// +// } +// +// private void clearDatePhone(String path, String url) { +// File file = new File(path); +// if (file.isDirectory()) { +// QuartzProjectAttendanceData where = new QuartzProjectAttendanceData(); +// where.setScanPhoto(url); +// List list = attendanceDataService.selectSurProjectAttendanceDataList(where); +// List names = new ArrayList<>(); +// for (QuartzProjectAttendanceData it : list) { +// names.add(it.getScanPhoto()); +// } +// for (String f : file.list()) { +// try { +// String name = FileUtils.getName(f); +// if (!findInNames(names, name)) { +// FileUtil.del(path + "/" + f); +// } +// } catch (Exception ex) { +// } +// +// } +// } +// } +// +// private boolean findInNames(List names, String name) { +// for (String it : names) { +// if (it.indexOf(name) >= 0) { +// return true; +// } +// } +// return false; +// } +// +// public static void main(String[] args) { +// Date d1 = DateUtil.date(-86169600000L); +// String d = "sxyzxx2024suc"; +// //System.out.println(Base64.encode(d)); +// //System.out.println(DateTime.now().year()); +// +// String appid = "6a6f24fe35b04ee0bcf31cfb46ed1051"; +// String secret = "c3h5enh4MjAyNHN1Yw=="; +// //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";// +// //String prjId="cace2f676371427e8f6da20d2924f64e";//泾河新城荟锦坊二期 +// String prjId = "209aa0c01d8248b6a56a0921d1b88c83";//泾河新城锦樾坊项目 +// String phone = "15619028761"; +// String token = getToken(appid, secret); +// if (token == null || token.length() == 0) { +// return; +// } +// //System.out.println(token); +// //System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); +// String subcontractorId = new AttendanceJgwTask().getSubcontractor(appid, token, phone); +// String leaderTeamId = "b3774a8cd04c418dabf36bffbf276661"; +// //System.out.println(subcontractorId); +// +// +// //findWorkerByLeader(appid,token,leaderTeamId); +// findDirectlyUnderTeam(appid, token, prjId, subcontractorId, 0); +// //queryProject(appid,token,phone,0);; +// //findAddWorkerByProject(appid,token,prjId,0); +// //findUpdateWorkerByProject(appid,token,prjId,0); +// //findAttendanceByProject(appid,token,prjId,"0"); +// //findTeamByProjectId(appid,token,prjId); +// //findProContractorByProjectId(appid,token,prjId); +// //getJobTypeData(appid,token,"0"); +// //findDirectlyUnderTeam(appid,token,prjId); +// } +// +// public static void findDirectlyUnderTeam(String appId, String token, String projectId, String subcontractorId, int rowId) { +// String path = "/webapi/project/findDirectlyUnderTeam"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// //System.out.println(url); +// String tokenSign = Md5Utils.hash(url); +// //System.out.println(tokenSign); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("subcontractorId", subcontractorId); +// params.put("rowId", rowId); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("teamList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject jo = arr.getJSONObject(i); +// //System.out.println("-->"+jo.getString("teamName")); +// } +// +// } +// } +// +// public static void queryProject(String appId, String token, String phone, int rowId) { +// +// String path = "/webapi/project/queryProject"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// //System.out.println(url); +// String tokenSign = Md5Utils.hash(url); +// //System.out.println(tokenSign); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("account", phone); +// params.put("rowId", rowId); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("projectList"); +// if (arr.size() > 0) { +// JSONObject jo = arr.getJSONObject(0); +// +// } +// } +// +// public String getSubcontractor(String appId, String token, String phone) { +// String ckey = "attendance_jgw_Subcontractor_" + phone; +// if (redisService != null) { +// Object obj = redisService.getCacheObject(ckey); +// if (obj != null) { +// String str = (String) obj; +// if (StrUtil.isNotEmpty(str)) { +// return str; +// } +// } +// } +// +// String path = "/webapi/project/querySubcontractorByPhone"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// //System.out.println(url); +// String tokenSign = Md5Utils.hash(url); +// //System.out.println(tokenSign); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("phone", phone); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("subcontractorList"); +// if (arr.size() > 0) { +// JSONObject jo = arr.getJSONObject(0); +// String tmp = jo.getString("subcontractorId"); +// if (StrUtil.isNotEmpty(tmp) && redisService != null) { +// redisService.setCacheObject(ckey, tmp, 1L, TimeUnit.DAYS); +// return tmp; +// } else { +// return tmp; +// } +// } +// return ""; +// } +// +// public static HashMap getJobTypeData(String appId, String token, String type) { +// String path = "/webapi/dictInfo/getJobTypeData"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// //System.out.println(url); +// String tokenSign = Md5Utils.hash(url); +// //System.out.println(tokenSign); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("type", type); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("jobTypes"); +// HashMap map = new HashMap<>(); +// for (int i = 0; i < arr.size(); i++) { +// JSONObject jo = arr.getJSONObject(i); +// String code = jo.getString("dictCode"); +// String value = jo.getString("dictValue"); +// map.put(code, value); +// } +// return map; +// } +// +// public void findAttendanceByProject(String appId, String token, String projectId, String startId) { +// String path = "/webapi/project/findAttendanceByProject"; +// String time = System.currentTimeMillis() + ""; +// //String startId="0"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// //System.out.println(url); +// String tokenSign = Md5Utils.hash(url); +// //System.out.println(tokenSign); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("startId", startId); +// params.put("startTime", DateUtil.format(DateTime.now(), "yyyy-MM-dd")); +// params.put("endTime", DateUtil.format(DateUtil.offsetDay(DateTime.now(), 0), "yyyy-MM-dd")); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// String endId = joData.getString("endId"); +// JSONArray arr = joData.getJSONArray("workerAttList"); +// if (arr != null && arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String photo = json.getString("signimg"); +// //System.out.println(json.getString("machineType")); +// String photoUrl = getPhoto(appId, token, photo); +// QuartzProjectAttendanceData sdata = QuartzProjectAttendanceData.createFromJgw(json); +// if (sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")) { +// //System.out.println("--->"+sdata.getRemark()); +// } +// //sdata.setScanPhoto(photoUrl); +// } +// findAttendanceByProject(appId, token, projectId, endId); +// } +// +// } +// +// private String getPhoto(String appId, String token, String photo) { +// String path = "/webapi/dictInfo/getPhoyoAllPaths"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// String tokenSign = Md5Utils.hash(url); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("filePath", photo); +// +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// String purl = joData.getString("result"); +// byte[] buffer = HttpUtil.downloadBytes(purl); +// String filePath = resourcesConfig.getUploadPath(); +// try { +// String name = FileUtil.getName(photo); +// return "/jgw/" + FileUtils.writeBytes(buffer, filePath + "/jgw", name); +// } catch (Exception ex) { +// return ""; +// } +// } +// +// +// public static void findWorkerByLeader(String appId, String token, String leaderTeamId) { +// String path = "/webapi/project/findWorkerByLeader"; +// String time = System.currentTimeMillis() + ""; +// String startId = "0"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("leaderTeamId", leaderTeamId); +// url = host + path; +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("recordList"); +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// if (json.getString("workerid").equals("56141214ea304fcc95a8098d3bafed0d")) { +// //System.out.println("---1--"); +// } +// } +// } +// +// public static void findProContractorByProjectId(String appId, String token, String projectId) { +// String path = "/webapi/project/findProContractorByProjectId"; +// String time = System.currentTimeMillis() + ""; +// String startId = "0"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("rowId", startId); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&projectId=" + projectId + "×tamp=" + time + "&rowId=" + startId; +// Request request = new Request.Builder() +// .url(url) +// .get() +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("proContractorList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// //System.out.println("-->"+json.getString("teamName")); +// } +// } +// } +// +// public static void findTeamByProjectId(String appId, String token, String projectId) { +// String path = "webapi/project/findTeamByProjectId"; +// String time = System.currentTimeMillis() + ""; +// String startId = "0"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("rowId", startId); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&projectId=" + projectId + "×tamp=" + time + "&rowId=" + startId; +// Request request = new Request.Builder() +// .url(url) +// .get() +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("teamList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProjectAttendanceGroup group = QuartzProjectAttendanceGroup.createJgw(json, false); +// group.setBizLicense(json.getString("corpCode")); +// String type = json.getString("corpType"); +// if ("009".equals(type)) { //总包人员 +// group.setCompanyTypeId("1"); +// } else if ("007".equals(type)) {//监理人员 +// group.setCompanyTypeId("8"); +// } else if ("006".equals(type)) {//劳务人员 +// group.setCompanyTypeId("2"); +// } +// if (StrUtil.isNotEmpty(group.getCompanyTypeId())) { +// +// } +// +// } +// } +// } +// +// public static void querySubcontractorByPhone(String appId, String token, String projectId) { +// String path = "webapi/project/querySubcontractorByPhone"; +// String time = System.currentTimeMillis() + ""; +// String startId = "100"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// String phone = "18171295380"; +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("phone", phone); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&phone=" + phone + "×tamp=" + time; +// Request request = new Request.Builder() +// .url(url) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("teamList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProjectAttendanceGroup group = QuartzProjectAttendanceGroup.createJgw(json, true); +// group.setBizLicense(json.getString("corpCode")); +// String type = json.getString("corpType"); +// if ("009".equals(type)) { //总包人员 +// group.setCompanyTypeId("1"); +// } else if ("007".equals(type)) {//监理人员 +// group.setCompanyTypeId("8"); +// } else if ("006".equals(type)) {//劳务人员 +// group.setCompanyTypeId("2"); +// } +// if (StrUtil.isNotEmpty(group.getCompanyTypeId())) { +// +// } +// +// } +// } +// } +// +// public static void findDirectlyUnderTeam(String appId, String token, String projectId) { +// String path = "webapi/project/findDirectlyUnderTeam"; +// String time = System.currentTimeMillis() + ""; +// String startId = "0"; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("subcontractorld", "ddcffe48c6a7413a91bbf6eafbf037a9"); +// params.put("rowId", 0); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&projectId=" + projectId + "×tamp=" + time + "&subcontractorld=" + params.get("subcontractorld").toString() + "&rowId=" + startId; +// Request request = new Request.Builder() +// .url(url) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("teamList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProjectAttendanceGroup group = QuartzProjectAttendanceGroup.createJgw(json, true); +// group.setBizLicense(json.getString("corpCode")); +// String type = json.getString("corpType"); +// if ("009".equals(type)) { //总包人员 +// group.setCompanyTypeId("1"); +// } else if ("007".equals(type)) {//监理人员 +// group.setCompanyTypeId("8"); +// } else if ("006".equals(type)) {//劳务人员 +// group.setCompanyTypeId("2"); +// } +// if (StrUtil.isNotEmpty(group.getCompanyTypeId())) { +// +// } +// +// } +// } +// } +// +// public static void findAddWorkerByProject(String appId, String token, String projectId, int startId) { +// String path = "/webapi/project/findAddWorkerByProject"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("startId", startId); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject jo = JSON.parseObject(data); +// JSONObject joData = jo.getJSONObject("data"); +// int endId = joData.getInteger("endId"); +// JSONArray arr = joData.getJSONArray("workerList"); +// if (arr.size() > 0) { +// int cnt = 0; +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String idNumber = json.getString("idNumber"); +// if (StrUtil.isEmpty(idNumber)) { +// String a = "xx"; +// } else { +// +// } +// String workerStatus = json.getString("workerStatus"); +// if ("02".equals(workerStatus)) { +// cnt++; +// } +// QuartzProjectAttendanceUser user = QuartzProjectAttendanceUser.createFromJgw(json); +// if (user.getName().equals("唐红吉")) { +// String k = user.getName(); +// JSONArray arr2 = json.getJSONArray("corpName"); +// Object o = arr2.get(0); +// } +// } +// //System.out.println("cnt:"+cnt+","+arr.size()); +// findAddWorkerByProject(appId, token, projectId, endId); +// } +// } +// +// public static void findUpdateWorkerByProject(String appId, String token, String projectId, int startId) { +// String path = "/webapi/project/findUpdateWorkerByProject"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("updateTime", "2024-01-01 00:00:00"); +// //params.put("startId",startId); +// params.put("startId", "32150708"); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject jo = JSON.parseObject(data); +// JSONObject joData = jo.getJSONObject("data"); +// //int endId= joData.getInteger("endId"); +// JSONArray arr = joData.getJSONArray("workerList"); +// if (arr.size() > 0) { +// int cnt = 0; +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String workerStatus = json.getString("workerStatus"); +// if ("02".equals(workerStatus)) { +// cnt++; +// } +// QuartzProjectAttendanceUser user = QuartzProjectAttendanceUser.createFromJgw(json); +// if (user.getName().equals("李文国")) { +// String k = user.getName(); +// JSONArray arr2 = json.getJSONArray("corpName"); +// Object o = arr2.get(0); +// } +// } +// //System.out.println("cnt:"+cnt+","+arr.size()); +// //findAddWorkerByProject(appId, token, projectId, endId); +// } +// } +// +// /** +// * 同步人员信息 +// */ +// public void syncWorker() { +// QuartzProjectAttendanceCfg where = new QuartzProjectAttendanceCfg(); +// where.setEnabled(1l); +// where.setIsDel(0l); +// where.setVendorsCode("jgw"); +// List list = attendanceCfgService.selectSurProjectAttendanceCfgList(where); +// for (QuartzProjectAttendanceCfg it : list) { +// String param = it.getVendorsParameter(); +// if (Strings.isNotEmpty(param)) { +// try { +// JSONObject jo = JSON.parseObject(param); +// String appId = jo.getString("appId"); +// String secret = jo.getString("secret"); +// secret = Base64.encode(secret); +// jo.put("secret", secret); +// String token = getToken(appId, secret); +// jo.put("token", token); +// doSyncWorker(jo, 0l, it); +// } catch (Exception ex) { +// ex.printStackTrace(); +// } +// } +// } +// syncWorkerByLeader(); +// } +// +// /** +// * 同步群组和人的关系 +// */ +// public void syncWorkerByLeader() { +// QuartzProjectAttendanceCfg where = new QuartzProjectAttendanceCfg(); +// where.setEnabled(1l); +// where.setIsDel(0l); +// where.setVendorsCode("jgw"); +// List list = attendanceCfgService.selectSurProjectAttendanceCfgList(where); +// for (QuartzProjectAttendanceCfg it : list) { +// String param = it.getVendorsParameter(); +// if (Strings.isNotEmpty(param)) { +// try { +// JSONObject jo = JSON.parseObject(param); +// String appId = jo.getString("appId"); +// String secret = jo.getString("secret"); +// secret = Base64.encode(secret); +// jo.put("secret", secret); +// String token = getToken(appId, secret); +// jo.put("token", token); +// QuartzProjectAttendanceGroup groupWhere = new QuartzProjectAttendanceGroup(); +// groupWhere.setCfgid(it.getId()); +// groupWhere.setLeaderPhone("directly"); +// List groupList = attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere); +// for (QuartzProjectAttendanceGroup g : groupList) { +// if (StrUtil.isNotEmpty(g.getLeaderName()) && StrUtil.isNotEmpty(g.getCompanyId())) { +// jo.put("subcontractorId", g.getLeaderName()); +// jo.put("leaderTeamId", g.getCompanyId()); +// jo.put("companyName", g.getCompanyName()); +// dosyncWorkerByLeader(jo, 0l, it); +// } +// } +// } catch (Exception ex) { +// ex.printStackTrace(); +// } +// } +// } +// } +// +// private void dosyncWorkerByLeader(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String path = "/webapi/project/findWorkerByLeader"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// String leaderTeamId = jo.getString("leaderTeamId"); +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("leaderTeamId", leaderTeamId); +// params.put("subcontractorId", jo.getString("subcontractorId")); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject jd = j.getJSONObject("data"); +// JSONArray arr = jd.getJSONArray("recordList"); +// if (arr != null && arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String workerId = json.getString("workerId"); +// QuartzProjectAttendanceUser userWhere = new QuartzProjectAttendanceUser(); +// userWhere.setWorkerId(workerId); +// userWhere.setCfgid(it.getId()); +// List userList = attendanceUserService.selectSurProjectAttendanceUserList(userWhere); +// if (userList.size() > 0) { +// QuartzProjectAttendanceUser upUser = userList.get(0); +// upUser.setCompanyId(json.getString("leaderTeamId")); +// upUser.setWorkTypeName(json.getString("jobType")); +// upUser.setCompanyName(jo.getString("companyName")); +// attendanceUserService.updateSurProjectAttendanceUser(upUser); +// } +// } +// } +// } +// +// private void doSyncWorker(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String projectId = jo.getString("appProjectId"); +// String path = "/webapi/project/findAddWorkerByProject"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("startId", startId); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// long endId = joData.getLong("endId"); +// JSONArray arr = joData.getJSONArray("workerList"); +// if (arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProjectAttendanceUser user = QuartzProjectAttendanceUser.createFromJgw(json); +// user.setVendorsCode(it.getVendorsCode()); +// user.setCfgid(it.getId()); +// user.setAppId(appId); +// String idNumber = json.getString("idNumber");//身份证 +// if (StrUtil.isNotEmpty(idNumber) && idNumber.length() > 6) { +// try { +// long idStr = Long.parseLong(idNumber.substring(0, 6)); +// String natstr = getNative(idStr); +// if (StrUtil.isNotEmpty(natstr)) { +// user.setNativePlace(natstr); +// } +// } catch (Exception ex) { +// +// } +// } +// attendanceUserService.add(user); +// } +// doSyncWorker(jo, endId, it); +// } +// } +// +// +// +// +// +// /** +// * 查询班组 +// * +// * @param jo +// * @param startId +// * @param it +// */ +// private void doSyncGroup(JSONObject jo, long startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String projectId = jo.getString("appProjectId"); +// String path = "/webapi/project/findTeamByProjectId"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("rowId", startId); +// url = host + path + "?appId=" + appId + "&tokenSign=" + tokenSign + "&projectId=" + projectId + "×tamp=" + time + "&rowId=" + startId; +// Request request = new Request.Builder() +// .url(url) +// .get() +// .build(); +// String data = getResult(request); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// JSONArray arr = joData.getJSONArray("teamList"); +// if (arr.size() > 0) { +// long rowId = 0; +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// QuartzProjectAttendanceGroup group = QuartzProjectAttendanceGroup.createJgw(json, false); +// group.setCfgid(it.getId()); +// group.setAppId(appId); +// rowId = json.getLong("id"); +// QuartzProjectAttendanceGroup where = new QuartzProjectAttendanceGroup(); +// where.setCompanyId(group.getCompanyId()); +// where.setCfgid(group.getCfgid()); +// List list = attendanceGroupService.selectSurProjectAttendanceGroupList(where); +// if (list.size() == 0) { +// attendanceGroupService.add(group); +// } +// } +// if (rowId > 0) { +// doSyncGroup(jo, rowId + 1, it); +// } +// } +// } +// +// /** +// * 同步当天数据 +// */ +// public void syncAttendanceData() { +// String dtStart = DateUtil.format(DateTime.now(), "yyyy-MM-dd"); +// String dtEnd = dtStart; +// syncAttendanceData(dtStart, dtEnd); +// clearToDayPhoto(); +// } +// +// /** +// * 同步7天之内数据 +// */ +// public void syncLastWeekAttendanceData() { +// String dtEnd = DateUtil.format(DateTime.now(), "yyyy-MM-dd"); +// String dtStart = DateUtil.format(DateUtil.offsetDay(DateTime.now(), -7), "yyyy-MM-dd"); +// syncAttendanceData(dtStart, dtEnd); +// } +// +// /** +// * 同步30天内数据 +// */ +// public void syncLast30DayAttendanceData() { +// String dtEnd = DateUtil.format(DateTime.now(), "yyyy-MM-dd"); +// String dtStart = DateUtil.format(DateUtil.offsetDay(DateTime.now(), -30), "yyyy-MM-dd"); +// syncAttendanceData(dtStart, dtEnd); +// } +// +// +// private void syncAttendanceData(String dtStart, String dtEnd) { +// QuartzProjectAttendanceCfg where = new QuartzProjectAttendanceCfg(); +// where.setEnabled(1l); +// where.setIsDel(0l); +// where.setVendorsCode("jgw"); +// List list = attendanceCfgService.selectSurProjectAttendanceCfgList(where); +// for (QuartzProjectAttendanceCfg it : list) { +// String param = it.getVendorsParameter(); +// if (Strings.isNotEmpty(param)) { +// try { +// JSONObject jo = JSON.parseObject(param); +// String appId = jo.getString("appId"); +// String secret = jo.getString("secret"); +// secret = Base64.encode(secret); +// jo.put("secret", secret); +// String token = getToken(appId, secret); +// jo.put("token", token); +// jo.put("startTime", dtStart); +// jo.put("endTime", dtEnd); +// doSyncAttendanceData(jo, "0", it); +// } catch (Exception ex) { +// ex.printStackTrace(); +// } +// } +// } +// } +// +// private void doSyncAttendanceData(JSONObject jo, String startId, QuartzProjectAttendanceCfg it) { +// String appId = jo.getString("appId"); +// String token = jo.getString("token"); +// String projectId = jo.getString("appProjectId"); +// String startTime = jo.getString("startTime"); +// String endTime = jo.getString("endTime"); +// String path = "/webapi/project/findAttendanceByProject"; +// String time = System.currentTimeMillis() + ""; +// String url = host + path + "?appId=" + appId + "&tokenSign=" + token + "×tamp=" + time; +// +// String tokenSign = Md5Utils.hash(url); +// Map params = new HashMap<>(); +// params.put("appId", appId); +// params.put("timestamp", time); +// params.put("tokenSign", tokenSign); +// params.put("projectId", projectId); +// params.put("startId", startId); +// params.put("startTime", startTime); +// params.put("endTime", endTime); +// Request request = new Request.Builder() +// .url(host + path) +// .post(toFormBody(params)) +// .build(); +// String data = getResult(request); +// //System.out.println(data); +// JSONObject j = JSON.parseObject(data); +// JSONObject joData = j.getJSONObject("data"); +// String endId = joData.getString("endId"); +// JSONArray arr = joData.getJSONArray("workerAttList"); +// //List addList=new ArrayList<>(); +// if (arr != null && arr.size() > 0) { +// for (int i = 0; i < arr.size(); i++) { +// JSONObject json = arr.getJSONObject(i); +// String photo = json.getString("signimg"); +// String photoUrl = getPhoto(appId, token, photo); +// QuartzProjectAttendanceData sdata = QuartzProjectAttendanceData.createFromJgw(json); +// sdata.setScanPhoto(photoUrl); +// sdata.setCfgid(it.getId()); +// sdata.setAppId(appId); +// if (sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")) { +// //System.out.println("--->"+sdata.getRemark()); +// } +// sdata.setVendorsCode(it.getVendorsCode()); +// attendanceDataService.add(sdata); +// //addList.add(sdata); +// } +// //attendanceDataService.addList(addList); +// doSyncAttendanceData(jo, endId, it); +// } +// } +// +// /** +// * 查询籍贯映射 +// * +// * @param id 籍贯编号 +// * @return +// */ +// private String getNative(long id) { +// String ckey = "attendance_jgw_native_" + id; +// Object obj = redisService.getCacheObject(ckey); +// String tmp = ""; +// if (obj != null) { +// tmp = obj.toString(); +// if (StrUtil.isNotEmpty(tmp)) { +// return tmp; +// } +// } +// List list = sysNativeService.selectSysNativeListById(id); +// if (list.size() == 0) { +// id = id / 100 * 100; +// list = sysNativeService.selectSysNativeListById(id); +// if (list.size() == 0) { +// id = id / 10000 * 10000; +// list = sysNativeService.selectSysNativeListById(id); +// } +// } +// if (list.size() == 0) { +// tmp = ""; +// } else { +// tmp = list.get(0).getAddress(); +// } +// redisService.setCacheObject(ckey, tmp, 1L, TimeUnit.DAYS); +// return tmp; +// } +// +// /** +// * 获取请求结果 +// * @param request +// * @return +// */ +// public static String getResult(Request request) { +// OkHttpClient client = new OkHttpClient.Builder() +// .sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()) +// .hostnameVerifier(SSLSocketClient.getHostnameVerifier()) +// .build(); +// Response response; +// try { +// response = client.newCall(request).execute(); +// if (response.body() != null) { +// return response.body().string(); +// } else { +// throw new RuntimeException(); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// throw new RuntimeException(); +// } +// } +// +//} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceTask.java index 90dd52f5..0699da5c 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceTask.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceTask.java @@ -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"); diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/SadaHzDataTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/SadaHzDataTask.java index 6aa0675c..c2df14b3 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/SadaHzDataTask.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/SadaHzDataTask.java @@ -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 configPoints = devIotService.selectDevIotConfigPointList(pointQuery); + List 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 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 pointList = devIotService.selectDevIotConfigPointList(pointQuery); + List pointList = devIotService.selectDevIotConfigPointList(pointQuery); result.forEach(item -> { JSONObject obj = (JSONObject) item; - List pointItems = pointList.stream().filter(point -> StringUtils.eqObj(point.getDeviceSn(),obj.getString("hashId"))).collect(Collectors.toList()); + List 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"))); diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/DevIotMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzDevIotMapper.xml similarity index 94% rename from yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/DevIotMapper.xml rename to yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzDevIotMapper.xml index b7d2c685..d284903f 100644 --- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/DevIotMapper.xml +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzDevIotMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -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 - and cfg_id = #{cfgId} @@ -43,7 +43,7 @@ - + insert into dev_iot_config_point cfg_id, @@ -93,7 +93,7 @@ - + update dev_iot_config_point cfg_id = #{cfgId}, @@ -128,7 +128,7 @@ where dic.is_del = '0' - + insert into dev_iot_datas cfg_id, @@ -202,7 +202,7 @@ - + insert into dev_iot_warning cfg_id, diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml new file mode 100644 index 00000000..1bf9921c --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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' + + + + + + + + insert into pro_project_info_subdepts_group + + com_id, + project_id, + sub_dept_id, + sub_dept_type, + sub_dept_name, + sub_dept_code, + group_name, + group_code, + craft_type, + craft_post, + group_leader_name, + group_leader_code, + group_leader_phone, + use_status, + approve_status, + qr_code, + is_del, + create_by, + create_time, + update_by, + update_time, + remark, + source, + + + #{comId}, + #{projectId}, + #{subDeptId}, + #{subDeptType}, + #{subDeptName}, + #{subDeptCode}, + #{groupName}, + #{groupCode}, + #{craftType}, + #{craftPost}, + #{groupLeaderName}, + #{groupLeaderCode}, + #{groupLeaderPhone}, + #{useStatus}, + #{approveStatus}, + #{qrCode}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{source}, + + + + + update pro_project_info_subdepts_group + + com_id = #{comId}, + project_id = #{projectId}, + sub_dept_id = #{subDeptId}, + sub_dept_type = #{subDeptType}, + sub_dept_name = #{subDeptName}, + sub_dept_code = #{subDeptCode}, + group_name = #{groupName}, + group_code = #{groupCode}, + craft_type = #{craftType}, + craft_post = #{craftPost}, + group_leader_name = #{groupLeaderName}, + group_leader_code = #{groupLeaderCode}, + group_leader_phone = #{groupLeaderPhone}, + use_status = #{useStatus}, + approve_status = #{approveStatus}, + qr_code = #{qrCode}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + source = #{source}, + + where id = #{id} + + + + update pro_project_info_subdepts_group set is_del = 2 where id = #{id} + + + + update pro_project_info_subdepts_group set is_del = 2 where id in + + #{id} + + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsMapper.xml new file mode 100644 index 00000000..b67dccdc --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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' + + + + + + + + insert into pro_project_info_subdepts + + com_id, + project_id, + sub_dept_type, + sub_dept_name, + sub_dept_code, + sub_dept_leader_id, + sub_dept_leader_name, + sub_dept_leader_code, + sub_dept_leader_phone, + business_license_path, + sub_dept_infos, + contract_infos, + use_dates, + start_work_dates, + end_work_dates, + use_status, + approve_status, + qr_code, + is_del, + create_by, + create_time, + update_by, + update_time, + remark, + source, + + + #{comId}, + #{projectId}, + #{subDeptType}, + #{subDeptName}, + #{subDeptCode}, + #{subDeptLeaderId}, + #{subDeptLeaderName}, + #{subDeptLeaderCode}, + #{subDeptLeaderPhone}, + #{businessLicensePath}, + #{subDeptInfos}, + #{contractInfos}, + #{useDates}, + #{startWorkDates}, + #{endWorkDates}, + #{useStatus}, + #{approveStatus}, + #{qrCode}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{source}, + + + + + update pro_project_info_subdepts + + com_id = #{comId}, + project_id = #{projectId}, + sub_dept_type = #{subDeptType}, + sub_dept_name = #{subDeptName}, + sub_dept_code = #{subDeptCode}, + sub_dept_leader_id = #{subDeptLeaderId}, + sub_dept_leader_name = #{subDeptLeaderName}, + sub_dept_leader_code = #{subDeptLeaderCode}, + sub_dept_leader_phone = #{subDeptLeaderPhone}, + business_license_path = #{businessLicensePath}, + sub_dept_infos = #{subDeptInfos}, + contract_infos = #{contractInfos}, + use_dates = #{useDates}, + start_work_dates = #{startWorkDates}, + end_work_dates = #{endWorkDates}, + use_status = #{useStatus}, + approve_status = #{approveStatus}, + qr_code = #{qrCode}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + source = #{source}, + + where id = #{id} + + + + update pro_project_info_subdepts set is_del=1 where id = #{id} + + + + update pro_project_info_subdepts set is_del=1 where id in + + #{id} + + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml index 01c119dd..3ab67e57 100644 --- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml @@ -26,34 +26,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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' - - - and ac.id = #{id} - + where pac.id = #{id} - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzSubdeptsUsersMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzSubdeptsUsersMapper.xml new file mode 100644 index 00000000..be1c663e --- /dev/null +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzSubdeptsUsersMapper.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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' + + + + + + + + + + insert into pro_project_info_subdepts_users + + par_id, + com_id, + project_id, + sub_dept_id, + sub_dept_type, + sub_dept_name, + sub_dept_power_path, + user_id, + user_post, + sub_dept_group, + sub_dept_group_name, + user_name, + card_type, + work_type, + card_code, + user_sex, + user_picture, + user_phone, + degree_grade, + user_infos, + craft_type, + craft_post, + edu_status, + edu_file_path, + edu_date, + approve_status, + use_date, + use_status, + admit_guid, + face_guid, + qr_code, + sub_step, + illness_status, + sup_illness_status, + is_del, + create_by, + create_time, + update_by, + update_time, + remark, + source, + + + #{parId}, + #{comId}, + #{projectId}, + #{subDeptId}, + #{subDeptType}, + #{subDeptName}, + #{subDeptPowerPath}, + #{userId}, + #{userPost}, + #{subDeptGroup}, + #{subDeptGroupName}, + #{userName}, + #{cardType}, + #{workType}, + #{cardCode}, + #{userSex}, + #{userPicture}, + #{userPhone}, + #{degreeGrade}, + #{userInfos}, + #{craftType}, + #{craftPost}, + #{eduStatus}, + #{eduFilePath}, + #{eduDate}, + #{approveStatus}, + #{useDate}, + #{useStatus}, + #{admitGuid}, + #{faceGuid}, + #{qrCode}, + #{subStep}, + #{illnessStatus}, + #{supIllnessStatus}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{source}, + + + + + update pro_project_info_subdepts_users + + par_id = #{parId}, + com_id = #{comId}, + project_id = #{projectId}, + sub_dept_id = #{subDeptId}, + sub_dept_type = #{subDeptType}, + sub_dept_name = #{subDeptName}, + sub_dept_power_path = #{subDeptPowerPath}, + user_id = #{userId}, + user_post = #{userPost}, + sub_dept_group = #{subDeptGroup}, + sub_dept_group_name = #{subDeptGroupName}, + user_name = #{userName}, + card_type = #{cardType}, + work_type = #{workType}, + card_code = #{cardCode}, + user_sex = #{userSex}, + user_picture = #{userPicture}, + user_phone = #{userPhone}, + degree_grade = #{degreeGrade}, + user_infos = #{userInfos}, + craft_type = #{craftType}, + craft_post = #{craftPost}, + edu_status = #{eduStatus}, + edu_file_path = #{eduFilePath}, + edu_date = #{eduDate}, + approve_status = #{approveStatus}, + use_date = #{useDate}, + use_status = #{useStatus}, + admit_guid = #{admitGuid}, + face_guid = #{faceGuid}, + qr_code = #{qrCode}, + sub_step = #{subStep}, + illness_status = #{illnessStatus}, + sup_illness_status = #{supIllnessStatus}, + sort_by = #{sortBy}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + source = #{source}, + + where id = #{id} + + + + update pro_project_info_subdepts_users set is_del = 2 where id = #{id} + + + + update pro_project_info_subdepts_users set is_del = 2 where id in + + #{id} + + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java index 9f5abc4e..b188edec 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java @@ -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; } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRoundReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRoundReqVO.java new file mode 100644 index 00000000..4741dd74 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRoundReqVO.java @@ -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; + +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRunReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRunReqVO.java new file mode 100644 index 00000000..8a2b45a3 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxRunReqVO.java @@ -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; +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxWarningReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxWarningReqVO.java new file mode 100644 index 00000000..75dce89d --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerLinuxWarningReqVO.java @@ -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; + +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRoundReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRoundReqVO.java index 4eb49c6b..417dbe60 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRoundReqVO.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRoundReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; /** - * 山东探越塔机请求-循环数据 + * 山东探越塔机请求-循环数据【Android】 */ @Data public class TyTowerRoundReqVO { diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRunReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRunReqVO.java index 4c0ba21e..edd9f09e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRunReqVO.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerRunReqVO.java @@ -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; } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerWarningReqVO.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerWarningReqVO.java index 56ea1f90..e91e4bfc 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerWarningReqVO.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/vo/TyTowerWarningReqVO.java @@ -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; } diff --git a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js index d072b8e3..bbf68bf2 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js @@ -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 }); }, diff --git a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml index 89064724..ba16115c 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml @@ -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" /> diff --git a/yanzhu-ui-app/miniprogram/pageage/project_video/list/index.js b/yanzhu-ui-app/miniprogram/pageage/project_video/list/index.js index 0cd9e333..3afb0268 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_video/list/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_video/list/index.js @@ -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}`, }) }, diff --git a/yanzhu-ui-app/miniprogram/pages/components/user-infos/index.js b/yanzhu-ui-app/miniprogram/pages/components/user-infos/index.js index d6fa1dec..b43e0e3b 100644 --- a/yanzhu-ui-app/miniprogram/pages/components/user-infos/index.js +++ b/yanzhu-ui-app/miniprogram/pages/components/user-infos/index.js @@ -122,8 +122,8 @@ Component({ loginOut().then(res => { removeToken(); wx.clearStorageSync(); - wx.redirectTo({ - url: '../login/login' + wx.navigateTo({ + url: '/pages/login/login' }) }); },