From fc67bb75ba199de81a0f3e67675a6d54899b578f Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 5 Jun 2025 11:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/AppletIndexController.java | 25 +++ .../org/jeecg/api/service/AppletIndexService.java | 7 + .../api/service/impl/AppletIndexServiceImpl.java | 55 ++++++ .../api/service/impl/AppletInfoServiceImpl.java | 17 ++ .../controller/CommonBannerController.java | 171 +++++++++++++++++ .../modules/commonBanner/entity/CommonBanner.java | 58 ++++++ .../commonBanner/mapper/CommonBannerMapper.java | 17 ++ .../commonBanner/mapper/xml/CommonBannerMapper.xml | 5 + .../commonBanner/service/ICommonBannerService.java | 14 ++ .../service/impl/CommonBannerServiceImpl.java | 19 ++ .../modules/commonBanner/vue/CommonBannerList.vue | 178 ++++++++++++++++++ .../commonBanner/vue/modules/CommonBannerForm.vue | 109 +++++++++++ .../vue/modules/CommonBannerModal.Style#Drawer.vue | 84 +++++++++ .../commonBanner/vue/modules/CommonBannerModal.vue | 60 ++++++ .../modules/commonBanner/vue3/CommonBanner.api.ts | 61 ++++++ .../modules/commonBanner/vue3/CommonBanner.data.ts | 36 ++++ .../modules/commonBanner/vue3/CommonBannerList.vue | 162 ++++++++++++++++ .../vue3/components/CommonBannerModal.vue | 58 ++++++ .../commonCat/controller/CommonCatController.java | 171 +++++++++++++++++ .../jeecg/modules/commonCat/entity/CommonCat.java | 84 +++++++++ .../modules/commonCat/mapper/CommonCatMapper.java | 17 ++ .../commonCat/mapper/xml/CommonCatMapper.xml | 5 + .../commonCat/service/ICommonCatService.java | 14 ++ .../service/impl/CommonCatServiceImpl.java | 19 ++ .../jeecg/modules/commonCat/vue/CommonCatList.vue | 207 +++++++++++++++++++++ .../commonCat/vue/modules/CommonCatForm.vue | 134 +++++++++++++ .../vue/modules/CommonCatModal.Style#Drawer.vue | 84 +++++++++ .../commonCat/vue/modules/CommonCatModal.vue | 60 ++++++ .../jeecg/modules/commonCat/vue3/CommonCat.api.ts | 61 ++++++ .../jeecg/modules/commonCat/vue3/CommonCat.data.ts | 83 +++++++++ .../jeecg/modules/commonCat/vue3/CommonCatList.vue | 162 ++++++++++++++++ .../commonCat/vue3/components/CommonCatModal.vue | 58 ++++++ .../controller/CommonCityController.java | 171 +++++++++++++++++ .../modules/commonCity/entity/CommonCity.java | 58 ++++++ .../commonCity/mapper/CommonCityMapper.java | 17 ++ .../commonCity/mapper/xml/CommonCityMapper.xml | 5 + .../commonCity/service/ICommonCityService.java | 14 ++ .../service/impl/CommonCityServiceImpl.java | 19 ++ .../modules/commonCity/vue/CommonCityList.vue | 177 ++++++++++++++++++ .../commonCity/vue/modules/CommonCityForm.vue | 109 +++++++++++ .../vue/modules/CommonCityModal.Style#Drawer.vue | 84 +++++++++ .../commonCity/vue/modules/CommonCityModal.vue | 60 ++++++ .../modules/commonCity/vue3/CommonCity.api.ts | 61 ++++++ .../modules/commonCity/vue3/CommonCity.data.ts | 33 ++++ .../modules/commonCity/vue3/CommonCityList.vue | 162 ++++++++++++++++ .../commonCity/vue3/components/CommonCityModal.vue | 58 ++++++ .../controller/CommonConfigController.java | 171 +++++++++++++++++ .../modules/commonConfig/entity/CommonConfig.java | 67 +++++++ .../commonConfig/mapper/CommonConfigMapper.java | 17 ++ .../commonConfig/mapper/xml/CommonConfigMapper.xml | 5 + .../commonConfig/service/ICommonConfigService.java | 14 ++ .../service/impl/CommonConfigServiceImpl.java | 19 ++ .../modules/commonConfig/vue/CommonConfigList.vue | 190 +++++++++++++++++++ .../commonConfig/vue/modules/CommonConfigForm.vue | 119 ++++++++++++ .../vue/modules/CommonConfigModal.Style#Drawer.vue | 84 +++++++++ .../commonConfig/vue/modules/CommonConfigModal.vue | 60 ++++++ .../modules/commonConfig/vue3/CommonConfig.api.ts | 61 ++++++ .../modules/commonConfig/vue3/CommonConfig.data.ts | 56 ++++++ .../modules/commonConfig/vue3/CommonConfigList.vue | 162 ++++++++++++++++ .../vue3/components/CommonConfigModal.vue | 58 ++++++ 60 files changed, 4406 insertions(+) create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBannerList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/components/CommonBannerModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/mapper/xml/CommonCatMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCatList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCat/vue3/components/CommonCatModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/controller/CommonCityController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/mapper/CommonCityMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/mapper/xml/CommonCityMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/service/ICommonCityService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/service/impl/CommonCityServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue/CommonCityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonCity/vue3/components/CommonCityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/controller/CommonConfigController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/entity/CommonConfig.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/CommonConfigMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/xml/CommonConfigMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/service/ICommonConfigService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/service/impl/CommonConfigServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue/CommonConfigList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfigList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/components/CommonConfigModal.vue diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java index d8aefcb..7b05197 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java @@ -115,4 +115,29 @@ public class AppletIndexController { + + //快捷订单列表数据带分页 + @ApiOperation(value="快捷订单列表数据带分页", notes="快捷订单列表数据带分页") + @GetMapping("/getAddOrderPageBean") + public Result getAddOrderPageBean(@RequestHeader("X-Access-Token") String token,String state, PageBean pageBean){ + return appletIndexService.getAddOrderPageBean(token,state,pageBean); + } + + //查询快捷订单详情 + @ApiOperation(value="查询快捷订单详情", notes="查询快捷订单详情") + @GetMapping("/getAddOrderInfo") + public Result getAddOrderInfo(@RequestHeader("X-Access-Token") String token,String orderId){ + return appletIndexService.getAddOrderInfo(token,orderId); + } + + + + + + + + + + + } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java index 7e9872f..4750d39 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java @@ -49,4 +49,11 @@ public interface AppletIndexService { //立即支付 Result payOrder(String token,Integer type,String orderId); + + //快捷订单列表数据带分页 + Result getAddOrderPageBean(String token,String state,PageBean pageBean); + + + //查询快捷订单详情 + Result getAddOrderInfo(String token,String orderId); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 7d3e0d2..8d0200a 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -338,7 +338,62 @@ public class AppletIndexServiceImpl implements AppletIndexService { } + //快捷订单列表数据带分页 + @Override + public Result getAddOrderPageBean(String token,String state,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = commonAddOrderService.lambdaQuery() + .eq(CommonAddOrder::getUserId,hanHaiMember.getId()) + .eq(StringUtils.isNotBlank(state),CommonAddOrder::getStatus,state) + .page(page); + //得到集合 + List records = pageList.getRecords(); + //创建一个新的集合 + List commonAddOrders = new ArrayList<>(); + + records.forEach(item->{ + //获取商品标识 + String[] shopIdSplit = item.getShopId().split(","); + //创建一个集合 + List list1 = new ArrayList<>(); + for (String shopId : shopIdSplit) { + //获取商品信息 + CommonShop commonShop = commonShopService.getById(shopId); + //加入集合 + list1.add(commonShop); + } + commonAddOrders.add(item); + }); + pageList.setRecords(commonAddOrders); + + return Result.OK("快捷订单信息列表",pageList); + } + + //查询快捷订单详情 + @Override + public Result getAddOrderInfo(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonAddOrder commonAddOrder = commonAddOrderService.getById(orderId); + //写入商品信息 + //如果有数据返回数据，循环赋值 + //获取商品标识 + String[] shopIdSplit = commonAddOrder.getShopId().split(","); + //创建一个集合 + List list1 = new ArrayList<>(); + for (String shopId : shopIdSplit) { + //获取商品信息 + CommonShop commonShop = commonShopService.getById(shopId); + //加入集合 + list1.add(commonShop); + } + commonAddOrder.setCommonShop(list1); + if (commonAddOrder.getUserId().equals(hanHaiMember.getId())){ + return Result.OK("快捷订单信息",commonAddOrder); + } + return Result.error("订单信息不存在"); + } } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java index 95109d5..6cbff00 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.api.bean.FansPageBean; @@ -21,6 +22,7 @@ import org.jeecg.modules.commonConfig.service.ICommonConfigService; import org.jeecg.modules.commonHelp.entity.CommonHelp; import org.jeecg.modules.commonHelp.service.ICommonHelpService; import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; +import org.jeecg.modules.commonMoneyLog.mapper.CommonMoneyLogMapper; import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; import org.jeecg.modules.commonOrder.entity.CommonOrder; import org.jeecg.modules.commonOrder.service.ICommonOrderService; @@ -44,6 +46,7 @@ import java.net.URL; import java.nio.file.Files; import java.util.*; import java.util.List; +import java.util.stream.Collectors; @Slf4j @Service @@ -60,6 +63,8 @@ public class AppletInfoServiceImpl implements AppletInfoService { @Resource private ICommonMoneyLogService commonMoneyLogService; @Resource + private CommonMoneyLogMapper commonMoneyLogMapper; + @Resource private ICommonConfigService commonConfigService; @Resource private ICommonHelpService commonHelpService; @@ -96,6 +101,18 @@ public class AppletInfoServiceImpl implements AppletInfoService { @Override public Result getUserInfo(String token){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + List moneyList = commonMoneyLogMapper.selectObjs( + new LambdaQueryWrapper() + .eq(CommonMoneyLog::getUserId, hanHaiMember.getId()) + .select(CommonMoneyLog::getMoney) + ).stream() + .filter(obj -> obj != null) + .map(obj -> new BigDecimal(obj.toString())) + .collect(Collectors.toList()); + + BigDecimal money = moneyList.stream() + .reduce(BigDecimal.ZERO, BigDecimal::add); + hanHaiMember.setPrice(money); return Result.OK("个人信息查询成功",hanHaiMember); } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java new file mode 100644 index 0000000..897b347 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonBanner.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.commonBanner.entity.CommonBanner; +import org.jeecg.modules.commonBanner.service.ICommonBannerService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 公共轮播图 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Api(tags="公共轮播图") +@RestController +@RequestMapping("/commonBanner/commonBanner") +@Slf4j +public class CommonBannerController extends JeecgController { + @Autowired + private ICommonBannerService commonBannerService; + + /** + * 分页列表查询 + * + * @param commonBanner + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "公共轮播图-分页列表查询") + @ApiOperation(value="公共轮播图-分页列表查询", notes="公共轮播图-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonBanner commonBanner, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonBanner, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonBannerService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonBanner + * @return + */ + @AutoLog(value = "公共轮播图-添加") + @ApiOperation(value="公共轮播图-添加", notes="公共轮播图-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonBanner commonBanner) { + commonBannerService.save(commonBanner); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonBanner + * @return + */ + @AutoLog(value = "公共轮播图-编辑") + @ApiOperation(value="公共轮播图-编辑", notes="公共轮播图-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonBanner commonBanner) { + commonBannerService.updateById(commonBanner); + 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) { + commonBannerService.removeById(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.commonBannerService.removeByIds(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) { + CommonBanner commonBanner = commonBannerService.getById(id); + if(commonBanner==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonBanner); + } + + /** + * 导出excel + * + * @param request + * @param commonBanner + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonBanner commonBanner) { + return super.exportXls(request, commonBanner, CommonBanner.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, CommonBanner.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java new file mode 100644 index 0000000..10e63a7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.commonBanner.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 公共轮播图 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Data +@TableName("common_banner") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_banner对象", description="公共轮播图") +public class CommonBanner implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**图片*/ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.String image; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java new file mode 100644 index 0000000..fbce545 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonBanner.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonBanner.entity.CommonBanner; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 公共轮播图 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +public interface CommonBannerMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml new file mode 100644 index 0000000..5fc1f08 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java new file mode 100644 index 0000000..eaf16f8 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonBanner.service; + +import org.jeecg.modules.commonBanner.entity.CommonBanner; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 公共轮播图 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +public interface ICommonBannerService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java new file mode 100644 index 0000000..1e82faa --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonBanner.service.impl; + +import org.jeecg.modules.commonBanner.entity.CommonBanner; +import org.jeecg.modules.commonBanner.mapper.CommonBannerMapper; +import org.jeecg.modules.commonBanner.service.ICommonBannerService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 公共轮播图 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Service +public class CommonBannerServiceImpl extends ServiceImpl implements ICommonBannerService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue new file mode 100644 index 0000000..d805380 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue new file mode 100644 index 0000000..fbdf2f1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue new file mode 100644 index 0000000..496d1a0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue new file mode 100644 index 0000000..1e25f38 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.api.ts b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.api.ts new file mode 100644 index 0000000..d99f1f2 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonBanner/commonBanner/list', + save='/commonBanner/commonBanner/add', + edit='/commonBanner/commonBanner/edit', + deleteOne = '/commonBanner/commonBanner/delete', + deleteBatch = '/commonBanner/commonBanner/deleteBatch', + importExcel = '/commonBanner/commonBanner/importExcel', + exportXls = '/commonBanner/commonBanner/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts new file mode 100644 index 0000000..51773d0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts @@ -0,0 +1,36 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '标题', + align:"center", + dataIndex: 'title' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '标题', + field: 'title', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBannerList.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBannerList.vue new file mode 100644 index 0000000..f04ad61 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBannerList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/components/CommonBannerModal.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/components/CommonBannerModal.vue new file mode 100644 index 0000000..b1c19f5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/components/CommonBannerModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java b/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java new file mode 100644 index 0000000..9641561 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/controller/CommonCatController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonCat.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.commonCat.entity.CommonCat; +import org.jeecg.modules.commonCat.service.ICommonCatService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 购物车表 + * @Author: jeecg-boot + * @Date: 2025-05-26 + * @Version: V1.0 + */ +@Api(tags="购物车表") +@RestController +@RequestMapping("/commonCat/commonCat") +@Slf4j +public class CommonCatController extends JeecgController { + @Autowired + private ICommonCatService commonCatService; + + /** + * 分页列表查询 + * + * @param commonCat + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "购物车表-分页列表查询") + @ApiOperation(value="购物车表-分页列表查询", notes="购物车表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonCat commonCat, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonCat, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonCatService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonCat + * @return + */ + @AutoLog(value = "购物车表-添加") + @ApiOperation(value="购物车表-添加", notes="购物车表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonCat commonCat) { + commonCatService.save(commonCat); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonCat + * @return + */ + @AutoLog(value = "购物车表-编辑") + @ApiOperation(value="购物车表-编辑", notes="购物车表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonCat commonCat) { + commonCatService.updateById(commonCat); + 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) { + commonCatService.removeById(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.commonCatService.removeByIds(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) { + CommonCat commonCat = commonCatService.getById(id); + if(commonCat==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonCat); + } + + /** + * 导出excel + * + * @param request + * @param commonCat + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonCat commonCat) { + return super.exportXls(request, commonCat, CommonCat.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, CommonCat.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java b/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java new file mode 100644 index 0000000..c4fad02 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/entity/CommonCat.java @@ -0,0 +1,84 @@ +package org.jeecg.modules.commonCat.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.commonShop.entity.CommonShop; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 购物车表 + * @Author: jeecg-boot + * @Date: 2025-05-26 + * @Version: V1.0 + */ +@Data +@TableName("common_cat") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_cat对象", description="购物车表") +public class CommonCat implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**图片*/ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.String image; + /**数量*/ + @Excel(name = "数量", width = 15) + @ApiModelProperty(value = "数量") + private java.lang.Integer num; + /**规格*/ + @Excel(name = "规格", width = 15) + @ApiModelProperty(value = "规格") + private java.lang.String sku; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**商品标识*/ + @Excel(name = "商品标识", width = 15) + @ApiModelProperty(value = "商品标识") + private java.lang.String shopId; + + + @TableField (exist = false) + private CommonShop shop; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java new file mode 100644 index 0000000..750a36c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/CommonCatMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonCat.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonCat.entity.CommonCat; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 购物车表 + * @Author: jeecg-boot + * @Date: 2025-05-26 + * @Version: V1.0 + */ +public interface CommonCatMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/xml/CommonCatMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/xml/CommonCatMapper.xml new file mode 100644 index 0000000..37e8786 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/mapper/xml/CommonCatMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java b/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java new file mode 100644 index 0000000..c93e731 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/service/ICommonCatService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonCat.service; + +import org.jeecg.modules.commonCat.entity.CommonCat; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 购物车表 + * @Author: jeecg-boot + * @Date: 2025-05-26 + * @Version: V1.0 + */ +public interface ICommonCatService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java new file mode 100644 index 0000000..84a01d1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/service/impl/CommonCatServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonCat.service.impl; + +import org.jeecg.modules.commonCat.entity.CommonCat; +import org.jeecg.modules.commonCat.mapper.CommonCatMapper; +import org.jeecg.modules.commonCat.service.ICommonCatService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 购物车表 + * @Author: jeecg-boot + * @Date: 2025-05-26 + * @Version: V1.0 + */ +@Service +public class CommonCatServiceImpl extends ServiceImpl implements ICommonCatService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue new file mode 100644 index 0000000..4b7ad11 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/CommonCatList.vue @@ -0,0 +1,207 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue new file mode 100644 index 0000000..d0f73a5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.Style#Drawer.vue new file mode 100644 index 0000000..15c42f1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.vue new file mode 100644 index 0000000..f274ff4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue/modules/CommonCatModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.api.ts b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.api.ts new file mode 100644 index 0000000..59f7d92 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonCat/commonCat/list', + save='/commonCat/commonCat/add', + edit='/commonCat/commonCat/edit', + deleteOne = '/commonCat/commonCat/delete', + deleteBatch = '/commonCat/commonCat/deleteBatch', + importExcel = '/commonCat/commonCat/importExcel', + exportXls = '/commonCat/commonCat/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts new file mode 100644 index 0000000..5b50220 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCat.data.ts @@ -0,0 +1,83 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '图片', + align:"center", + dataIndex: 'image' + }, + { + title: '数量', + align:"center", + dataIndex: 'num' + }, + { + title: '规格', + align:"center", + dataIndex: 'sku' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '商品标识', + align:"center", + dataIndex: 'shopId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '图片', + field: 'image', + component: 'Input', + }, + { + label: '数量', + field: 'num', + component: 'InputNumber', + }, + { + label: '规格', + field: 'sku', + component: 'Input', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '商品标识', + field: 'shopId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCatList.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCatList.vue new file mode 100644 index 0000000..a21bb5b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/CommonCatList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/components/CommonCatModal.vue b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/components/CommonCatModal.vue new file mode 100644 index 0000000..fd11f86 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCat/vue3/components/CommonCatModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/controller/CommonCityController.java b/module-common/src/main/java/org/jeecg/modules/commonCity/controller/CommonCityController.java new file mode 100644 index 0000000..f7b8578 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/controller/CommonCityController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonCity.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.commonCity.entity.CommonCity; +import org.jeecg.modules.commonCity.service.ICommonCityService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 所属城市 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Api(tags="所属城市") +@RestController +@RequestMapping("/commonCity/commonCity") +@Slf4j +public class CommonCityController extends JeecgController { + @Autowired + private ICommonCityService commonCityService; + + /** + * 分页列表查询 + * + * @param commonCity + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "所属城市-分页列表查询") + @ApiOperation(value="所属城市-分页列表查询", notes="所属城市-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonCity commonCity, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonCity, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonCityService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonCity + * @return + */ + @AutoLog(value = "所属城市-添加") + @ApiOperation(value="所属城市-添加", notes="所属城市-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonCity commonCity) { + commonCityService.save(commonCity); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonCity + * @return + */ + @AutoLog(value = "所属城市-编辑") + @ApiOperation(value="所属城市-编辑", notes="所属城市-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonCity commonCity) { + commonCityService.updateById(commonCity); + 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) { + commonCityService.removeById(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.commonCityService.removeByIds(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) { + CommonCity commonCity = commonCityService.getById(id); + if(commonCity==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonCity); + } + + /** + * 导出excel + * + * @param request + * @param commonCity + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonCity commonCity) { + return super.exportXls(request, commonCity, CommonCity.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, CommonCity.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java b/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java new file mode 100644 index 0000000..40e9c34 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.commonCity.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 所属城市 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Data +@TableName("common_city") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_city对象", description="所属城市") +public class CommonCity implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**城市名称*/ + @Excel(name = "城市名称", width = 15) + @ApiModelProperty(value = "城市名称") + private java.lang.String name; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/CommonCityMapper.java b/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/CommonCityMapper.java new file mode 100644 index 0000000..6d3325c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/CommonCityMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonCity.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonCity.entity.CommonCity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 所属城市 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +public interface CommonCityMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/xml/CommonCityMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/xml/CommonCityMapper.xml new file mode 100644 index 0000000..4d002bb --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/mapper/xml/CommonCityMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/service/ICommonCityService.java b/module-common/src/main/java/org/jeecg/modules/commonCity/service/ICommonCityService.java new file mode 100644 index 0000000..56817f9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/service/ICommonCityService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonCity.service; + +import org.jeecg.modules.commonCity.entity.CommonCity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 所属城市 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +public interface ICommonCityService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/service/impl/CommonCityServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonCity/service/impl/CommonCityServiceImpl.java new file mode 100644 index 0000000..1546f5a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/service/impl/CommonCityServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonCity.service.impl; + +import org.jeecg.modules.commonCity.entity.CommonCity; +import org.jeecg.modules.commonCity.mapper.CommonCityMapper; +import org.jeecg.modules.commonCity.service.ICommonCityService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 所属城市 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Service +public class CommonCityServiceImpl extends ServiceImpl implements ICommonCityService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue/CommonCityList.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/CommonCityList.vue new file mode 100644 index 0000000..2fe656e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/CommonCityList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityForm.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityForm.vue new file mode 100644 index 0000000..ecbee42 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.Style#Drawer.vue new file mode 100644 index 0000000..6a9c8aa --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.vue new file mode 100644 index 0000000..3cae421 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue/modules/CommonCityModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.api.ts b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.api.ts new file mode 100644 index 0000000..bd05b9a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonCity/commonCity/list', + save='/commonCity/commonCity/add', + edit='/commonCity/commonCity/edit', + deleteOne = '/commonCity/commonCity/delete', + deleteBatch = '/commonCity/commonCity/deleteBatch', + importExcel = '/commonCity/commonCity/importExcel', + exportXls = '/commonCity/commonCity/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.data.ts b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.data.ts new file mode 100644 index 0000000..c65a720 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCity.data.ts @@ -0,0 +1,33 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '城市名称', + align:"center", + dataIndex: 'name' + }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '城市名称', + field: 'name', + component: 'Input', + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCityList.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCityList.vue new file mode 100644 index 0000000..1cc5467 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/CommonCityList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/components/CommonCityModal.vue b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/components/CommonCityModal.vue new file mode 100644 index 0000000..2782c39 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/vue3/components/CommonCityModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/controller/CommonConfigController.java b/module-common/src/main/java/org/jeecg/modules/commonConfig/controller/CommonConfigController.java new file mode 100644 index 0000000..8979830 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/controller/CommonConfigController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonConfig.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.commonConfig.entity.CommonConfig; +import org.jeecg.modules.commonConfig.service.ICommonConfigService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 公共配置表 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Api(tags="公共配置表") +@RestController +@RequestMapping("/commonConfig/commonConfig") +@Slf4j +public class CommonConfigController extends JeecgController { + @Autowired + private ICommonConfigService commonConfigService; + + /** + * 分页列表查询 + * + * @param commonConfig + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "公共配置表-分页列表查询") + @ApiOperation(value="公共配置表-分页列表查询", notes="公共配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonConfig commonConfig, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonConfig, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonConfigService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonConfig + * @return + */ + @AutoLog(value = "公共配置表-添加") + @ApiOperation(value="公共配置表-添加", notes="公共配置表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonConfig commonConfig) { + commonConfigService.save(commonConfig); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonConfig + * @return + */ + @AutoLog(value = "公共配置表-编辑") + @ApiOperation(value="公共配置表-编辑", notes="公共配置表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonConfig commonConfig) { + commonConfigService.updateById(commonConfig); + 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) { + commonConfigService.removeById(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.commonConfigService.removeByIds(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) { + CommonConfig commonConfig = commonConfigService.getById(id); + if(commonConfig==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonConfig); + } + + /** + * 导出excel + * + * @param request + * @param commonConfig + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonConfig commonConfig) { + return super.exportXls(request, commonConfig, CommonConfig.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, CommonConfig.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/entity/CommonConfig.java b/module-common/src/main/java/org/jeecg/modules/commonConfig/entity/CommonConfig.java new file mode 100644 index 0000000..4b20750 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/entity/CommonConfig.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.commonConfig.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 公共配置表 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Data +@TableName("common_config") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_config对象", description="公共配置表") +public class CommonConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**标识*/ + @Excel(name = "标识", width = 15) + @ApiModelProperty(value = "标识") + private java.lang.String keyName; + /**说明*/ + @Excel(name = "说明", width = 15) + @ApiModelProperty(value = "说明") + private java.lang.String keyValue; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String keyContent; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "common_config_type") + @Dict(dicCode = "common_config_type") + @ApiModelProperty(value = "类型") + private java.lang.Integer type; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/CommonConfigMapper.java b/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/CommonConfigMapper.java new file mode 100644 index 0000000..40c5bfb --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/CommonConfigMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonConfig.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonConfig.entity.CommonConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 公共配置表 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +public interface CommonConfigMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/xml/CommonConfigMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/xml/CommonConfigMapper.xml new file mode 100644 index 0000000..045f19c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/xml/CommonConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/service/ICommonConfigService.java b/module-common/src/main/java/org/jeecg/modules/commonConfig/service/ICommonConfigService.java new file mode 100644 index 0000000..3653d78 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/service/ICommonConfigService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonConfig.service; + +import org.jeecg.modules.commonConfig.entity.CommonConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 公共配置表 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +public interface ICommonConfigService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/service/impl/CommonConfigServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonConfig/service/impl/CommonConfigServiceImpl.java new file mode 100644 index 0000000..fff3211 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/service/impl/CommonConfigServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonConfig.service.impl; + +import org.jeecg.modules.commonConfig.entity.CommonConfig; +import org.jeecg.modules.commonConfig.mapper.CommonConfigMapper; +import org.jeecg.modules.commonConfig.service.ICommonConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 公共配置表 + * @Author: jeecg-boot + * @Date: 2025-05-07 + * @Version: V1.0 + */ +@Service +public class CommonConfigServiceImpl extends ServiceImpl implements ICommonConfigService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/CommonConfigList.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/CommonConfigList.vue new file mode 100644 index 0000000..c1fad50 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/CommonConfigList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigForm.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigForm.vue new file mode 100644 index 0000000..4c9556c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.Style#Drawer.vue new file mode 100644 index 0000000..767ae9a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.vue new file mode 100644 index 0000000..a4b0829 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue/modules/CommonConfigModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.api.ts b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.api.ts new file mode 100644 index 0000000..122a60c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonConfig/commonConfig/list', + save='/commonConfig/commonConfig/add', + edit='/commonConfig/commonConfig/edit', + deleteOne = '/commonConfig/commonConfig/delete', + deleteBatch = '/commonConfig/commonConfig/deleteBatch', + importExcel = '/commonConfig/commonConfig/importExcel', + exportXls = '/commonConfig/commonConfig/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.data.ts b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.data.ts new file mode 100644 index 0000000..3dfb2fc --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfig.data.ts @@ -0,0 +1,56 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '标识', + align:"center", + dataIndex: 'keyName' + }, + { + title: '说明', + align:"center", + dataIndex: 'keyValue' + }, + { + title: '内容', + align:"center", + dataIndex: 'keyContent' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标识', + field: 'keyName', + component: 'Input', + }, + { + label: '说明', + field: 'keyValue', + component: 'Input', + }, + { + label: '内容', + field: 'keyContent', + component: 'Input', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"common_config_type" + }, + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfigList.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfigList.vue new file mode 100644 index 0000000..68dcabf --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/CommonConfigList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/components/CommonConfigModal.vue b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/components/CommonConfigModal.vue new file mode 100644 index 0000000..f9425b0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonConfig/vue3/components/CommonConfigModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file