diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 3aec9087f..75b0a792c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -7,8 +7,8 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.generater.modules.online.cgform.entity.OnlCgformField; -import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; +import com.jero.modules.tag.entity.OnlCgformTag; +import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -26,21 +26,21 @@ import java.util.List; /** * @Description: 标签管理 * @Author: jero-boot - * @Date: 2022-01-25 + * @Date: 2022-02-12 * @Version: V1.0 */ @Api(tags="标签管理") @RestController -@RequestMapping("/Field/onlCgformField") +@RequestMapping("/tag/onlCgformTag") @Slf4j -public class OnlCgformTagController extends JeroController { +public class OnlCgformTagController extends JeroController { @Autowired - private IOnlCgformFieldService onlCgformFieldService; + private IOnlCgformTagService onlCgformTagService; /** * 分页列表查询 * - * @param onlCgformField + * @param onlCgformTag * @param pageNo * @param pageSize * @param req @@ -49,13 +49,13 @@ public class OnlCgformTagController extends JeroController queryPageList(OnlCgformField onlCgformField, + public Result queryPageList(OnlCgformTag onlCgformTag, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformField, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = onlCgformFieldService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = onlCgformTagService.page(page, queryWrapper); return Result.OK(pageList); } @@ -67,36 +67,36 @@ public class OnlCgformTagController extends JeroController> queryList() { - List list = onlCgformFieldService.queryList(); + public Result> queryList() { + List list = onlCgformTagService.queryList(); return Result.OK(list); } /** * 添加 * - * @param onlCgformField + * @param onlCgformTag * @return */ @AutoLog(value = "标签管理-添加") @ApiOperation(value="标签管理-添加", notes="标签管理-添加") @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OnlCgformField onlCgformField) { - onlCgformFieldService.add(onlCgformField); + public Result add(@Validated @RequestBody OnlCgformTag onlCgformTag) { + onlCgformTagService.add(onlCgformTag); return Result.OK("添加成功!"); } /** * 编辑 * - * @param onlCgformField + * @param onlCgformTag * @return */ @AutoLog(value = "标签管理-编辑") @ApiOperation(value="标签管理-编辑", notes="标签管理-编辑") @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OnlCgformField onlCgformField) { - onlCgformFieldService.editById(onlCgformField); + public Result edit(@Validated @RequestBody OnlCgformTag onlCgformTag) { + onlCgformTagService.editById(onlCgformTag); return Result.OK("编辑成功!"); } @@ -110,7 +110,7 @@ public class OnlCgformTagController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - onlCgformFieldService.deleteById(id); + onlCgformTagService.deleteById(id); return Result.OK("删除成功!"); } @@ -124,7 +124,7 @@ public class OnlCgformTagController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.onlCgformFieldService.deleteByIds(Arrays.asList(ids.split(","))); + this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -138,22 +138,22 @@ public class OnlCgformTagController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - OnlCgformField onlCgformField = onlCgformFieldService.queryById(id); - if(onlCgformField==null) { + OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); + if(onlCgformTag==null) { return Result.error("未找到对应数据"); } - return Result.OK(onlCgformField); + return Result.OK(onlCgformTag); } /** * 导出excel * * @param request - * @param onlCgformField + * @param onlCgformTag */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, OnlCgformField onlCgformField) { - return super.exportXls(request, onlCgformField, OnlCgformField.class, "标签管理"); + public ModelAndView exportXls(HttpServletRequest request, OnlCgformTag onlCgformTag) { + return super.exportXls(request, onlCgformTag, OnlCgformTag.class, "标签管理"); } /** @@ -165,7 +165,7 @@ public class OnlCgformTagController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, OnlCgformField.class); + return super.importExcel(request, response, OnlCgformTag.class); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java new file mode 100644 index 000000000..c712bef56 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -0,0 +1,148 @@ +package com.jero.modules.tag.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 标签管理 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +@Data +@TableName("onl_cgform_tag") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="onl_cgform_tag对象", description="标签管理") +public class OnlCgformTag implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**所属模块(1文档库,0文档拆分*/ + @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dictTable = "onl_cgform_area", dicText = "所属模块", dicCode = "is_model") + @Dict(dictTable = "onl_cgform_area", dicText = "所属模块", dicCode = "is_model") + @ApiModelProperty(value = "所属模块(1文档库,0文档拆分") + private String isModel; + + /**字段备注*/ + @Excel(name = "字段备注", width = 15) + @ApiModelProperty(value = "字段备注") + private String dbFieldTxt; + + /**字段英文名称描述*/ + @Excel(name = "字段英文名称描述", width = 15) + @ApiModelProperty(value = "字段英文名称描述") + private String dbFieldName; + + /**表单控件类型*/ + @Excel(name = "表单控件类型", width = 15, dictTable = "onl_cgform_field", dicText = "属性类型", dicCode = "field_show_type") + @Dict(dictTable = "onl_cgform_field", dicText = "属性类型", dicCode = "field_show_type") + @ApiModelProperty(value = "表单控件类型") + private String fieldShowType; + + /**字典名称*/ + @Excel(name = "字典名称", width = 15, dictTable = "sys_dict", dicText = "选项内容", dicCode = "dict_name") + @Dict(dictTable = "sys_dict", dicText = "选项内容", dicCode = "dict_name") + @ApiModelProperty(value = "字典名称") + private String dictName; + + /**数据库字段长度*/ + @Excel(name = "数据库字段长度", width = 15) + @ApiModelProperty(value = "数据库字段长度") + private Integer dbLength; + + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private Integer orderNum; + + /**字段是否必填0否 1是*/ + @Excel(name = "字段是否必填0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "字段是否必填0否 1是") + private String fieldMustInput; + + /**表单是否显示0否 1是*/ + @Excel(name = "表单是否显示0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "表单是否显示0否 1是") + private Integer isShowForm; + + /**列表是否显示0否 1是*/ + @Excel(name = "列表是否显示0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "列表是否显示0否 1是") + private Integer isShowList; + + /**是否是只读(1是 0否)*/ + @Excel(name = "是否是只读(1是 0否)", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否是只读(1是 0否)") + private Integer isReadOnly; + + /**展示区域*/ + @Excel(name = "展示区域", width = 15, dictTable = "onl_cgform_area", dicText = "展示区域", dicCode = "show_area") + @Dict(dictTable = "onl_cgform_area", dicText = "展示区域", dicCode = "show_area") + @ApiModelProperty(value = "展示区域") + private String showArea; + + /**是否查询条件0否 1是*/ + @Excel(name = "是否查询条件0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否查询条件0否 1是") + private Integer isQuery; + + /**法规清单是否展示0否 1是*/ + @Excel(name = "法规清单是否展示0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "法规清单是否展示0否 1是") + private Integer isShowLawsList; + + /**搜索中心是否展示0否 1是*/ + @Excel(name = "搜索中心是否展示0否 1是", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "搜索中心是否展示0否 1是") + private Integer isShowSearch; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java new file mode 100644 index 000000000..fd41a0873 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.tag.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.tag.entity.OnlCgformTag; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标签管理 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +public interface OnlCgformTagMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml new file mode 100644 index 000000000..69de4da41 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java new file mode 100644 index 000000000..c6a5d938e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -0,0 +1,61 @@ +package com.jero.modules.tag.service; + +import com.jero.modules.tag.entity.OnlCgformTag; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 标签管理 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +public interface IOnlCgformTagService extends IService { + + /** + * 保存 + * + * @param onlCgformTag + * @return + */ + void add(OnlCgformTag onlCgformTag); + + /** + * 更新 + * + * @param onlCgformTag + * @return + */ + void editById(OnlCgformTag onlCgformTag); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OnlCgformTag queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java new file mode 100644 index 000000000..5360b6508 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.tag.service.impl; + +import com.jero.modules.tag.entity.OnlCgformTag; +import com.jero.modules.tag.mapper.OnlCgformTagMapper; +import com.jero.modules.tag.service.IOnlCgformTagService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 标签管理 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +@Service +public class OnlCgformTagServiceImpl extends ServiceImpl implements IOnlCgformTagService { + + /** + * 保存 + * + * @param onlCgformTag + * @return + */ + @Override + public void add(OnlCgformTag onlCgformTag) { + Date now = new Date(); + onlCgformTag.setCreateTime(now); + onlCgformTag.setUpdateTime(now); + save(onlCgformTag); + } + + /** + * 更新 + * + * @param onlCgformTag + * @return + */ + @Override + public void editById(OnlCgformTag onlCgformTag) { + Date now = new Date(); + onlCgformTag.setUpdateTime(now); + saveOrUpdate(onlCgformTag); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OnlCgformTag queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties b/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties index 082a902b3..f3c9af74f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties +++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties @@ -26,4 +26,4 @@ db_filed_convert=true page_search_filed_num=1 #page_filter_fields page_filter_fields=create_time,create_by,update_time,update_by -exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_ +exclude_table=act_,ext_act_,design_,qrtz_