|
@@ -19,6 +19,7 @@ import com.persagy.proxy.object.service.IAdmEquipmentService;
|
|
import com.persagy.proxy.object.service.IAdmFloorService;
|
|
import com.persagy.proxy.object.service.IAdmFloorService;
|
|
import com.persagy.proxy.object.service.IAdmISpaceService;
|
|
import com.persagy.proxy.object.service.IAdmISpaceService;
|
|
import com.persagy.proxy.object.service.IAdmSpaceService;
|
|
import com.persagy.proxy.object.service.IAdmSpaceService;
|
|
|
|
+import com.persagy.proxy.object.service.impl.AdmFloorServiceImpl;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -58,7 +59,7 @@ public class AdmFloorController {
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
public AdmResponse create(@RequestBody AdmCreateRequest<AdmFloor> createRequest) throws Exception {
|
|
public AdmResponse create(@RequestBody AdmCreateRequest<AdmFloor> createRequest) throws Exception {
|
|
List<AdmFloor> vos = createRequest.getContent();
|
|
List<AdmFloor> vos = createRequest.getContent();
|
|
- service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, false);
|
|
|
|
|
|
+ service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, AdmFloorServiceImpl.CREAT_UPDATE);
|
|
for(AdmFloor floor : vos){
|
|
for(AdmFloor floor : vos){
|
|
if(StrUtil.isEmpty(floor.getName())){
|
|
if(StrUtil.isEmpty(floor.getName())){
|
|
floor.setName(ObjectNameUtil.objectName("楼层-"));
|
|
floor.setName(ObjectNameUtil.objectName("楼层-"));
|
|
@@ -173,7 +174,7 @@ public class AdmFloorController {
|
|
@PostMapping("/update")
|
|
@PostMapping("/update")
|
|
public AdmResponse update(@RequestBody AdmCreateRequest<AdmFloor> admFloor) throws Exception {
|
|
public AdmResponse update(@RequestBody AdmCreateRequest<AdmFloor> admFloor) throws Exception {
|
|
List<AdmFloor> vos = CollUtil.newArrayList(admFloor.getContent());
|
|
List<AdmFloor> vos = CollUtil.newArrayList(admFloor.getContent());
|
|
- service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, false);
|
|
|
|
|
|
+ service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, AdmFloorServiceImpl.CREAT_UPDATE);
|
|
/** 遍历楼层列表 */
|
|
/** 遍历楼层列表 */
|
|
Map<String, AdmFloor> admFloorBdMap = CollUtil.fieldValueMap(vos, "buildingId");
|
|
Map<String, AdmFloor> admFloorBdMap = CollUtil.fieldValueMap(vos, "buildingId");
|
|
if (CollUtil.isNotEmpty(admFloorBdMap)){
|
|
if (CollUtil.isNotEmpty(admFloorBdMap)){
|
|
@@ -250,7 +251,7 @@ public class AdmFloorController {
|
|
request.setName(AdmFloor.OBJ_TYPE);
|
|
request.setName(AdmFloor.OBJ_TYPE);
|
|
AdmResponse rs = service.doQuery(AdmContextUtil.toDmpContext(), request, AdmFloor.class);
|
|
AdmResponse rs = service.doQuery(AdmContextUtil.toDmpContext(), request, AdmFloor.class);
|
|
List<AdmFloor> vos = (List<AdmFloor>) rs.getContent();
|
|
List<AdmFloor> vos = (List<AdmFloor>) rs.getContent();
|
|
- service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, true);
|
|
|
|
|
|
+ service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, AdmFloorServiceImpl.QUERY);
|
|
rs.setContent(vos);
|
|
rs.setContent(vos);
|
|
return rs;
|
|
return rs;
|
|
}
|
|
}
|