站班会/站班会人员

This commit is contained in:
cwchen 2024-05-08 13:10:47 +08:00
parent 9703e8584c
commit a3379227a6
6 changed files with 263 additions and 418 deletions

View File

@ -1,138 +1,88 @@
package com.xxl.job.executor.inter.entity; package com.xxl.job.executor.inter.entity;
import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* 站班会人员 实体类 /**
* 2024-05-08 09:31:40 zijixiangba * @authorcwchen
* @date2024-05-08-11:26
* @version1.0
* @description站班会人员实体类
*/ */
@Data
public class JjClassMeetingPeople {
public class JjClassMeetingPeople{ /**
private String id; //主键ID * 主键ID
private String registrationDate; //准入生效日期 */
private String validityPeriod; //准入失效期限 private String id;
private String provinceCode; //省公司编码 /**
private String createrId; //创建人 * 准入生效日期
private String createTime; //创建时间 */
private String updaterId; //更新人 private String registrationDate;
private String updateTime; //更新时间 /**
private String deleteFlag; //删除状态默认0包括0未删除1已删除 * 准入失效期限
private String workCode; //工种编码 */
private String personnelId; //人员id private String validityPeriod;
private String toolBoxTalkId; //站班会id /**
private String realName; //姓名 * 省公司编码
private String idCard; //身份证号 */
private String positionCode; //岗位编码 private String provinceCode;
private String safetyGuardianFlag; //是否安全监护人包括0-非安全监护人1-安全监护人 /**
private String positionFlag; //是否在岗 * 创建人
private String workDivision; //具体分工 1-施工人员 2-新增人员临时人员 */
public void setId(String id){ private String createrId;
this.id=id; /**
} * 创建时间
public String getId(){ */
return id; private String createTime;
} /**
public void setRegistrationDate(String registrationDate){ * 更新人
this.registrationDate=registrationDate; */
} private String updaterId;
public String getRegistrationDate(){ /**
return registrationDate; * 更新时间
} */
public void setValidityPeriod(String validityPeriod){ private String updateTime;
this.validityPeriod=validityPeriod; /**
} * 删除状态默认0包括0未删除1已删除
public String getValidityPeriod(){ */
return validityPeriod; private String deleteFlag;
} /**
public void setProvinceCode(String provinceCode){ * 工种编码
this.provinceCode=provinceCode; */
} private String workCode;
public String getProvinceCode(){ /**
return provinceCode; * 人员id
} */
public void setCreaterId(String createrId){ private String personnelId;
this.createrId=createrId; /**
} * 站班会id
public String getCreaterId(){ */
return createrId; private String toolBoxTalkId;
} /**
public void setCreateTime(String createTime){ * 姓名
this.createTime=createTime; */
} private String realName;
public String getCreateTime(){ /**
return createTime; * 身份证号
} */
public void setUpdaterId(String updaterId){ private String idCard;
this.updaterId=updaterId; /**
} * 岗位编码
public String getUpdaterId(){ */
return updaterId; private String positionCode;
} /**
public void setUpdateTime(String updateTime){ * 是否安全监护人包括0-非安全监护人1-安全监护人
this.updateTime=updateTime; */
} private String safetyGuardianFlag;
public String getUpdateTime(){ /**
return updateTime; * 是否在岗
} */
public void setDeleteFlag(String deleteFlag){ private String positionFlag;
this.deleteFlag=deleteFlag; /**
} * 具体分工 1-施工人员 2-新增人员临时人员
public String getDeleteFlag(){ */
return deleteFlag; private String workDivision;
}
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;
}
} }

View File

