diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java index 775271c..17a3b1e 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java @@ -167,10 +167,7 @@ public class PlanVO extends BaseEntity implements Serializable { @ApiModelProperty(value = "开始任务时AI检测项,来自数据字段表: beginCheckType, 多个检测项直接通过 ^ 隔开") private String aiCheckItems; - /** - * 是否视频自动巡检 - */ - @ApiModelProperty(value = "是否视频自动巡检") + @ApiModelProperty(value = "巡检类型(0-日常巡检 6-维护检查)") private String autoVideo; /** hzims add end **/ diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/plan/service/impl/PlanServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/plan/service/impl/PlanServiceImpl.java index 721c39c..8e6647e 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/plan/service/impl/PlanServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/plan/service/impl/PlanServiceImpl.java @@ -14,6 +14,7 @@ import org.springblade.core.secure.utils.AuthUtil; 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.hzinfo_inspect.obj.entity.ObjectEntity; import org.springblade.hzinfo_inspect.obj.entity.TemplateEntity; import org.springblade.hzinfo_inspect.obj.services.ObjectService; @@ -41,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -101,15 +103,16 @@ public class PlanServiceImpl extends BaseServiceImpl imp return remove(Wrappers.lambdaQuery().eq(PlanEntity::getId, id)); } - /** - * 保存巡检计划 - */ @Transactional(rollbackFor = Exception.class) @Override public Boolean submit(PlanVO plan) { checkInputParam(plan); boolean modify = plan.getId() != null; PlanEntity entity = BeanUtil.copy(plan, PlanEntity.class); + if (StringUtil.isBlank(plan.getName())) { + String nameSuffix = "0".equals(plan.getAutoVideo()) ? "日常检查" : "维护养护"; + entity.setName(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")) + nameSuffix); + } //不管是新增还是修改成功后都为待提交状态 entity.setStatus(Integer.valueOf(PlanContants.PlanStatusEnum.PLAN_SUBMIT.getStatus())); boolean success = this.saveOrUpdate(entity);