Browse Source

#离线修改

zhongwei
yang_shj 1 year ago
parent
commit
4dd3a1433e
  1. 4
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java
  2. 17
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java
  3. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java
  4. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java
  5. 6
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml
  6. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java
  7. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml
  8. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java
  9. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java
  10. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java
  11. 1
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java
  12. 11
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java
  13. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java
  14. 3
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java
  15. 3
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java
  16. 49
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java
  17. 138
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java
  18. 51
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java
  19. 34
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java
  20. 61
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java

4
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java

@ -63,11 +63,11 @@ public class RouteController extends BladeController {
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询巡检路径管理列表")
public R<BladePage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route, Query query) {
public R<IPage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route, Query query) {
QueryWrapper<RouteEntity> queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class);
queryWrapper.orderByDesc("create_time", "update_time");
IPage<RouteEntity> pages = st_re_routeService.page(Condition.getPage(query), queryWrapper);
return R.data(BladePage.of(pages));
return R.data(pages);
}
/**

17
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java

@ -17,7 +17,6 @@ import com.hnac.hzinfo.inspect.task.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -25,11 +24,11 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.feign.IFlowClient;
import org.springblade.system.feign.IDictClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -53,17 +52,11 @@ public class EventController{
/**
* 获取巡检情况列表信息
*/
@GetMapping(value = "/list")
@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
@ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId")
public R<BladePage<EventListVO>> eventList(@RequestParam Long taskId, @SpringQueryMap Query query,
@SpringQueryMap BladeUser bladeUser) {
if (bladeUser == null) {
bladeUser = new BladeUser();
bladeUser.setTenantId("200000");
}
public R<IPage<EventListVO>> list(Long taskId, Query query, BladeUser bladeUser) {
LambdaQueryWrapper<EventEntity> queryWrapper = Wrappers.<EventEntity>lambdaQuery().eq(EventEntity::getTaskId,taskId).orderByDesc(EventEntity::getCreateTime);
IPage<EventEntity> pages = eventService.page(Condition.getPage(query),
(!BladeConstant.ADMIN_TENANT_ID.equals(bladeUser.getTenantId())) ?
IPage<EventEntity> pages = eventService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ?
queryWrapper.eq(EventEntity::getTenantId, bladeUser.getTenantId()).orderByDesc(EventEntity::getCreateTime) : queryWrapper);
IPage<EventListVO> resultPages = new Page<>(pages.getCurrent(), pages.getSize(),pages.getTotal());
@ -92,7 +85,7 @@ public class EventController{
result.add(EventListVO.builder().id(entity.getId()).objectName(objectName).projectName(projectName).isProblem(entity.getIsProblem()).checkInTime(entity.getCreateTime()).build());
});
resultPages.setRecords(result);
return R.data(BladePage.of(resultPages));
return R.data(resultPages);
}
/**

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java

@ -24,7 +24,7 @@ import com.hnac.hzinfo.inspect.task.service.IEventService;
import com.hnac.hzinfo.inspect.task.service.ITaskService;
import com.hnac.hzinfo.inspect.task.service.ITaskUserService;
import com.hnac.hzinfo.inspect.task.vo.TaskListQuery;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.vo.TaskVo;
import com.hnac.hzinfo.inspect.utils.Condition;
import io.swagger.annotations.*;

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java

@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.task.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

6
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml

@ -3,7 +3,7 @@
<mapper namespace="com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper">
<resultMap id="TaskObjectMap" type="com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO">
<resultMap id="TaskObjectMap" type="com.hnac.hzinfo.inspect.task.vo.TaskObjectVO">
<result column="TASK_ID" property="taskId"/>
<result column="OBJECT_ID" property="objId"/>
<result column="NAME" property="objName"/>
@ -13,14 +13,14 @@
</resultMap>
<resultMap id="TaskObjectProjectMap" type="com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectVO">
<resultMap id="TaskObjectProjectMap" type="com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectVO">
<result column="PROJECT_ID" property="projectId"/>
<result column="PROJECT_NAME" property="projectName"/>
<result column="PRJ_STATUS" property="status"/>
<collection property="contents" resultMap="TaskObjectProjectContentMap" />
</resultMap>
<resultMap id="TaskObjectProjectContentMap" type="com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO">
<resultMap id="TaskObjectProjectContentMap" type="com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO">
<result column="CONTENT_ID" property="contentId"/>
<result column="CONTENT_NAME" property="name"/>
<result column="AVAILABLE" property="available"/>

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java

@ -2,7 +2,7 @@ package com.hnac.hzinfo.inspect.task.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml

@ -15,7 +15,7 @@
</select>
<select id="getObjectProjectData" resultType="com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO">
<select id="getObjectProjectData" resultType="com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO">
SELECT * from hz_st_ex_object_project
where IS_DELETED = 0
AND task_id IN

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java

@ -1,6 +1,6 @@
package com.hnac.hzinfo.inspect.task.service;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO;
import org.springblade.core.mp.base.BaseService;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java

@ -1,6 +1,6 @@
package com.hnac.hzinfo.inspect.task.service;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO;
import org.springblade.core.mp.base.BaseService;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java

@ -1,7 +1,7 @@
package com.hnac.hzinfo.inspect.task.service;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
import org.springblade.core.mp.base.BaseService;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;

1
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hnac.hzims.vo.SafeCheckStatisticVO;
import com.hnac.hzims.vo.VoteChartVo;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.dto.TaskDTO;
import com.hnac.hzinfo.inspect.task.entity.InspectionTaskSMS;
import com.hnac.hzinfo.inspect.task.entity.TaskEntity;

11
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java

@ -1,13 +1,16 @@
package com.hnac.hzinfo.inspect.task.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.hnac.hzims.operational.station.entity.StationEntity;
import com.hnac.hzims.operational.station.feign.IStationClient;
import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient;
import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData;
import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO;
import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
import com.hnac.hzinfo.inspect.obj.services.ContentService;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO;
import com.hnac.hzinfo.sdk.v5.redis.RedisClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -18,9 +21,15 @@ import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.List;
import java.util.Optional;
/**
* 服务实现类

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java

@ -1,6 +1,6 @@
package com.hnac.hzinfo.inspect.task.service.impl;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO;
import org.springblade.core.mp.base.BaseServiceImpl;
import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper;

3
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java

@ -7,7 +7,8 @@ import com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper;
import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService;
import com.hnac.hzinfo.inspect.task.service.ITaskObjectService;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO;
import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.CollectionUtil;

3
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java

@ -16,9 +16,6 @@ import com.hnac.hzims.safeproduct.feign.IImsMonCameraInfoClient;
import com.hnac.hzims.vo.SafeCheckStatisticVO;
import com.hnac.hzims.vo.VoteChartVo;
import com.hnac.hzinfo.inspect.ai.service.IRobotService;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectVO;
import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
import com.hnac.hzinfo.inspect.obj.ObjContants;
import com.hnac.hzinfo.inspect.obj.services.IObjectDangerService;
import com.hnac.hzinfo.inspect.plan.PlanContants;

49
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java

@ -0,0 +1,49 @@
package com.hnac.hzinfo.inspect.task.vo;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@ApiModel(value = "巡检情况列表")
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EventListVO implements Serializable {
private static final long serialVersionUID = 3596553809412766823L;
@ApiModelProperty(value = "eventId")
private Long id;
@ApiModelProperty(value = "巡检对象名称")
private String objectName;
@ApiModelProperty(value = "巡检项目名称")
private String projectName;
/**
* 是否问题 0: 1 默认0
*/
@ApiModelProperty(value = "是否问题 0:否 1 是 默认0")
private String isProblem;
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty(value = "登记时间")
private Date checkInTime;
}