@ -1,285 +1,165 @@
package com.xxl.job.executor.inter.entity; package com.xxl.job.executor.inter.entity;
import java.util.Date; import java.util.Date;
/**
* 站班会 实体类 /**
* 2024-05-08 09:31:40 zijixiangba * @authorcwchen
* @date2024-05-08-11:26
* @version1.0
* @description站班会实体类
*/ */
public class JjClassMeetting {
/**
public class JjClassMeetting{ * 主键ID
private String id; //主键ID */
private String workStartTime; //作业开始时间 private String id;
private String currentConstrDate; //施工时间施工日期 /**
private String currentConstructionStatus; //当前施工状态 01-开始02-暂停 03-恢复04-完成 * 作业开始时间
private String workOvernightFlag; //是否跨零点作业 施工作业票日施工作业任务关联 中跨零点作业是否一致 一致作业时间算第二天 */
private String toolBoxTalkAddress; //站班会地址 private String workStartTime;
private String toolBoxTalkLongitude; //站班会地理坐标-经度 /**
private String toolBoxTalkLatitude; //站班会地理坐标-纬度 * 施工时间施工日期
private String mcWorkSiteId; //距离站班会最近的作业部位ID根据坐标获取最近的 */
private String biddingSectionCode; //标段编码 private String currentConstrDate;
private String biddingSectionName; //标段名称 /**
private String offOnlineFlag; //离线标识0-非离线1-离线 * 当前施工状态 01-开始02-暂停 03-恢复04-完成
private String singleProjectCode; //单项工程编码 */
private String singleProjectName; //单项工程名称 private String currentConstructionStatus;
private String singleProjectType; //单项工程类型 /**
private String constrUnifiedSocialCreditId; //施工单位统一社会信用代码 * 是否跨零点作业 施工作业票日施工作业任务关联 中跨零点作业是否一致 一致作业时间算第二天
private String supervisionUnitName; //监理单位名称 */
private String supervisionSocialCreditCode; //监理单位统一社会信用代码 private String workOvernightFlag;
private String voltageLevel; //电压等级编码 /**
private String huvFlag; //0:常规工程 1:特高压 * 站班会地址
private String buildUnitCode; //建设管理单位编码 */
private String provinceCode; //省公司编码 private String toolBoxTalkAddress;
private String createrId; //创建人 /**
private String prjName; //项目名称 * 站班会地理坐标-经度
private String createTime; //创建时间 */
private String updaterId; //更新人 private String toolBoxTalkLongitude;
private String updateTime; //更新时间 /**
private String deleteFlag; //删除状态默认0包括0未删除1已删除 * 站班会地理坐标-纬度
private String riskPrecautionId; //风险底数一本账id */
private String talkDesStatusChangeId; // private String toolBoxTalkLatitude;
private String fileId; // /**
private String cameraId; //布控球id * 距离站班会最近的作业部位ID根据坐标获取最近的
private String prjCode; //项目编码 */
private String ticketId; //作业票id private String mcWorkSiteId;
private String ticketNo; //作业票编号 /**
private String reAssessmentRiskLevel; //复测风险等级 * 标段编码
private String currentConstrHeadcount; //当日作业人数 */
private String constructionHeadcount; //施工人数是当前班组人数 private String biddingSectionCode;
private String changeTime; //状态变更时间 /**
public void setId(String id){ * 标段名称
this.id=id; */
} private String biddingSectionName;
public String getId(){ /**
return id; * 离线标识0-非离线1-离线
} */
public void setWorkStartTime(String workStartTime){ private String offOnlineFlag;
this.workStartTime=workStartTime; /**
} * 单项工程编码
public String getWorkStartTime(){ */
return workStartTime; private String singleProjectCode;
} /**
public void setCurrentConstrDate(String currentConstrDate){ * 单项工程名称
this.currentConstrDate=currentConstrDate; */
} private String singleProjectName;
public String getCurrentConstrDate(){ /**
return currentConstrDate; * 单项工程类型
} */
public void setCurrentConstructionStatus(String currentConstructionStatus){ private String singleProjectType;
this.currentConstructionStatus=currentConstructionStatus; /**
} * 施工单位统一社会信用代码
public String getCurrentConstructionStatus(){ */
return currentConstructionStatus; private String constrUnifiedSocialCreditId;
} /**
public void setWorkOvernightFlag(String workOvernightFlag){ * 监理单位名称
this.workOvernightFlag=workOvernightFlag; */
} private String supervisionUnitName;
public String getWorkOvernightFlag(){ /**
return workOvernightFlag; * 监理单位统一社会信用代码
} */
public void setToolBoxTalkAddress(String toolBoxTalkAddress){ private String supervisionSocialCreditCode;
this.toolBoxTalkAddress=toolBoxTalkAddress; /**
} * 电压等级编码
public String getToolBoxTalkAddress(){ */
return toolBoxTalkAddress; private String voltageLevel;
} /**
public void setToolBoxTalkLongitude(String toolBoxTalkLongitude){ * 0:常规工程 1:特高压
this.toolBoxTalkLongitude=toolBoxTalkLongitude; */
} private String huvFlag;
public String getToolBoxTalkLongitude(){ /**
return toolBoxTalkLongitude; * 建设管理单位编码
} */
public void setToolBoxTalkLatitude(String toolBoxTalkLatitude){ private String buildUnitCode;
this.toolBoxTalkLatitude=toolBoxTalkLatitude; /**
} * 省公司编码
public String getToolBoxTalkLatitude(){ */
return toolBoxTalkLatitude; private String provinceCode; /**
} * 创建人
public void setMcWorkSiteId(String mcWorkSiteId){ */
this.mcWorkSiteId=mcWorkSiteId; private String createrId;
} /**
public String getMcWorkSiteId(){ * 项目名称
return mcWorkSiteId; */
} private String prjName;
public void setBiddingSectionCode(String biddingSectionCode){ /**
this.biddingSectionCode=biddingSectionCode; * 创建时间
} */
public String getBiddingSectionCode(){ private String createTime;
return biddingSectionCode; /**
} * 更新人
public void setBiddingSectionName(String biddingSectionName){ */
this.biddingSectionName=biddingSectionName; private String updaterId;
} /**
public String getBiddingSectionName(){ * 更新时间
return biddingSectionName; */
} private String updateTime;
public void setOffOnlineFlag(String offOnlineFlag){ /**
this.offOnlineFlag=offOnlineFlag; * 删除状态默认0包括0未删除1已删除
} */
public String getOffOnlineFlag(){ private String deleteFlag;
return offOnlineFlag; /**
} * 风险底数一本账id
public void setSingleProjectCode(String singleProjectCode){ */
this.singleProjectCode=singleProjectCode; private String riskPrecautionId;
} /**
public String getSingleProjectCode(){ *
return singleProjectCode; */
} private String talkDesStatusChangeId;
public void setSingleProjectName(String singleProjectName){ private String fileId;
this.singleProjectName=singleProjectName; /**
} * 布控球id
public String getSingleProjectName(){ */
return singleProjectName; private String cameraId;
} /**
public void setSingleProjectType(String singleProjectType){ * 项目编码
this.singleProjectType=singleProjectType; */
} private String prjCode;
public String getSingleProjectType(){ /**
return singleProjectType; * 作业票id
} */
public void setConstrUnifiedSocialCreditId(String constrUnifiedSocialCreditId){ private String ticketId;
this.constrUnifiedSocialCreditId=constrUnifiedSocialCreditId; /**
} * 作业票编号
public String getConstrUnifiedSocialCreditId(){ */
return constrUnifiedSocialCreditId; private String ticketNo;
} /**
public void setSupervisionUnitName(String supervisionUnitName){ * 复测风险等级
this.supervisionUnitName=supervisionUnitName; */
} private String reAssessmentRiskLevel;
public String getSupervisionUnitName(){ /**
return supervisionUnitName; * 当日作业人数
} */
public void setSupervisionSocialCreditCode(String supervisionSocialCreditCode){ private String currentConstrHeadcount;
this.supervisionSocialCreditCode=supervisionSocialCreditCode; /**
} * 施工人数是当前班组人数
public String getSupervisionSocialCreditCode(){ */
return supervisionSocialCreditCode; private String constructionHeadcount;
} /**
public void setVoltageLevel(String voltageLevel){ * 状态变更时间
this.voltageLevel=voltageLevel; */
} private String changeTime;
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;
}
} }

