许鹏程
2023-05-17 07f6af85516f68ba6943c1e4823fc0be4f851be6
表单设计器、表单加载
已添加2个文件
已修改4个文件
238 ■■■■■ 文件已修改
src/main/java/com/product/face/config/ErrorCode.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/config/FaceConst.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/controller/FaceApplyController.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/entity/TableColumn.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/service/FaceApplyService.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/service/FaceDesignService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/config/ErrorCode.java
@@ -18,6 +18,10 @@
    SAVE_EMPTY_FACE_FAIL("保存表单内容失败,表单内容不能为空", 2),
    DELETE_FACE_FAIL("删除表单失败", 3),
    GET_FACE_COLUMN_FAIL("获取列表配置失败", 4),
    GET_FACE_CONFIG_FAIL("获取表单配置信息失败", 5),
    REQUEST_PARAM_ERROR("请求参数有误", 6),
    ;
src/main/java/com/product/face/config/FaceConst.java
@@ -17,7 +17,10 @@
    public static final String CHILDREN = "children";
    public static final String FIELD_CONFIG = "__config__";
    //控件绑定字段名的属性名称
    public static final String FIELD_PROPERTY_CONFIG = "__config__";
    public static final String FIELD_PROPERTY_VMODEL = "__vModel__";
    public static final String FIELD_PROPERTY_LABEL = "label";
    public static final String FIELD_MASTER = "master_uuid";
    //控件表属性名字段
src/main/java/com/product/face/controller/FaceApplyController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.product.face.controller;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.face.config.ErrorCode;
import com.product.face.config.FaceConst;
import com.product.face.service.FaceApplyService;
import com.product.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;
import com.product.util.support.AbstractBaseController;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
 * @Author cheng
 * @Date 2023/5/17 10:17
 * @Desc è¡¨å•应用控制层
 */
@RestController
@RequestMapping("/api/face/apply")
public class FaceApplyController extends AbstractBaseController {
    @Resource
    private FaceApplyService faceApplyService;
    /**
     * èŽ·å–è¡¨æ ¼åˆ—é…ç½®
     *
     * @param request
     * @return
     */
    @PostMapping("/get-list-column/{version}")
    @ApiVersion(1)
    public String getListColumn(HttpServletRequest request) {
        try {
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
            return success(faceApplyService.getFaceListConf(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            return error(e);
        } catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return error(ErrorCode.GET_FACE_COLUMN_FAIL, e);
        }
    }
    /**
     * å½•入表单获取配置
     *
     * @param request
     * @return
     */
    @PostMapping("/get-form-conf/{version}")
    @ApiVersion(1)
    public String getFormConf(HttpServletRequest request) {
        try {
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
            return faceApplyService.getFaceFormConfig(fse);
        } catch (BaseException e) {
            e.printStackTrace();
            return error(e);
        } catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return error(ErrorCode.GET_FACE_CONFIG_FAIL, e);
        }
    }
}
src/main/java/com/product/face/entity/TableColumn.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package com.product.face.entity;
import java.io.Serializable;
/**
 * @Author cheng
 * @Date 2023/5/17 10:13
 * @Desc è¡¨æ ¼åˆ—
 */
