Browse Source

fix: 修复巡检记录新增接口

master_tdsql
hxh 1 year ago
parent
commit
0cfc32db90
  1. 2
      shuili-admin/src/main/resources/application-druid-sy.yml
  2. 2
      shuili-admin/src/main/resources/application-sy.yml
  3. 3
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
  4. 7
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

2
shuili-admin/src/main/resources/application-druid-sy.yml

@ -6,7 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://mysql:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://mysql:3306/sy-shuili?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
password: mysql123456 password: mysql123456
# 从库数据源 # 从库数据源

2
shuili-admin/src/main/resources/application-sy.yml

@ -56,7 +56,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: druid-dev active: druid-sy
session: session:
store-type: redis store-type: redis
redis: redis:

3
shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@ -102,6 +102,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
record.setPlanId(startPlan.getPlanId()); record.setPlanId(startPlan.getPlanId());
record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow());
record.setStatus(RecordStatus.CHECKING.getValue()); record.setStatus(RecordStatus.CHECKING.getValue());
getBaseMapper().insert(record);
String id = record.getId(); String id = record.getId();
if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) {
checkingDetailDto.getItems().forEach(o -> { checkingDetailDto.getItems().forEach(o -> {
@ -138,8 +139,8 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
} }
return itemDto; return itemDto;
})); }));
return dto;
} }
return dto;
} }
return null; return null;
} }

7
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysUserService; import com.kms.system.service.SysUserService;
import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.CheckingStatus;
import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.base.enums.RecordStatus;
import com.kms.yxgh.sz.domain.SzRecord;
import com.kms.yxgh.sz.domain.SzRecordItem;
import com.kms.yxgh.sz.dto.StartPlan; import com.kms.yxgh.sz.dto.StartPlan;
import com.kms.yxgh.sz.dto.SzCheckingDetailDto; import com.kms.yxgh.sz.dto.SzCheckingDetailDto;
import com.kms.yxgh.sz.dto.SzPlanDetailDto; import com.kms.yxgh.sz.dto.SzPlanDetailDto;
import com.kms.yxgh.sz.dto.SzRecordDetailDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto;
import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto;
import com.kms.yxgh.sz.domain.SzRecord;
import com.kms.yxgh.sz.domain.SzRecordItem;
import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.dto.SzRecordSearchDto;
import com.kms.yxgh.sz.mapper.SzRecordItemMapper; import com.kms.yxgh.sz.mapper.SzRecordItemMapper;
import com.kms.yxgh.sz.mapper.SzRecordMapper; import com.kms.yxgh.sz.mapper.SzRecordMapper;
@ -103,6 +103,7 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
record.setPlanId(startPlan.getPlanId()); record.setPlanId(startPlan.getPlanId());
record.setName(planDetailDto.getName() + DateUtils.dateTimeNow()); record.setName(planDetailDto.getName() + DateUtils.dateTimeNow());
record.setStatus(RecordStatus.CHECKING.getValue()); record.setStatus(RecordStatus.CHECKING.getValue());
getBaseMapper().insert(record);
String id = record.getId(); String id = record.getId();
if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) {
checkingDetailDto.getItems().forEach(o -> { checkingDetailDto.getItems().forEach(o -> {
@ -139,8 +140,8 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
} }
return itemDto; return itemDto;
})); }));
return dto;
} }
return dto;
} }
return null; return null;
} }

Loading…
Cancel
Save