View File

@ -73,7 +73,7 @@ public class DataCenterService {
} }
} }
public void getClassMeetingPeopleInfo(List<JjClassMeetingPeople> list) { public void insertClassMeetingPeopleData(List<JjClassMeetingPeople> list) {
try{ try{
mapper2.insertClassMeetingPeopleData(list); mapper2.insertClassMeetingPeopleData(list);
}catch (Exception e){ }catch (Exception e){

View File

@ -85,7 +85,7 @@ public class InterService2 {
JSONArray array = (JSONArray) map.get("array"); JSONArray array = (JSONArray) map.get("array");
if (array != null) { if (array != null) {
List<JjClassMeetingPeople> list = JSONArray.parseArray(array.toJSONString(), JjClassMeetingPeople.class); List<JjClassMeetingPeople> list = JSONArray.parseArray(array.toJSONString(), JjClassMeetingPeople.class);
service.getClassMeetingPeopleInfo(list); service.insertClassMeetingPeopleData(list);
pageNum++; pageNum++;
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) { if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
// getProInfo(); // getProInfo();

View File

@ -2,6 +2,7 @@ package com.xxl.job.executor.service.jobhandler;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.executor.inter.service.InterService; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -16,6 +17,9 @@ public class DataCenterXxlJob {
@Autowired @Autowired
private InterService interService; private InterService interService;
@Autowired
private InterService2 interService2;
@XxlJob("getProInfo") @XxlJob("getProInfo")
public void getProInfo(){ public void getProInfo(){
interService.getProInfo(); interService.getProInfo();
@ -27,13 +31,24 @@ public class DataCenterXxlJob {
interService.getBidPro(); interService.getBidPro();
} }
/**
* 站班会
*/
@XxlJob("getClassMet") @XxlJob("getClassMet")
public void getClassMet(){ public void getClassMet(){
interService.getClassMet(); interService.getClassMet();
} }
/**
* 站班会定时任务
*/
@XxlJob("getClassMeetingInfo")
public void getClassMeetingInfo(){
interService2.getClassMeetingInfo();
}
/**
* 站班会人员定时任务
*/
@XxlJob("getClassMeetingPeopleInfo")
public void getClassMeetingPeopleInfo(){
interService2.getClassMeetingPeopleInfo();
}
} }

View File

@ -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, 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, 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, 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 current_constr_headcount,construction_headcount,change_time) VALUES
<foreach collection="list" item="item" separator=",">( <foreach collection="list" item="item" separator=",">(
#{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.toolBoxTalkLongitude},#{item.toolBoxTalkLatitude},#{item.mcWorkSiteId},#{item.biddingSectionCode},#{item.biddingSectionName},#{item.offOnlineFlag},
#{item.singleProjectCode},#{item.singleProjectName},#{item.singleProjectType},#{item.constrUnifiedSocialCreditId},#{item.supervisionUnitName},#{item.supervisionSocialCreditCode}, #{item.singleProjectCode},#{item.singleProjectName},#{item.singleProjectType},#{item.constrUnifiedSocialCreditId},#{item.supervisionUnitName},#{item.supervisionSocialCreditCode},
#{item.voltageLevel},#{item.huvFlag},#{item.buildUnitCode},#{item.provinceCode},#{item.createrId},#{item.prjName}, #{item.voltageLevel},#{item.huvFlag},#{item.buildUnitCode},#{item.provinceCode},#{item.createrId},#{item.prjName},