|
@@ -1,13 +1,15 @@
|
|
-package com.dragoninfo.dcuc.authweb.restcontroller.attr.controller;
|
|
|
|
|
|
+package com.dragoninfo.dcuc.authweb.restcontroller.sub;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
|
+import com.alibaba.fastjson.TypeReference;
|
|
import com.dragoninfo.dcuc.app.entity.ApplyInfo;
|
|
import com.dragoninfo.dcuc.app.entity.ApplyInfo;
|
|
-import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrAcceptDTO;
|
|
|
|
|
|
+import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrInfoDTO;
|
|
import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrRelAcceptDTO;
|
|
import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrRelAcceptDTO;
|
|
import com.dragoninfo.dcuc.auth.auth.dto.attr.RelSearchDTO;
|
|
import com.dragoninfo.dcuc.auth.auth.dto.attr.RelSearchDTO;
|
|
import com.dragoninfo.dcuc.auth.auth.facade.attr.IAttrFacade;
|
|
import com.dragoninfo.dcuc.auth.auth.facade.attr.IAttrFacade;
|
|
-import com.dragoninfo.dcuc.authweb.restcontroller.attr.vo.AttrAcceptVo;
|
|
|
|
-import com.dragoninfo.dcuc.authweb.restcontroller.attr.vo.AttrRelAcceptVo;
|
|
|
|
-import com.dragoninfo.dcuc.authweb.restcontroller.attr.vo.RelSearchVo;
|
|
|
|
|
|
+import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.attr.AttrInfoVo;
|
|
|
|
+import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.attr.AttrRelAcceptVo;
|
|
|
|
+import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.attr.RelSearchVo;
|
|
import com.dragoninfo.dcuc.authweb.util.VersionUtils;
|
|
import com.dragoninfo.dcuc.authweb.util.VersionUtils;
|
|
import com.dragoninfo.duceap.core.response.Result;
|
|
import com.dragoninfo.duceap.core.response.Result;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -38,10 +40,12 @@ public class AttrController {
|
|
private IAttrFacade attrFacade;
|
|
private IAttrFacade attrFacade;
|
|
|
|
|
|
@ApiOperation(value = "添加主客体属性")
|
|
@ApiOperation(value = "添加主客体属性")
|
|
- @ApiImplicitParam(name = "AttrAcceptVo", value = "主体属性新增Vo")
|
|
|
|
|
|
+ @ApiImplicitParam(name = "AttrInfoVo", value = "主客体属性Vo")
|
|
@PostMapping(value = "attrAdds")
|
|
@PostMapping(value = "attrAdds")
|
|
- public Result attrAdds(@RequestBody AttrAcceptVo vo){
|
|
|
|
- AttrAcceptDTO dto = new AttrAcceptDTO();
|
|
|
|
|
|
+ public Result attrAdds(@RequestBody AttrInfoVo vo){
|
|
|
|
+ String voStr = JSON.toJSONString(vo);
|
|
|
|
+ AttrInfoDTO dto = JSON.parseObject(voStr, new TypeReference<AttrInfoDTO>() {{
|
|
|
|
+ }});
|
|
BeanUtils.copyProperties(vo,dto);
|
|
BeanUtils.copyProperties(vo,dto);
|
|
Boolean b = attrFacade.attrSave(dto);
|
|
Boolean b = attrFacade.attrSave(dto);
|
|
if (b) {
|
|
if (b) {
|
|
@@ -74,8 +78,11 @@ public class AttrController {
|
|
@ApiImplicitParam(name = "attrType", value = "属性类别 SUB:主体属性 OBJ:客体属性")
|
|
@ApiImplicitParam(name = "attrType", value = "属性类别 SUB:主体属性 OBJ:客体属性")
|
|
@GetMapping(value = "getAttrTreeList")
|
|
@GetMapping(value = "getAttrTreeList")
|
|
public Result getAttrTreeList(@RequestParam("attrType") String attrType) {
|
|
public Result getAttrTreeList(@RequestParam("attrType") String attrType) {
|
|
- List<AttrAcceptDTO> list = attrFacade.getAttrTreeList(attrType);
|
|
|
|
- return Result.success(list);
|
|
|
|
|
|
+ List<AttrInfoDTO> list = attrFacade.getAttrTreeList(attrType);
|
|
|
|
+ String dtoStr = JSON.toJSONString(list);
|
|
|
|
+ List<AttrInfoVo> voList = JSON.parseObject(dtoStr, new TypeReference<List<AttrInfoVo>>() {{
|
|
|
|
+ }});
|
|
|
|
+ return Result.success(voList);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "属性关联主客体关系添加")
|
|
@ApiOperation(value = "属性关联主客体关系添加")
|