diff --git a/form/src/main/java/com/ccsens/form/api/ModuleController.java b/form/src/main/java/com/ccsens/form/api/ModuleController.java index 6d11f1cc..a92064fc 100644 --- a/form/src/main/java/com/ccsens/form/api/ModuleController.java +++ b/form/src/main/java/com/ccsens/form/api/ModuleController.java @@ -3,6 +3,7 @@ package com.ccsens.form.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.form.bean.dto.ModuleDto; import com.ccsens.form.bean.vo.ModuleVo; +import com.ccsens.form.service.IModuleService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; @@ -15,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + /** * @author 逗 */ @@ -23,15 +27,37 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/module") public class ModuleController { + @Resource + private IModuleService moduleService; @MustLogin - @ApiOperation(value = "查找所有组件模板", notes = "") + @ApiOperation(value = "查找所有组件模板", notes = "zy:查找所有组件模板和对应的配置信息") @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selResult(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看测评结果:{}",params); + public JsonResponse> queryModule(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找所有组件模板:{}",params); + List moduleInfoList = moduleService.queryModule(); + log.info("查找所有组件结果"); + return JsonResponse.newInstance().ok(moduleInfoList); + } - log.info("查看测评结果"); - return JsonResponse.newInstance().ok(); + + @MustLogin + @ApiOperation(value = "查找表单内组件和配置信息", notes = "zy:查找表单内添加的组件的配置和选项信息,如果没有则返回改组价模板的默认配置") + @RequestMapping(value = "/get/formModule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getFormModule(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找表单内组件和配置信息:{}",params); + List moduleInfoList = moduleService.getFormModule(params); + log.info("查找表单内组件和配置信息结果:{}",moduleInfoList); + return JsonResponse.newInstance().ok(moduleInfoList); } + @MustLogin + @ApiOperation(value = "修改组件的配置信息和选项", notes = "查找该组件以前添加的配置和选项信息,删除后,重新添加新的的配置和选项") + @RequestMapping(value = "/update/formModule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateFormModule(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("修改组件的配置信息和选项:{}",params); + moduleService.updateFormModule(params); + log.info("修改组件的配置信息和选项成功"); + return JsonResponse.newInstance().ok(); + } } diff --git a/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java b/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java index aaba39ca..896832b0 100644 --- a/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java +++ b/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java @@ -1,7 +1,29 @@ package com.ccsens.form.bean.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + /** * @author 逗 */ +@Data public class ModuleDto { + @Data + @ApiModel("查找表单内的组件信息") + public static class GetFormModule{ + @NotNull + @ApiModelProperty("表单组件关联id") + private Long formModuleId; + } + + @Data + @ApiModel("修改组件配置和选项") + public static class UpdateFormModule{ + @NotNull + @ApiModelProperty("表单组件关联id") + private Long formModuleId; + } } diff --git a/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOption.java b/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOption.java index 4503f4fc..03327417 100644 --- a/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOption.java +++ b/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOption.java @@ -6,7 +6,7 @@ import java.util.Date; public class FormModuleConfigOption implements Serializable { private Long id; - private Long formModuleConfigId; + private Long formModuleId; private Long parentId; @@ -34,12 +34,12 @@ public class FormModuleConfigOption implements Serializable { this.id = id; } - public Long getFormModuleConfigId() { - return formModuleConfigId; + public Long getFormModuleId() { + return formModuleId; } - public void setFormModuleConfigId(Long formModuleConfigId) { - this.formModuleConfigId = formModuleConfigId; + public void setFormModuleId(Long formModuleId) { + this.formModuleId = formModuleId; } public Long getParentId() { @@ -113,7 +113,7 @@ public class FormModuleConfigOption implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", formModuleConfigId=").append(formModuleConfigId); + sb.append(", formModuleId=").append(formModuleId); sb.append(", parentId=").append(parentId); sb.append(", optionKey=").append(optionKey); sb.append(", optionValue=").append(optionValue); diff --git a/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOptionExample.java b/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOptionExample.java index b760b093..2fa2c1d3 100644 --- a/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOptionExample.java +++ b/form/src/main/java/com/ccsens/form/bean/po/FormModuleConfigOptionExample.java @@ -165,63 +165,63 @@ public class FormModuleConfigOptionExample { return (Criteria) this; } - public Criteria andFormModuleConfigIdIsNull() { - addCriterion("form_module_config_id is null"); + public Criteria andFormModuleIdIsNull() { + addCriterion("form_module_id is null"); return (Criteria) this; } - public Criteria andFormModuleConfigIdIsNotNull() { - addCriterion("form_module_config_id is not null"); + public Criteria andFormModuleIdIsNotNull() { + addCriterion("form_module_id is not null"); return (Criteria) this; } - public Criteria andFormModuleConfigIdEqualTo(Long value) { - addCriterion("form_module_config_id =", value, "formModuleConfigId"); + public Criteria andFormModuleIdEqualTo(Long value) { + addCriterion("form_module_id =", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdNotEqualTo(Long value) { - addCriterion("form_module_config_id <>", value, "formModuleConfigId"); + public Criteria andFormModuleIdNotEqualTo(Long value) { + addCriterion("form_module_id <>", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdGreaterThan(Long value) { - addCriterion("form_module_config_id >", value, "formModuleConfigId"); + public Criteria andFormModuleIdGreaterThan(Long value) { + addCriterion("form_module_id >", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdGreaterThanOrEqualTo(Long value) { - addCriterion("form_module_config_id >=", value, "formModuleConfigId"); + public Criteria andFormModuleIdGreaterThanOrEqualTo(Long value) { + addCriterion("form_module_id >=", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdLessThan(Long value) { - addCriterion("form_module_config_id <", value, "formModuleConfigId"); + public Criteria andFormModuleIdLessThan(Long value) { + addCriterion("form_module_id <", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdLessThanOrEqualTo(Long value) { - addCriterion("form_module_config_id <=", value, "formModuleConfigId"); + public Criteria andFormModuleIdLessThanOrEqualTo(Long value) { + addCriterion("form_module_id <=", value, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdIn(List values) { - addCriterion("form_module_config_id in", values, "formModuleConfigId"); + public Criteria andFormModuleIdIn(List values) { + addCriterion("form_module_id in", values, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdNotIn(List values) { - addCriterion("form_module_config_id not in", values, "formModuleConfigId"); + public Criteria andFormModuleIdNotIn(List values) { + addCriterion("form_module_id not in", values, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdBetween(Long value1, Long value2) { - addCriterion("form_module_config_id between", value1, value2, "formModuleConfigId"); + public Criteria andFormModuleIdBetween(Long value1, Long value2) { + addCriterion("form_module_id between", value1, value2, "formModuleId"); return (Criteria) this; } - public Criteria andFormModuleConfigIdNotBetween(Long value1, Long value2) { - addCriterion("form_module_config_id not between", value1, value2, "formModuleConfigId"); + public Criteria andFormModuleIdNotBetween(Long value1, Long value2) { + addCriterion("form_module_id not between", value1, value2, "formModuleId"); return (Criteria) this; } diff --git a/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java b/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java index 0850fe0a..26e7f760 100644 --- a/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java +++ b/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java @@ -1,4 +1,67 @@ package com.ccsens.form.bean.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author 逗 + */ +@Data public class ModuleVo { + + @Data + @ApiModel("组件基本信息") + public static class ModuleInfo{ + @ApiModelProperty("组件id") + private Long id; + @ApiModelProperty("组件类型 (单选:radio)(多选:CheckBox)(下拉菜单:pullDown)(文本:text)(多行文本:textarea)(富文本:richText)") + private byte type; + @ApiModelProperty("图标") + private String logo; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("是否有选项 0否 1是") + private byte option; + @ApiModelProperty("关联层级数") + private byte hierarchy; + @ApiModelProperty("组件配置") + private List moduleConfigList; + @ApiModelProperty("选项信息") + private List