Skip to content

A
amos-boot-biz
Commit 06ce621a authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.app维保记录详情接口重新

parent 9583a210
Hide whitespace changes
Inline Side-by-side
Showing with 557 additions and 510 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 @ 06ce621a
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-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java
View file @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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/resources/db/changelog/mt-1.0.0.xml
View file @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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 @ 06ce621a
...@@ -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