Skip to content

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

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

parent 9583a210
Show whitespace changes
Inline Side-by-side
Showing with 153 additions and 107 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;
import javax.persistence.*;
import java.util.Date;
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.
*
*/
@Entity
@Table(name="p_check")
@NamedQuery(name="Check.findAll", query="SELECT c FROM Check c")
@Table(name = "p_check")
@NamedQuery(name = "Check.findAll", query = "SELECT c FROM Check c")
public class Check extends BasicEntity {
......@@ -28,30 +19,29 @@ public class Check extends BasicEntity {
/**
* 参考地址
*/
@Column(name="address")
@Column(name = "address")
private String address;
/**
* 巡检方式
*/
@Column(name="check_mode")
private String checkMode="";
@Column(name = "check_mode")
private String checkMode = "";
/**
* 检查时间
*/
@Temporal(TemporalType.TIMESTAMP)
@Column(name="check_time")
@Column(name = "check_time")
private Date checkTime;
/**
* 设备编号
*/
@Column(name="device_id")
@Column(name = "device_id")
private String deviceId;
/**
* 不合格项目
*/
......@@ -60,7 +50,7 @@ public class Check extends BasicEntity {
/**
* 是否合格
*/
@Column(name="is_ok")
@Column(name = "is_ok")
private String isOk;
/**
......@@ -76,43 +66,82 @@ public class Check extends BasicEntity {
/**
* 权限系统org code
*/
@Column(name="org_code")
@Column(name = "org_code")
private String orgCode;
/**
* 计划编号
*/
@Column(name="plan_id")
@Column(name = "plan_id")
private Long planId;
/**
* 线路名称
*/
@Column(name="plan_name")
@Column(name = "plan_name")
private String planName;
/**
* 计划执行编号
*/
@Column(name="plan_task_id")
@Column(name = "plan_task_id")
private Long planTaskId;
/**
* 执行计划详情id
*/
@Column(name="plan_task_detail_id")
@Column(name = "plan_task_detail_id")
private Long planTaskDetailId;
/**
* 风险辨识与管控措施
*/
private String riskAndManage;
/**
* 计划开始日期
*/
private String beginTime;
/**
* 计划结束日期
*/
private String endTime;
/**
* 巡检点id
*/
@Column(name="point_id")
@Column(name = "point_id")
private Long pointId;
public String getRiskAndManage() {
return riskAndManage;
}
public void setRiskAndManage(String riskAndManage) {
this.riskAndManage = riskAndManage;
}
public String getBeginTime() {
return beginTime;
}
public void setBeginTime(String beginTime) {
this.beginTime = beginTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
/**
* 点名称
*/
@Column(name="point_name")
@Column(name = "point_name")
private String pointName;
/**
......@@ -136,13 +165,13 @@ public class Check extends BasicEntity {
/**
* 路线编号
*/
@Column(name="route_id")
@Column(name = "route_id")
private Long routeId;
/**
* 路线名称
*/
@Column(name="route_name")
@Column(name = "route_name")
private String routeName;
/**
......@@ -153,40 +182,40 @@ public class Check extends BasicEntity {
/**
* 拍照数量
*/
@Column(name="shot_number")
@Column(name = "shot_number")
private int shotNumber;
/**
* 记录上传时间
*/
@Temporal(TemporalType.TIMESTAMP)
@Column(name="upload_time")
@Column(name = "upload_time")
private Date uploadTime;
/**
* 巡检人ids
*/
@Column(name="user_id")
@Column(name = "user_id")
private String userId;
/**
* 执行人名称
*/
@Column(name="user_name")
@Column(name = "user_name")
private String userName;
/**
* 执行部门ids
*/
@Column(name="dep_id")
@Column(name = "dep_id")
private String depId;
/**
* 执行部门名称
*/
@Column(name="dep_name")
@Column(name = "dep_name")
private String depName;
@Column(name="error_classify")
@Column(name = "error_classify")
private String errorClassify;
/**
......@@ -260,7 +289,6 @@ public class Check extends BasicEntity {
}
public String getOwnerId() {
return ownerId;
}
......@@ -459,7 +487,7 @@ public class Check extends BasicEntity {
this.errorClassify = errorClassify;
}
@OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE,CascadeType.MERGE,CascadeType.PERSIST })
@OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
public List<CheckShot> getCheckShot() {
return checkShot;
}
......
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 {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "维保记录详情", notes = "维保记录详情")
@GetMapping(value = "/detail/{id}")
@GetMapping(value = "/{id}/detail")
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));
}
......
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
......@@ -76,6 +76,12 @@ public class PlanTaskPointInputItemBo {
*/
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 {
check.setPointName(point.getName());
check.setPointId(point.getId());
check.setPointNo(point.getPointNo());
check.setRiskAndManage(point.getRemark());
check.setRemark(recordParam.getRemark());
check.setCheckTime(new Date());
check.setBeginTime(planTask.getBeginTime());
check.setEndTime(planTask.getEndTime());
check.setUploadTime(new Date());
check.setOrgCode(recordParam.getOrgCode());
check.setUserId(mtUserSeq);
......@@ -268,8 +271,8 @@ public class CheckServiceImpl implements ICheckService {
//7.返回不合格记录
return new CheckDto(check.getId(), unqualifiedCheckItemList);
} catch (Exception e) {
log.error(e.getMessage(),e);
throw new Exception(e.getMessage(),e);
log.error(e.getMessage(), e);
throw new Exception(e.getMessage(), e);
}
}
......@@ -445,10 +448,10 @@ public class CheckServiceImpl implements ICheckService {
@Override
public List<CheckInputDto> getInputDetail(String checkId) {
List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId,fileUrl);
list.forEach(input->{
List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId, fileUrl);
list.forEach(input -> {
CheckStatusEnum statusEnum = CheckStatusEnum.getEnum(input.getIsOk());
if(statusEnum != null){
if (statusEnum != null) {
input.setIsOkDesc(statusEnum.getName());
}
});
......@@ -1110,15 +1113,19 @@ public class CheckServiceImpl implements ICheckService {
}
@Override
public Map<String, Object> getCheckDetail(String id) {
Map<String, Object> map = checkMapper.getCheckDetail(id);
if (map.containsKey("isOk")) {
map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
public Map<String, Object> getCheckDetail(String checkId) {
Map<String, Object> result = new HashMap<>();
result.put("facility", this.buildCheckMainInfo(checkId));
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
......
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;
import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.maintenance.business.dao.repository.*;
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.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.util.PlanTaskUtil;
import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
......@@ -57,29 +55,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired
IPlanDao iplanDao;
@Autowired
private ICheckDao checkDao;
@Autowired
private RemoteSecurityService remoteSecurityService;
@Autowired
private IPlanTaskDetailDao planTaskDetail;
@Autowired
IRoutePointDao iRoutePointDao;
@Autowired
IJobService jobService;
@Autowired
private ICheckService checkService;
@Autowired
private EquipFeignClient equipFeign;
@Autowired
IPointDao iPointDao;
@Autowired
IPlanTaskDetailDao iPlanTaskDetailDao;
@Autowired
InputItemMapper inputItemMapper;
......@@ -515,12 +501,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
}
@Override
public List<Map<String,Object>> getPlanTaskPoints(Map<String, Object> param) {
List<Map<String,Object>> result = planTaskMapper.getPlanTaskPoints(param);
result.forEach(r->{
if(r.containsKey("isFinish")){
public List<Map<String, Object>> getPlanTaskPoints(Map<String, Object> param) {
List<Map<String, Object>> result = planTaskMapper.getPlanTaskPoints(param);
result.forEach(r -> {
if (r.containsKey("isFinish")) {
String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("isFinish").toString()));
r.put("isFinishDesc",isFinishDesc);
r.put("isFinishDesc", isFinishDesc);
}
});
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 {
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) {
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);
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 {
check.setPointName(arg.getPointName());
check.setPointId(arg.getPointId());
check.setPointNo(arg.getPointNo());
check.setRiskAndManage(arg.getRiskAndManage());
check.setBeginTime(planTask.getBeginTime());
check.setEndTime(planTask.getEndTime());
check.setBuildingName(arg.getBuildingName());
check.setUploadTime(new Date());
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 @@
ALTER TABLE p_plan_task add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
</sql>
</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>
\ 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 @@
</select>
<select id="getCheckDetail" resultType="Map">
SELECT
pc.id checkId,
pci.is_ok isOk,
date_format(
pc.check_time,
'%Y-%m-%d %H:%i:%s'
) maintenanceDate,
pp.id pointId,
pp.equipment_id equipmentId,
pp.remark remark,
pp.owner_name ownerName,
pp.equipment_name equipmentName,
pp.belong_system_id systemId,
pp.belong_system_name systemName,
CONCAT_WS(',',pp.building_name,pp.address) address,
CONCAT(date_format(
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
pc.id,
pc.point_name as pointName,
pc.point_no as pointNo,
pc.is_ok isOk,
CONCAT_WS(',',pc.building_name,pc.address) address,
pc.user_name as userName,
pc.plan_id as planId,
pc.plan_name as planName,
pc.plan_type as planType,
pc.owner_name as ownerName,
pc.begin_time as beginTime,
pc.end_time as endTime,
pc.check_time as checkTime,
pc.risk_and_manage as riskAndManage,
pc.remark
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
pc.id = #{id}
</select>
......
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ 06ce621a
......@@ -392,6 +392,7 @@
temp1.pointNo,
temp1.buildingName,
temp1.equipmentName,
temp1.remark as riskAndManage,
pii.`name` inputName,
temp2.*
FROM
......@@ -412,7 +413,8 @@
p.owner_id as ownerId,
p.point_no as pointNo,
p.building_name as buildingName,
p.equipment_name as equipmentName
p.equipment_name as equipmentName,
p.remark
FROM
p_route_point_item prpi
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