Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java

@@ -8,6 +8,8 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.pagemodel.OsAttributeVO;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
@@ -45,6 +47,25 @@
     * 日志
     */
    private Logger logger = LoggerFactory.getLogger(getClass());

    /**
     * 获取所有属性（树形结构）
     * @return 查询结果
     */
    @GetMapping( "/getTreeAttributes")
    @VciBusinessLog(operateName = "获取属性（树形结构）")
    public BaseResult<List<Tree>> getTreeAttributesByBtmName(TreeQueryObject treeQueryObject){
        try {
            List<Tree> trees = attributeService.getTreeAttributesByBtmName(treeQueryObject);
            return BaseResult.dataList(trees);
          //  return BaseResult.tree(trees);
        }catch (Throwable e) {
            e.printStackTrace();
            String exceptionMessage = "查询业务类型时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

    /**
     * 属性列表
@@ -85,7 +106,7 @@
    /**
     * 添加单条属性到属性池
     * @param osAttributeDTO
     * @return 列表的内容
     * @return
     */
    @PostMapping( "/addAttribute")
    @VciBusinessLog(operateName = "添加属性")
@@ -164,10 +185,10 @@
    @VciBusinessLog(operateName = "导出属性")
    public void exportAttributes(String exportFileName,String attrNames, HttpServletResponse response){
        try {
            String excelPath = attributeService.exportAttributes(exportFileName,attrNames);
            String excelPath = attributeService.exportAttributes(exportFileName,attrNames,false);
            ControllerUtil.writeFileToResponse(response,excelPath);
        } catch (Exception e) {
            String msg = "导出枚举时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            String msg = "导出属性时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            try {
                //出错时
                e.printStackTrace();
@@ -214,7 +235,7 @@
        try {
            file.transferTo(new File(excelFileName));
            if (file != null) {
                return attributeService.importAttributes(file1);
                return attributeService.importAttributes(file1,false);
            } else {
                return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"无导入的文件"});
            }