public class TableColumn implements Serializable {
    private static final long serialVersionUID = -2568367952209207590L;
    /**
     * åˆ—绑定字段名
     */
    private String field;
    /**
     * åˆ—标题
     */
    private String title;
    /**
     * åˆ—宽度
     */
    private String columnWidth;
    public String getField() {
        return field;
    }
    public void setField(String field) {
        this.field = field;
    }
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    public String getColumnWidth() {
        return columnWidth;
    }
    public void setColumnWidth(String columnWidth) {
        this.columnWidth = columnWidth;
    }
}
src/main/java/com/product/face/service/FaceApplyService.java
@@ -1,13 +1,25 @@
package com.product.face.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.product.admin.service.SystemFaceService;
import com.product.common.lang.StringUtils;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.service.support.AbstractBaseService;
import com.product.face.config.ErrorCode;
import com.product.face.config.FaceConst;
import com.product.face.entity.TableColumn;
import com.product.util.BaseUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * @Author cheng
@@ -20,20 +32,80 @@
    @Resource
    private SystemFaceService systemFaceService;
    @Resource
    private FaceDesignService designService;
    public Object getFaceListConf(FieldSetEntity fse) {
        //TODO ä½¿ç”¨å˜åЍ安
        String faceUuid = fse.getString(FaceConst.FIELD_FACE_UUID);
        String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
        if (faceNumber == null && faceUuid == null) {
            return null;
        }
        if (StringUtils.isEmpty(faceNumber) && StringUtils.isEmpty(faceUuid)) {
            throw new BaseException(ErrorCode.REQUEST_PARAM_ERROR);
        if(StringUtils.isEmpty(faceUuid)){
        }
        if (!StringUtils.isEmpty(faceUuid) && StringUtils.isEmpty(faceNumber)) {
            return systemFaceService.getFaceFieldList(faceUuid);
        }
        //TODO ä½¿ç”¨è¡¨å•设计器设计的列表返回
        return null;
        //根据表单号查询
        FieldSetEntity faceConf = getBaseDao().getFieldSetByFilter(FaceConst.TABLE_FACE_CONFIG, "face_number=?", new Object[]{faceNumber}, true);
        DataTableEntity fieldPropertyDt = faceConf.getSubDataTable(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY);
        if (DataTableEntity.isEmpty(fieldPropertyDt)) {
            throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
        }
        List<JSONObject> faceControlList = designService.getFaceControlList(fieldPropertyDt);
        JSONObject jsonObject = faceControlList.get(0);
        if (jsonObject == null || jsonObject.isEmpty()) {
            throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
        }
        //表格列
        JSONArray tableColumns = jsonObject.getJSONObject(FaceConst.FIELD_PROPERTY_CONFIG).getJSONArray(FaceConst.CHILDREN);
        if (tableColumns == null || tableColumns.isEmpty()) {
            throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
        }
        List<TableColumn> result = Lists.newArrayList();
        for (int i = 0; i < tableColumns.size(); i++) {
            TableColumn tableColumn = new TableColumn();
            JSONObject columnJson = tableColumns.getJSONObject(i);
            String fieldName = columnJson.getString(FaceConst.FIELD_PROPERTY_VMODEL);
            if (StringUtils.isEmpty(fieldName)) {
                continue;
            }
            JSONObject config = columnJson.getJSONObject(FaceConst.FIELD_PROPERTY_CONFIG);
            Object setWidth = config.get("setWidth");
            if (!StringUtils.isEmpty(setWidth)) {
                tableColumn.setColumnWidth(setWidth + "%");
            }
            tableColumn.setField(fieldName);
            tableColumn.setTitle(config.getString(FaceConst.FIELD_PROPERTY_LABEL));
            result.add(tableColumn);
        }
        return result;
    }
    /**
     * å½•入表单获取表单配置
     *
     * @param fse
     * @return
     * @throws BaseException
     */
    public String getFaceFormConfig(FieldSetEntity fse) throws BaseException {
        String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
        if (StringUtils.isEmpty(faceNumber)) {
            throw new BaseException(ErrorCode.REQUEST_PARAM_ERROR);
        }
        //根据表单号查询
        FieldSetEntity faceConf = getBaseDao().getFieldSetByFilter(FaceConst.TABLE_FACE_CONFIG, "face_number=?", new Object[]{faceNumber}, true);
        DataTableEntity fieldPropertyDt = faceConf.getSubDataTable(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY);
        if (DataTableEntity.isEmpty(fieldPropertyDt)) {
            throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
        }
        List<JSONObject> faceControlList = designService.getFaceControlList(fieldPropertyDt);
        Map<String, Object> other = new HashMap<>();
        other.put("drawingList", faceControlList);
        faceConf.getSubData().clear();
        return BaseUtil.success(faceConf, other);
    }
}
src/main/java/com/product/face/service/FaceDesignService.java
@@ -39,7 +39,7 @@
    @Resource
    private PublicService publicService;
    public PublicService publicService;
    /**
     * èŽ·å–è¡¨å•é…ç½®è¯¦æƒ…
@@ -53,10 +53,18 @@
        FieldSetEntity fse = getBaseDao().getFieldSetEntity(FaceConst.TABLE_FACE_CONFIG, uuid, true);
        DataTableEntity fieldPropertyDt = fse.getSubDataTable(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY);
        if (DataTableEntity.isEmpty(fieldPropertyDt)) {
            return null;
            throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
        }
        List<JSONObject> result = getFaceControlList(fieldPropertyDt);
        Map<String, Object> other = new HashMap<>();
        other.put("drawingList", result);
        fse.getSubData().clear();
        return BaseUtil.success(fse, other);
    }
    public List<JSONObject> getFaceControlList(DataTableEntity faceControlDt) {
        List<JSONObject> result = new ArrayList<>();
        List<FieldSetEntity> data = fieldPropertyDt.getData();
        List<FieldSetEntity> data = faceControlDt.getData();
        Map<String, List<FieldSetEntity>> collect = data.stream()
                .filter(item -> StringUtils.isEmpty(item.getString(FaceConst.FIELD_PARENT_UUID))) //过滤 å–父级
//                .sorted(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE))) //排序
@@ -69,11 +77,7 @@
            result.add(getPropertyJson(propertyList, groupContainer));
        }
        result.sort(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE)));
        System.out.println(result);
        Map<String, Object> other = new HashMap<>();
        other.put("drawingList", result);
        fse.getSubData().clear();
        return BaseUtil.success(fse, other);
        return result;
    }
    private JSONObject getPropertyJson(List<FieldSetEntity> propertyList, Map<String, List<FieldSetEntity>> groupContainer) {