diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java similarity index 97% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index caf36208f..3c95e98e9 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -1,4 +1,4 @@ -package com.jero.controller; +package com.jero.modules.tag.controller; import java.util.Arrays; import java.util.List; @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.jero.modules.com.jero.service.IOnlCgformAreaService; +import com.jero.modules.tag.entity.OnlCgformArea; +import com.jero.modules.tag.service.IOnlCgformAreaService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java similarity index 78% rename from jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 5a030729d..3d22c56c0 100644 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -1,4 +1,4 @@ -package com.jero.modules.com.jero.entity; +package com.jero.modules.tag.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -74,33 +74,9 @@ public class OnlCgformArea implements Serializable { /**所属模块*/ @Excel(name = "所属模块", width = 15) - private transient java.lang.String isModelString; + @ApiModelProperty(value = "所属模块") + private java.lang.String isModel; - private byte[] isModel; - - public byte[] getIsModel(){ - if(isModelString==null){ - return null; - } - try { - return isModelString.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - - public String getIsModelString(){ - if(isModel==null || isModel.length==0){ - return ""; - } - try { - return new String(isModel,"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return ""; - } /**排序号*/ @Excel(name = "排序号", width = 15) @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java similarity index 77% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java index 39513be9c..b8ce650ce 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java @@ -1,9 +1,9 @@ -package com.jero.mapper; +package com.jero.modules.tag.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.tag.entity.OnlCgformArea; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml similarity index 88% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml index 4b81b4221..fb114c081 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java similarity index 90% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index fc9c69291..66df572c9 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -1,6 +1,6 @@ -package com.jero.service; +package com.jero.modules.tag.service; -import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.tag.entity.OnlCgformArea; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java similarity index 87% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index a569d9fa0..bcf696101 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.service.impl; +package com.jero.modules.tag.service.impl; -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.jero.modules.com.jero.mapper.OnlCgformAreaMapper; -import com.jero.modules.com.jero.service.IOnlCgformAreaService; +import com.jero.modules.tag.entity.OnlCgformArea; +import com.jero.modules.tag.mapper.OnlCgformAreaMapper; +import com.jero.modules.tag.service.IOnlCgformAreaService; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue similarity index 93% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue index 94a140599..67c0b2d0d 100644 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue @@ -134,7 +134,7 @@ { title:'所属模块', align:"center", - dataIndex: 'isModelString' + dataIndex: 'isModel' }, { title:'排序号', @@ -152,11 +152,11 @@ } ], url: { - list: "/com.jero/onlCgformArea/page", - delete: "/com.jero/onlCgformArea/delete", - deleteBatch: "/com.jero/onlCgformArea/deleteBatch", - exportXlsUrl: "/com.jero/onlCgformArea/exportXls", - importExcelUrl: "com.jero/onlCgformArea/importExcel", + list: "/tag/onlCgformArea/page", + delete: "/tag/onlCgformArea/delete", + deleteBatch: "/tag/onlCgformArea/deleteBatch", + exportXlsUrl: "/tag/onlCgformArea/exportXls", + importExcelUrl: "tag/onlCgformArea/importExcel", }, dictOptions:{}, @@ -178,7 +178,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'showArea',text:'展示区域',dictCode:''}) fieldList.push({type:'string',value:'enName',text:'英文名称',dictCode:''}) - fieldList.push({type:'Blob',value:'isModel',text:'所属模块',dictCode:''}) + fieldList.push({type:'string',value:'isModel',text:'所属模块',dictCode:''}) fieldList.push({type:'int',value:'sort',text:'排序号',dictCode:''}) this.superFieldList = fieldList } diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue similarity index 94% rename from jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue index 4e246cf22..4780dbdb1 100644 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue @@ -15,7 +15,7 @@ - + @@ -100,9 +100,9 @@ }, }, url: { - add: "/com.jero/onlCgformArea/add", - edit: "/com.jero/onlCgformArea/edit", - queryById: "/com.jero/onlCgformArea/queryById" + add: "/tag/onlCgformArea/add", + edit: "/tag/onlCgformArea/edit", + queryById: "/tag/onlCgformArea/queryById" } } }, @@ -138,7 +138,7 @@ this.model = Object.assign({}, record); this.visible = true; this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model,'showArea','enName','isModelString','sort')) + this.form.setFieldsValue(pick(this.model,'showArea','enName','isModel','sort')) }) }, //渲染流程表单数据 @@ -184,7 +184,7 @@ }) }, popupCallback(row){ - this.form.setFieldsValue(pick(row,'showArea','enName','isModelString','sort')) + this.form.setFieldsValue(pick(row,'showArea','enName','isModel','sort')) }, } } diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal.vue similarity index 100% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal.vue rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal.vue diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal__Style#Drawer.vue similarity index 100% rename from jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal__Style#Drawer.vue diff --git a/jero-boot/jero-boot-single-startup/pom.xml b/jero-boot/jero-boot-single-startup/pom.xml index 640542089..b8c6481cd 100644 --- a/jero-boot/jero-boot-single-startup/pom.xml +++ b/jero-boot/jero-boot-single-startup/pom.xml @@ -32,11 +32,6 @@ jero-boot-modules ${jero.version} - - com.jero.boot - jero-boot-tag-system - ${jero.version} - 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 053cafa29..082a902b3 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 @@ -1,6 +1,5 @@ #code_generate_project_path -project_path=F:\\idea-workspace\\laws-weilai\\jero-boot - +project_path=E:\\project\\jero-boot #bussi_package[User defined] bussi_package=com.jero.modules @@ -27,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_,qrtz_ +exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_ diff --git a/jero-boot/jero-boot-tag-system/pom.xml b/jero-boot/jero-boot-tag-system/pom.xml deleted file mode 100644 index 8a551cec4..000000000 --- a/jero-boot/jero-boot-tag-system/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - jero-boot - com.jero.boot - 2.4.2 - - 4.0.0 - - jero-boot-tag-system - - - 8 - 8 - - - - com.jero.boot - jero-system-local-api - - - com.jero.boot - jero-boot-starter-redis - - - - org.springframework - spring-web - 5.3.9 - - - - com.jero.boot - jero-boot - 2.4.2 - compile - - - - com.baomidou - mybatis-plus - 3.4.1 - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java deleted file mode 100644 index bf3be52bc..000000000 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.jero.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: 区域管理表 - * @Author: jero-boot - * @Date: 2022-01-21 - * @Version: V1.0 - */ -@Data -@TableName("onl_cgform_area") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="onl_cgform_area对象", description="区域管理表") -public class OnlCgformArea 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; - - /**展示区域*/ - @Excel(name = "展示区域", width = 15) - @ApiModelProperty(value = "展示区域") - private String showArea; - - /**英文名称*/ - @Excel(name = "英文名称", width = 15) - @javax.validation.constraints.Pattern(regexp = "^[a-zA-Z]{1}$",message = "请输入正确的字母") - @ApiModelProperty(value = "英文名称") - private String enName; - - /**所属模块*/ - @Excel(name = "所属模块", width = 15) - private transient String isModelString; - - private byte[] isModel; - - public byte[] getIsModel(){ - if(isModelString==null){ - return null; - } - try { - return isModelString.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - - public String getIsModelString(){ - if(isModel==null || isModel.length==0){ - return ""; - } - try { - return new String(isModel,"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return ""; - } - /**排序号*/ - @Excel(name = "排序号", width = 15) - @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") - @ApiModelProperty(value = "排序号") - private Integer sort; - -} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue deleted file mode 100644 index 4e246cf22..000000000 --- a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index d881dbcc2..5fc21ff45 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -54,7 +54,6 @@ jero-boot-single-startup jero-boot-modules - jero-boot-tag-system @@ -109,60 +108,6 @@ fastjson ${fastjson.version} - - io.swagger - swagger-annotations - 1.5.22 - compile - - - com.baomidou - mybatis-plus-annotation - 3.4.1 - compile - - - com.fasterxml.jackson.core - jackson-annotations - - - org.springframework - spring-context - - - org.jeecgframework - autopoi - 1.2.5 - compile - - - com.fasterxml.jackson.core - jackson-databind - - - com.baomidou - mybatis-plus-core - 3.4.1 - compile - - - org.apache.tomcat.embed - tomcat-embed-core - - - com.baomidou - mybatis-plus-extension - 3.4.1 - compile - - - org.springframework - spring-webmvc - - - com.jero.boot - jero-boot-base-core - diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java b/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java deleted file mode 100644 index 3746f0abe..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.jero.modules.com.jero.controller; - -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.jero.modules.com.jero.service.IOnlCgformAreaService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; - - - /** - * @Description: 区域管理表 - * @Author: jero-boot - * @Date: 2022-01-21 - * @Version: V1.0 - */ -@Api(tags="区域管理表") -@RestController -@RequestMapping("/com.jero/onlCgformArea") -@Slf4j -public class OnlCgformAreaController extends JeroController { - @Autowired - private IOnlCgformAreaService onlCgformAreaService; - - /** - * 分页列表查询 - * - * @param onlCgformArea - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "区域管理表-分页列表查询") - @ApiOperation(value="区域管理表-分页列表查询", notes="区域管理表-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OnlCgformArea onlCgformArea, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = onlCgformAreaService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "区域管理表-列表查询") - @ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = onlCgformAreaService.queryList(); - return Result.OK(list); - } - - /** - * 添加 - * - * @param onlCgformArea - * @return - */ - @AutoLog(value = "区域管理表-添加") - @ApiOperation(value="区域管理表-添加", notes="区域管理表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OnlCgformArea onlCgformArea) { - onlCgformAreaService.add(onlCgformArea); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param onlCgformArea - * @return - */ - @AutoLog(value = "区域管理表-编辑") - @ApiOperation(value="区域管理表-编辑", notes="区域管理表-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { - onlCgformAreaService.editById(onlCgformArea); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "区域管理表-通过id删除") - @ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - onlCgformAreaService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "区域管理表-批量删除") - @ApiOperation(value="区域管理表-批量删除", notes="区域管理表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.onlCgformAreaService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "区域管理表-通过id查询") - @ApiOperation(value="区域管理表-通过id查询", notes="区域管理表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); - if(onlCgformArea==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(onlCgformArea); - } - - /** - * 导出excel - * - * @param request - * @param onlCgformArea - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, OnlCgformArea onlCgformArea) { - return super.exportXls(request, onlCgformArea, OnlCgformArea.class, "区域管理表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, OnlCgformArea.class); - } - -} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java deleted file mode 100644 index fe7305c7c..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.com.jero.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 区域管理表 - * @Author: jero-boot - * @Date: 2022-01-21 - * @Version: V1.0 - */ -public interface OnlCgformAreaMapper extends BaseMapper { - -} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml deleted file mode 100644 index 4b81b4221..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java b/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java deleted file mode 100644 index 0a46956e2..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.com.jero.service; - -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 区域管理表 - * @Author: jero-boot - * @Date: 2022-01-21 - * @Version: V1.0 - */ -public interface IOnlCgformAreaService extends IService { - - /** - * 保存 - * - * @param onlCgformArea - * @return - */ - void add(OnlCgformArea onlCgformArea); - - /** - * 更新 - * - * @param onlCgformArea - * @return - */ - void editById(OnlCgformArea onlCgformArea); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - OnlCgformArea queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List queryList(); -} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java deleted file mode 100644 index 1e766f564..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jero.modules.com.jero.service.impl; - -import com.jero.modules.com.jero.entity.OnlCgformArea; -import com.jero.modules.com.jero.mapper.OnlCgformAreaMapper; -import com.jero.modules.com.jero.service.IOnlCgformAreaService; -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-01-21 - * @Version: V1.0 - */ -@Service -public class OnlCgformAreaServiceImpl extends ServiceImpl implements IOnlCgformAreaService { - - /** - * 保存 - * - * @param onlCgformArea - * @return - */ - @Override - public void add(OnlCgformArea onlCgformArea) { - Date now = new Date(); - onlCgformArea.setCreateTime(now); - onlCgformArea.setUpdateTime(now); - save(onlCgformArea); - } - - /** - * 更新 - * - * @param onlCgformArea - * @return - */ - @Override - public void editById(OnlCgformArea onlCgformArea) { - Date now = new Date(); - onlCgformArea.setUpdateTime(now); - saveOrUpdate(onlCgformArea); - } - - /** - * 通过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 OnlCgformArea queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - public List queryList() { - return list(); - } -} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue deleted file mode 100644 index 94a140599..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue deleted file mode 100644 index 298a5218a..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue deleted file mode 100644 index d7d160556..000000000 --- a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - \ No newline at end of file