138
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java

@ -0,0 +1,138 @@
package com.hnac.hzinfo.inspect.task.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 任务对象项目内容
* @author ninglong
* @create 2020-08-24 8:55
*/
@Setter
@Getter
@ApiModel(value = "任务对象项目内容")
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class TaskObjectProjectContentVO implements Serializable {
/**
* 内容ID
*/
@ApiModelProperty(value = "内容ID")
private Long contentId;
/**
* 内容名称
*/
@ApiModelProperty(value = "内容名称")
private String name;
/**
* 检测标准
*/
@ApiModelProperty(value = "检测标准")
private String description;
/**
* 完成标识
*/
@ApiModelProperty(value = "完成标识 0 不可用 1 可用")
private String available;
/**
* 检测类型
*/
@ApiModelProperty(value = "检测类型")
private String checkType;
/**
* 记录类型
*/
@ApiModelProperty(value = "记录类型")
private String recordType;
/**
* 内容当前状态 0 异常 1 正常
*/
@ApiModelProperty(value = "内容当前状态 0 异常 1 正常 ")
private String currentStatus;
/**
* 内容当前值
*/
@ApiModelProperty(value = "内容当前值")
private String currentValue;
/**
* 文件地址
*/
@ApiModelProperty(value = "文件地址")
private String fileUrl;
/**
* 表针识别表盘ID
*/
@JsonSerialize(nullsUsing = NullSerializer.class)
@ApiModelProperty(value = "表针识别,表盘ID")
private Long clockId;
/**
* 视频巡检摄像机ID
*/
@JsonSerialize(nullsUsing = NullSerializer.class)
@ApiModelProperty(value = "视频巡检摄像机ID")
private Long cameraId;
/**
* 检测类型子类
*/
@ApiModelProperty(value = "检测类型子类")
private String checkTypeSon;
/**
* 开关//表盘在摄像机可视面二维坐标位置例如2,1 表示第三行第二列行列均从0开始记录,默认 0,0如果有多张图则0,0,1( 最后一位表示所在图片最后一位1表示第二张图)默认0,0,0
*/
@ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置,例如:2,1 表示第三行第二列,行列均从0开始记录,默认 0,0,如果有多张图则:0,0,1( 最后一位表示所在图片,最后一位1表示第二张图),默认0,0,0")
private String cameraAddr;
/**
* 其他参数例如多联断路器内断路器的个数
*/
@ApiModelProperty(value = "其他参数,例如多联断路器内断路器的个数")
private String otherParam;
/**
* 校验值用来判断当前值是否正确枚举数据通过 , 隔开, 区间通过~隔开
*/
@ApiModelProperty(value = "校验值,用来判断当前值是否正确:枚举数据通过 “ , ”隔开, 区间通过~隔开")
private String checkVal;
/**
* 记值方式为选择时选择值
*/
@ApiModelProperty(value = "记值方式为选择时选择值")
private String dictType;
@ApiModelProperty(value = "实时数据")
private String realData;
@ApiModelProperty(value = "实时数据采集时间")
private String gatherTime;
@ApiModelProperty(value = "绑定物模型属性标识")
private String attrSignage;
@ApiModelProperty(value = "绑定物模型属性名称")
private String attrName;
@ApiModelProperty(value = "设备编号")
private String emCode;
}

