diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 247ffd42f..35e4befd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -1,31 +1,32 @@ package com.jero.modules.tag.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.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; -import lombok.extern.slf4j.Slf4j; +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.modules.tag.entity.OnlCgformArea; +import com.jero.modules.tag.service.IOnlCgformAreaService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; 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; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 区域管理表 * @Author: jero-boot - * @Date: 2022-01-21 + * @Date: 2022-01-24 * @Version: V1.0 */ @Api(tags="区域管理表") @@ -35,7 +36,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class OnlCgformAreaController extends JeroController { @Autowired private IOnlCgformAreaService onlCgformAreaService; - + List list; /** * 分页列表查询 * @@ -58,18 +59,17 @@ public class OnlCgformAreaController extends JeroController> queryList() { - OnlCgformArea onlCgformArea = new OnlCgformArea(); - List list = onlCgformAreaService.queryList(onlCgformArea); - return Result.OK(list); + public Result> queryList(String isModel,int sort){ + list = onlCgformAreaService.queryList(isModel,sort); + return Result.OK(list); } /** @@ -145,27 +145,27 @@ public class OnlCgformAreaController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, 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/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 3d22c56c0..124ab0aa3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -1,27 +1,24 @@ package com.jero.modules.tag.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.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 区域管理表 * @Author: jero-boot - * @Date: 2022-01-21 + * @Date: 2022-01-24 * @Version: V1.0 */ @Data @@ -72,9 +69,9 @@ public class OnlCgformArea implements Serializable { @ApiModelProperty(value = "英文名称") private java.lang.String enName; - /**所属模块*/ - @Excel(name = "所属模块", width = 15) - @ApiModelProperty(value = "所属模块") + /**所属模块(1文档库,0文档拆分)*/ + @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15) + @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") private java.lang.String isModel; /**排序号*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java index b8ce650ce..e64f9adda 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 区域管理表 * @Author: jero-boot - * @Date: 2022-01-21 + * @Date: 2022-01-24 * @Version: V1.0 */ public interface OnlCgformAreaMapper extends BaseMapper { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml index fb114c081..9a97773d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformAreaMapper.xml @@ -13,4 +13,8 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index b9fdb6001..10a6bb5a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 区域管理表 * @Author: jero-boot - * @Date: 2022-01-21 + * @Date: 2022-01-24 * @Version: V1.0 */ public interface IOnlCgformAreaService extends IService { @@ -57,5 +57,7 @@ public interface IOnlCgformAreaService extends IService { * * @return */ - List queryList(OnlCgformArea onlCgformArea); + List queryList(String isModel); + + List queryList(String isModel, int sort); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 885c95d55..b000a6af6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -1,19 +1,18 @@ package com.jero.modules.tag.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.service.IOnlCgformAreaService; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 区域管理表 * @Author: jero-boot - * @Date: 2022-01-21 + * @Date: 2022-01-24 * @Version: V1.0 */ @Service @@ -85,12 +84,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryList(OnlCgformArea onlCgformArea) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ - lambdaQueryWrapper.eq(OnlCgformArea::getIsModel,onlCgformArea.getIsModel()) - .orderByAsc(OnlCgformArea::getSort); - } - return list(lambdaQueryWrapper); + public List queryList(String isModel) { + return list(); } + + @Override + public List queryList(String isModel, int sort) { + return null; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue deleted file mode 100644 index 67c0b2d0d..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/OnlCgformAreaList.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue deleted file mode 100644 index 4780dbdb1..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaForm.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal.vue deleted file mode 100644 index 298a5218a..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/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 deleted file mode 100644 index d7d160556..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/vue/modules/OnlCgformAreaModal__Style#Drawer.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - \ No newline at end of file