Skip to content

Commit c6cb97d

Browse files
little3201little3201
committed
迁移region 到assets模块
1 parent 1cdb8cc commit c6cb97d

25 files changed

+130
-205
lines changed

‎assets/src/main/java/io/leafage/basic/assets/audit/AuditMetadata.java

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ public Long getId() {
125125
return this.id;
126126
}
127127

128+
/**
129+
* <p>Setter for the field <code>id</code>.</p>
130+
*
131+
* @param id a {@link java.lang.Long} object
132+
*/
133+
public void setId(Long id) {
134+
this.id = id;
135+
}
136+
128137
/** {@inheritDoc} */
129138
@Override
130139
public boolean isNew() {

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/bo/RegionBO.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/bo/RegionBO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.bo;
18+
package io.leafage.basic.assets.bo;
1919

2020
import jakarta.validation.constraints.NotBlank;
2121

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/controller/RegionController.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/controller/RegionController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.controller;
18+
package io.leafage.basic.assets.controller;
1919

20-
import io.leafage.basic.hypervisor.service.RegionService;
21-
import io.leafage.basic.hypervisor.vo.RegionVO;
20+
import io.leafage.basic.assets.service.RegionService;
21+
import io.leafage.basic.assets.vo.RegionVO;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424
import org.springframework.data.domain.Page;

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/domain/Region.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/domain/Region.java

+26-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.domain;
18+
package io.leafage.basic.assets.domain;
1919

20-
import io.leafage.basic.hypervisor.audit.AuditMetadata;
20+
import io.leafage.basic.assets.audit.AuditMetadata;
2121
import org.springframework.data.relational.core.mapping.Column;
2222
import org.springframework.data.relational.core.mapping.Table;
2323

@@ -50,6 +50,12 @@ public class Region extends AuditMetadata {
5050
@Column(value = "area_code")
5151
private String areaCode;
5252

53+
/**
54+
* 是否启用
55+
*/
56+
@Column(value = "is_enabled")
57+
private boolean enabled = true;
58+
5359
/**
5460
* 描述
5561
*/
@@ -127,6 +133,24 @@ public void setAreaCode(String areaCode) {
127133
this.areaCode = areaCode;
128134
}
129135

136+
/**
137+
* <p>isEnabled.</p>
138+
*
139+
* @return a boolean
140+
*/
141+
public boolean isEnabled() {
142+
return enabled;
143+
}
144+
145+
/**
146+
* <p>Setter for the field <code>enabled</code>.</p>
147+
*
148+
* @param enabled a boolean
149+
*/
150+
public void setEnabled(boolean enabled) {
151+
this.enabled = enabled;
152+
}
153+
130154
/**
131155
* <p>Getter for the field <code>description</code>.</p>
132156
*

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/dto/RegionDTO.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/dto/RegionDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.dto;
18+
package io.leafage.basic.assets.dto;
1919

20-
import io.leafage.basic.hypervisor.bo.RegionBO;
20+
import io.leafage.basic.assets.bo.RegionBO;
2121

2222
/**
2323
* dto class for region

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/repository/RegionRepository.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/repository/RegionRepository.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.repository;
18+
package io.leafage.basic.assets.repository;
1919

20-
import io.leafage.basic.hypervisor.domain.Region;
20+
import io.leafage.basic.assets.domain.Region;
2121
import org.springframework.data.domain.Pageable;
2222
import org.springframework.data.r2dbc.repository.R2dbcRepository;
2323
import org.springframework.stereotype.Repository;

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/service/RegionService.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/service/RegionService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.service;
18+
package io.leafage.basic.assets.service;
1919

20-
import io.leafage.basic.hypervisor.dto.RegionDTO;
21-
import io.leafage.basic.hypervisor.vo.RegionVO;
20+
import io.leafage.basic.assets.dto.RegionDTO;
21+
import io.leafage.basic.assets.vo.RegionVO;
2222
import org.springframework.data.domain.Page;
2323
import reactor.core.publisher.Flux;
2424
import reactor.core.publisher.Mono;

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/service/impl/RegionServiceImpl.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/service/impl/RegionServiceImpl.java

+13-25
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.service.impl;
18+
package io.leafage.basic.assets.service.impl;
1919

20-
import io.leafage.basic.hypervisor.domain.Region;
21-
import io.leafage.basic.hypervisor.dto.RegionDTO;
22-
import io.leafage.basic.hypervisor.repository.RegionRepository;
23-
import io.leafage.basic.hypervisor.service.RegionService;
24-
import io.leafage.basic.hypervisor.vo.RegionVO;
20+
import io.leafage.basic.assets.domain.Region;
21+
import io.leafage.basic.assets.dto.RegionDTO;
22+
import io.leafage.basic.assets.repository.RegionRepository;
23+
import io.leafage.basic.assets.service.RegionService;
24+
import io.leafage.basic.assets.vo.RegionVO;
2525
import org.springframework.beans.BeanUtils;
2626
import org.springframework.data.domain.Page;
2727
import org.springframework.data.domain.PageImpl;
@@ -47,7 +47,7 @@ public class RegionServiceImpl implements RegionService {
4747
/**
4848
* <p>Constructor for RegionServiceImpl.</p>
4949
*
50-
* @param regionRepository a {@link io.leafage.basic.hypervisor.repository.RegionRepository} object
50+
* @param regionRepository a {@link io.leafage.basic.assets.repository.RegionRepository} object
5151
*/
5252
public RegionServiceImpl(RegionRepository regionRepository) {
5353
this.regionRepository = regionRepository;
@@ -67,46 +67,36 @@ public Mono<Page<RegionVO>> retrieve(int page, int size) {
6767
new PageImpl<>(objects.getT1(), pageable, objects.getT2()));
6868
}
6969

70-
/**
71-
* {@inheritDoc}
72-
*/
70+
/** {@inheritDoc} */
7371
@Override
7472
public Mono<RegionVO> fetch(Long id) {
7573
Assert.notNull(id, "region id must not be null.");
7674
return regionRepository.findById(id).flatMap(this::convertOuter);
7775
}
7876

79-
/**
80-
* {@inheritDoc}
81-
*/
77+
/** {@inheritDoc} */
8278
@Override
8379
public Mono<Boolean> exist(String name) {
8480
Assert.hasText(name, "region name must not be blank.");
8581
return regionRepository.existsByName(name);
8682
}
8783

88-
/**
89-
* {@inheritDoc}
90-
*/
84+
/** {@inheritDoc} */
9185
@Override
9286
public Flux<RegionVO> subordinates(Long superiorId) {
9387
Assert.notNull(superiorId, "region superior id must not be null.");
9488
return regionRepository.findBySuperiorId(superiorId).flatMap(this::convertOuter);
9589
}
9690

97-
/**
98-
* {@inheritDoc}
99-
*/
91+
/** {@inheritDoc} */
10092
@Override
10193
public Mono<RegionVO> create(RegionDTO regionDTO) {
10294
Region region = new Region();
10395
BeanUtils.copyProperties(regionDTO, region);
10496
return regionRepository.save(region).flatMap(this::convertOuter);
10597
}
10698

107-
/**
108-
* {@inheritDoc}
109-
*/
99+
/** {@inheritDoc} */
110100
@Override
111101
public Mono<RegionVO> modify(Long id, RegionDTO regionDTO) {
112102
Assert.notNull(id, "region id must not be null.");
@@ -115,9 +105,7 @@ public Mono<RegionVO> modify(Long id, RegionDTO regionDTO) {
115105
.flatMap(regionRepository::save).flatMap(this::convertOuter);
116106
}
117107

118-
/**
119-
* {@inheritDoc}
120-
*/
108+
/** {@inheritDoc} */
121109
@Override
122110
public Mono<Void> remove(Long id) {
123111
Assert.notNull(id, "region id must not be null.");

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/vo/RegionVO.java renamed to ‎assets/src/main/java/io/leafage/basic/assets/vo/RegionVO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.vo;
18+
package io.leafage.basic.assets.vo;
1919

20-
import io.leafage.basic.hypervisor.bo.RegionBO;
20+
import io.leafage.basic.assets.bo.RegionBO;
2121

2222
import java.time.Instant;
2323

‎hypervisor/src/test/java/io/leafage/basic/hypervisor/controller/RegionControllerTest.java renamed to ‎assets/src/test/java/io/leafage/basic/assets/controller/RegionControllerTest.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.controller;
18+
package io.leafage.basic.assets.controller;
1919

20-
import io.leafage.basic.hypervisor.service.RegionService;
21-
import io.leafage.basic.hypervisor.vo.RegionVO;
22-
import io.leafage.basic.hypervisor.vo.RoleVO;
20+
import io.leafage.basic.assets.service.RegionService;
21+
import io.leafage.basic.assets.vo.RegionVO;
2322
import org.junit.jupiter.api.BeforeEach;
2423
import org.junit.jupiter.api.Test;
2524
import org.junit.jupiter.api.extension.ExtendWith;
@@ -79,7 +78,7 @@ void retrieve() {
7978

8079
webTestClient.get().uri(uriBuilder -> uriBuilder.path("/regions").queryParam("page", 0)
8180
.queryParam("size", 2).build()).exchange()
82-
.expectStatus().isOk().expectBodyList(RoleVO.class);
81+
.expectStatus().isOk().expectBodyList(RegionVO.class);
8382
}
8483

8584
@Test

‎hypervisor/src/test/java/io/leafage/basic/hypervisor/service/impl/RegionServiceImplTest.java renamed to ‎assets/src/test/java/io/leafage/basic/assets/service/impl/RegionServiceImplTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*
1616
*/
1717

18-
package io.leafage.basic.hypervisor.service.impl;
18+
package io.leafage.basic.assets.service.impl;
1919

20-
import io.leafage.basic.hypervisor.domain.Region;
21-
import io.leafage.basic.hypervisor.dto.RegionDTO;
22-
import io.leafage.basic.hypervisor.repository.RegionRepository;
20+
import io.leafage.basic.assets.domain.Region;
21+
import io.leafage.basic.assets.dto.RegionDTO;
22+
import io.leafage.basic.assets.repository.RegionRepository;
2323
import org.junit.jupiter.api.BeforeEach;
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.api.extension.ExtendWith;

‎hypervisor/src/main/java/io/leafage/basic/hypervisor/audit/AuditMetadata.java

+16-27
Original file line numberDiff line numberDiff line change
@@ -103,76 +103,65 @@ public Optional<String> getCreatedBy() {
103103
return Optional.ofNullable(this.createdBy);
104104
}
105105

106-
/**
107-
* {@inheritDoc}
108-
*/
106+
/** {@inheritDoc} */
109107
@Override
110108
public void setCreatedBy(String createdBy) {
111109
this.createdBy = createdBy;
112110
}
113111

114112

115-
/**
116-
* {@inheritDoc}
117-
*/
113+
/** {@inheritDoc} */
118114
@Override
119115
public Optional<Instant> getCreatedDate() {
120116
return Optional.ofNullable(this.createdDate);
121117
}
122118

123-
/**
124-
* {@inheritDoc}
125-
*/
119+
/** {@inheritDoc} */
126120
@Override
127121
public void setCreatedDate(Instant creationDate) {
128122
this.createdDate = creationDate;
129123
}
130124

131-
132-
/**
133-
* {@inheritDoc}
134-
*/
125+
/** {@inheritDoc} */
135126
@Override
136127
public Optional<String> getLastModifiedBy() {
137128
return Optional.ofNullable(this.lastModifiedBy);
138129
}
139130

140-
/**
141-
* {@inheritDoc}
142-
*/
131+
/** {@inheritDoc} */
143132
@Override
144133
public void setLastModifiedBy(String lastModifiedBy) {
145134
this.lastModifiedBy = lastModifiedBy;
146135
}
147136

148-
149-
/**
150-
* {@inheritDoc}
151-
*/
137+
/** {@inheritDoc} */
152138
@Override
153139
public Optional<Instant> getLastModifiedDate() {
154140
return Optional.ofNullable(this.lastModifiedDate);
155141
}
156142

157-
/**
158-
* {@inheritDoc}
159-
*/
143+
/** {@inheritDoc} */
160144
@Override
161145
public void setLastModifiedDate(Instant lastModifiedDate) {
162146
this.lastModifiedDate = lastModifiedDate;
163147
}
164148

165-
/**
166-
* {@inheritDoc}
167-
*/
149+
/** {@inheritDoc} */
168150
@Override
169151
public Long getId() {
170152
return this.id;
171153
}
172154

173155
/**
174-
* {@inheritDoc}
156+
* <p>Setter for the field <code>id</code>.</p>
157+
*
158+
* @param id a {@link java.lang.Long} object
175159
*/
160+
public void setId(Long id) {
161+
this.id = id;
162+
}
163+
164+
/** {@inheritDoc} */
176165
@Override
177166
public boolean isNew() {
178167
return Objects.isNull(getId());

0 commit comments

Comments
 (0)