51
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java

@ -0,0 +1,51 @@
package com.hnac.hzinfo.inspect.task.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.core.tenant.mp.TenantEntity;
/**
* 实体类
*
* @author Chill
*/
@Data
public class TaskObjectProjectOfflineVO extends TenantEntity {
private static final long serialVersionUID = 1L;
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private Long taskId;
/**
* 对象ID
*/
@ApiModelProperty(value = "对象ID")
private Long objectId;
/**
* 项目ID
*/
@ApiModelProperty(value = "项目ID")
private Long projectId;
/**
* 目标编码
*/
@ApiModelProperty(value = "目标编码")
private String code;
/**
* 目标名称
*/
@ApiModelProperty(value = "目标名称")
private String name;
/**
* 目标描述
*/
@ApiModelProperty(value = "目标描述")
private String description;
}

34
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java

@ -0,0 +1,34 @@
package com.hnac.hzinfo.inspect.task.vo;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serializable;
import java.util.List;
/**
* 任务对象项目
* @author ninglong
* @create 2020-08-24 8:52
*/
@Getter
@Setter
@ApiModel(value = "任务对象项目")
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class TaskObjectProjectVO implements Serializable {
@ApiModelProperty(value = "任务对象项目ID")
private Long projectId;
@ApiModelProperty(value = "任务对象项目名称")
private String projectName;
@ApiModelProperty(value = "项目状态")
private Integer status;
@Builder.Default
@ApiModelProperty(value = "任务对象项目内容")
private List<TaskObjectProjectContentVO> contents = Lists.newArrayList();
}

61
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java

@ -0,0 +1,61 @@
package com.hnac.hzinfo.inspect.task.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.google.common.collect.Lists;
import com.hnac.hzims.safeproduct.entity.DangerSourceEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import org.springblade.core.tool.utils.ObjectUtil;
import java.io.Serializable;
import java.util.List;
/**
* 任务对象
* @author ninglong
* @create 2020-08-24 8:51
*/
@Setter
@Getter
@ApiModel(value = "任务对象")
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class TaskObjectVO implements Serializable {
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private Long taskId;
@ApiModelProperty(value = "任务对象ID")
private Long objId;
@ApiModelProperty(value = "任务对象名称")
private String objName;
@ApiModelProperty(value = "对象状态")
private Integer status;
/**
* 是否重复记录 0 不允许 1允许
*/
@ApiModelProperty(value = "是否重复记录 0 不允许 1允许")
private String duplicateRecord;
@ApiModelProperty(value = "排序")
private Integer order;
@ApiModelProperty(value = "巡检对象危险点信息")
private List<DangerSourceEntity> dangers;
@Builder.Default
@ApiModelProperty(value = "任务对象项目")
private List<TaskObjectProjectVO> projects = Lists.newArrayList();
public Integer getOrder() {
if(ObjectUtil.isEmpty(this.order)){
return 1;
}
return order;
}
}
Loading…
Cancel
Save