Skip to content

A
amos-boot-biz
Commit 40aacfd6 authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop

parents 47d8a4d3 06ce621a
Hide whitespace changes
Inline Side-by-side
Showing with 1055 additions and 1011 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Check.java
View file @ 40aacfd6
package com.yeejoin.amos.maintenance.dao.entity; package com.yeejoin.amos.maintenance.dao.entity;
import javax.persistence.*;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
/** /**
* The persistent class for the p_check database table. * The persistent class for the p_check database table.
*
*/ */
@Entity @Entity
@Table(name="p_check") @Table(name = "p_check")
@NamedQuery(name="Check.findAll", query="SELECT c FROM Check c") @NamedQuery(name = "Check.findAll", query = "SELECT c FROM Check c")
public class Check extends BasicEntity { public class Check extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 参考地址 * 参考地址
*/ */
@Column(name="address") @Column(name = "address")
private String address; private String address;
/** /**
* 巡检方式 * 巡检方式
*/ */
@Column(name="check_mode") @Column(name = "check_mode")
private String checkMode=""; private String checkMode = "";
/** /**
* 检查时间 * 检查时间
*/ */
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="check_time") @Column(name = "check_time")
private Date checkTime; private Date checkTime;
/** /**
* 设备编号 * 设备编号
*/ */
@Column(name="device_id") @Column(name = "device_id")
private String deviceId; private String deviceId;
/**
/** * 不合格项目
* 不合格项目 */
*/ private String error;
private String error;
/**
/** * 是否合格
* 是否合格 */
*/ @Column(name = "is_ok")
@Column(name="is_ok") private String isOk;
private String isOk;
/**
/** * 经度
* 经度 */
*/ private String latitude;
private String latitude;
/**
/** * 纬度
* 纬度 */
*/ private String longitude;
private String longitude;
/**
/** * 权限系统org code
* 权限系统org code */
*/ @Column(name = "org_code")
@Column(name="org_code") private String orgCode;
private String orgCode;
/**
/** * 计划编号
* 计划编号 */
*/ @Column(name = "plan_id")
@Column(name="plan_id") private Long planId;
private Long planId;
/**
/** * 线路名称
* 线路名称 */
*/ @Column(name = "plan_name")
@Column(name="plan_name") private String planName;
private String planName;
/**
/** * 计划执行编号
* 计划执行编号 */
*/ @Column(name = "plan_task_id")
@Column(name="plan_task_id") private Long planTaskId;
private Long planTaskId;
/**
/** * 执行计划详情id
* 执行计划详情id */
*/ @Column(name = "plan_task_detail_id")
@Column(name="plan_task_detail_id") private Long planTaskDetailId;
private Long planTaskDetailId;
/**
/** * 风险辨识与管控措施
* 巡检点id */
*/ private String riskAndManage;
@Column(name="point_id")
private Long pointId; /**
* 计划开始日期
/** */
* 点名称 private String beginTime;
*/
@Column(name="point_name") /**
private String pointName; * 计划结束日期
*/
/** private String endTime;
* 设备编号
*/ /**
private String pointNo; * 巡检点id
*/
public String getPointNo() { @Column(name = "point_id")
return pointNo; private Long pointId;
}
public String getRiskAndManage() {
public void setPointNo(String pointNo) { return riskAndManage;
this.pointNo = pointNo; }
}
public void setRiskAndManage(String riskAndManage) {
/** this.riskAndManage = riskAndManage;
* 巡检备注说明 }
*/
private String remark; public String getBeginTime() {
return beginTime;
/** }
* 路线编号
*/ public void setBeginTime(String beginTime) {
@Column(name="route_id") this.beginTime = beginTime;
private Long routeId; }
/** public String getEndTime() {
* 路线名称 return endTime;
*/ }
@Column(name="route_name")
private String routeName; public void setEndTime(String endTime) {
this.endTime = endTime;
/** }
* 评分
*/ /**
private int score; * 点名称
*/
/** @Column(name = "point_name")
* 拍照数量 private String pointName;
*/
@Column(name="shot_number") /**
private int shotNumber; * 设备编号
*/
/** private String pointNo;
* 记录上传时间
*/ public String getPointNo() {
@Temporal(TemporalType.TIMESTAMP) return pointNo;
@Column(name="upload_time") }
private Date uploadTime;
public void setPointNo(String pointNo) {
/** this.pointNo = pointNo;
* 巡检人ids }
*/
@Column(name="user_id") /**
private String userId; * 巡检备注说明
*/
/** private String remark;
* 执行人名称
*/ /**
@Column(name="user_name") * 路线编号
private String userName; */
@Column(name = "route_id")
/** private Long routeId;
* 执行部门ids
*/ /**
@Column(name="dep_id") * 路线名称
private String depId; */
/** @Column(name = "route_name")
* 执行部门名称 private String routeName;
*/
@Column(name="dep_name") /**
private String depName; * 评分
*/
@Column(name="error_classify") private int score;
private String errorClassify;
/**
/** * 拍照数量
* 业主单位id */
*/ @Column(name = "shot_number")
private String ownerId; private int shotNumber;
/** /**
* 维保公司id * 记录上传时间
*/ */
private String companyId; @Temporal(TemporalType.TIMESTAMP)
@Column(name = "upload_time")
/** private Date uploadTime;
* 维保公司名称
*/ /**
private String companyName; * 巡检人ids
*/
/** @Column(name = "user_id")
* 安装位置：buildingName private String userId;
*/
private String buildingName; /**
* 执行人名称
/** */
* 设备分类 @Column(name = "user_name")
*/ private String userName;
private String equipmentName;
/**
/** * 执行部门ids
* 计划类型 */
*/ @Column(name = "dep_id")
private String planType; private String depId;
/**
public String getBuildingName() { * 执行部门名称
return buildingName; */
} @Column(name = "dep_name")
private String depName;
public void setBuildingName(String buildingName) {
this.buildingName = buildingName; @Column(name = "error_classify")
} private String errorClassify;
public String getEquipmentName() { /**
return equipmentName; * 业主单位id
} */
private String ownerId;
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName; /**
} * 维保公司id
*/
public String getPlanType() { private String companyId;
return planType;
} /**
* 维保公司名称
public void setPlanType(String planType) { */
this.planType = planType; private String companyName;
}
/**
public String getCompanyId() { * 安装位置：buildingName
return companyId; */
} private String buildingName;
public void setCompanyId(String companyId) { /**
this.companyId = companyId; * 设备分类
} */
private String equipmentName;
public String getCompanyName() {
return companyName; /**
} * 计划类型
*/
public void setCompanyName(String companyName) { private String planType;
this.companyName = companyName;
} public String getBuildingName() {
return buildingName;
}
public String getOwnerId() { public void setBuildingName(String buildingName) {
return ownerId; this.buildingName = buildingName;
} }
public void setOwnerId(String ownerId) { public String getEquipmentName() {
this.ownerId = ownerId; return equipmentName;
} }
private List<CheckShot> checkShot; public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
public Check() { }
}
public String getPlanType() {
public String getUserName() { return planType;
return userName; }
}
public void setPlanType(String planType) {
public void setUserName(String userName) { this.planType = planType;
this.userName = userName; }
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getOwnerId() {
return ownerId;
}
public void setOwnerId(String ownerId) {
this.ownerId = ownerId;
}
private List<CheckShot> checkShot;
public Check() {
}
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 getDepId() { public String getDeviceId() {
return depId; return this.deviceId;
} }
public void setDepId(String depId) { public void setDeviceId(String deviceId) {
this.depId = depId; this.deviceId = deviceId;
} }
public String getDepName() { public String getError() {
return depName; return this.error;
} }
public void setDepName(String depName) { public void setError(String error) {
this.depName = depName; this.error = error;
} }
public long getPlanTaskDetailId() { public String getIsOk() {
return planTaskDetailId; return this.isOk;
} }
public void setPlanTaskDetailId(long planTaskDetailId) { public void setIsOk(String isOk) {
this.planTaskDetailId = planTaskDetailId; this.isOk = isOk;
} }
public String getAddress() { public String getLatitude() {
return this.address; return this.latitude;
} }
public void setAddress(String address) { public void setLatitude(String latitude) {
this.address = address; this.latitude = latitude;
} }
public String getCheckMode() { public String getLongitude() {
return this.checkMode; return this.longitude;
} }
public void setCheckMode(String checkMode) { public void setLongitude(String longitude) {
this.checkMode = checkMode; this.longitude = longitude;
} }
public Date getCheckTime() { public String getOrgCode() {
return this.checkTime; return this.orgCode;
} }
public void setCheckTime(Date checkTime) { public void setOrgCode(String orgCode) {
this.checkTime = checkTime; this.orgCode = orgCode;
} }
public String getDeviceId() { public long getPlanId() {
return this.deviceId; return this.planId;
} }
public void setDeviceId(String deviceId) { public void setPlanId(long planId) {
this.deviceId = deviceId; this.planId = planId;
} }
public String getError() { public long getPlanTaskId() {
return this.error; return this.planTaskId;
} }
public void setError(String error) { public void setPlanTaskId(long planTaskId) {
this.error = error; this.planTaskId = planTaskId;
} }
public String getIsOk() { public long getPointId() {
return this.isOk; return this.pointId;
} }
public void setIsOk(String isOk) { public void setPointId(long pointId) {
this.isOk = isOk; this.pointId = pointId;
} }
public String getLatitude() { public String getRemark() {
return this.latitude; return this.remark;
} }
public void setLatitude(String latitude) { public void setRemark(String remark) {
this.latitude = latitude; this.remark = remark;
} }
public String getLongitude() { public long getRouteId() {
return this.longitude; return this.routeId;
} }
public void setLongitude(String longitude) { public void setRouteId(long routeId) {
this.longitude = longitude; this.routeId = routeId;
} }
public String getOrgCode() { public int getScore() {
return this.orgCode; return this.score;
} }
public void setOrgCode(String orgCode) { public void setScore(int score) {
this.orgCode = orgCode; this.score = score;
} }
public long getPlanId() { public int getShotNumber() {
return this.planId; return this.shotNumber;
} }
public void setPlanId(long planId) { public void setShotNumber(int shotNumber) {
this.planId = planId; this.shotNumber = shotNumber;
} }
public long getPlanTaskId() { public Date getUploadTime() {
return this.planTaskId; return this.uploadTime;
} }
public void setPlanTaskId(long planTaskId) { public void setUploadTime(Date uploadTime) {
this.planTaskId = planTaskId; this.uploadTime = uploadTime;
} }
public long getPointId() {
return this.pointId;
}
public void setPointId(long pointId) { public String getUserId() {
this.pointId = pointId; return userId;
} }
public String getRemark() { public void setUserId(String userId) {
return this.remark; this.userId = userId;
} }
public void setRemark(String remark) { public String getErrorClassify() {
this.remark = remark; return errorClassify;
} }
public long getRouteId() { public void setErrorClassify(String errorClassify) {
return this.routeId; this.errorClassify = errorClassify;
} }
public void setRouteId(long routeId) { @OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
this.routeId = routeId; public List<CheckShot> getCheckShot() {
} return checkShot;
}
public int getScore() { public void setCheckShot(List<CheckShot> checkShot) {
return this.score; this.checkShot = checkShot;
} }
public void setScore(int score) { public String getPlanName() {
this.score = score; return planName;
} }
public int getShotNumber() { public void setPlanName(String planName) {
return this.shotNumber; this.planName = planName;
} }
public void setShotNumber(int shotNumber) { public String getPointName() {
this.shotNumber = shotNumber; return pointName;
} }
public Date getUploadTime() { public void setPointName(String pointName) {
return this.uploadTime; this.pointName = pointName;
} }
public void setUploadTime(Date uploadTime) { public String getRouteName() {
this.uploadTime = uploadTime; return routeName;
} }
public void setRouteName(String routeName) {
public String getUserId() { this.routeName = routeName;
return userId; }
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getErrorClassify() {
return errorClassify;
}
public void setErrorClassify(String errorClassify) {
this.errorClassify = errorClassify;
}
@OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE,CascadeType.MERGE,CascadeType.PERSIST })
public List<CheckShot> getCheckShot() {
return checkShot;
}
public void setCheckShot(List<CheckShot> checkShot) {
this.checkShot = checkShot;
}
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;
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Plan.java
View file @ 40aacfd6
package com.yeejoin.amos.maintenance.dao.entity; package com.yeejoin.amos.maintenance.dao.entity;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.sql.Time; import java.sql.Time;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.LastModifiedDate;
/** /**
* The persistent class for the p_plan database table. * The persistent class for the p_plan database table.
*
*/ */
@Entity @Entity
@Table(name="p_plan") @Table(name = "p_plan")
@NamedQuery(name="Plan.findAll", query="SELECT p FROM Plan p") @NamedQuery(name = "Plan.findAll", query = "SELECT p FROM Plan p")
public class Plan extends BasicEntity { public class Plan extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 部门id * 部门id
*/ */
@Column(name="dept_id") @Column(name = "dept_id")
private String deptId; private String deptId;
/** /**
* 创建者 * 创建者
*/ */
@Column(name="create_by") @Column(name = "create_by")
private String createBy; private String createBy;
/** /**
* 开始时间 * 开始时间
*/ */
@Column(name="day_begin") @Column(name = "day_begin")
private Time dayBegin; private Time dayBegin;
/** /**
* 结束时间 * 结束时间
*/ */
@Column(name="day_end") @Column(name = "day_end")
private Time dayEnd; private Time dayEnd;
/** /**
* 执行间隔（每天执行频率为多次时使用） * 执行间隔（每天执行频率为多次时使用）
*/ */
@Column(name="day_interval") @Column(name = "day_interval")
private int dayInterval; private int dayInterval;
/** /**
* 执行间隔单位：小时，分钟，秒 * 执行间隔单位：小时，分钟，秒
*/ */
@Column(name="day_interval_unit") @Column(name = "day_interval_unit")
private String dayIntervalUnit; private String dayIntervalUnit;
/** /**
* 每天频率：0-一次；1-多次 * 每天频率：0-一次；1-多次
*/ */
@Column(name="day_rate") @Column(name = "day_rate")
private int dayRate = -1; private int dayRate = -1;
/** /**
* 开始时间（执行频率为一次时，使用） * 开始时间（执行频率为一次时，使用）
*/ */
@Column(name="day_time") @Column(name = "day_time")
private String dayTime; private String dayTime;
/** /**
* 工作时长（分钟） * 工作时长（分钟）
*/ */
private int duration; private int duration;
private String ownerId; private String ownerId;
/** /**
* 维保公司id * 维保公司id
*/ */
private String companyId; private String companyId;
/** /**
* 维保公司名称 * 维保公司名称
*/ */
private String companyName; private String companyName;
public String getCompanyId() { public String getCompanyId() {
return companyId; return companyId;
} }
public void setCompanyId(String companyId) { public void setCompanyId(String companyId) {
this.companyId = companyId; this.companyId = companyId;
} }
public String getCompanyName() { public String getCompanyName() {
return companyName; return companyName;
} }
public void setCompanyName(String companyName) { public void setCompanyName(String companyName) {
this.companyName = companyName; this.companyName = companyName;
} }
@Transient @Transient
public String getOwnerId() { public String getOwnerId() {
return ownerId; return ownerId;
} }
public void setOwnerId(String ownerId) { public void setOwnerId(String ownerId) {
this.ownerId = ownerId; this.ownerId = ownerId;
} }
/** /**
* 首次标志 * 首次标志
*/ */
private int firstFlag; private int firstFlag;
/** /**
* 允许误差(分钟) * 允许误差(分钟)
*/ */
private int error; private int error;
/** /**
* 执行频率（年计划使用） * 执行频率（年计划使用）
*/ */
@Column(name="execute_rate") @Column(name = "execute_rate")
private int executeRate; private int executeRate;
/** /**
* 排序 * 排序
*/ */
@Column(name="in_order") @Column(name = "in_order")
private String inOrder; private String inOrder;
/** /**
* 执行间隔 * 执行间隔
*/ */
@Column(name="execute_interval") @Column(name = "execute_interval")
private int executeInterval; private int executeInterval;
/** /**
* 是否固定巡检日期：0-否；1-是 * 是否固定巡检日期：0-否；1-是
*/ */
@Column(name="is_fixed_date") @Column(name = "is_fixed_date")
private String isFixedDate; private String isFixedDate;
/** /**
* 是否评分 * 是否评分
*/ */
@Column(name="is_score") @Column(name = "is_score")
private String isScore; private String isScore;
/** /**
* 最近更新者 * 最近更新者
*/ */
@Column(name="last_upd_by") @Column(name = "last_upd_by")
private String lastUpdBy; private String lastUpdBy;
/** /**
* 最近更新时间 * 最近更新时间
*/ */
@LastModifiedDate @LastModifiedDate
@Column(name="last_upd_time") @Column(name = "last_upd_time")
private Date lastUpdTime; private Date lastUpdTime;
/** /**
* 最少间隔 * 最少间隔
*/ */
@Column(name="min_space") @Column(name = "min_space")
private int minSpace; private int minSpace;
/** /**
* 月执行类型：第，在 * 月执行类型：第，在
*/ */
@Column(name="month_type") @Column(name = "month_type")
private String monthType; private String monthType;
/** /**
* 计划名称 * 计划名称
*/ */
@Column(name="[name]") @Column(name = "[name]")
private String name; private String name;
/** /**
* 下次任务生成日期 * 下次任务生成日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="next_gen_date") @Column(name = "next_gen_date")
private Date nextGenDate; private Date nextGenDate;
/** /**
* 公司Id * 公司Id
*/ */
@Column(name="org_code") @Column(name = "org_code")
private String orgCode; private String orgCode;
/** /**
* 计划开始日期 * 计划开始日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="plan_begin") @Column(name = "plan_begin")
private String planBegin; private String planBegin;
/** /**
* 计划结束日期 * 计划结束日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="plan_end") @Column(name = "plan_end")
private String planEnd; private String planEnd;
/** /**
* 计划类型：日，周，月，年 * 计划类型：日，周，月，年
*/ */
@Column(name="plan_type") @Column(name = "plan_type")
private String planType; private String planType;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 备注1 * 备注1
*/ */
private String remark1; private String remark1;
/** /**
* 备注2 * 备注2
*/ */
private String remark2; private String remark2;
/** /**
* 路线编号 * 路线编号
*/ */
@Column(name="route_id") @Column(name = "route_id")
private long routeId; private long routeId;
/** /**
* 评分计算公式 * 评分计算公式
*/ */
@Column(name="score_formula") @Column(name = "score_formula")
private String scoreFormula; private String scoreFormula;
/** /**
* 状态:0-已停用；1-正常 * 状态:0-已停用；1-正常
*/ */
@Column(name="[status]") @Column(name = "[status]")
private byte status; private byte status;
/** /**
* 用户编号 * 用户编号
*/ */
@Column(name="user_id") @Column(name = "user_id")
private String userId; private String userId;
/** /**
* 用户名称（多个逗号分隔） * 用户名称（多个逗号分隔）
*/ */
@Column(name="user_name") @Column(name = "user_name")
private String userName; private String userName;
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
public void setUserName(String userName) { public void setUserName(String userName) {
this.userName = userName; this.userName = userName;
} }
/** /**
* 开始编号 * 开始编号
*/ */
@Column(name="week_begin_num") @Column(name = "week_begin_num")
private int weekBeginNum; private int weekBeginNum;
/** /**
* 周几 * 周几
*/ */
@Column(name="week_day") @Column(name = "week_day")
private int weekDay; private int weekDay;
/** /**
* 结束编号 * 结束编号
*/ */
@Column(name="week_end_num") @Column(name = "week_end_num")
private int weekEndNum; private int weekEndNum;
/** /**
* 哪一天 * 哪一天
*/ */
@Column(name="what_day") @Column(name = "what_day")
private String whatDay; private String whatDay;
/** /**
* 第几周 * 第几周
*/ */
@Column(name="what_week") @Column(name = "what_week")
private int whatWeek; private int whatWeek;
/** /**
* 是否删除：0表示未删除，1表示已删除 * 是否删除：0表示未删除，1表示已删除
*/ */
@Column(name="is_delete") @Column(name = "is_delete")
private boolean isDelete=false; private boolean isDelete = false;
/** /**
* 原始字段 * 原始字段
*/ */
@Column(name = "original_id", columnDefinition = "varchar(50) COMMENT '原始字段'") @Column(name = "original_id", columnDefinition = "varchar(50) COMMENT '原始字段'")
private String originalId; private String originalId;
/** /**
*
* 任务id * 任务id
*/ */
@Column(name="plan_task_id") @Column(name = "plan_task_id")
private Long planTaskId = 0L; private Long planTaskId = 0L;
/** /**
* 是否单人执行 * 是否单人执行
*/ */
@Column(name="is_single_execution") @Column(name = "is_single_execution")
private boolean isSingleExecution=false; private boolean isSingleExecution = false;
/** /**
* 用户部门 * 用户部门
*/ */
@Column(name="user_dept") @Column(name = "user_dept")
private String userDept; private String userDept;
public String getUserDept() { public String getUserDept() {
return userDept; return userDept;
} }
public void setUserDept(String userDept) { public void setUserDept(String userDept) {
this.userDept = userDept; this.userDept = userDept;
} }
public Plan() { public Plan() {
} }
public String getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
this.deptId = deptId;
}
public String getCreateBy() {
return this.createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Time getDayBegin() {
return this.dayBegin;
}
public void setDayBegin(Time dayBegin) {
this.dayBegin = dayBegin;
}
public Time getDayEnd() {
return this.dayEnd;
}
public void setDayEnd(Time dayEnd) {
this.dayEnd = dayEnd;
}
public int getDayInterval() {
return this.dayInterval;
}
public void setDayInterval(int dayInterval) {
this.dayInterval = dayInterval;
}
public String getDayIntervalUnit() {
return this.dayIntervalUnit;
}
public void setDayIntervalUnit(String dayIntervalUnit) {
this.dayIntervalUnit = dayIntervalUnit;
}
public int getDayRate() {
return this.dayRate;
}
public void setDayRate(int dayRate) {
this.dayRate = dayRate;
}
public String getDayTime() {
return this.dayTime;
}
public void setDayTime(String dayTime) {
this.dayTime = dayTime;
}
public int getDuration() {
return this.duration;
}
public void setDuration(int duration) {
this.duration = duration;
}
public int getError() {
return this.error;
}
public void setError(int error) {
this.error = error;
}
public int getExecuteRate() {
return this.executeRate;
}
public void setExecuteRate(int executeRate) {
this.executeRate = executeRate;
}
public String getInOrder() {
return this.inOrder;
}
public void setInOrder(String inOrder) {
this.inOrder = inOrder;
}
public String getIsFixedDate() {
return this.isFixedDate;
}
public String getDeptId() { public void setIsFixedDate(String isFixedDate) {
return deptId; this.isFixedDate = isFixedDate;
} }
public void setDeptId(String deptId) { public String getIsScore() {
this.deptId = deptId; return this.isScore;
} }
public String getCreateBy() {
return this.createBy;
}
public void setCreateBy(String createBy) { public void setIsScore(String isScore) {
this.createBy = createBy; this.isScore = isScore;
} }
public String getLastUpdBy() {
return this.lastUpdBy;
}
public Time getDayBegin() { public void setLastUpdBy(String lastUpdBy) {
return this.dayBegin; this.lastUpdBy = lastUpdBy;
} }
public void setDayBegin(Time dayBegin) { public Date getLastUpdTime() {
this.dayBegin = dayBegin; return this.lastUpdTime;
} }
public Time getDayEnd() { public void setLastUpdTime(Date lastUpdTime) {
return this.dayEnd; this.lastUpdTime = lastUpdTime;
} }
public void setDayEnd(Time dayEnd) { public int getMinSpace() {
this.dayEnd = dayEnd; return this.minSpace;
} }
public int getDayInterval() { public void setMinSpace(int minSpace) {
return this.dayInterval; this.minSpace = minSpace;
} }
public void setDayInterval(int dayInterval) { public String getMonthType() {
this.dayInterval = dayInterval; return this.monthType;
} }
public String getDayIntervalUnit() { public void setMonthType(String monthType) {
return this.dayIntervalUnit; this.monthType = monthType;
} }
public void setDayIntervalUnit(String dayIntervalUnit) { public String getName() {
this.dayIntervalUnit = dayIntervalUnit; return this.name;
} }
public int getDayRate() { public void setName(String name) {
return this.dayRate; this.name = name;
} }
public void setDayRate(int dayRate) { public Date getNextGenDate() {
this.dayRate = dayRate; return this.nextGenDate;
} }
public String getDayTime() { public void setNextGenDate(Date nextGenDate) {
return this.dayTime; this.nextGenDate = nextGenDate;
} }
public void setDayTime(String dayTime) { public String getOrgCode() {
this.dayTime = dayTime; return this.orgCode;
} }
public int getDuration() { public void setOrgCode(String orgCode) {
return this.duration; this.orgCode = orgCode;
} }
public void setDuration(int duration) { public String getPlanBegin() {
this.duration = duration; return this.planBegin;
} }
public int getError() { public void setPlanBegin(String planBegin) {
return this.error; this.planBegin = planBegin;
} }
public void setError(int error) { public String getPlanEnd() {
this.error = error; return this.planEnd;
} }
public int getExecuteRate() { public void setPlanEnd(String planEnd) {
return this.executeRate; this.planEnd = planEnd;
} }
public void setExecuteRate(int executeRate) { public String getPlanType() {
this.executeRate = executeRate; return this.planType;
} }
public String getInOrder() { public void setPlanType(String planType) {
return this.inOrder; this.planType = planType;
} }
public void setInOrder(String inOrder) { public String getRemark() {
this.inOrder = inOrder; 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 String getScoreFormula() {
return this.scoreFormula;
}
public String getIsFixedDate() { public void setScoreFormula(String scoreFormula) {
return this.isFixedDate; this.scoreFormula = scoreFormula;
} }
public void setIsFixedDate(String isFixedDate) { public byte getStatus() {
this.isFixedDate = isFixedDate; return this.status;
} }
public String getIsScore() { public void setStatus(byte status) {
return this.isScore; this.status = status;
} }
public void setIsScore(String isScore) { public String getUserId() {
this.isScore = isScore; return this.userId;
} }
public String getLastUpdBy() { public void setUserId(String userId) {
return this.lastUpdBy; this.userId = userId;
} }
public void setLastUpdBy(String lastUpdBy) { public int getWeekBeginNum() {
this.lastUpdBy = lastUpdBy; return this.weekBeginNum;
} }
public Date getLastUpdTime() { public void setWeekBeginNum(int weekBeginNum) {
return this.lastUpdTime; this.weekBeginNum = weekBeginNum;
} }
public void setLastUpdTime(Date lastUpdTime) { public int getWeekDay() {
this.lastUpdTime = lastUpdTime; return this.weekDay;
} }
public int getMinSpace() { public void setWeekDay(int weekDay) {
return this.minSpace; this.weekDay = weekDay;
} }
public void setMinSpace(int minSpace) { public int getWeekEndNum() {
this.minSpace = minSpace; return this.weekEndNum;
} }
public String getMonthType() { public void setWeekEndNum(int weekEndNum) {
return this.monthType; this.weekEndNum = weekEndNum;
} }
public void setMonthType(String monthType) { public String getWhatDay() {
this.monthType = monthType; return this.whatDay;
} }
public String getName() { public void setWhatDay(String whatDay) {
return this.name; this.whatDay = whatDay;
} }
public void setName(String name) { public int getWhatWeek() {
this.name = name; return this.whatWeek;
} }
public Date getNextGenDate() { public void setWhatWeek(int whatWeek) {
return this.nextGenDate; this.whatWeek = whatWeek;
} }
public void setNextGenDate(Date nextGenDate) { public String getRemark1() {
this.nextGenDate = nextGenDate; return remark1;
} }
public String getOrgCode() { public void setRemark1(String remark1) {
return this.orgCode; this.remark1 = remark1;
} }
public void setOrgCode(String orgCode) { public String getRemark2() {
this.orgCode = orgCode; return remark2;
} }
public String getPlanBegin() { public void setRemark2(String remark2) {
return this.planBegin; this.remark2 = remark2;
} }
public void setPlanBegin(String planBegin) { public int getExecuteInterval() {
this.planBegin = planBegin; return executeInterval;
} }
public String getPlanEnd() { public void setExecuteInterval(int executeInterval) {
return this.planEnd; this.executeInterval = executeInterval;
} }
public void setPlanEnd(String planEnd) { public int getFirstFlag() {
this.planEnd = planEnd; return firstFlag;
} }
public String getPlanType() { public void setFirstFlag(int firstFlag) {
return this.planType; this.firstFlag = firstFlag;
} }
public void setPlanType(String planType) { public boolean getIsDelete() {
this.planType = planType; return isDelete;
} }
public String getRemark() { public void setIsDelete(boolean isDelete) {
return this.remark; this.isDelete = isDelete;
} }
public void setRemark(String remark) { public String getOriginalId() {
this.remark = remark; return originalId;
} }
public long getRouteId() { public void setOriginalId(String originalId) {
return this.routeId; this.originalId = originalId;
} }
public void setRouteId(long routeId) { public Long getPlanTaskId() {
this.routeId = routeId; return planTaskId;
} }
public String getScoreFormula() { public void setPlanTaskId(Long planTaskId) {
return this.scoreFormula; this.planTaskId = planTaskId;
} }
public void setScoreFormula(String scoreFormula) { public boolean getIsSingleExecution() {
this.scoreFormula = scoreFormula; return isSingleExecution;
} }
public byte getStatus() { public void setIsSingleExecution(boolean isSingleExecution) {
return this.status; this.isSingleExecution = isSingleExecution;
} }
public void setStatus(byte status) {
this.status = status;
}
public String getUserId() {
return this.userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public int getWeekBeginNum() {
return this.weekBeginNum;
}
public void setWeekBeginNum(int weekBeginNum) {
this.weekBeginNum = weekBeginNum;
}
public int getWeekDay() {
return this.weekDay;
}
public void setWeekDay(int weekDay) {
this.weekDay = weekDay;
}
public int getWeekEndNum() {
return this.weekEndNum;
}
public void setWeekEndNum(int weekEndNum) {
this.weekEndNum = weekEndNum;
}
public String getWhatDay() {
return this.whatDay;
}
public void setWhatDay(String whatDay) {
this.whatDay = whatDay;
}
public int getWhatWeek() {
return this.whatWeek;
}
public void setWhatWeek(int whatWeek) {
this.whatWeek = whatWeek;
}
public String getRemark1() {
return remark1;
}
public void setRemark1(String remark1) {
this.remark1 = remark1;
}
public String getRemark2() {
return remark2;
}
public void setRemark2(String remark2) {
this.remark2 = remark2;
}
public int getExecuteInterval() {
return executeInterval;
}
public void setExecuteInterval(int executeInterval) {
this.executeInterval = executeInterval;
}
public int getFirstFlag() {
return firstFlag;
}
public void setFirstFlag(int firstFlag) {
this.firstFlag = firstFlag;
}
public boolean getIsDelete() {
return isDelete;
}
public void setIsDelete(boolean isDelete) {
this.isDelete = isDelete;
}
public String getOriginalId() {
return originalId;
}
public void setOriginalId(String originalId) {
this.originalId = originalId;
}
public Long getPlanTaskId() {
return planTaskId;
}
public void setPlanTaskId(Long planTaskId) {
this.planTaskId = planTaskId;
}
public boolean getIsSingleExecution() {
return isSingleExecution;
}
public void setIsSingleExecution(boolean isSingleExecution) {
this.isSingleExecution = isSingleExecution;
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/pom.xml
View file @ 40aacfd6
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
<groupId>org.typroject</groupId> <groupId>org.typroject</groupId>
<artifactId>tyboot-core-auth</artifactId> <artifactId>tyboot-core-auth</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -36,12 +40,6 @@ ...@@ -36,12 +40,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- 添加fastjson 依赖包. -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.15</version>
</dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java
View file @ 40aacfd6
...@@ -519,9 +519,9 @@ public class CheckController extends AbstractBaseController { ...@@ -519,9 +519,9 @@ public class CheckController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "维保记录详情", notes = "维保记录详情") @ApiOperation(value = "维保记录详情", notes = "维保记录详情")
@GetMapping(value = "/detail/{id}") @GetMapping(value = "/{id}/detail")
public CommonResponse getCheckDetail( public CommonResponse getCheckDetail(
@ApiParam(value = "记录Id") @PathVariable(value = "id") String id) throws Exception { @ApiParam(value = "记录Id",required = true) @PathVariable(value = "id") String id) {
return CommonResponseUtil.success(checkService.getCheckDetail(id)); return CommonResponseUtil.success(checkService.getCheckDetail(id));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java
View file @ 40aacfd6
...@@ -75,6 +75,12 @@ public class PlanTaskPointInputItemBo { ...@@ -75,6 +75,12 @@ public class PlanTaskPointInputItemBo {
* 巡检任务详情id * 巡检任务详情id
*/ */
private long planTaskDetailId; private long planTaskDetailId;
/**
* 风险辨识与管控措施
*/
private String riskAndManage;
/** /**
* 巡检路线 * 巡检路线
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java
View file @ 40aacfd6
...@@ -156,8 +156,11 @@ public class CheckServiceImpl implements ICheckService { ...@@ -156,8 +156,11 @@ public class CheckServiceImpl implements ICheckService {
check.setPointName(point.getName()); check.setPointName(point.getName());
check.setPointId(point.getId()); check.setPointId(point.getId());
check.setPointNo(point.getPointNo()); check.setPointNo(point.getPointNo());
check.setRiskAndManage(point.getRemark());
check.setRemark(recordParam.getRemark()); check.setRemark(recordParam.getRemark());
check.setCheckTime(new Date()); check.setCheckTime(new Date());
check.setBeginTime(planTask.getBeginTime());
check.setEndTime(planTask.getEndTime());
check.setUploadTime(new Date()); check.setUploadTime(new Date());
check.setOrgCode(recordParam.getOrgCode()); check.setOrgCode(recordParam.getOrgCode());
check.setUserId(mtUserSeq); check.setUserId(mtUserSeq);
...@@ -268,8 +271,8 @@ public class CheckServiceImpl implements ICheckService { ...@@ -268,8 +271,8 @@ public class CheckServiceImpl implements ICheckService {
//7.返回不合格记录 //7.返回不合格记录
return new CheckDto(check.getId(), unqualifiedCheckItemList); return new CheckDto(check.getId(), unqualifiedCheckItemList);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(), e);
throw new Exception(e.getMessage(),e); throw new Exception(e.getMessage(), e);
} }
} }
...@@ -445,10 +448,10 @@ public class CheckServiceImpl implements ICheckService { ...@@ -445,10 +448,10 @@ public class CheckServiceImpl implements ICheckService {
@Override @Override
public List<CheckInputDto> getInputDetail(String checkId) { public List<CheckInputDto> getInputDetail(String checkId) {
List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId,fileUrl); List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId, fileUrl);
list.forEach(input->{ list.forEach(input -> {
CheckStatusEnum statusEnum = CheckStatusEnum.getEnum(input.getIsOk()); CheckStatusEnum statusEnum = CheckStatusEnum.getEnum(input.getIsOk());
if(statusEnum != null){ if (statusEnum != null) {
input.setIsOkDesc(statusEnum.getName()); input.setIsOkDesc(statusEnum.getName());
} }
}); });
...@@ -1110,15 +1113,19 @@ public class CheckServiceImpl implements ICheckService { ...@@ -1110,15 +1113,19 @@ public class CheckServiceImpl implements ICheckService {
} }
@Override @Override
public Map<String, Object> getCheckDetail(String id) { public Map<String, Object> getCheckDetail(String checkId) {
Map<String, Object> map = checkMapper.getCheckDetail(id); Map<String, Object> result = new HashMap<>();
if (map.containsKey("isOk")) { result.put("facility", this.buildCheckMainInfo(checkId));
map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName()); result.put("itemList", this.getInputDetail(checkId));
} return result;
if (map.containsKey("picture")) { }
map.put("picture", fileUrl + map.get("picture"));
private Map<String, Object> buildCheckMainInfo(String checkId) {
Map<String, Object> facility = checkMapper.getCheckDetail(checkId);
if (facility.containsKey("isOk")) {
facility.put("isOkDesc", CheckStatusEnum.getEnum(String.valueOf(facility.get("isOk"))).getName());
} }
return map; return facility;
} }
@Override @Override
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @ 40aacfd6
...@@ -8,10 +8,8 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskDetailMapper; ...@@ -8,10 +8,8 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskDetailMapper;
import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper; import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.maintenance.business.dao.repository.*; import com.yeejoin.amos.maintenance.business.dao.repository.*;
import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo; import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam; import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam; import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService; import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil; import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
import com.yeejoin.amos.maintenance.business.vo.CalDateVo; import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
...@@ -57,29 +55,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -57,29 +55,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired @Autowired
IPlanDao iplanDao; IPlanDao iplanDao;
@Autowired @Autowired
private ICheckDao checkDao;
@Autowired
private RemoteSecurityService remoteSecurityService; private RemoteSecurityService remoteSecurityService;
@Autowired @Autowired
private IPlanTaskDetailDao planTaskDetail; private IPlanTaskDetailDao planTaskDetail;
@Autowired @Autowired
IRoutePointDao iRoutePointDao; IRoutePointDao iRoutePointDao;
@Autowired @Autowired
IJobService jobService; IJobService jobService;
@Autowired
private ICheckService checkService;
@Autowired
private EquipFeignClient equipFeign;
@Autowired @Autowired
IPointDao iPointDao; IPointDao iPointDao;
@Autowired @Autowired
IPlanTaskDetailDao iPlanTaskDetailDao; IPlanTaskDetailDao iPlanTaskDetailDao;
@Autowired @Autowired
InputItemMapper inputItemMapper; InputItemMapper inputItemMapper;
...@@ -515,12 +501,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -515,12 +501,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
@Override @Override
public List<Map<String,Object>> getPlanTaskPoints(Map<String, Object> param) { public List<Map<String, Object>> getPlanTaskPoints(Map<String, Object> param) {
List<Map<String,Object>> result = planTaskMapper.getPlanTaskPoints(param); List<Map<String, Object>> result = planTaskMapper.getPlanTaskPoints(param);
result.forEach(r->{ result.forEach(r -> {
if(r.containsKey("isFinish")){ if (r.containsKey("isFinish")) {
String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("isFinish").toString())); String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("isFinish").toString()));
r.put("isFinishDesc",isFinishDesc); r.put("isFinishDesc", isFinishDesc);
} }
}); });
return result; return result;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java
View file @ 40aacfd6
...@@ -47,7 +47,7 @@ public class PersonIdentifyAspect { ...@@ -47,7 +47,7 @@ public class PersonIdentifyAspect {
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) { if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) {
throw new RuntimeException(responseModel.getDevMessage()); throw new RuntimeException(responseModel.getDevMessage());
} }
ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(),ReginParams.PersonIdentity.class); ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
reginParam.setPersonIdentity(personIdentity); reginParam.setPersonIdentity(personIdentity);
redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam)); redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java
View file @ 40aacfd6
...@@ -198,6 +198,9 @@ public class JobService implements IJobService { ...@@ -198,6 +198,9 @@ public class JobService implements IJobService {
check.setPointName(arg.getPointName()); check.setPointName(arg.getPointName());
check.setPointId(arg.getPointId()); check.setPointId(arg.getPointId());
check.setPointNo(arg.getPointNo()); check.setPointNo(arg.getPointNo());
check.setRiskAndManage(arg.getRiskAndManage());
check.setBeginTime(planTask.getBeginTime());
check.setEndTime(planTask.getEndTime());
check.setBuildingName(arg.getBuildingName()); check.setBuildingName(arg.getBuildingName());
check.setUploadTime(new Date()); check.setUploadTime(new Date());
check.setPlanId(arg.getPlanId()); check.setPlanId(arg.getPlanId());
......
amos-boot-system-maintenance/src/main/java/com/yeejoin/amos/MaintenanceApplication.java
View file @ 40aacfd6
...@@ -13,11 +13,13 @@ import org.springframework.cloud.openfeign.EnableFeignClients; ...@@ -13,11 +13,13 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.restful.config.JsonSerializerManage;
import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler; import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
import java.io.IOException; import java.io.IOException;
...@@ -42,8 +44,9 @@ import java.net.UnknownHostException; ...@@ -42,8 +44,9 @@ import java.net.UnknownHostException;
@EnableFeignClients @EnableFeignClients
@EnableAsync @EnableAsync
@EnableEurekaClient @EnableEurekaClient
@ComponentScan({"org.typroject", "com.yeejoin.amos"}) @ComponentScan(value = {"org.typroject", "com.yeejoin.amos"}, excludeFilters = {
@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper"}) @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {JsonSerializerManage.class})})
@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
public class MaintenanceApplication { public class MaintenanceApplication {
private static final Logger logger = LoggerFactory.getLogger(MaintenanceApplication.class); private static final Logger logger = LoggerFactory.getLogger(MaintenanceApplication.class);
...@@ -61,9 +64,9 @@ public class MaintenanceApplication { ...@@ -61,9 +64,9 @@ public class MaintenanceApplication {
* @throws IOException * @throws IOException
* @throws URISyntaxException * @throws URISyntaxException
*/ */
public static void main(String[] args) throws UnknownHostException{ public static void main(String[] args) throws UnknownHostException {
logger.info("start Service.........."); logger.info("start Service..........");
ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
GlobalExceptionHandler.setAlwaysOk(true); GlobalExceptionHandler.setAlwaysOk(true);
Environment env = context.getEnvironment(); Environment env = context.getEnvironment();
String ip = InetAddress.getLocalHost().getHostAddress(); String ip = InetAddress.getLocalHost().getHostAddress();
......
amos-boot-system-maintenance/src/main/resources/db/changelog/mt-1.0.0.xml
View file @ 40aacfd6
...@@ -190,4 +190,37 @@ ...@@ -190,4 +190,37 @@
ALTER TABLE p_plan_task add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称'; ALTER TABLE p_plan_task add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="suhuiguang" id="1630291249911-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_check" columnName="risk_and_manage"/>
</not>
</preConditions>
<comment>p_check add COLUMN risk_and_manage '风险辨识与管控措施'</comment>
<sql>
ALTER TABLE p_check add COLUMN `risk_and_manage` varchar(255) DEFAULT NULL COMMENT '风险辨识与管控措施' after `point_no`;
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1630291249911-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_check" columnName="begin_time"/>
</not>
</preConditions>
<comment>p_check add COLUMN begin_time '开始时间'</comment>
<sql>
ALTER TABLE p_check add COLUMN `begin_time` datetime DEFAULT NULL COMMENT '开始时间' after `plan_task_detail_id`;
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1630291249911-3">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_check" columnName="end_time"/>
</not>
</preConditions>
<comment>p_check add COLUMN end_time '结束时间'</comment>
<sql>
ALTER TABLE p_check add COLUMN `end_time` datetime DEFAULT NULL COMMENT '结束时间' after `begin_time`;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ 40aacfd6
...@@ -2023,42 +2023,22 @@ ...@@ -2023,42 +2023,22 @@
</select> </select>
<select id="getCheckDetail" resultType="Map"> <select id="getCheckDetail" resultType="Map">
SELECT SELECT
pc.id checkId, pc.id,
pci.is_ok isOk, pc.point_name as pointName,
date_format( pc.point_no as pointNo,
pc.check_time, pc.is_ok isOk,
'%Y-%m-%d %H:%i:%s' CONCAT_WS(',',pc.building_name,pc.address) address,
) maintenanceDate, pc.user_name as userName,
pp.id pointId, pc.plan_id as planId,
pp.equipment_id equipmentId, pc.plan_name as planName,
pp.remark remark, pc.plan_type as planType,
pp.owner_name ownerName, pc.owner_name as ownerName,
pp.equipment_name equipmentName, pc.begin_time as beginTime,
pp.belong_system_id systemId, pc.end_time as endTime,
pp.belong_system_name systemName, pc.check_time as checkTime,
CONCAT_WS(',',pp.building_name,pp.address) address, pc.risk_and_manage as riskAndManage,
CONCAT(date_format( pc.remark
ppl.plan_begin,
'%Y-%m-%d %H:%i:%s'
), '-', date_format(
ppl.plan_end,
'%Y-%m-%d %H:%i:%s'
)) planDate,
ppl.name planName,
ppl.plan_type planType,
ppt.user_name planUser,
pci.input_name itemName,
pii.maintenance_content itemContent,
pcs.photo_data picture,
pcs.point_name pointName,
pcs.shot_type shotType
FROM p_check pc FROM p_check pc
LEFT JOIN p_point pp ON pp.id = pc.point_id
LEFT JOIN p_plan ppl ON ppl.id = pc.plan_id
LEFT JOIN p_check_input pci ON pci.check_id = pc.id
LEFT JOIN p_input_item pii ON pii.id = pci.input_id
LEFT JOIN p_check_shot pcs ON pcs.check_id = pc.id
LEFT JOIN p_plan_task ppt ON ppt.id = pc.plan_task_id
WHERE WHERE
pc.id = #{id} pc.id = #{id}
</select> </select>
......
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ 40aacfd6
...@@ -392,6 +392,7 @@ ...@@ -392,6 +392,7 @@
temp1.pointNo, temp1.pointNo,
temp1.buildingName, temp1.buildingName,
temp1.equipmentName, temp1.equipmentName,
temp1.remark as riskAndManage,
pii.`name` inputName, pii.`name` inputName,
temp2.* temp2.*
FROM FROM
...@@ -412,7 +413,8 @@ ...@@ -412,7 +413,8 @@
p.owner_id as ownerId, p.owner_id as ownerId,
p.point_no as pointNo, p.point_no as pointNo,
p.building_name as buildingName, p.building_name as buildingName,
p.equipment_name as equipmentName p.equipment_name as equipmentName,
p.remark
FROM FROM
p_route_point_item prpi p_route_point_item prpi
LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
......
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