diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetingPeople.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetingPeople.java index fbe7177..798c731 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetingPeople.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetingPeople.java @@ -1,138 +1,88 @@ package com.xxl.job.executor.inter.entity; +import lombok.Data; + import java.util.Date; - /** - * 站班会人员 实体类 - * 2024-05-08 09:31:40 zijixiangba - */ - -public class JjClassMeetingPeople{ - private String id; //主键ID - private String registrationDate; //准入生效日期 - private String validityPeriod; //准入失效期限 - private String provinceCode; //省公司编码 - private String createrId; //创建人 - private String createTime; //创建时间 - private String updaterId; //更新人 - private String updateTime; //更新时间 - private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除 - private String workCode; //工种编码 - private String personnelId; //人员id； - private String toolBoxTalkId; //站班会id - private String realName; //姓名 - private String idCard; //身份证号 - private String positionCode; //岗位编码 - private String safetyGuardianFlag; //是否安全监护人；包括：0-非安全监护人；1-安全监护人 - private String positionFlag; //是否在岗 - private String workDivision; //具体分工 1-施工人员， 2-新增人员（临时人员） - public void setId(String id){ - this.id=id; - } - public String getId(){ - return id; - } - public void setRegistrationDate(String registrationDate){ - this.registrationDate=registrationDate; - } - public String getRegistrationDate(){ - return registrationDate; - } - public void setValidityPeriod(String validityPeriod){ - this.validityPeriod=validityPeriod; - } - public String getValidityPeriod(){ - return validityPeriod; - } - public void setProvinceCode(String provinceCode){ - this.provinceCode=provinceCode; - } - public String getProvinceCode(){ - return provinceCode; - } - public void setCreaterId(String createrId){ - this.createrId=createrId; - } - public String getCreaterId(){ - return createrId; - } - public void setCreateTime(String createTime){ - this.createTime=createTime; - } - public String getCreateTime(){ - return createTime; - } - public void setUpdaterId(String updaterId){ - this.updaterId=updaterId; - } - public String getUpdaterId(){ - return updaterId; - } - public void setUpdateTime(String updateTime){ - this.updateTime=updateTime; - } - public String getUpdateTime(){ - return updateTime; - } - public void setDeleteFlag(String deleteFlag){ - this.deleteFlag=deleteFlag; - } - public String getDeleteFlag(){ - return deleteFlag; - } - public void setWorkCode(String workCode){ - this.workCode=workCode; - } - public String getWorkCode(){ - return workCode; - } - public void setPersonnelId(String personnelId){ - this.personnelId=personnelId; - } - public String getPersonnelId(){ - return personnelId; - } - public void setToolBoxTalkId(String toolBoxTalkId){ - this.toolBoxTalkId=toolBoxTalkId; - } - public String getToolBoxTalkId(){ - return toolBoxTalkId; - } - public void setRealName(String realName){ - this.realName=realName; - } - public String getRealName(){ - return realName; - } - public void setIdCard(String idCard){ - this.idCard=idCard; - } - public String getIdCard(){ - return idCard; - } - public void setPositionCode(String positionCode){ - this.positionCode=positionCode; - } - public String getPositionCode(){ - return positionCode; - } - public void setSafetyGuardianFlag(String safetyGuardianFlag){ - this.safetyGuardianFlag=safetyGuardianFlag; - } - public String getSafetyGuardianFlag(){ - return safetyGuardianFlag; - } - public void setPositionFlag(String positionFlag){ - this.positionFlag=positionFlag; - } - public String getPositionFlag(){ - return positionFlag; - } - public void setWorkDivision(String workDivision){ - this.workDivision=workDivision; - } - public String getWorkDivision(){ - return workDivision; - } +/** + * @author：cwchen + * @date：2024-05-08-11:26 + * @version：1.0 + * @description：站班会人员实体类 + */ +@Data +public class JjClassMeetingPeople { + /** + * 主键ID + */ + private String id; + /** + * 准入生效日期 + */ + private String registrationDate; + /** + * 准入失效期限 + */ + private String validityPeriod; + /** + * 省公司编码 + */ + private String provinceCode; + /** + * 创建人 + */ + private String createrId; + /** + * 创建时间 + */ + private String createTime; + /** + * 更新人 + */ + private String updaterId; + /** + * 更新时间 + */ + private String updateTime; + /** + * 删除状态；默认0，包括：0未删除，1已删除 + */ + private String deleteFlag; + /** + * 工种编码 + */ + private String workCode; + /** + * 人员id + */ + private String personnelId; + /** + * 站班会id + */ + private String toolBoxTalkId; + /** + * 姓名 + */ + private String realName; + /** + * 身份证号 + */ + private String idCard; + /** + * 岗位编码 + */ + private String positionCode; + /** + * 是否安全监护人；包括：0-非安全监护人；1-安全监护人 + */ + private String safetyGuardianFlag; + /** + * 是否在岗 + */ + private String positionFlag; + /** + * 具体分工 1-施工人员， 2-新增人员（临时人员） + */ + private String workDivision; } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetting.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetting.java index 98c4ba2..54e6761 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetting.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/JjClassMeetting.java @@ -1,285 +1,165 @@ package com.xxl.job.executor.inter.entity; import java.util.Date; - /** - * 站班会 实体类 - * 2024-05-08 09:31:40 zijixiangba - */ - -public class JjClassMeetting{ - private String id; //主键ID - private String workStartTime; //作业开始时间 - private String currentConstrDate; //施工时间；施工日期 - private String currentConstructionStatus; //当前施工状态 01-开始；02-暂停； 03-恢复；04-完成 - private String workOvernightFlag; //是否跨零点作业 和 施工作业票日施工作业任务关联 中跨零点作业是否一致 ，，一致，作业时间算第二天 - private String toolBoxTalkAddress; //站班会地址 - private String toolBoxTalkLongitude; //站班会地理坐标-经度 - private String toolBoxTalkLatitude; //站班会地理坐标-纬度 - private String mcWorkSiteId; //距离站班会最近的作业部位ID；根据坐标获取最近的 - private String biddingSectionCode; //标段编码 - private String biddingSectionName; //标段名称 - private String offOnlineFlag; //离线标识：0-非离线，1-离线 - private String singleProjectCode; //单项工程编码 - private String singleProjectName; //单项工程名称 - private String singleProjectType; //单项工程类型 - private String constrUnifiedSocialCreditId; //施工单位统一社会信用代码 - private String supervisionUnitName; //监理单位名称 - private String supervisionSocialCreditCode; //监理单位统一社会信用代码 - private String voltageLevel; //电压等级编码 - private String huvFlag; //0:常规工程 1:特高压 - private String buildUnitCode; //建设管理单位编码 - private String provinceCode; //省公司编码 - private String createrId; //创建人； - private String prjName; //项目名称； - private String createTime; //创建时间 - private String updaterId; //更新人； - private String updateTime; //更新时间 - private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除 - private String riskPrecautionId; //风险底数一本账id - private String talkDesStatusChangeId; // - private String fileId; // - private String cameraId; //布控球id； - private String prjCode; //项目编码 - private String ticketId; //作业票id - private String ticketNo; //作业票编号 - private String reAssessmentRiskLevel; //复测风险等级 - private String currentConstrHeadcount; //当日作业人数 - private String constructionHeadcount; //施工人数是当前班组人数 - private String changeTime; //状态变更时间 - public void setId(String id){ - this.id=id; - } - public String getId(){ - return id; - } - public void setWorkStartTime(String workStartTime){ - this.workStartTime=workStartTime; - } - public String getWorkStartTime(){ - return workStartTime; - } - public void setCurrentConstrDate(String currentConstrDate){ - this.currentConstrDate=currentConstrDate; - } - public String getCurrentConstrDate(){ - return currentConstrDate; - } - public void setCurrentConstructionStatus(String currentConstructionStatus){ - this.currentConstructionStatus=currentConstructionStatus; - } - public String getCurrentConstructionStatus(){ - return currentConstructionStatus; - } - public void setWorkOvernightFlag(String workOvernightFlag){ - this.workOvernightFlag=workOvernightFlag; - } - public String getWorkOvernightFlag(){ - return workOvernightFlag; - } - public void setToolBoxTalkAddress(String toolBoxTalkAddress){ - this.toolBoxTalkAddress=toolBoxTalkAddress; - } - public String getToolBoxTalkAddress(){ - return toolBoxTalkAddress; - } - public void setToolBoxTalkLongitude(String toolBoxTalkLongitude){ - this.toolBoxTalkLongitude=toolBoxTalkLongitude; - } - public String getToolBoxTalkLongitude(){ - return toolBoxTalkLongitude; - } - public void setToolBoxTalkLatitude(String toolBoxTalkLatitude){ - this.toolBoxTalkLatitude=toolBoxTalkLatitude; - } - public String getToolBoxTalkLatitude(){ - return toolBoxTalkLatitude; - } - public void setMcWorkSiteId(String mcWorkSiteId){ - this.mcWorkSiteId=mcWorkSiteId; - } - public String getMcWorkSiteId(){ - return mcWorkSiteId; - } - public void setBiddingSectionCode(String biddingSectionCode){ - this.biddingSectionCode=biddingSectionCode; - } - public String getBiddingSectionCode(){ - return biddingSectionCode; - } - public void setBiddingSectionName(String biddingSectionName){ - this.biddingSectionName=biddingSectionName; - } - public String getBiddingSectionName(){ - return biddingSectionName; - } - public void setOffOnlineFlag(String offOnlineFlag){ - this.offOnlineFlag=offOnlineFlag; - } - public String getOffOnlineFlag(){ - return offOnlineFlag; - } - public void setSingleProjectCode(String singleProjectCode){ - this.singleProjectCode=singleProjectCode; - } - public String getSingleProjectCode(){ - return singleProjectCode; - } - public void setSingleProjectName(String singleProjectName){ - this.singleProjectName=singleProjectName; - } - public String getSingleProjectName(){ - return singleProjectName; - } - public void setSingleProjectType(String singleProjectType){ - this.singleProjectType=singleProjectType; - } - public String getSingleProjectType(){ - return singleProjectType; - } - public void setConstrUnifiedSocialCreditId(String constrUnifiedSocialCreditId){ - this.constrUnifiedSocialCreditId=constrUnifiedSocialCreditId; - } - public String getConstrUnifiedSocialCreditId(){ - return constrUnifiedSocialCreditId; - } - public void setSupervisionUnitName(String supervisionUnitName){ - this.supervisionUnitName=supervisionUnitName; - } - public String getSupervisionUnitName(){ - return supervisionUnitName; - } - public void setSupervisionSocialCreditCode(String supervisionSocialCreditCode){ - this.supervisionSocialCreditCode=supervisionSocialCreditCode; - } - public String getSupervisionSocialCreditCode(){ - return supervisionSocialCreditCode; - } - public void setVoltageLevel(String voltageLevel){ - this.voltageLevel=voltageLevel; - } - public String getVoltageLevel(){ - return voltageLevel; - } - public void setHuvFlag(String huvFlag){ - this.huvFlag=huvFlag; - } - public String getHuvFlag(){ - return huvFlag; - } - public void setBuildUnitCode(String buildUnitCode){ - this.buildUnitCode=buildUnitCode; - } - public String getBuildUnitCode(){ - return buildUnitCode; - } - public void setProvinceCode(String provinceCode){ - this.provinceCode=provinceCode; - } - public String getProvinceCode(){ - return provinceCode; - } - public void setCreaterId(String createrId){ - this.createrId=createrId; - } - public String getCreaterId(){ - return createrId; - } - public void setPrjName(String prjName){ - this.prjName=prjName; - } - public String getPrjName(){ - return prjName; - } - public void setCreateTime(String createTime){ - this.createTime=createTime; - } - public String getCreateTime(){ - return createTime; - } - public void setUpdaterId(String updaterId){ - this.updaterId=updaterId; - } - public String getUpdaterId(){ - return updaterId; - } - public void setUpdateTime(String updateTime){ - this.updateTime=updateTime; - } - public String getUpdateTime(){ - return updateTime; - } - public void setDeleteFlag(String deleteFlag){ - this.deleteFlag=deleteFlag; - } - public String getDeleteFlag(){ - return deleteFlag; - } - public void setRiskPrecautionId(String riskPrecautionId){ - this.riskPrecautionId=riskPrecautionId; - } - public String getRiskPrecautionId(){ - return riskPrecautionId; - } - public void setTalkDesStatusChangeId(String talkDesStatusChangeId){ - this.talkDesStatusChangeId=talkDesStatusChangeId; - } - public String getTalkDesStatusChangeId(){ - return talkDesStatusChangeId; - } - public void setFileId(String fileId){ - this.fileId=fileId; - } - public String getFileId(){ - return fileId; - } - public void setCameraId(String cameraId){ - this.cameraId=cameraId; - } - public String getCameraId(){ - return cameraId; - } - public void setPrjCode(String prjCode){ - this.prjCode=prjCode; - } - public String getPrjCode(){ - return prjCode; - } - public void setTicketId(String ticketId){ - this.ticketId=ticketId; - } - public String getTicketId(){ - return ticketId; - } - public void setTicketNo(String ticketNo){ - this.ticketNo=ticketNo; - } - public String getTicketNo(){ - return ticketNo; - } - public void setReAssessmentRiskLevel(String reAssessmentRiskLevel){ - this.reAssessmentRiskLevel=reAssessmentRiskLevel; - } - public String getReAssessmentRiskLevel(){ - return reAssessmentRiskLevel; - } - public void setCurrentConstrHeadcount(String currentConstrHeadcount){ - this.currentConstrHeadcount=currentConstrHeadcount; - } - public String getCurrentConstrHeadcount(){ - return currentConstrHeadcount; - } - public void setConstructionHeadcount(String constructionHeadcount){ - this.constructionHeadcount=constructionHeadcount; - } - public String getConstructionHeadcount(){ - return constructionHeadcount; - } - public void setChangeTime(String changeTime){ - this.changeTime=changeTime; - } - public String getChangeTime(){ - return changeTime; - } +/** + * @author：cwchen + * @date：2024-05-08-11:26 + * @version：1.0 + * @description：站班会实体类 + */ +public class JjClassMeetting { + /** + * 主键ID + */ + private String id; + /** + * 作业开始时间 + */ + private String workStartTime; + /** + * 施工时间；施工日期 + */ + private String currentConstrDate; + /** + * 当前施工状态 01-开始；02-暂停； 03-恢复；04-完成 + */ + private String currentConstructionStatus; + /** + * 是否跨零点作业 和 施工作业票日施工作业任务关联 中跨零点作业是否一致 ，，一致，作业时间算第二天 + */ + private String workOvernightFlag; + /** + * 站班会地址 + */ + private String toolBoxTalkAddress; + /** + * 站班会地理坐标-经度 + */ + private String toolBoxTalkLongitude; + /** + * 站班会地理坐标-纬度 + */ + private String toolBoxTalkLatitude; + /** + * 距离站班会最近的作业部位ID；根据坐标获取最近的 + */ + private String mcWorkSiteId; + /** + * 标段编码 + */ + private String biddingSectionCode; + /** + * 标段名称 + */ + private String biddingSectionName; + /** + * 离线标识：0-非离线，1-离线 + */ + private String offOnlineFlag; + /** + * 单项工程编码 + */ + private String singleProjectCode; + /** + * 单项工程名称 + */ + private String singleProjectName; + /** + * 单项工程类型 + */ + private String singleProjectType; + /** + * 施工单位统一社会信用代码 + */ + private String constrUnifiedSocialCreditId; + /** + * 监理单位名称 + */ + private String supervisionUnitName; + /** + * 监理单位统一社会信用代码 + */ + private String supervisionSocialCreditCode; + /** + * 电压等级编码 + */ + private String voltageLevel; + /** + * 0:常规工程 1:特高压 + */ + private String huvFlag; + /** + * 建设管理单位编码 + */ + private String buildUnitCode; + /** + * 省公司编码 + */ + private String provinceCode; /** + * 创建人 + */ + private String createrId; + /** + * 项目名称 + */ + private String prjName; + /** + * 创建时间 + */ + private String createTime; + /** + * 更新人 + */ + private String updaterId; + /** + * 更新时间 + */ + private String updateTime; + /** + * 删除状态；默认0，包括：0未删除，1已删除 + */ + private String deleteFlag; + /** + * 风险底数一本账id + */ + private String riskPrecautionId; + /** + * + */ + private String talkDesStatusChangeId; + private String fileId; + /** + * 布控球id + */ + private String cameraId; + /** + * 项目编码 + */ + private String prjCode; + /** + * 作业票id + */ + private String ticketId; + /** + * 作业票编号 + */ + private String ticketNo; + /** + * 复测风险等级 + */ + private String reAssessmentRiskLevel; + /** + * 当日作业人数 + */ + private String currentConstrHeadcount; + /** + * 施工人数是当前班组人数 + */ + private String constructionHeadcount; + /** + * 状态变更时间 + */ + private String changeTime; } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java index dd556c5..339065f 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java @@ -73,7 +73,7 @@ public class DataCenterService { } } - public void getClassMeetingPeopleInfo(List list) { + public void insertClassMeetingPeopleData(List list) { try{ mapper2.insertClassMeetingPeopleData(list); }catch (Exception e){ diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService2.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService2.java index c023ecf..3d9649d 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService2.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService2.java @@ -85,7 +85,7 @@ public class InterService2 { JSONArray array = (JSONArray) map.get("array"); if (array != null) { List list = JSONArray.parseArray(array.toJSONString(), JjClassMeetingPeople.class); - service.getClassMeetingPeopleInfo(list); + service.insertClassMeetingPeopleData(list); pageNum++; if (pageNum <= (Integer) map.get("TOTAL_PAGE")) { // getProInfo(); diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java index 13e85f1..982ad37 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java @@ -2,6 +2,7 @@ package com.xxl.job.executor.service.jobhandler; import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.executor.inter.service.InterService; +import com.xxl.job.executor.inter.service.InterService2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -16,6 +17,9 @@ public class DataCenterXxlJob { @Autowired private InterService interService; + @Autowired + private InterService2 interService2; + @XxlJob("getProInfo") public void getProInfo(){ interService.getProInfo(); @@ -27,13 +31,24 @@ public class DataCenterXxlJob { interService.getBidPro(); } - /** - * 站班会 - */ @XxlJob("getClassMet") public void getClassMet(){ interService.getClassMet(); } + /** + * 站班会定时任务 + */ + @XxlJob("getClassMeetingInfo") + public void getClassMeetingInfo(){ + interService2.getClassMeetingInfo(); + } + /** + * 站班会人员定时任务 + */ + @XxlJob("getClassMeetingPeopleInfo") + public void getClassMeetingPeopleInfo(){ + interService2.getClassMeetingPeopleInfo(); + } } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/InterMapper2.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/Inter2Mapper.xml similarity index 94% rename from xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/InterMapper2.xml rename to xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/Inter2Mapper.xml index 27fecca..45729e7 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/InterMapper2.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/Inter2Mapper.xml @@ -10,10 +10,10 @@ single_project_code,single_project_name,single_project_type,constr_unified_social_credit_id,supervision_unit_name,supervision_social_credit_code, voltage_level,huv_flag,build_unit_code,province_code,creater_id,prj_name, create_time,updater_id,update_time,delete_flag,risk_precaution_id,talk_des_status_change_id, - file_id,,camera_id,prj_code,ticket_id,ticket_no,re_assessment_risk_level, + file_id,camera_id,prj_code,ticket_id,ticket_no,re_assessment_risk_level, current_constr_headcount,construction_headcount,change_time) VALUES ( - #{item.id},#{item.workstartTime},#{item.currentConstrDate},#{item.currentConstructionStatus},#{item.workOvernightFlag},#{item.toolBoxTalkAddress}, + #{item.id},#{item.workStartTime},#{item.currentConstrDate},#{item.currentConstructionStatus},#{item.workOvernightFlag},#{item.toolBoxTalkAddress}, #{item.toolBoxTalkLongitude},#{item.toolBoxTalkLatitude},#{item.mcWorkSiteId},#{item.biddingSectionCode},#{item.biddingSectionName},#{item.offOnlineFlag}, #{item.singleProjectCode},#{item.singleProjectName},#{item.singleProjectType},#{item.constrUnifiedSocialCreditId},#{item.supervisionUnitName},#{item.supervisionSocialCreditCode}, #{item.voltageLevel},#{item.huvFlag},#{item.buildUnitCode},#{item.provinceCode},#{item.createrId},#{item.prjName},