From 201630f861f241425a2ba376dddbaa4d2fee17bd Mon Sep 17 00:00:00 2001 From: username <1532322479@qq.com> Date: Sat, 13 Apr 2024 11:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dfArea=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DfProductInfoController.java | 18 +- ...aController.java => DfAreaController.java} | 97 ++-- .../domain/{DouArea.java => DfArea.java} | 8 +- .../{DouAreaMapper.java => DfAreaMapper.java} | 6 +- ...ouAreaService.java => IDfAreaService.java} | 6 +- ...erviceImpl.java => DfAreaServiceImpl.java} | 10 +- .../{DouAreaMapper.xml => DfAreaMapper.xml} | 2 +- bs-ui/src/views/indexs/warehouse/index.vue | 446 +++++++++--------- 8 files changed, 314 insertions(+), 279 deletions(-) rename bs-admin/src/main/java/com/bs/system/controller/{DouAreaController.java => DfAreaController.java} (50%) rename bs-admin/src/main/java/com/bs/system/domain/{DouArea.java => DfArea.java} (91%) rename bs-admin/src/main/java/com/bs/system/mapper/{DouAreaMapper.java => DfAreaMapper.java} (53%) rename bs-admin/src/main/java/com/bs/system/service/{IDouAreaService.java => IDfAreaService.java} (53%) rename bs-admin/src/main/java/com/bs/system/service/impl/{DouAreaServiceImpl.java => DfAreaServiceImpl.java} (55%) rename bs-admin/src/main/resources/mapper/system/{DouAreaMapper.xml => DfAreaMapper.xml} (73%) diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java index cef0e6c..cb6d118 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java @@ -15,8 +15,8 @@ import com.bs.df.service.IDfBrokerProductService; import com.bs.df.service.IDfBrokerService; import com.bs.df.service.IDfProductPosterService; import com.bs.df.utils.HtmlUtils; -import com.bs.system.domain.DouArea; -import com.bs.system.service.IDouAreaService; +import com.bs.system.domain.DfArea; +import com.bs.system.service.IDfAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -56,7 +56,7 @@ public class DfProductInfoController extends BaseController { @Resource private IDfProductPosterService dfProductPosterService; @Resource - private IDouAreaService douAreaService; + private IDfAreaService dfAreaService; @Resource private IDfBrokerProductService dfBrokerProductService; @Resource @@ -79,8 +79,8 @@ public class DfProductInfoController extends BaseController { condition(queryWrapper,dfProductInfo); List list = dfProductInfoService.list(queryWrapper); Map cityMap = new HashMap<>(); - List allCities = douAreaService.list(); - for (DouArea city : allCities) { + List allCities = dfAreaService.list(); + for (DfArea city : allCities) { cityMap.put(city.getAreaId(), city.getName()); } Map brokerProductMap = new HashMap<>(); @@ -150,8 +150,8 @@ public class DfProductInfoController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, DfProductInfo dfProductInfo) { Map cityMap = new HashMap<>(); - List allCities = douAreaService.list(); - for (DouArea city : allCities) { + List allCities = dfAreaService.list(); + for (DfArea city : allCities) { cityMap.put(city.getAreaId(), city.getName()); } Map brokerProductMap = new HashMap<>(); @@ -212,9 +212,9 @@ public class DfProductInfoController extends BaseController { return success(byId); } List businessCityList = Arrays.asList(businessCity.split(",")); - List douAreas = douAreaService.listByIds(businessCityList); + List douAreas = dfAreaService.listByIds(businessCityList); String concatenatedNames = douAreas.stream() - .map(DouArea::getName) + .map(DfArea::getName) .collect(Collectors.joining(",")); byId.setBusinessCityByName(concatenatedNames); return success(byId); diff --git a/bs-admin/src/main/java/com/bs/system/controller/DouAreaController.java b/bs-admin/src/main/java/com/bs/system/controller/DfAreaController.java similarity index 50% rename from bs-admin/src/main/java/com/bs/system/controller/DouAreaController.java rename to bs-admin/src/main/java/com/bs/system/controller/DfAreaController.java index 46779f6..2acc873 100644 --- a/bs-admin/src/main/java/com/bs/system/controller/DouAreaController.java +++ b/bs-admin/src/main/java/com/bs/system/controller/DfAreaController.java @@ -23,33 +23,33 @@ import com.bs.common.enums.BusinessType; import com.bs.common.utils.poi.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.hutool.core.lang.Validator; -import com.bs.system.domain.DouArea; -import com.bs.system.service.IDouAreaService; +import com.bs.system.domain.DfArea; +import com.bs.system.service.IDfAreaService; import javax.annotation.Resource; /** * 全国城市Controller * * @author bs - * @date 2024-04-08 + * @date 2024-04-13 */ @Api(tags = "全国城市") @RestController @RequestMapping("/system/area") -public class DouAreaController extends BaseController { +public class DfAreaController extends BaseController { @Resource - private IDouAreaService douAreaService; + private IDfAreaService dfAreaService; /** * 分页查询全国城市列表 */ @ApiOperation("分页查询全国城市列表") @GetMapping("/pageList") - public TableDataInfo pageList(DouArea douArea) { + public TableDataInfo pageList(DfArea dfArea) { startPage(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - condition(queryWrapper,douArea); - List list = douAreaService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + condition(queryWrapper,dfArea); + List list = dfAreaService.list(queryWrapper); return getDataTable(list); } @@ -58,10 +58,10 @@ public class DouAreaController extends BaseController { */ @ApiOperation("查询全国城市列表") @GetMapping("/list") - public AjaxResult list(DouArea douArea) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - condition(queryWrapper,douArea); - List list = douAreaService.list(queryWrapper); + public AjaxResult list(DfArea dfArea) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + condition(queryWrapper,dfArea); + List list = dfAreaService.list(queryWrapper); return success(list); } @@ -71,11 +71,11 @@ public class DouAreaController extends BaseController { @ApiOperation("导出全国城市列表") @Log(title = "全国城市导出", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DouArea douArea) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - condition(queryWrapper,douArea); - List list = douAreaService.list(queryWrapper); - ExcelUtil util = new ExcelUtil(DouArea. class); + public void export(HttpServletResponse response, DfArea dfArea) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + condition(queryWrapper,dfArea); + List list = dfAreaService.list(queryWrapper); + ExcelUtil util = new ExcelUtil(DfArea. class); util.exportExcel(response, list, "全国城市数据"); } @@ -85,7 +85,7 @@ public class DouAreaController extends BaseController { @ApiOperation("获取全国城市详细信息") @GetMapping(value = "/{areaId}") public AjaxResult getInfo(@PathVariable("areaId") String areaId) { - return success(douAreaService.getById(areaId)); + return success(dfAreaService.getById(areaId)); } /** @@ -94,8 +94,8 @@ public class DouAreaController extends BaseController { @ApiOperation("新增全国城市") @Log(title = "全国城市新增", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DouArea douArea) { - return toAjax(douAreaService.save(douArea)); + public AjaxResult add(@RequestBody DfArea dfArea) { + return toAjax(dfAreaService.save(dfArea)); } /** @@ -104,8 +104,8 @@ public class DouAreaController extends BaseController { @ApiOperation("修改全国城市") @Log(title = "全国城市修改", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DouArea douArea) { - return toAjax(douAreaService.updateById(douArea)); + public AjaxResult edit(@RequestBody DfArea dfArea) { + return toAjax(dfAreaService.updateById(dfArea)); } /** @@ -115,28 +115,63 @@ public class DouAreaController extends BaseController { @Log(title = "全国城市删除", businessType = BusinessType.DELETE) @DeleteMapping("/{areaIds}") public AjaxResult remove(@PathVariable List areaIds) { - return toAjax(douAreaService.removeBatchByIds(areaIds)); + return toAjax(dfAreaService.removeBatchByIds(areaIds)); } /** * 条件设置 */ - private void condition (LambdaQueryWrapper queryWrapper,DouArea douArea){ + private void condition (LambdaQueryWrapper queryWrapper,DfArea dfArea){ //${column.columnComment} - if(Validator.isNotEmpty(douArea.getAreaId())){ - queryWrapper.eq(DouArea::getAreaId,douArea.getAreaId()); + if(Validator.isNotEmpty(dfArea.getAreaId())){ + queryWrapper.eq(DfArea::getAreaId,dfArea.getAreaId()); } //${column.columnComment} - if(Validator.isNotEmpty(douArea.getParentId())){ - queryWrapper.eq(DouArea::getParentId,douArea.getParentId()); + if(Validator.isNotEmpty(dfArea.getParentId())){ + queryWrapper.eq(DfArea::getParentId,dfArea.getParentId()); } //${column.columnComment} - if(Validator.isNotEmpty(douArea.getName())){ - queryWrapper.eq(DouArea::getName,douArea.getName()); + if(Validator.isNotEmpty(dfArea.getName())){ + queryWrapper.eq(DfArea::getName,dfArea.getName()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getTenantId())){ + queryWrapper.eq(DfArea::getTenantId,dfArea.getTenantId()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getCreateDept())){ + queryWrapper.eq(DfArea::getCreateDept,dfArea.getCreateDept()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getCreateBy())){ + queryWrapper.eq(DfArea::getCreateBy,dfArea.getCreateBy()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getCreateTime())){ + queryWrapper.eq(DfArea::getCreateTime,dfArea.getCreateTime()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getUpdateBy())){ + queryWrapper.eq(DfArea::getUpdateBy,dfArea.getUpdateBy()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getUpdateTime())){ + queryWrapper.eq(DfArea::getUpdateTime,dfArea.getUpdateTime()); + } + + //${column.columnComment} + if(Validator.isNotEmpty(dfArea.getDelFlag())){ + queryWrapper.eq(DfArea::getDelFlag,dfArea.getDelFlag()); } } diff --git a/bs-admin/src/main/java/com/bs/system/domain/DouArea.java b/bs-admin/src/main/java/com/bs/system/domain/DfArea.java similarity index 91% rename from bs-admin/src/main/java/com/bs/system/domain/DouArea.java rename to bs-admin/src/main/java/com/bs/system/domain/DfArea.java index 6d5e455..e27f9e0 100644 --- a/bs-admin/src/main/java/com/bs/system/domain/DouArea.java +++ b/bs-admin/src/main/java/com/bs/system/domain/DfArea.java @@ -12,16 +12,16 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; /** - * 全国城市 dou_area + * 全国城市对象 df_area * * @author bs - * @date 2024-04-08 + * @date 2024-04-13 */ @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) -@TableName("dou_area") +@TableName("df_area") @Data -public class DouArea extends BaseEntity{ +public class DfArea extends BaseEntity{ private static final long serialVersionUID = 1L; /** $column.columnComment */ diff --git a/bs-admin/src/main/java/com/bs/system/mapper/DouAreaMapper.java b/bs-admin/src/main/java/com/bs/system/mapper/DfAreaMapper.java similarity index 53% rename from bs-admin/src/main/java/com/bs/system/mapper/DouAreaMapper.java rename to bs-admin/src/main/java/com/bs/system/mapper/DfAreaMapper.java index e4aa05a..48438be 100644 --- a/bs-admin/src/main/java/com/bs/system/mapper/DouAreaMapper.java +++ b/bs-admin/src/main/java/com/bs/system/mapper/DfAreaMapper.java @@ -1,14 +1,14 @@ package com.bs.system.mapper; import com.bs.common.mybatis.mapper.BaseMapperX; -import com.bs.system.domain.DouArea; +import com.bs.system.domain.DfArea; /** * 全国城市Mapper接口 * * @author bs - * @date 2024-04-08 + * @date 2024-04-13 */ -public interface DouAreaMapper extends BaseMapperX { +public interface DfAreaMapper extends BaseMapperX { } diff --git a/bs-admin/src/main/java/com/bs/system/service/IDouAreaService.java b/bs-admin/src/main/java/com/bs/system/service/IDfAreaService.java similarity index 53% rename from bs-admin/src/main/java/com/bs/system/service/IDouAreaService.java rename to bs-admin/src/main/java/com/bs/system/service/IDfAreaService.java index fe5250a..633c2eb 100644 --- a/bs-admin/src/main/java/com/bs/system/service/IDouAreaService.java +++ b/bs-admin/src/main/java/com/bs/system/service/IDfAreaService.java @@ -1,14 +1,14 @@ package com.bs.system.service; import com.github.yulichang.base.MPJBaseService; -import com.bs.system.domain.DouArea; +import com.bs.system.domain.DfArea; /** * 全国城市Service接口 * * @author bs - * @date 2024-04-08 + * @date 2024-04-13 */ -public interface IDouAreaService extends MPJBaseService{ +public interface IDfAreaService extends MPJBaseService{ } diff --git a/bs-admin/src/main/java/com/bs/system/service/impl/DouAreaServiceImpl.java b/bs-admin/src/main/java/com/bs/system/service/impl/DfAreaServiceImpl.java similarity index 55% rename from bs-admin/src/main/java/com/bs/system/service/impl/DouAreaServiceImpl.java rename to bs-admin/src/main/java/com/bs/system/service/impl/DfAreaServiceImpl.java index a6e867d..9e7f94d 100644 --- a/bs-admin/src/main/java/com/bs/system/service/impl/DouAreaServiceImpl.java +++ b/bs-admin/src/main/java/com/bs/system/service/impl/DfAreaServiceImpl.java @@ -1,8 +1,8 @@ package com.bs.system.service.impl; -import com.bs.system.mapper.DouAreaMapper; -import com.bs.system.domain.DouArea; -import com.bs.system.service.IDouAreaService; +import com.bs.system.mapper.DfAreaMapper; +import com.bs.system.domain.DfArea; +import com.bs.system.service.IDfAreaService; import com.github.yulichang.base.MPJBaseServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -10,10 +10,10 @@ import org.springframework.transaction.annotation.Transactional; * 全国城市Service业务层处理 * * @author bs - * @date 2024-04-08 + * @date 2024-04-13 */ @Service @Transactional(rollbackFor = Exception.class) -public class DouAreaServiceImpl extends MPJBaseServiceImpl implements IDouAreaService { +public class DfAreaServiceImpl extends MPJBaseServiceImpl implements IDfAreaService { } diff --git a/bs-admin/src/main/resources/mapper/system/DouAreaMapper.xml b/bs-admin/src/main/resources/mapper/system/DfAreaMapper.xml similarity index 73% rename from bs-admin/src/main/resources/mapper/system/DouAreaMapper.xml rename to bs-admin/src/main/resources/mapper/system/DfAreaMapper.xml index 6301c2e..ba3cd05 100644 --- a/bs-admin/src/main/resources/mapper/system/DouAreaMapper.xml +++ b/bs-admin/src/main/resources/mapper/system/DfAreaMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/bs-ui/src/views/indexs/warehouse/index.vue b/bs-ui/src/views/indexs/warehouse/index.vue index de225ac..56838bf 100644 --- a/bs-ui/src/views/indexs/warehouse/index.vue +++ b/bs-ui/src/views/indexs/warehouse/index.vue @@ -1,103 +1,103 @@