diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/ITraveAreaService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/ITraveAreaService.java deleted file mode 100644 index e123150..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/ITraveAreaService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.traveArea.service; - -import org.jeecg.modules.traveArea.entity.TraveArea; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 景区表 - * @Author: jeecg-boot - * @Date: 2024-09-14 - * @Version: V1.0 - */ -public interface ITraveAreaService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/impl/TraveAreaServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/impl/TraveAreaServiceImpl.java deleted file mode 100644 index 72bee2e..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/impl/TraveAreaServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.traveArea.service.impl; - -import org.jeecg.modules.traveArea.entity.TraveArea; -import org.jeecg.modules.traveArea.mapper.TraveAreaMapper; -import org.jeecg.modules.traveArea.service.ITraveAreaService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 景区表 - * @Author: jeecg-boot - * @Date: 2024-09-14 - * @Version: V1.0 - */ -@Service -public class TraveAreaServiceImpl extends ServiceImpl implements ITraveAreaService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/controller/TraveAreaController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java similarity index 73% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/controller/TraveAreaController.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java index 1a1786f..251805a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/controller/TraveAreaController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.traveArea.controller; +package org.jeecg.modules.travelArea.controller; import java.util.Arrays; import java.util.List; @@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.traveArea.entity.TraveArea; -import org.jeecg.modules.traveArea.service.ITraveAreaService; +import org.jeecg.modules.travelArea.entity.TravelArea; +import org.jeecg.modules.travelArea.service.ITravelAreaService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,21 +39,21 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-14 + * @Date: 2024-09-15 * @Version: V1.0 */ @Api(tags="景区表") @RestController -@RequestMapping("/traveArea/traveArea") +@RequestMapping("/travelArea/travelArea") @Slf4j -public class TraveAreaController extends JeecgController { +public class TravelAreaController extends JeecgController { @Autowired - private ITraveAreaService traveAreaService; + private ITravelAreaService travelAreaService; /** * 分页列表查询 * - * @param traveArea + * @param travelArea * @param pageNo * @param pageSize * @param req @@ -62,41 +62,41 @@ public class TraveAreaController extends JeecgController> queryPageList(TraveArea traveArea, + public Result> queryPageList(TravelArea travelArea, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(traveArea, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = traveAreaService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(travelArea, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = travelAreaService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param traveArea + * @param travelArea * @return */ @AutoLog(value = "景区表-添加") @ApiOperation(value="景区表-添加", notes="景区表-添加") @PostMapping(value = "/add") - public Result add(@RequestBody TraveArea traveArea) { - traveAreaService.save(traveArea); + public Result add(@RequestBody TravelArea travelArea) { + travelAreaService.save(travelArea); return Result.OK("添加成功!"); } /** * 编辑 * - * @param traveArea + * @param travelArea * @return */ @AutoLog(value = "景区表-编辑") @ApiOperation(value="景区表-编辑", notes="景区表-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody TraveArea traveArea) { - traveAreaService.updateById(traveArea); + public Result edit(@RequestBody TravelArea travelArea) { + travelAreaService.updateById(travelArea); return Result.OK("编辑成功!"); } @@ -110,7 +110,7 @@ public class TraveAreaController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - traveAreaService.removeById(id); + travelAreaService.removeById(id); return Result.OK("删除成功!"); } @@ -124,7 +124,7 @@ public class TraveAreaController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.traveAreaService.removeByIds(Arrays.asList(ids.split(","))); + this.travelAreaService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -137,23 +137,23 @@ public class TraveAreaController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - TraveArea traveArea = traveAreaService.getById(id); - if(traveArea==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + TravelArea travelArea = travelAreaService.getById(id); + if(travelArea==null) { return Result.error("未找到对应数据"); } - return Result.OK(traveArea); + return Result.OK(travelArea); } /** * 导出excel * * @param request - * @param traveArea + * @param travelArea */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, TraveArea traveArea) { - return super.exportXls(request, traveArea, TraveArea.class, "景区表"); + public ModelAndView exportXls(HttpServletRequest request, TravelArea travelArea) { + return super.exportXls(request, travelArea, TravelArea.class, "景区表"); } /** @@ -165,7 +165,7 @@ public class TraveAreaController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TraveArea.class); + return super.importExcel(request, response, TravelArea.class); } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/entity/TraveArea.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java similarity index 88% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/entity/TraveArea.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java index 6edcf9a..39c1fad 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/entity/TraveArea.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.traveArea.entity; +package org.jeecg.modules.travelArea.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -20,15 +20,15 @@ import lombok.experimental.Accessors; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-14 + * @Date: 2024-09-15 * @Version: V1.0 */ @Data -@TableName("trave_area") +@TableName("travel_area") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="trave_area对象", description="景区表") -public class TraveArea implements Serializable { +@ApiModel(value="travel_area对象", description="景区表") +public class TravelArea implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/TraveAreaMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java similarity index 51% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/TraveAreaMapper.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java index d693e3a..0ce3434 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/TraveAreaMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java @@ -1,17 +1,17 @@ -package org.jeecg.modules.traveArea.mapper; +package org.jeecg.modules.travelArea.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.traveArea.entity.TraveArea; +import org.jeecg.modules.travelArea.entity.TravelArea; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 景区表 * @Author: jeecg-boot - * @Date: 2024-09-14 + * @Date: 2024-09-15 * @Version: V1.0 */ -public interface TraveAreaMapper extends BaseMapper { +public interface TravelAreaMapper extends BaseMapper { } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/xml/TraveAreaMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/xml/TravelAreaMapper.xml similarity index 64% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/xml/TraveAreaMapper.xml rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/xml/TravelAreaMapper.xml index d5e4183..732b4a7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/xml/TraveAreaMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/xml/TravelAreaMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java new file mode 100644 index 0000000..5127c0d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.travelArea.service; + +import org.jeecg.modules.travelArea.entity.TravelArea; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 景区表 + * @Author: jeecg-boot + * @Date: 2024-09-15 + * @Version: V1.0 + */ +public interface ITravelAreaService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java new file mode 100644 index 0000000..442ae79 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.travelArea.service.impl; + +import org.jeecg.modules.travelArea.entity.TravelArea; +import org.jeecg.modules.travelArea.mapper.TravelAreaMapper; +import org.jeecg.modules.travelArea.service.ITravelAreaService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 景区表 + * @Author: jeecg-boot + * @Date: 2024-09-15 + * @Version: V1.0 + */ +@Service +public class TravelAreaServiceImpl extends ServiceImpl implements ITravelAreaService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/TraveAreaList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue similarity index 92% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/TraveAreaList.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue index 9d0f9ea..78f611e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/TraveAreaList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue @@ -89,7 +89,7 @@ - + @@ -98,13 +98,13 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import TraveAreaModal from './modules/TraveAreaModal' + import TravelAreaModal from './modules/TravelAreaModal' export default { - name: 'TraveAreaList', + name: 'TravelAreaList', mixins:[JeecgListMixin, mixinDevice], components: { - TraveAreaModal + TravelAreaModal }, data () { return { @@ -153,11 +153,11 @@ } ], url: { - list: "/traveArea/traveArea/list", - delete: "/traveArea/traveArea/delete", - deleteBatch: "/traveArea/traveArea/deleteBatch", - exportXlsUrl: "/traveArea/traveArea/exportXls", - importExcelUrl: "traveArea/traveArea/importExcel", + list: "/travelArea/travelArea/list", + delete: "/travelArea/travelArea/delete", + deleteBatch: "/travelArea/travelArea/deleteBatch", + exportXlsUrl: "/travelArea/travelArea/exportXls", + importExcelUrl: "travelArea/travelArea/importExcel", }, dictOptions:{}, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaForm.vue similarity index 94% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaForm.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaForm.vue index d7f31a4..2da6901 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaForm.vue @@ -35,7 +35,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'TraveAreaForm', + name: 'TravelAreaForm', components: { }, props: { @@ -62,9 +62,9 @@ validatorRules: { }, url: { - add: "/traveArea/traveArea/add", - edit: "/traveArea/traveArea/edit", - queryById: "/traveArea/traveArea/queryById" + add: "/travelArea/travelArea/add", + edit: "/travelArea/travelArea/edit", + queryById: "/travelArea/travelArea/queryById" } } }, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaModal.Style#Drawer.vue similarity index 88% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaModal.Style#Drawer.vue index c99e4f1..b306c58 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +