Skip to content

A
amos-boot-biz
Commit cb31dd9c authored by litengwei's avatar litengwei
Browse files
Options

双规优化代码提交

parent 55d03cdc
Hide whitespace changes
Inline Side-by-side
Showing with 2243 additions and 27 deletions
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/CheckHistory.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* The persistent class for the p_check database table.
*
*/
@Entity
@Table(name="p_check_history")
public class CheckHistory implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 参考地址
*/
@Column(name="address")
private String address;
/**
* 巡检方式
*/
@Column(name="check_mode")
private String checkMode="";
/**
* 检查时间
*/
@Temporal(TemporalType.TIMESTAMP)
@Column(name="check_time")
private Date checkTime;
/**
* 设备编号
*/
@Column(name="device_id")
private String deviceId;
/**
* 不合格项目
*/
private String error;
/**
* 是否合格
*/
@Column(name="is_ok")
private String isOk;
/**
* 经度
*/
private String latitude;
/**
* 纬度
*/
private String longitude;
/**
* 权限系统org code
*/
@Column(name="org_code")
private String orgCode;
/**
* 计划编号
*/
@Column(name="plan_id")
private Long planId;
/**
* 线路名称
*/
@Column(name="plan_name")
private String planName;
/**
* 计划执行编号
*/
@Column(name="plan_task_id")
private Long planTaskId;
/**
* 执行计划详情id
*/
@Column(name="plan_task_detail_id")
private Long planTaskDetailId;
/**
* 巡检点id
*/
@Column(name="point_id")
private Long pointId;
/**
* 点名称
*/
@Column(name="point_name")
private String pointName;
/**
* 巡检备注说明
*/
private String remark;
/**
* 路线编号
*/
@Column(name="route_id")
private Long routeId;
/**
* 路线名称
*/
@Column(name="route_name")
private String routeName;
/**
* 评分
*/
private int score;
/**
* 拍照数量
*/
@Column(name="shot_number")
private int shotNumber;
/**
* 记录上传时间
*/
@Temporal(TemporalType.TIMESTAMP)
@Column(name="upload_time")
private Date uploadTime;
/**
* 巡检人ids
*/
@Column(name="user_id")
private String userId;
/**
* 执行人名称
*/
@Column(name="user_name")
private String userName;
/**
* 执行部门ids
*/
@Column(name="dep_id")
private String depId;
/**
* 执行部门名称
*/
@Column(name="dep_name")
private String depName;
@Column(name="error_classify")
private String errorClassify;
public CheckHistory() {
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getDepId() {
return depId;
}
public void setDepId(String depId) {
this.depId = depId;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
public long getPlanTaskDetailId() {
return planTaskDetailId;
}
public void setPlanTaskDetailId(long planTaskDetailId) {
this.planTaskDetailId = planTaskDetailId;
}
public String getAddress() {
return this.address;
}
public void setAddress(String address) {
this.address = address;
}
public String getCheckMode() {
return this.checkMode;
}
public void setCheckMode(String checkMode) {
this.checkMode = checkMode;
}
public Date getCheckTime() {
return this.checkTime;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public String getDeviceId() {
return this.deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public String getError() {
return this.error;
}
public void setError(String error) {
this.error = error;
}
public String getIsOk() {
return this.isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public String getLatitude() {
return this.latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getLongitude() {
return this.longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public long getPlanId() {
return this.planId;
}
public void setPlanId(long planId) {
this.planId = planId;
}
public long getPlanTaskId() {
return this.planTaskId;
}
public void setPlanTaskId(long planTaskId) {
this.planTaskId = planTaskId;
}
public long getPointId() {
return this.pointId;
}
public void setPointId(long pointId) {
this.pointId = pointId;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public long getRouteId() {
return this.routeId;
}
public void setRouteId(long routeId) {
this.routeId = routeId;
}
public int getScore() {
return this.score;
}
public void setScore(int score) {
this.score = score;
}
public int getShotNumber() {
return this.shotNumber;
}
public void setShotNumber(int shotNumber) {
this.shotNumber = shotNumber;
}
public Date getUploadTime() {
return this.uploadTime;
}
public void setUploadTime(Date uploadTime) {
this.uploadTime = uploadTime;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getErrorClassify() {
return errorClassify;
}
public void setErrorClassify(String errorClassify) {
this.errorClassify = errorClassify;
}
public String getPlanName() {
return planName;
}
public void setPlanName(String planName) {
this.planName = planName;
}
public String getPointName() {
return pointName;
}
public void setPointName(String pointName) {
this.pointName = pointName;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@Id
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/CheckInputHistory.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* The persistent class for the p_check_input database table.
*
*/
@Entity
@Table(name="p_check_input_history")
public class CheckInputHistory implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name="check_id")
private Long checkId;
/**
* 检查项id
*/
@Column(name="input_id")
private Long inputId;
/**
* 检查项名称
*/
@Column(name="input_name")
private String inputName;
/**
* 巡检点检查项
*/
@Column(name="route_point_item_id")
private Long routePointItemId;
/**
* 输入值
*/
@Column(name="input_value")
private String inputValue;
/**
* 是否合格
*/
@Column(name="is_ok")
private String isOk;
/**
* 序号
*/
@Column(name="order_no")
private int orderNo;
/**
* 权限系统org code
*/
@Column(name="org_code")
private String orgCode;
/**
* 检查点分类id
*/
@Column(name="point_classify_id")
private Long pointClassifyId;
/**
* 检查点分类名称
*/
@Column(name="point_classify_name")
private String pointClassifyName;
/**
* 评分
*/
private int score;
/**
* 备注
*/
private String remark;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public CheckInputHistory() {
}
public Long getCheckId() {
return this.checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public Long getInputId() {
return this.inputId;
}
public void setInputId(Long inputId) {
this.inputId = inputId;
}
public String getInputValue() {
return this.inputValue;
}
public void setInputValue(String inputValue) {
this.inputValue = inputValue;
}
public String getIsOk() {
return this.isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public int getOrderNo() {
return this.orderNo;
}
public void setOrderNo(int orderNo) {
this.orderNo = orderNo;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public int getScore() {
return this.score;
}
public void setScore(int score) {
this.score = score;
}
public String getInputName() {
return inputName;
}
public void setInputName(String inputName) {
this.inputName = inputName;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
public Long getPointClassifyId() {
return pointClassifyId;
}
public void setPointClassifyId(Long pointClassifyId) {
this.pointClassifyId = pointClassifyId;
}
public String getPointClassifyName() {
return pointClassifyName;
}
public void setPointClassifyName(String pointClassifyName) {
this.pointClassifyName = pointClassifyName;
}
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@Id
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/CheckShotHistory.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* The persistent class for the p_check_shot database table.
*
*/
@Entity
@Table(name="p_check_shot_history")
public class CheckShotHistory implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name="check_id")
private long checkId;
/**
* 权限系统org code
*/
@Column(name="org_code")
private String orgCode;
/**
* 照片内容
*/
@Lob
@Column(name="photo_data")
private String photoData;
/**
* 拍照点名称
*/
@Column(name="point_name")
private String pointName;
/**
* 拍照类型:定点（检查项拍照），普通（检
*
*
*
*
* 点现场照片）
*/
@Column(name="shot_type")
private String shotType;
/**
* 检查项id
*/
@Column(name="check_input_id")
private long checkInputId;
/**
* 扩展分类id
*/
@Column(name="classify_id")
private long classifyId;
public long getClassifyId() {
return classifyId;
}
public void setClassifyId(long classifyId) {
this.classifyId = classifyId;
}
public long getCheckInputId() {
return checkInputId;
}
public void setCheckInputId(long checkInputId) {
this.checkInputId = checkInputId;
}
public CheckShotHistory() {
}
public long getCheckId() {
return this.checkId;
}
public void setCheckId(long checkId) {
this.checkId = checkId;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getPhotoData() {
return this.photoData;
}
public void setPhotoData(String photoData) {
this.photoData = photoData;
}
public String getPointName() {
return this.pointName;
}
public void setPointName(String pointName) {
this.pointName = pointName;
}
public String getShotType() {
return this.shotType;
}
public void setShotType(String shotType) {
this.shotType = shotType;
}
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@Id
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/PlanTaskDetailHistory.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* The persistent class for the p_plan_task_detail database table.
*
*/
@Entity
@Table(name="p_plan_task_detail_history")
public class PlanTaskDetailHistory implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 是否完成：是否完成0-未完成，1-已完成，2-超时漏检
*/
@Column(name="is_finish")
private int isFinish;
/**
* 点编号
*/
@Column(name="point_id")
private long pointId;
/**
* 任务批次号
*/
@Column(name="task_no")
private long taskNo;
/**
* 具体执行人id
*/
@Column(name="executor_id")
private String executorId;
/**
* 执行时间
*/
@Column(name="executor_date")
private Date executorDate;
private PlanTask planTask;
/**
* 状态：0 未开始；1 合格；2 不合格；3 漏检
*/
@Column(name="status")
private String status="0";
public PlanTaskDetailHistory() {
}
public int getIsFinish() {
return this.isFinish;
}
public void setIsFinish(int isFinish) {
this.isFinish = isFinish;
}
public long getPointId() {
return this.pointId;
}
public void setPointId(long pointId) {
this.pointId = pointId;
}
public long getTaskNo() {
return this.taskNo;
}
public void setTaskNo(long taskNo) {
this.taskNo = taskNo;
}
public void setPlanTask(PlanTask planTask) {
this.planTask = planTask;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getExecutorId() {
return executorId;
}
public void setExecutorId(String executorId) {
this.executorId = executorId;
}
public Date getExecutorDate() {
return executorDate;
}
public void setExecutorDate(Date executorDate) {
this.executorDate = executorDate;
}
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@Id
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/PlanTaskHistory.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* The persistent class for the p_plan_task database table.
*
*/
@Entity
@Table(name="p_plan_task_history")
public class PlanTaskHistory implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 批次号(该字段暂时无效，取值为表id)
*/
@Column(name="batch_no")
private long batchNo;
/**
* 开始时间
*/
@Column(name="begin_time")
private String beginTime;
/**
* 巡检日期
*/
@Column(name="check_date")
private String checkDate;
/**
* 结束时间
*/
@Column(name="end_time")
private String endTime;
/**
* 已完成数量
*/
@Column(name="finish_num")
private int finishNum;
/**
* 完成状态：0-尚未开始；1-正在进行;2-已经结束；3-超时漏检
*/
@Column(name="finish_status")
private int finishStatus;
/**
* 公司Id
*/
@Column(name="org_code")
private String orgCode;
/**
* 计划编号
*/
@Column(name="plan_id")
private long planId;
/**
* 计划巡检点数
*/
@Column(name="point_num")
private int pointNum;
/**
* 信用代码
*/
@Column(name="use_code")
private String useCode;
public String getUseCode() {
return useCode;
}
public void setUseCode(String useCode) {
this.useCode = useCode;
}
public String getPlanType() {
return planType;
}
public void setPlanType(String planType) {
this.planType = planType;
}
/**
* 计划类型
*/
@Column(name="plan_type")
private String planType;
/**
* 路线编号
*/
@Column(name="route_id")
private long routeId;
/**
* 状态：0-有效；1-无效
*/
private int status;
/**
* 状态：0-有效；1-无效
*/
@Column(name="risk_status")
private int riskStatus;
public int getRiskStatus() {
return riskStatus;
}
public void setRiskStatus(int riskStatus) {
this.riskStatus = riskStatus;
}
/**
* 可执行人，一个或多个，多个用,隔开
*/
@Column(name="user_id")
private String userId;
/**
* 是否按排序0-否；1-是
*/
@Column(name="in_order")
private String inOrder;
/**
* 用户部门
*/
@Column(name="user_dept")
private String userDept;
/**
* 用户姓名
*/
@Column(name="user_name")
private String userName;
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserDept() {
return userDept;
}
public void setUserDept(String userDept) {
this.userDept = userDept;
}
public PlanTaskHistory() {
}
public long getBatchNo() {
return batchNo;
}
public void setBatchNo(long batchNo) {
this.batchNo = batchNo;
}
public String getBeginTime() {
return this.beginTime;
}
public void setBeginTime(String beginTime) {
this.beginTime = beginTime;
}
public String getCheckDate() {
return this.checkDate;
}
public void setCheckDate(String checkDate) {
this.checkDate = checkDate;
}
public String getEndTime() {
return this.endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public int getFinishNum() {
return this.finishNum;
}
public void setFinishNum(int finishNum) {
this.finishNum = finishNum;
}
public int getFinishStatus() {
return this.finishStatus;
}
public void setFinishStatus(int finishStatus) {
this.finishStatus = finishStatus;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public long getPlanId() {
return this.planId;
}
public void setPlanId(long planId) {
this.planId = planId;
}
public int getPointNum() {
return this.pointNum;
}
public void setPointNum(int pointNum) {
this.pointNum = pointNum;
}
public long getRouteId() {
return this.routeId;
}
public void setRouteId(long routeId) {
this.routeId = routeId;
}
public int getStatus() {
return this.status;
}
public void setStatus(int status) {
this.status = status;
}
public String getInOrder() {
return inOrder;
}
public void setInOrder(String inOrder) {
this.inOrder = inOrder;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@Id
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/StaticDay.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name="p_static_day")
public class StaticDay extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 未完成
*/
@Column(name="not_start")
private int notStart;
/**
* 已完成有风险
*/
@Column(name="risk_end")
private int riskEnd;
/**
* 已完成无风险
*/
@Column(name="no_risk_end")
private int noRiskEnd;
/**
* 已超时
*/
@Column(name="time_out")
private int timeOut;
/**
* 检查时间
*/
@Column(name="check_time")
private String checkTime;
/**
* 单位code
*/
@Column(name="org_code")
private String orgCode;
/**
* 单位信用代码
*/
@Column(name="unit_code")
private String unitCode;
/**
* 开始时间
*/
@Column(name="begin_time")
private Date beginTime;
/**
* 结束时间
*/
@Column(name="end_time")
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public int getNotStart() {
return notStart;
}
public void setNotStart(int notStart) {
this.notStart = notStart;
}
public int getRiskEnd() {
return riskEnd;
}
public void setRiskEnd(int riskEnd) {
this.riskEnd = riskEnd;
}
public int getNoRiskEnd() {
return noRiskEnd;
}
public void setNoRiskEnd(int noRiskEnd) {
this.noRiskEnd = noRiskEnd;
}
public int getTimeOut() {
return timeOut;
}
public void setTimeOut(int timeOut) {
this.timeOut = timeOut;
}
public String getCheckTime() {
return checkTime;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getUnitCode() {
return unitCode;
}
public void setUnitCode(String unitCode) {
this.unitCode = unitCode;
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/StaticMonth.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name="p_static_month")
public class StaticMonth extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 未完成
*/
@Column(name="not_start")
private int notStart;
/**
* 已完成有风险
*/
@Column(name="risk_end")
private int riskEnd;
/**
* 已完成无风险
*/
@Column(name="no_risk_end")
private int noRiskEnd;
/**
* 已超时
*/
@Column(name="time_out")
private int timeOut;
/**
* 检查时间
*/
@Column(name="check_time")
private String checkTime;
/**
* 单位code
*/
@Column(name="org_code")
private String orgCode;
/**
* 单位信用代码
*/
@Column(name="unit_code")
private String unitCode;
/**
* 开始时间
*/
@Column(name="begin_time")
private Date beginTime;
/**
* 结束时间
*/
@Column(name="end_time")
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public int getNotStart() {
return notStart;
}
public void setNotStart(int notStart) {
this.notStart = notStart;
}
public int getRiskEnd() {
return riskEnd;
}
public void setRiskEnd(int riskEnd) {
this.riskEnd = riskEnd;
}
public int getNoRiskEnd() {
return noRiskEnd;
}
public void setNoRiskEnd(int noRiskEnd) {
this.noRiskEnd = noRiskEnd;
}
public int getTimeOut() {
return timeOut;
}
public void setTimeOut(int timeOut) {
this.timeOut = timeOut;
}
public String getCheckTime() {
return checkTime;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getUnitCode() {
return unitCode;
}
public void setUnitCode(String unitCode) {
this.unitCode = unitCode;
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/StaticWeek.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name="p_static_week")
public class StaticWeek extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 未完成
*/
@Column(name="not_start")
private int notStart;
/**
* 已完成有风险
*/
@Column(name="risk_end")
private int riskEnd;
/**
* 已完成无风险
*/
@Column(name="no_risk_end")
private int noRiskEnd;
/**
* 已超时
*/
@Column(name="time_out")
private int timeOut;
/**
* 检查时间
*/
@Column(name="check_time")
private String checkTime;
/**
* 单位code
*/
@Column(name="org_code")
private String orgCode;
/**
* 单位信用代码
*/
@Column(name="unit_code")
private String unitCode;
/**
* 开始时间
*/
@Column(name="begin_time")
private Date beginTime;
/**
* 结束时间
*/
@Column(name="end_time")
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public int getNotStart() {
return notStart;
}
public void setNotStart(int notStart) {
this.notStart = notStart;
}
public int getRiskEnd() {
return riskEnd;
}
public void setRiskEnd(int riskEnd) {
this.riskEnd = riskEnd;
}
public int getNoRiskEnd() {
return noRiskEnd;
}
public void setNoRiskEnd(int noRiskEnd) {
this.noRiskEnd = noRiskEnd;
}
public int getTimeOut() {
return timeOut;
}
public void setTimeOut(int timeOut) {
this.timeOut = timeOut;
}
public String getCheckTime() {
return checkTime;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getUnitCode() {
return unitCode;
}
public void setUnitCode(String unitCode) {
this.unitCode = unitCode;
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @ cb31dd9c
...@@ -555,7 +555,11 @@ public class CheckController extends AbstractBaseController { ...@@ -555,7 +555,11 @@ public class CheckController extends AbstractBaseController {
String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode(); String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
if(StringUtils.isBlank(checkTime)) { if(StringUtils.isBlank(checkTime)) {
checkTime = DateUtils.dateFormat(new Date(), null); if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.month.getValue()))) {
checkTime = DateUtils.dateFormat(new Date(), DateUtils.YEAR_PATTERN);
} else {
checkTime = DateUtils.dateFormat(new Date(), DateUtils.MONTH_PATTERN);
}
} }
Map<String, Object> map = checkService.checkCalendarNew(checkTime,loginOrgCode,String.valueOf(PlanTaskTypeStatusEnum.getValue(type)),userId); Map<String, Object> map = checkService.checkCalendarNew(checkTime,loginOrgCode,String.valueOf(PlanTaskTypeStatusEnum.getValue(type)),userId);
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java
View file @ cb31dd9c
...@@ -27,6 +27,7 @@ import com.yeejoin.amos.patrol.feign.RemoteSecurityService; ...@@ -27,6 +27,7 @@ import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import io.swagger.annotations.Authorization;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -375,6 +376,26 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -375,6 +376,26 @@ public class PlanTaskController extends AbstractBaseController {
} }
/** /**
* 定时查询任务状态
*
* @return
*/
@Scheduled(cron = "${jobs.cron}")
@ApiOperation(value = "定时任务生成统计数据", notes = "定时任务生成统计数据")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/initStatic", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse initStatic() {
try {
planTaskService.taskStaticExecution(null);
return CommonResponseUtil.success();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);
return CommonResponseUtil.failure();
}
}
/**
* 定时任务推送巡检待办任务消息 * 定时任务推送巡检待办任务消息
*/ */
@Scheduled(cron = "${jobs.cron}") @Scheduled(cron = "${jobs.cron}")
...@@ -1102,4 +1123,17 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -1102,4 +1123,17 @@ public class PlanTaskController extends AbstractBaseController {
} }
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检当天数据归档", notes = "巡检当天数据归档")
@RequestMapping(value = "/sharding/bak", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public ResponseModel bakPatrolInfo() {
try {
planTaskService.backPatrolInfo();
return CommonPatrolResponseUtil.success(null);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonPatrolResponseUtil.failure("远程查询巡检信息失败！");
}
}
} }
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java
View file @ cb31dd9c
...@@ -49,6 +49,8 @@ public interface CheckMapper extends BaseMapper { ...@@ -49,6 +49,8 @@ public interface CheckMapper extends BaseMapper {
List<Map<String,Object>> planCount(String checkTime, String orgCode,String type,String userId, String startTime, String endTime); List<Map<String,Object>> planCount(String checkTime, String orgCode,String type,String userId, String startTime, String endTime);
List<Map<String,Object>> planCountNew(String checkTime, String orgCode,String table, String type, String startTime, String endTime);
List<Map<String, Object>> queryRecordByPointId(HashMap<String, Object> req); List<Map<String, Object>> queryRecordByPointId(HashMap<String, Object> req);
Map<String, Object> queryCheckById(@Param(value="checkId") int checkId); Map<String, Object> queryCheckById(@Param(value="checkId") int checkId);
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java
View file @ cb31dd9c
...@@ -12,6 +12,7 @@ import com.yeejoin.amos.patrol.dao.entity.Plan; ...@@ -12,6 +12,7 @@ import com.yeejoin.amos.patrol.dao.entity.Plan;
import com.yeejoin.amos.patrol.dao.entity.PlanTask; import com.yeejoin.amos.patrol.dao.entity.PlanTask;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail; import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.patrol.dao.entity.PointInputItem; import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
import com.yeejoin.amos.patrol.dao.entity.*;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
...@@ -243,4 +244,23 @@ public interface PlanTaskMapper extends BaseMapper { ...@@ -243,4 +244,23 @@ public interface PlanTaskMapper extends BaseMapper {
List<PlanTaskDetail> selectTaskDetails(String id); List<PlanTaskDetail> selectTaskDetails(String id);
int selectTaskStatus(Long planTaskId); int selectTaskStatus(Long planTaskId);
void updatePlanTaskList(long planId, int oldStatus, int newStatus);
List<PlanTask> findPlanTask();
List<PlanTaskDetail> findPlanTaskDetail();
List<Check> findCheck();
List<CheckInput> findCheckInput();
List<CheckShot> findCheckShot();
List<StaticDay> findStaticDay();
List<StaticDay> findStaticWeek();
void insertAll(String table,StaticDay item);
int deleteDate(String table);
} }
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPlanTaskHistoryDao.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.business.dao.repository;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskHistory;
import org.springframework.stereotype.Repository;
@Repository("planTaskHistoryDao")
public interface IPlanTaskHistoryDao extends BaseDao<PlanTaskHistory, Long> {
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @ cb31dd9c
...@@ -116,6 +116,12 @@ public class CheckServiceImpl implements ICheckService { ...@@ -116,6 +116,12 @@ public class CheckServiceImpl implements ICheckService {
@Autowired @Autowired
private IdxFeign idxFeign; private IdxFeign idxFeign;
private String P_STATIC_DAY = "p_static_day";
private String P_STATIC_MONTH = "p_static_month";
private String P_STATIC_WEEK = "p_static_week";
@PersistenceContext @PersistenceContext
private final EntityManager em; private final EntityManager em;
...@@ -1157,8 +1163,11 @@ public class CheckServiceImpl implements ICheckService { ...@@ -1157,8 +1163,11 @@ public class CheckServiceImpl implements ICheckService {
public Map<String, Object> checkCalendarNew(String checkTime, String orgCode,String type,String userId) throws ParseException { public Map<String, Object> checkCalendarNew(String checkTime, String orgCode,String type,String userId) throws ParseException {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
Calendar calendarNew = new GregorianCalendar();
calendarNew.setTime(new Date());
String startTime = "" ; String startTime = "" ;
String endTime = ""; String endTime = "";
String table = "";
if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.week.getValue()))) { if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.week.getValue()))) {
Date startMonthDate = DateUtils.getStartMonthDate(checkTime, DateUtils.DATE_PATTERN); Date startMonthDate = DateUtils.getStartMonthDate(checkTime, DateUtils.DATE_PATTERN);
Date endMonthDate = DateUtils.getEndMonthDate(checkTime, DateUtils.DATE_PATTERN); Date endMonthDate = DateUtils.getEndMonthDate(checkTime, DateUtils.DATE_PATTERN);
...@@ -1181,9 +1190,32 @@ public class CheckServiceImpl implements ICheckService { ...@@ -1181,9 +1190,32 @@ public class CheckServiceImpl implements ICheckService {
} else { } else {
endTime = DateUtils.dateTimeToDateString(calendar.getTime()); endTime = DateUtils.dateTimeToDateString(calendar.getTime());
} }
int sYear = calendar.get(Calendar.YEAR);
int year = calendarNew.get(Calendar.YEAR);
if(sYear == year) {
table = P_STATIC_WEEK;
} else {
table = P_STATIC_DAY + "_" + sYear;
}
}
if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.day.getValue()))) {
calendar.setTime(DateUtils.dateParse(checkTime, DateUtils.DATE_PATTERN));
int sYear = calendar.get(Calendar.YEAR);
int sMonth = calendar.get(Calendar.MONTH) + 1;
int month = calendarNew.get(Calendar.MONTH) + 1;
if(sMonth == month) {
table = P_STATIC_DAY;
} else {
table = P_STATIC_DAY + "_" + sYear+sMonth;
}
}
if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.month.getValue()))) {
table = P_STATIC_MONTH;
} }
List<Map<String, Object>> list = checkMapper.planCount(checkTime, orgCode, type, userId,startTime,endTime); List<Map<String, Object>> list = checkMapper.planCountNew(checkTime, orgCode, table, type,startTime,endTime);
result.put("calendarData", list); result.put("calendarData", list);
return result; return result;
} }
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ cb31dd9c
...@@ -48,8 +48,12 @@ import com.yeejoin.amos.patrol.quartz.IJobService; ...@@ -48,8 +48,12 @@ import com.yeejoin.amos.patrol.quartz.IJobService;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.compress.utils.Sets; import org.apache.commons.compress.utils.Sets;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -58,6 +62,7 @@ import org.springframework.stereotype.Service; ...@@ -58,6 +62,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -66,15 +71,21 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil; ...@@ -66,15 +71,21 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.annotation.Resource;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -89,6 +100,8 @@ import static com.alibaba.fastjson.JSON.toJSONString; ...@@ -89,6 +100,8 @@ import static com.alibaba.fastjson.JSON.toJSONString;
@Service("planTaskService") @Service("planTaskService")
public class PlanTaskServiceImpl implements IPlanTaskService { public class PlanTaskServiceImpl implements IPlanTaskService {
private final Logger log = LoggerFactory.getLogger(PlanTaskServiceImpl.class); private final Logger log = LoggerFactory.getLogger(PlanTaskServiceImpl.class);
@Resource
private ShardingSphereDataSource dataSource;
@Autowired @Autowired
ESPlanTaskList esPlanTaskList; ESPlanTaskList esPlanTaskList;
...@@ -98,6 +111,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -98,6 +111,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired @Autowired
PlanTaskDetailMapper planTaskDetailMapper; PlanTaskDetailMapper planTaskDetailMapper;
@Autowired @Autowired
private CheckMapper checkMapper;
@Autowired
PlanMapper planMapper; PlanMapper planMapper;
@Autowired @Autowired
IPlanTaskDao iplanTaskDao; IPlanTaskDao iplanTaskDao;
...@@ -118,6 +133,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -118,6 +133,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
IRouteDao routeDao; IRouteDao routeDao;
@Autowired @Autowired
IPlanTaskHistoryDao planTaskHistoryDao;
@Autowired
IJobService jobService; IJobService jobService;
@Autowired @Autowired
...@@ -154,6 +172,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -154,6 +172,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired @Autowired
private RepositoryTs repositoryTs; private RepositoryTs repositoryTs;
private String DB = "amos_tzs_biz.";
private String P_STATIC_DAY = "p_static_day";
private String P_STATIC_MONTH = "p_static_month";
private String P_STATIC_WEEK = "p_static_week";
@PersistenceContext @PersistenceContext
private final EntityManager em; private final EntityManager em;
...@@ -648,6 +674,78 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -648,6 +674,78 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
/** /**
* 自动任务执行
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void taskStaticExecution(String runDate) {
// 判断当天是不是月第一天
int date = DateUtils.getDate(new Date());
int month = DateUtils.getMonth(new Date());
if(date == 1) {
// 日统计表按月归档
Calendar calendar = new GregorianCalendar();
calendar.setTime(new Date());
calendar.add(Calendar.DATE, -1);
Date oldDate = calendar.getTime();
try {
String s = DateUtils.dateFormat(oldDate, DateUtils.MONTH_PATTERN);
s = s.replace("-","");
createNeedTime(P_STATIC_DAY,DB,P_STATIC_DAY+"_"+s);
List<StaticDay> staticDay = planTaskMapper.findStaticDay();
for (StaticDay st : staticDay
) {
planTaskMapper.insertAll( P_STATIC_DAY+"_"+s,st);
}
planTaskMapper.deleteDate(P_STATIC_DAY);
} catch (ParseException e) {
e.printStackTrace();
}
if(month == 1) {
try {
String s = DateUtils.dateFormat(oldDate, DateUtils.YEAR_PATTERN);
createNeedTime(P_STATIC_WEEK,DB,P_STATIC_WEEK+"_"+s);
List<StaticDay> staticWeeks = planTaskMapper.findStaticWeek();
for (StaticDay st : staticWeeks
) {
planTaskMapper.insertAll( P_STATIC_WEEK+"_"+s,st);
}
planTaskMapper.deleteDate(P_STATIC_WEEK);
} catch (ParseException e) {
e.printStackTrace();
}
}
}
// 插入日统计表
List<Map<String, Object>> listDay = checkMapper.planCount(null, null, String.valueOf(PlanTaskTypeStatusEnum.day.getValue()), null,null,null);
List<StaticDay> staticDays = listDay.stream().map(e->{
String s = JSON.toJSONString(e);
StaticDay staticDay = JSON.parseObject(s, StaticDay.class);
return staticDay;
}).collect(Collectors.toList());
// 插入周统计表
List<Map<String, Object>> listWeek = checkMapper.planCount(null, null, String.valueOf(PlanTaskTypeStatusEnum.week.getValue()), null,null,null);
List<StaticWeek> staticWeeks = listWeek.stream().map(e->{
String s = JSON.toJSONString(e);
StaticWeek staticWeek = JSON.parseObject(s, StaticWeek.class);
return staticWeek;
}).collect(Collectors.toList());
// 插入月统计表
List<Map<String, Object>> listMonth = checkMapper.planCount(null, null, String.valueOf(PlanTaskTypeStatusEnum.month.getValue()), null,null,null);
List<StaticMonth> staticMonths = listMonth.stream().map(e->{
String s = JSON.toJSONString(e);
StaticMonth staticMonth = JSON.parseObject(s, StaticMonth.class);
return staticMonth;
}).collect(Collectors.toList());
repositoryTs.batchSave(staticDays);
repositoryTs.batchSave(staticWeeks);
repositoryTs.batchSave(staticMonths);
}
/**
* 删除plantask及det * 删除plantask及det
* *
* @param param * @param param
...@@ -2090,6 +2188,88 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -2090,6 +2188,88 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
// @ShardingSphereTransactionType(TransactionType.XA)
public void backPatrolInfo() {
long sTime = System.currentTimeMillis();
backChcek();
backChcekInput();
backPlanTask();
backChcekShot();
backPlanTaskDetail();
long eTime = System.currentTimeMillis();
System.out.printf("执行时长：%d 毫秒.", (sTime - eTime));
}
@Transactional(rollbackFor = Exception.class)
public void backPlanTask() {
log.info("开始归档p_plan_task表========");
List<PlanTask> list = planTaskMapper.findPlanTask();
List<PlanTaskHistory> collect = list.stream().map(e -> {
PlanTaskHistory d = new PlanTaskHistory();
BeanUtils.copyProperties(e, d);
return d;
}).collect(Collectors.toList());
repositoryTs.batchSave(collect);
log.info("归档p_plan_task表完成========");
}
@Transactional(rollbackFor = Exception.class)
public void backPlanTaskDetail() {
log.info("开始归档p_plan_task_detail表========");
List<PlanTaskDetail> list = planTaskMapper.findPlanTaskDetail();
List<PlanTaskDetailHistory> collect = list.stream().map(e -> {
PlanTaskDetailHistory d = new PlanTaskDetailHistory();
BeanUtils.copyProperties(e, d);
return d;
}).collect(Collectors.toList());
repositoryTs.batchSave(collect);
log.info("归档p_plan_task_detail表完成========");
}
@Transactional(rollbackFor = Exception.class)
public void backChcek() {
log.info("开始归档p_check表========");
List<Check> list = planTaskMapper.findCheck();
List<CheckHistory> collect = list.stream().map(e -> {
CheckHistory d = new CheckHistory();
BeanUtils.copyProperties(e, d);
return d;
}).collect(Collectors.toList());
repositoryTs.batchSave(collect);
log.info("归档p_check表完成========");
}
@Transactional(rollbackFor = Exception.class)
public void backChcekInput() {
log.info("开始归档p_check_input表========");
List<CheckInput> list = planTaskMapper.findCheckInput();
List<CheckInputHistory> collect = list.stream().map(e -> {
CheckInputHistory d = new CheckInputHistory();
BeanUtils.copyProperties(e, d);
return d;
}).collect(Collectors.toList());
repositoryTs.batchSave(collect);
log.info("归档p_check_input表完成========");
}
@Transactional(rollbackFor = Exception.class)
public void backChcekShot() {
log.info("开始归档p_check_shot表========");
List<CheckShot> list = planTaskMapper.findCheckShot();
List<CheckShotHistory> collect = list.stream().map(e -> {
CheckShotHistory d = new CheckShotHistory();
BeanUtils.copyProperties(e, d);
return d;
}).collect(Collectors.toList());
repositoryTs.batchSave(collect);
log.info("归档p_check_shot表完成========");
}
@Override
public List<Map<String, Object>> getStatics(String companyCode, String bizOrgCode) { public List<Map<String, Object>> getStatics(String companyCode, String bizOrgCode) {
if (StringUtils.isEmpty(bizOrgCode) && StringUtil.isNotEmpty(companyCode)) { if (StringUtils.isEmpty(bizOrgCode) && StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = planTaskMapper.queryByCompanyCode(companyCode); bizOrgCode = planTaskMapper.queryByCompanyCode(companyCode);
...@@ -2161,4 +2341,62 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -2161,4 +2341,62 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
return null; return null;
} }
} }
private void createNeedTime(String table, String db, String create) {
DataSource dataSource = this.dataSource;
String sql = "SHOW CREATE TABLE " + table;
String existSql = "select * from information_schema.tables where table_name ='" + table + "'; ";
doCreate(dataSource, sql, existSql, create, db, table);
}
private void doCreate(DataSource dataSource, String sql, String existSql, String create, String db, String table) {
String msg = " create table: " + create + " origin table: " + table + " db: " + db;
Connection conn = null;
Statement stmt = null;
try {
conn = dataSource.getConnection().getMetaData().getConnection();
stmt = conn.createStatement();
ResultSet resultSet = stmt.executeQuery(existSql);
Assert.isTrue(resultSet.next(), msg + "初始化表不存在");
ResultSet resTable = stmt.executeQuery(sql);
Assert.isTrue(resTable.next(), msg + "初始化表不存在");
String existTableName = resTable.getString(1);
String createSqlOrigin = resTable.getString(2);
// log.info(existTableName, createSqlOrigin);
String existSqlNew = org.apache.commons.lang3.StringUtils.replaceOnce(existSql, existTableName, create);
ResultSet executeQuery = stmt.executeQuery(existSqlNew);
if (executeQuery.next()) {
log.info("table exist :" + msg);
} else {
createSqlOrigin = createSqlOrigin.substring(0,createSqlOrigin.indexOf(";"));
String creatsql = org.apache.commons.lang3.StringUtils.replace(createSqlOrigin, existTableName, create).replaceFirst(create, DB+create).replace("bigint(64)", "int8").replace("smallint(16)","int2");
if (0 == stmt.executeUpdate(creatsql)) {
log.info(msg + "success ！");
} else {
log.error(msg + "fail ！");
}
}
} catch (Exception e) {
log.error("create table fail error : {} ", e.getMessage());
} finally {
if (stmt != null) {
try {
stmt.close();
} catch (SQLException e) {
log.error("SQLException", e);
}
}
if (conn != null) {
try {
conn.close();
} catch (SQLException e) {
log.error("SQLException", e);
}
}
}
}
} }
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java
View file @ cb31dd9c
...@@ -67,6 +67,12 @@ public interface IPlanTaskService { ...@@ -67,6 +67,12 @@ public interface IPlanTaskService {
void taskExecution(String runDate); void taskExecution(String runDate);
/** /**
* 自动任务执行
* @param runDate
*/
void taskStaticExecution(String runDate);
/**
* 定时任务发送消息执行中的消息 * 定时任务发送消息执行中的消息
* *
* @param runDate * @param runDate
...@@ -207,4 +213,6 @@ public interface IPlanTaskService { ...@@ -207,4 +213,6 @@ public interface IPlanTaskService {
void download(HttpServletRequest request, HttpServletResponse response, String taskDetailId) throws UnsupportedEncodingException; void download(HttpServletRequest request, HttpServletResponse response, String taskDetailId) throws UnsupportedEncodingException;
Map<String,Object> queryPatrolInfoList(String bizOrgCode, Date startDate, Date endDate); Map<String,Object> queryPatrolInfoList(String bizOrgCode, Date startDate, Date endDate);
void backPatrolInfo();
} }
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/config/TableCreate.java 0 → 100644
View file @ cb31dd9c
package com.yeejoin.amos.patrol.config;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
/**
* @author liran
*/
@Slf4j
@Setter
@Getter
@Component
public class TableCreate {
@Resource
private ShardingSphereDataSource dataSource;
Map<String, Object> createdTables = new HashMap<>();
@Value("${shardingsphere.create.tables.num:10}")
private String num;
private String PLAN_TASK = "p_plan_task";
private String PLAN_TASK_HISTORY = "p_plan_task_history_";
private String PLAN_TASK_DETAIL = "p_plan_task_detail";
private String PLAN_TASK_DETAIL_HISTORY = "p_plan_task_detail_history_";
private String P_CHECK = "p_check";
private String P_CHECK_HISTORY = "p_check_history_";
private String P_CHECK_INPUT = "p_check_input";
private String P_CHECK_INPUT_HISTORY = "p_check_input_history_";
private String P_CHECK_SHOT = "p_check_shot";
private String P_CHECK_SHOT_HISTORY = "p_check_shot_history_";
private String DB = "amos_tzs_biz.";
@PostConstruct
public void init() {
for(int i = 1; i<=Integer.parseInt(num); i++) {
createNeedTime(PLAN_TASK,DB,PLAN_TASK_HISTORY+i);
}
for(int i = 1; i<=Integer.parseInt(num); i++) {
createNeedTime(PLAN_TASK_DETAIL,DB,PLAN_TASK_DETAIL_HISTORY+i);
}
for(int i = 1; i<=Integer.parseInt(num); i++) {
createNeedTime(P_CHECK,DB,P_CHECK_HISTORY+i);
}
for(int i = 1; i<=Integer.parseInt(num); i++) {
createNeedTime(P_CHECK_INPUT,DB,P_CHECK_INPUT_HISTORY+i);
}
for(int i = 1; i<=Integer.parseInt(num); i++) {
createNeedTime(P_CHECK_SHOT,DB,P_CHECK_SHOT_HISTORY+i);
}
}
private void createNeedTime(String table, String db, String create) {
DataSource dataSource = this.dataSource;
String sql = "SHOW CREATE TABLE " + table;
String existSql = "select * from information_schema.tables where table_name ='" + table + "'; ";
doCreate(dataSource, sql, existSql, create, db, table);
}
private void doCreate(DataSource dataSource, String sql, String existSql, String create, String db, String table) {
String msg = " create table: " + create + " origin table: " + table + " db: " + db;
Connection conn = null;
Statement stmt = null;
try {
conn = dataSource.getConnection().getMetaData().getConnection();
stmt = conn.createStatement();
ResultSet resultSet = stmt.executeQuery(existSql);
Assert.isTrue(resultSet.next(), msg + "初始化表不存在");
ResultSet resTable = stmt.executeQuery(sql);
Assert.isTrue(resTable.next(), msg + "初始化表不存在");
String existTableName = resTable.getString(1);
String createSqlOrigin = resTable.getString(2);
// log.info(existTableName, createSqlOrigin);
String existSqlNew = StringUtils.replaceOnce(existSql, existTableName, create);
ResultSet executeQuery = stmt.executeQuery(existSqlNew);
if (executeQuery.next()) {
log.info("table exist :" + msg);
} else {
createSqlOrigin = createSqlOrigin.substring(0,createSqlOrigin.indexOf(";"));
String creatsql = StringUtils.replace(createSqlOrigin, existTableName, create).replaceFirst(create, DB+create).replace("bigint(64)", "int8").replace("smallint(16)","int2");
if (0 == stmt.executeUpdate(creatsql)) {
log.info(msg + "success ！");
} else {
log.error(msg + "fail ！");
}
}
} catch (Exception e) {
log.error("create table fail error : {} ", e.getMessage());
} finally {
if (stmt != null) {
try {
stmt.close();
} catch (SQLException e) {
log.error("SQLException", e);
}
}
if (conn != null) {
try {
conn.close();
} catch (SQLException e) {
log.error("SQLException", e);
}
}
}
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java
View file @ cb31dd9c
...@@ -136,6 +136,7 @@ public class JobService implements IJobService { ...@@ -136,6 +136,7 @@ public class JobService implements IJobService {
SimpleDateFormat formatter = new SimpleDateFormat("ss mm HH dd MM ? yyyy"); SimpleDateFormat formatter = new SimpleDateFormat("ss mm HH dd MM ? yyyy");
String cronDate = formatter.format(time); String cronDate = formatter.format(time);
log.error("addJob==jobName==" + jobName); log.error("addJob==jobName==" + jobName);
QuartzManager.addJob(jobName, jobType, id, getJobInstance(name).getClass(), cronDate); QuartzManager.addJob(jobName, jobType, id, getJobInstance(name).getClass(), cronDate);
} }
} }
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/QuartzManager.java
View file @ cb31dd9c
...@@ -32,11 +32,16 @@ public class QuartzManager { ...@@ -32,11 +32,16 @@ public class QuartzManager {
.withIdentity(jobName, TRIGGER_GROUP_NAME) //给触发器起一个名字和组名 .withIdentity(jobName, TRIGGER_GROUP_NAME) //给触发器起一个名字和组名
.withSchedule(CronScheduleBuilder.cronSchedule(time)) .withSchedule(CronScheduleBuilder.cronSchedule(time))
.build(); .build();
sched.scheduleJob(jobDetail, trigger); if(!sched.checkExists(jobDetail.getKey())) {
if (!sched.isShutdown()) { sched.scheduleJob(jobDetail, trigger);
sched.start(); // 启动 if (!sched.isShutdown()) {
} sched.start(); // 启动
} catch (Exception e) { }
System.out.println("定时器添加成功=========");
} else {
System.out.println("定时器已存在=========");
}
} catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ cb31dd9c
...@@ -553,27 +553,20 @@ ...@@ -553,27 +553,20 @@
<select id="planCount" resultType="Map"> <select id="planCount" resultType="Map">
SELECT SELECT
SUM ( CASE WHEN pt.finish_status = '0' or pt.finish_status = '1' THEN ( CASE WHEN pl.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END ) notStart, SUM ( CASE WHEN pt.finish_status = '0' or pt.finish_status = '1' THEN ( CASE WHEN pt.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END ) notStart,
SUM ( CASE WHEN pt.finish_status = '2' THEN ( CASE WHEN pl.plan_type = #{type} THEN ( CASE WHEN pt.risk_status = '1' THEN 1 ELSE 0 END) ELSE 0 END) ELSE 0 END ) riskEnd, SUM ( CASE WHEN pt.finish_status = '2' THEN ( CASE WHEN pt.plan_type = #{type} THEN ( CASE WHEN pt.risk_status = '1' THEN 1 ELSE 0 END) ELSE 0 END) ELSE 0 END ) riskEnd,
SUM ( CASE WHEN pt.finish_status = '2' THEN ( CASE WHEN pl.plan_type = #{type} THEN ( CASE WHEN pt.risk_status = '2' THEN 1 ELSE 0 END) ELSE 0 END) ELSE 0 END ) noRiskEnd, SUM ( CASE WHEN pt.finish_status = '2' THEN ( CASE WHEN pt.plan_type = #{type} THEN ( CASE WHEN pt.risk_status = '2' THEN 1 ELSE 0 END) ELSE 0 END) ELSE 0 END ) noRiskEnd,
SUM ( CASE WHEN pt.finish_status = '3' THEN ( CASE WHEN pl.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END ) timeOut, SUM ( CASE WHEN pt.finish_status = '3' THEN ( CASE WHEN pt.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END ) timeOut,
( DATE_FORMAT ( pt.check_date, '%Y-%m-%d' ) checkTime,
CASE pt.org_code orgCode,
WHEN '2' = #{type} THEN ( 1+( date_part( 'week', pt.begin_time ) ) ) pt.use_code unitCode,
ELSE ( CASE WHEN '1' = #{type} THEN DATE_FORMAT ( pt.check_date, '%Y-%m-%d' ) ELSE ( substr( DATE_FORMAT ( pt.check_date, '%Y-%m' ) , 6)) END ) END pt.begin_time beginTime,
) stime, pt.end_time endTime
pl.plan_type as type
FROM FROM
p_plan_task pt left join p_plan pl on pt.plan_id = pl.id p_plan_task pt
WHERE WHERE
pl.plan_type = #{type} pt.plan_type = #{type}
<if test="type!=null and type==1">AND DATE_FORMAT(pt.check_date, '%Y-%m') = left(#{checkTime}, 7) </if> GROUP BY pt.use_code
<if test="type!=null and type==2">AND pt.check_date between #{startTime} and #{endTime} </if>
<if test="type!=null and type==3">AND DATE_FORMAT(pt.check_date, '%Y') = left(#{checkTime}, 4)</if>
<if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, pt.user_id)>0</if>
<if test="orgCode!=null">AND pt.org_code = #{orgCode} </if>
GROUP BY stime
order by stime ASC
</select> </select>
...@@ -2298,4 +2291,25 @@ ...@@ -2298,4 +2291,25 @@
</if> </if>
</where> </where>
</select> </select>
<select id="planCountNew" resultType="java.util.Map">
select tb.not_start notStart, tb.risk_end riskEnd, tb.no_risk_end noRiskEnd, tb.time_out timeOut,
(
CASE
WHEN '2' = #{type} THEN ( 1+( date_part( 'week', tb.begin_time ) ) )
ELSE ( CASE WHEN '1' = #{type} THEN DATE_FORMAT ( tb.check_time, '%Y-%m-%d' ) ELSE ( substr( DATE_FORMAT ( tb.check_time, '%Y-%m' ) , 6)) END ) END
) stime
from ${table} tb
<where>
<if test="type=='1'">
DATE_FORMAT(tb.check_time, '%Y-%m') = #{checkTime}
</if>
<if test="type=='2'">
AND tb.check_time between #{startTime} and #{endTime}
</if>
<if test="type=='3'">
AND DATE_FORMAT(tb.check_time, '%Y') = #{checkTime}
</if>
<if test="orgCode!=null">AND tb.org_code = #{orgCode} </if>
</where>
</select>
</mapper> </mapper>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ cb31dd9c
...@@ -2,7 +2,39 @@ ...@@ -2,7 +2,39 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper"> <mapper namespace="com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper">
<!--统计-计划执行 --> <insert id="insertAll">
insert into
${table} (
id ,
not_start,
risk_end,
no_risk_end,
time_out,
check_time,
org_code,
unit_code,
create_date,
begin_time,
end_time
) values
<!-- <foreach collection="list" item="item" index="index" separator="," >-->
(
#{item.id},
#{item.notStart},
#{item.riskEnd},
#{item.noRiskEnd},
#{item.timeOut},
#{item.checkTime},
#{item.orgCode},
#{item.unitCode},
#{item.createDate},
#{item.beginTime},
#{item.endTime}
);
<!-- </foreach>-->
</insert>
<!--统计-计划执行 -->
<select id="countPlanTask" resultType="long"> <select id="countPlanTask" resultType="long">
SELECT COUNT(1) as total_num FROM ( SELECT COUNT(1) as total_num FROM (
SELECT SELECT
...@@ -142,6 +174,7 @@ ...@@ -142,6 +174,7 @@
#{Id} #{Id}
</foreach> </foreach>
</delete> </delete>
<update id="updatePlanTaskPtInfo" > <update id="updatePlanTaskPtInfo" >
update p_plan_task a update p_plan_task a
set a.point_num = (select count(1) from p_plan_task_detail b where a.id = b.task_no), set a.point_num = (select count(1) from p_plan_task_detail b where a.id = b.task_no),
...@@ -1619,6 +1652,27 @@ ...@@ -1619,6 +1652,27 @@
plan_id, plan_id,
finish_status finish_status
</select> </select>
<select id="findPlanTask" resultType="com.yeejoin.amos.patrol.dao.entity.PlanTask">
select * from p_plan_task
</select>
<select id="findPlanTaskDetail" resultType="com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail">
select * from p_plan_task_detail
</select>
<select id="findCheck" resultType="com.yeejoin.amos.patrol.dao.entity.Check">
select * from p_check
</select>
<select id="findCheckInput" resultType="com.yeejoin.amos.patrol.dao.entity.CheckInput">
select * from p_check_input
</select>
<select id="findCheckShot" resultType="com.yeejoin.amos.patrol.dao.entity.CheckShot">
select * from p_check_shot
</select>
<select id="findStaticDay" resultType="com.yeejoin.amos.patrol.dao.entity.StaticDay">
select * from p_static_day
</select>
<select id="findStaticWeek" resultType="com.yeejoin.amos.patrol.dao.entity.StaticDay">
select * from p_static_week
</select>
<update id="updatePlanTaskList"> <update id="updatePlanTaskList">
update update
...@@ -1654,4 +1708,9 @@ ...@@ -1654,4 +1708,9 @@
<select id="selectTaskStatus" resultType="java.lang.Integer"> <select id="selectTaskStatus" resultType="java.lang.Integer">
select finish_status from "p_plan_task" where plan_id = #{planTaskId} select finish_status from "p_plan_task" where plan_id = #{planTaskId}
</select> </select>
<delete id="deleteDate">
delete from ${table} where 1=1;
</delete>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment