diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md new file mode 100644 index 0000000..ce3233a --- /dev/null +++ b/.trae/rules/project_rules.md @@ -0,0 +1,6 @@ +1. 当前项目使用的是jeecgboot3.8.1 +2. 项目使用的是mysql数据库 +3. 项目使用的是redis缓存 +4. 项目使用的是shiro权限框架 +5. 项目使用的是vue3+element-plus前端框架 + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java index 82c9fcf..61ec38e 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java @@ -40,7 +40,7 @@ public class AppletApiLoginController { @IgnoreAuth public Result> wxLogin( @Parameter(description = "微信登录code", required = true) - @RequestParam String code) { + String code) { if (StringUtils.isBlank(code)) { return Result.error("微信登录code不能为空"); @@ -61,7 +61,7 @@ public class AppletApiLoginController { @IgnoreAuth public Result getPhoneNumber( @Parameter(description = "手机号获取code", required = true) - @RequestParam String code) { + String code) { if (StringUtils.isBlank(code)) { return Result.error("手机号获取code不能为空"); @@ -112,8 +112,7 @@ public class AppletApiLoginController { @Operation(summary = "更新用户信息", description = "更新当前登录用户信息") public Result updateUserInfo( @Parameter(description = "用户信息", required = true) - @RequestBody AppletUser userInfo) { - + AppletUser userInfo) { if (userInfo == null) { return Result.error("用户信息不能为空"); } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java new file mode 100644 index 0000000..eabe2e2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.applet.controller; + + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.applet.service.AppletApiPaperService; +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +@Tag(name="试卷/报告") +@RestController +@RequestMapping("/appletApi/paper") +@Slf4j +public class AppletApiPaperController { + + @Autowired + private AppletApiPaperService appletApiPaperService; + + @GetMapping("/paper") + @Operation(summary = "试卷查询") + public Result> paper(@Parameter(description = "类型【选填】（0已完成，1未完成）") String type){ + return Result.ok(appletApiPaperService.list(type)); + } + + @GetMapping("/paperDetail") + @Operation(summary = "试卷详情") + public Result paperDetail(@Parameter(description = "试卷id") String id){ + return Result.ok(appletApiPaperService.paperDetail(id)); + } + + @GetMapping("/reportById") + @Operation(summary = "试卷下的报告列表") + public Result report(@Parameter(description = "试卷id") String id){ + appletApiPaperService.report(id); + return Result.ok(); + } + + @GetMapping("/reportDetail") + @Operation(summary = "报告详情") + public Result reportDetail(@Parameter(description = "报告id") String id){ + appletApiPaperService.reportDetail(id); + return Result.ok(); + } + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiProductController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiProductController.java index bab117b..76fd960 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiProductController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiProductController.java @@ -91,8 +91,9 @@ public class AppletApiProductController { @GetMapping(value = "/category") @IgnoreAuth public Result> category( - @Parameter(description = "产品类型（0营养剂，1预约，2课程）", required = true) @RequestParam String type) { - + @Parameter(description = "产品类型（0营养剂，1预约，2课程）", required = true) @RequestParam String type, + @Parameter(description = "父id，不传为一级分类") @RequestParam String pid) { + log.info("产品分类查询 - type: {}", type); List list = appletProductService.getCategoriesByType(type); diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiPaperService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiPaperService.java new file mode 100644 index 0000000..cc5732d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiPaperService.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.applet.service; + +import org.jeecg.modules.demo.appletAbout.entity.AppletAbout; +import org.jeecg.modules.demo.appletBanner.entity.AppletBanner; +import org.jeecg.modules.demo.appletHomeVideo.entity.AppletHomeVideo; +import org.jeecg.modules.demo.appletIntroduce.entity.AppletIntroduce; +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import org.jeecg.modules.demo.appletProduct.entity.AppletProduct; +import org.jeecg.modules.demo.personalizedRecommen.entity.PersonalizedRecommen; + +import java.awt.print.Paper; +import java.util.List; + +/** + * @Description: 小程序Banner查询服务接口 + * @Author: jeecg-boot + * @Date: 2025-01-XX + * @Version: V1.0 + */ +public interface AppletApiPaperService { + + List list(String type); + + Object report(String id); + + void reportDetail(String id); + + AppletPaper paperDetail(String id); +} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java index a10998f..fce1654 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java @@ -65,7 +65,7 @@ public class AppletApiIndexServiceImpl implements AppletApiIndexService { public List getRecommendProduct() { return appletProductService .lambdaQuery() - .eq(AppletProduct::getHomeRecommend, "true") + .eq(AppletProduct::getHomeRecommend, "Y") .list(); } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java new file mode 100644 index 0000000..0cc13f0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java @@ -0,0 +1,40 @@ +package org.jeecg.modules.applet.service.impl; + +import org.jeecg.modules.applet.service.AppletApiPaperService; +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.awt.print.Paper; +import java.util.List; + + +@Service +public class AppletApiPaperServiceImpl implements AppletApiPaperService { + + @Autowired + private IAppletPaperService appletPaperService; + + @Override + public List list(String type) { + return appletPaperService.list(); + } + + @Override + public Object report(String id) { + return null; + } + + @Override + public void reportDetail(String id) { + + } + + @Override + public AppletPaper paperDetail(String id) { + return null; + } + + +} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiProductServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiProductServiceImpl.java index cc10893..3db9284 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiProductServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiProductServiceImpl.java @@ -60,10 +60,11 @@ public class AppletApiProductServiceImpl implements AppletApiProductService { AppletProduct byId = appletProductService.getById(id); - byId.setSpecs(appletProductSpecService - .lambdaQuery() - .eq(AppletProductSpec::getProductId, id) - .list()); +// byId.setSpecs(appletProductSpecService +// .lambdaQuery() +// .orderByDesc(AppletProductSpec::getSortOrder) +// .eq(AppletProductSpec::getProductId, id) +// .list()); return byId; } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java new file mode 100644 index 0000000..b2a1f4c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java @@ -0,0 +1,182 @@ +package org.jeecg.modules.demo.appletPaper.controller; + +import java.util.Arrays; +import java.util.HashMap; +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.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService; + +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.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 试卷 + * @Author: jeecg-boot + * @Date: 2025-08-19 + * @Version: V1.0 + */ +@Tag(name="试卷") +@RestController +@RequestMapping("/appletPaper/appletPaper") +@Slf4j +public class AppletPaperController extends JeecgController { + @Autowired + private IAppletPaperService appletPaperService; + + /** + * 分页列表查询 + * + * @param appletPaper + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试卷-分页列表查询") + @Operation(summary="试卷-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AppletPaper appletPaper, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletPaper, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = appletPaperService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param appletPaper + * @return + */ + @AutoLog(value = "试卷-添加") + @Operation(summary="试卷-添加") + @RequiresPermissions("appletPaper:applet_paper:add") + @PostMapping(value = "/add") + public Result add(@RequestBody AppletPaper appletPaper) { + appletPaperService.save(appletPaper); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param appletPaper + * @return + */ + @AutoLog(value = "试卷-编辑") + @Operation(summary="试卷-编辑") + @RequiresPermissions("appletPaper:applet_paper:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AppletPaper appletPaper) { + appletPaperService.updateById(appletPaper); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "试卷-通过id删除") + @Operation(summary="试卷-通过id删除") + @RequiresPermissions("appletPaper:applet_paper:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + appletPaperService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "试卷-批量删除") + @Operation(summary="试卷-批量删除") + @RequiresPermissions("appletPaper:applet_paper:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.appletPaperService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "试卷-通过id查询") + @Operation(summary="试卷-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AppletPaper appletPaper = appletPaperService.getById(id); + if(appletPaper==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(appletPaper); + } + + /** + * 导出excel + * + * @param request + * @param appletPaper + */ + @RequiresPermissions("appletPaper:applet_paper:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AppletPaper appletPaper) { + return super.exportXls(request, appletPaper, AppletPaper.class, "试卷"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("appletPaper:applet_paper:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AppletPaper.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java new file mode 100644 index 0000000..6c9c34b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java @@ -0,0 +1,63 @@ +package org.jeecg.modules.demo.appletPaper.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 com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +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.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 试卷 + * @Author: jeecg-boot + * @Date: 2025-08-19 + * @Version: V1.0 + */ +@Data +@TableName("applet_paper") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="试卷") +public class AppletPaper implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**试卷名称*/ + @Excel(name = "试卷名称", width = 15) + @Schema(description = "试卷名称") + private java.lang.String title; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java new file mode 100644 index 0000000..0a953ef --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.appletPaper.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 试卷 + * @Author: jeecg-boot + * @Date: 2025-08-19 + * @Version: V1.0 + */ +public interface AppletPaperMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletPaperMapper.xml b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletPaperMapper.xml new file mode 100644 index 0000000..7b5e80d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletPaperMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java new file mode 100644 index 0000000..015d48a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.appletPaper.service; + +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 试卷 + * @Author: jeecg-boot + * @Date: 2025-08-19 + * @Version: V1.0 + */ +public interface IAppletPaperService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java new file mode 100644 index 0000000..b18086a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.appletPaper.service.impl; + +import org.jeecg.modules.demo.appletPaper.entity.AppletPaper; +import org.jeecg.modules.demo.appletPaper.mapper.AppletPaperMapper; +import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 试卷 + * @Author: jeecg-boot + * @Date: 2025-08-19 + * @Version: V1.0 + */ +@Service +public class AppletPaperServiceImpl extends ServiceImpl implements IAppletPaperService { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperForm.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperForm.vue new file mode 100644 index 0000000..dd92e9b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperForm.vue @@ -0,0 +1,83 @@ + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperList.vue new file mode 100644 index 0000000..0edd007 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp/AppletPaperList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperData.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperData.ts new file mode 100644 index 0000000..2aee9a2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperData.ts @@ -0,0 +1,9 @@ +import { render } from '@/common/renderUtils'; +//列表数据 +export const columns = [ + { + title: '试卷名称', + align:"center", + dataIndex: 'title' + }, +]; \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperForm.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperForm.vue new file mode 100644 index 0000000..4e04911 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperForm.vue @@ -0,0 +1,209 @@ + +{ +layout: 'default', +style: { +navigationStyle: 'custom', +navigationBarTitleText: '试卷', +}, +} + + + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperList.vue new file mode 100644 index 0000000..6236177 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/uniapp3/AppletPaperList.vue @@ -0,0 +1,148 @@ + +{ +layout: 'default', +style: { +navigationBarTitleText: '试卷', +navigationStyle: 'custom', +}, +} + + + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts new file mode 100644 index 0000000..b09dc2b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/appletPaper/appletPaper/list', + save='/appletPaper/appletPaper/add', + edit='/appletPaper/appletPaper/edit', + deleteOne = '/appletPaper/appletPaper/delete', + deleteBatch = '/appletPaper/appletPaper/deleteBatch', + importExcel = '/appletPaper/appletPaper/importExcel', + exportXls = '/appletPaper/appletPaper/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) => { + createConfirm({ + iconType: 'warning', + 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/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts new file mode 100644 index 0000000..0516b21 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts @@ -0,0 +1,45 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '试卷名称', + align:"center", + dataIndex: 'title' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '试卷名称', + field: 'title', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + title: {title: '试卷名称',order: 0,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue new file mode 100644 index 0000000..c65cbcb --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250819_1__menu_insert_AppletPaper.sql b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250819_1__menu_insert_AppletPaper.sql new file mode 100644 index 0000000..888013d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250819_1__menu_insert_AppletPaper.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/appletPaper文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2025081903521750270', NULL, '试卷', '/appletPaper/appletPaperList', 'appletPaper/AppletPaperList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750271', '2025081903521750270', '添加试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750272', '2025081903521750270', '编辑试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750273', '2025081903521750270', '删除试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750274', '2025081903521750270', '批量删除试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750275', '2025081903521750270', '导出excel_试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081903521750276', '2025081903521750270', '导入excel_试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 15:52:27', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperForm.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperForm.vue new file mode 100644 index 0000000..d4b1f6c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperModal.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperModal.vue new file mode 100644 index 0000000..665a3cb --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperModal.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/entity/AppletProduct.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/entity/AppletProduct.java index 379fe9e..ea01ca0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/entity/AppletProduct.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/entity/AppletProduct.java @@ -57,6 +57,10 @@ public class AppletProduct implements Serializable { @Excel(name = "产品名称", width = 15) @Schema(description = "产品名称") private java.lang.String name; + /**产品名称*/ + @Excel(name = "产品英文名称", width = 15) + @Schema(description = "产品英文名称") + private java.lang.String enName; /**产品描述*/ @Excel(name = "产品描述", width = 15) @Schema(description = "产品描述") @@ -106,6 +110,12 @@ public class AppletProduct implements Serializable { @Schema(description = "首页推荐") private String homeRecommend; + /**服务*/ + @Excel(name = "服务", width = 15) + @Schema(description = "服务") + private String service; + + @TableField(exist = false) private List specs; } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/controller/AppletProductCategoryController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/controller/AppletProductCategoryController.java index 756312a..b469b64 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/controller/AppletProductCategoryController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/controller/AppletProductCategoryController.java @@ -1,7 +1,6 @@ package org.jeecg.modules.demo.appletProductCategory.controller; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -12,8 +11,8 @@ 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.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.system.vo.SelectTreeModel; import org.jeecg.modules.demo.appletProductCategory.entity.AppletProductCategory; import org.jeecg.modules.demo.appletProductCategory.service.IAppletProductCategoryService; @@ -38,20 +37,21 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; + /** * @Description: 产品分类表 * @Author: jeecg-boot - * @Date: 2025-07-21 + * @Date: 2025-08-19 * @Version: V1.0 */ @Tag(name="产品分类表") @RestController @RequestMapping("/appletProductCategory/appletProductCategory") @Slf4j -public class AppletProductCategoryController extends JeecgController { +public class AppletProductCategoryController extends JeecgController{ @Autowired private IAppletProductCategoryService appletProductCategoryService; - + /** * 分页列表查询 * @@ -63,22 +63,135 @@ public class AppletProductCategoryController extends JeecgController> queryPageList(AppletProductCategory appletProductCategory, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + String hasQuery = req.getParameter("hasQuery"); + if(hasQuery != null && "true".equals(hasQuery)){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletProductCategory, req.getParameterMap()); + List list = appletProductCategoryService.queryTreeListNoPage(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + }else{ + String parentId = appletProductCategory.getPid(); + if (oConvertUtils.isEmpty(parentId)) { + parentId = "0"; + } + appletProductCategory.setPid(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletProductCategory, req.getParameterMap()); + // 使用 eq 防止模糊查询 + queryWrapper.eq("pid", parentId); + Page page = new Page(pageNo, pageSize); + IPage pageList = appletProductCategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + } + + /** + * 【vue3专用】加载节点的子数据 + * + * @param pid + * @return + */ + @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET) + public Result> loadTreeChildren(@RequestParam(name = "pid") String pid) { + Result> result = new Result<>(); + try { + List ls = appletProductCategoryService.queryListByPid(pid); + result.setResult(ls); + result.setSuccess(true); + } catch (Exception e) { + e.printStackTrace(); + result.setMessage(e.getMessage()); + result.setSuccess(false); + } + return result; + } + /** + * 【vue3专用】加载一级节点/如果是同步 则所有数据 + * + * @param async + * @param pcode + * @return + */ + @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) + public Result> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { + Result> result = new Result<>(); + try { + List ls = appletProductCategoryService.queryListByCode(pcode); + if (!async) { + loadAllChildren(ls); + } + result.setResult(ls); + result.setSuccess(true); + } catch (Exception e) { + e.printStackTrace(); + result.setMessage(e.getMessage()); + result.setSuccess(false); + } + return result; + } - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletProductCategory, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = appletProductCategoryService.page(page, queryWrapper); + /** + * 【vue3专用】递归求子节点 同步加载用到 + * + * @param ls + */ + private void loadAllChildren(List ls) { + for (SelectTreeModel tsm : ls) { + List temp = appletProductCategoryService.queryListByPid(tsm.getKey()); + if (temp != null && temp.size() > 0) { + tsm.setChildren(temp); + loadAllChildren(temp); + } + } + } + + /** + * 获取子数据 + * @param appletProductCategory + * @param req + * @return + */ + //@AutoLog(value = "产品分类表-获取子数据") + @Operation(summary="产品分类表-获取子数据") + @GetMapping(value = "/childList") + public Result> queryPageList(AppletProductCategory appletProductCategory,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletProductCategory, req.getParameterMap()); + List list = appletProductCategoryService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); return Result.OK(pageList); } + + /** + * 批量查询子节点 + * @param parentIds 父ID（多个采用半角逗号分割） + * @return 返回 IPage + * @param parentIds + * @return + */ + //@AutoLog(value = "产品分类表-批量获取子数据") + @Operation(summary="产品分类表-批量获取子数据") + @GetMapping("/getChildListBatch") + public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List parentIdList = Arrays.asList(parentIds.split(",")); + queryWrapper.in("pid", parentIdList); + List list = appletProductCategoryService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("批量查询子节点失败：" + e.getMessage()); + } + } /** * 添加 @@ -88,11 +201,10 @@ public class AppletProductCategoryController extends JeecgController add(@RequestBody AppletProductCategory appletProductCategory) { - appletProductCategoryService.save(appletProductCategory); - + appletProductCategoryService.addAppletProductCategory(appletProductCategory); return Result.OK("添加成功！"); } @@ -104,10 +216,10 @@ public class AppletProductCategoryController extends JeecgController edit(@RequestBody AppletProductCategory appletProductCategory) { - appletProductCategoryService.updateById(appletProductCategory); + appletProductCategoryService.updateAppletProductCategory(appletProductCategory); return Result.OK("编辑成功!"); } @@ -119,10 +231,10 @@ public class AppletProductCategoryController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - appletProductCategoryService.removeById(id); + appletProductCategoryService.deleteAppletProductCategory(id); return Result.OK("删除成功!"); } @@ -134,11 +246,11 @@ public class AppletProductCategoryController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.appletProductCategoryService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK("批量删除成功！"); } /** @@ -167,7 +279,7 @@ public class AppletProductCategoryController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, AppletProductCategory.class); + return super.importExcel(request, response, AppletProductCategory.class); } } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/entity/AppletProductCategory.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/entity/AppletProductCategory.java index 537ab42..c12c715 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/entity/AppletProductCategory.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/entity/AppletProductCategory.java @@ -1,7 +1,6 @@ package org.jeecg.modules.demo.appletProductCategory.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; @@ -15,20 +14,18 @@ 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.v3.oas.annotations.media.Schema; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +import java.io.UnsupportedEncodingException; /** * @Description: 产品分类表 * @Author: jeecg-boot - * @Date: 2025-07-21 + * @Date: 2025-08-19 * @Version: V1.0 */ @Data @TableName("applet_product_category") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) @Schema(description="产品分类表") public class AppletProductCategory implements Serializable { private static final long serialVersionUID = 1L; @@ -70,4 +67,13 @@ public class AppletProductCategory implements Serializable { @Dict(dicCode = "applet_product_type") @Schema(description = "类型") private java.lang.String type; + /**父级节点*/ + @Excel(name = "父级节点", width = 15) + @Schema(description = "父级节点") + private java.lang.String pid; + /**是否有子节点*/ + @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @Schema(description = "是否有子节点") + private java.lang.String hasChild; } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/AppletProductCategoryMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/AppletProductCategoryMapper.java index 57cea2a..437b075 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/AppletProductCategoryMapper.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/AppletProductCategoryMapper.java @@ -1,17 +1,35 @@ package org.jeecg.modules.demo.appletProductCategory.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.jeecg.common.system.vo.SelectTreeModel; import org.jeecg.modules.demo.appletProductCategory.entity.AppletProductCategory; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; /** * @Description: 产品分类表 * @Author: jeecg-boot - * @Date: 2025-07-21 + * @Date: 2025-08-19 * @Version: V1.0 */ public interface AppletProductCategoryMapper extends BaseMapper { + /** + * 编辑节点状态 + * @param id + * @param status + */ + void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); + + /** + * 【vue3专用】根据父级ID查询树节点数据 + * + * @param pid + * @param query + * @return + */ + List queryListByPid(@Param("pid") String pid, @Param("query") Map query); + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/xml/AppletProductCategoryMapper.xml b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/xml/AppletProductCategoryMapper.xml index a092179..f07154b 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/xml/AppletProductCategoryMapper.xml +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/mapper/xml/AppletProductCategoryMapper.xml @@ -2,4 +2,24 @@ + + update applet_product_category set has_child = #{status} where id = #{id} + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/IAppletProductCategoryService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/IAppletProductCategoryService.java index e83454d..1213dc8 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/IAppletProductCategoryService.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/IAppletProductCategoryService.java @@ -1,14 +1,74 @@ package org.jeecg.modules.demo.appletProductCategory.service; +import org.jeecg.common.system.vo.SelectTreeModel; import org.jeecg.modules.demo.appletProductCategory.entity.AppletProductCategory; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.exception.JeecgBootException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.util.List; /** * @Description: 产品分类表 * @Author: jeecg-boot - * @Date: 2025-07-21 + * @Date: 2025-08-19 * @Version: V1.0 */ public interface IAppletProductCategoryService extends IService { + /**根节点父ID的值*/ + public static final String ROOT_PID_VALUE = "0"; + + /**树节点有子节点状态值*/ + public static final String HASCHILD = "1"; + + /**树节点无子节点状态值*/ + public static final String NOCHILD = "0"; + + /** + * 新增节点 + * + * @param appletProductCategory + */ + void addAppletProductCategory(AppletProductCategory appletProductCategory); + + /** + * 修改节点 + * + * @param appletProductCategory + * @throws JeecgBootException + */ + void updateAppletProductCategory(AppletProductCategory appletProductCategory) throws JeecgBootException; + + /** + * 删除节点 + * + * @param id + * @throws JeecgBootException + */ + void deleteAppletProductCategory(String id) throws JeecgBootException; + + /** + * 查询所有数据，无分页 + * + * @param queryWrapper + * @return List + */ + List queryTreeListNoPage(QueryWrapper queryWrapper); + + /** + * 【vue3专用】根据父级编码加载分类字典的数据 + * + * @param parentCode + * @return + */ + List queryListByCode(String parentCode); + + /** + * 【vue3专用】根据pid查询子节点集合 + * + * @param pid + * @return + */ + List queryListByPid(String pid); + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/impl/AppletProductCategoryServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/impl/AppletProductCategoryServiceImpl.java index eeea295..b5bdf97 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/impl/AppletProductCategoryServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/service/impl/AppletProductCategoryServiceImpl.java @@ -1,19 +1,219 @@ package org.jeecg.modules.demo.appletProductCategory.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.system.vo.SelectTreeModel; import org.jeecg.modules.demo.appletProductCategory.entity.AppletProductCategory; import org.jeecg.modules.demo.appletProductCategory.mapper.AppletProductCategoryMapper; import org.jeecg.modules.demo.appletProductCategory.service.IAppletProductCategoryService; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 产品分类表 * @Author: jeecg-boot - * @Date: 2025-07-21 + * @Date: 2025-08-19 * @Version: V1.0 */ @Service public class AppletProductCategoryServiceImpl extends ServiceImpl implements IAppletProductCategoryService { + @Override + public void addAppletProductCategory(AppletProductCategory appletProductCategory) { + //新增时设置hasChild为0 + appletProductCategory.setHasChild(IAppletProductCategoryService.NOCHILD); + if(oConvertUtils.isEmpty(appletProductCategory.getPid())){ + appletProductCategory.setPid(IAppletProductCategoryService.ROOT_PID_VALUE); + }else{ + //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 + AppletProductCategory parent = baseMapper.selectById(appletProductCategory.getPid()); + if(parent!=null && !"1".equals(parent.getHasChild())){ + parent.setHasChild("1"); + baseMapper.updateById(parent); + } + } + baseMapper.insert(appletProductCategory); + } + + @Override + public void updateAppletProductCategory(AppletProductCategory appletProductCategory) { + AppletProductCategory entity = this.getById(appletProductCategory.getId()); + if(entity==null) { + throw new JeecgBootException("未找到对应实体"); + } + String old_pid = entity.getPid(); + String new_pid = appletProductCategory.getPid(); + if(!old_pid.equals(new_pid)) { + updateOldParentNode(old_pid); + if(oConvertUtils.isEmpty(new_pid)){ + appletProductCategory.setPid(IAppletProductCategoryService.ROOT_PID_VALUE); + } + if(!IAppletProductCategoryService.ROOT_PID_VALUE.equals(appletProductCategory.getPid())) { + baseMapper.updateTreeNodeStatus(appletProductCategory.getPid(), IAppletProductCategoryService.HASCHILD); + } + } + baseMapper.updateById(appletProductCategory); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAppletProductCategory(String id) throws JeecgBootException { + //查询选中节点下所有子节点一并删除 + id = this.queryTreeChildIds(id); + if(id.indexOf(",")>0) { + StringBuffer sb = new StringBuffer(); + String[] idArr = id.split(","); + for (String idVal : idArr) { + if(idVal != null){ + AppletProductCategory appletProductCategory = this.getById(idVal); + String pidVal = appletProductCategory.getPid(); + //查询此节点上一级是否还有其他子节点 + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr))); + boolean flag = (dataList == null || dataList.size() == 0) && !Arrays.asList(idArr).contains(pidVal) && !sb.toString().contains(pidVal); + if(flag){ + //如果当前节点原本有子节点 现在木有了，更新状态 + sb.append(pidVal).append(","); + } + } + } + //批量删除节点 + baseMapper.deleteBatchIds(Arrays.asList(idArr)); + //修改已无子节点的标识 + String[] pidArr = sb.toString().split(","); + for(String pid : pidArr){ + this.updateOldParentNode(pid); + } + }else{ + AppletProductCategory appletProductCategory = this.getById(id); + if(appletProductCategory==null) { + throw new JeecgBootException("未找到对应实体"); + } + updateOldParentNode(appletProductCategory.getPid()); + baseMapper.deleteById(id); + } + } + + @Override + public List queryTreeListNoPage(QueryWrapper queryWrapper) { + List dataList = baseMapper.selectList(queryWrapper); + List mapList = new ArrayList<>(); + for(AppletProductCategory data : dataList){ + String pidVal = data.getPid(); + //递归查询子节点的根节点 + if(pidVal != null && !IAppletProductCategoryService.NOCHILD.equals(pidVal)){ + AppletProductCategory rootVal = this.getTreeRoot(pidVal); + if(rootVal != null && !mapList.contains(rootVal)){ + mapList.add(rootVal); + } + }else{ + if(!mapList.contains(data)){ + mapList.add(data); + } + } + } + return mapList; + } + + @Override + public List queryListByCode(String parentCode) { + String pid = ROOT_PID_VALUE; + if (oConvertUtils.isNotEmpty(parentCode)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppletProductCategory::getPid, parentCode); + List list = baseMapper.selectList(queryWrapper); + if (list == null || list.size() == 0) { + throw new JeecgBootException("该编码【" + parentCode + "】不存在，请核实!"); + } + if (list.size() > 1) { + throw new JeecgBootException("该编码【" + parentCode + "】存在多个，请核实!"); + } + pid = list.get(0).getId(); + } + return baseMapper.queryListByPid(pid, null); + } + + @Override + public List queryListByPid(String pid) { + if (oConvertUtils.isEmpty(pid)) { + pid = ROOT_PID_VALUE; + } + return baseMapper.queryListByPid(pid, null); + } + + /** + * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 + * @param pid + */ + private void updateOldParentNode(String pid) { + if(!IAppletProductCategoryService.ROOT_PID_VALUE.equals(pid)) { + Long count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); + if(count==null || count<=1) { + baseMapper.updateTreeNodeStatus(pid, IAppletProductCategoryService.NOCHILD); + } + } + } + + /** + * 递归查询节点的根节点 + * @param pidVal + * @return + */ + private AppletProductCategory getTreeRoot(String pidVal){ + AppletProductCategory data = baseMapper.selectById(pidVal); + if(data != null && !IAppletProductCategoryService.ROOT_PID_VALUE.equals(data.getPid())){ + return this.getTreeRoot(data.getPid()); + }else{ + return data; + } + } + + /** + * 根据id查询所有子节点id + * @param ids + * @return + */ + private String queryTreeChildIds(String ids) { + //获取id数组 + String[] idArr = ids.split(","); + StringBuffer sb = new StringBuffer(); + for (String pidVal : idArr) { + if(pidVal != null){ + if(!sb.toString().contains(pidVal)){ + if(sb.toString().length() > 0){ + sb.append(","); + } + sb.append(pidVal); + this.getTreeChildIds(pidVal,sb); + } + } + } + return sb.toString(); + } + + /** + * 递归查询所有子节点 + * @param pidVal + * @param sb + * @return + */ + private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); + if(dataList != null && dataList.size()>0){ + for(AppletProductCategory tree : dataList) { + if(!sb.toString().contains(tree.getId())){ + sb.append(",").append(tree.getId()); + } + this.getTreeChildIds(tree.getId(),sb); + } + } + return sb; + } + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.api.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.api.ts new file mode 100644 index 0000000..5a42e86 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.api.ts @@ -0,0 +1,71 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/appletProductCategory/appletProduct/list', + save='/appletProductCategory/appletProduct/add', + edit='/appletProductCategory/appletProduct/edit', + deleteOne = '/appletProductCategory/appletProduct/delete', + deleteBatch = '/appletProductCategory/appletProduct/deleteBatch', + importExcel = '/appletProductCategory/appletProduct/importExcel', + exportXls = '/appletProductCategory/appletProduct/exportXls', + appletProductSpecList = '/appletProductCategory/appletProduct/queryAppletProductSpecByMainId', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 查询子表数据 + * @param params + */ +export const appletProductSpecList = Api.appletProductSpecList; +/** + * 列表接口 + * @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) => { + createConfirm({ + iconType: 'warning', + 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/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.data.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.data.ts new file mode 100644 index 0000000..cfb13a5 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProduct.data.ts @@ -0,0 +1,280 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '产品名称', + align:"center", + dataIndex: 'name' + }, + { + title: '英文名称', + align:"center", + dataIndex: 'enName' + }, + { + title: '图片', + align:"center", + dataIndex: 'image', + customRender:render.renderImage, + }, + { + title: '产品描述', + align:"center", + dataIndex: 'info' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '分类', + align:"center", + dataIndex: 'classId_dictText' + }, + { + title: '原价', + align:"center", + dataIndex: 'originalPrice' + }, + { + title: '现价', + align:"center", + dataIndex: 'currentPrice' + }, + { + title: '单位', + align:"center", + dataIndex: 'unit' + }, + { + title: '已出售', + align:"center", + dataIndex: 'sold' + }, + { + title: '跨境商品', + align:"center", + dataIndex: 'isCrossBorder', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '推荐', + align:"center", + dataIndex: 'homeRecommend', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '检测预约类型', + align:"center", + dataIndex: 'subscribeType_dictText' + }, + { + title: '服务', + align:"center", + dataIndex: 'service' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "类型", + field: "type", + component: 'JSelectMultiple', + componentProps:{ + dictCode:"applet_product_type" + }, + //colProps: {span: 6}, + }, + { + label: "分类", + field: "classId", + component: 'JTreeSelect', + componentProps:{ + dict:"applet_product_category,name,id", + pidValue:"0", + }, + //colProps: {span: 6}, + }, + { + label: "检测预约类型", + field: "subscribeType", + component: 'JSelectMultiple', + componentProps:{ + dictCode:"applett_subscribe_type" + }, + //colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '产品名称', + field: 'name', + component: 'Input', + }, + { + label: '英文名称', + field: 'enName', + component: 'Input', + }, + { + label: '图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + fileMax: 0 + }, + }, + { + label: '产品描述', + field: 'info', + component: 'Input', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"applet_product_type" + }, + }, + { + label: '分类', + field: 'classId', + component: 'JTreeSelect', + componentProps:{ + dict:"applet_product_category,name,id", + pidValue:"0", + }, + }, + { + label: '原价', + field: 'originalPrice', + component: 'InputNumber', + }, + { + label: '现价', + field: 'currentPrice', + component: 'InputNumber', + }, + { + label: '单位', + field: 'unit', + component: 'Input', + }, + { + label: '详情', + field: 'detail', + component: 'JEditor', + }, + { + label: '已出售', + field: 'sold', + component: 'InputNumber', + }, + { + label: '产品内容', + field: 'content', + component: 'Input', + }, + { + label: '跨境商品', + field: 'isCrossBorder', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '推荐', + field: 'homeRecommend', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '检测预约类型', + field: 'subscribeType', + component: 'JCheckbox', + componentProps:{ + dictCode:"applett_subscribe_type" + }, + }, + { + label: '服务', + field: 'service', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; +//子表单数据 +//子表表格配置 +export const appletProductSpecColumns: JVxeColumn[] = [ + { + title: '规格名称', + key: 'specName', + type: JVxeTypes.input, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '排序', + key: 'sortOrder', + type: JVxeTypes.inputNumber, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '价格', + key: 'price', + type: JVxeTypes.inputNumber, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + ] + +// 高级查询数据 +export const superQuerySchema = { + name: {title: '产品名称',order: 0,view: 'text', type: 'string',}, + enName: {title: '英文名称',order: 1,view: 'text', type: 'string',}, + image: {title: '图片',order: 2,view: 'image', type: 'string',}, + info: {title: '产品描述',order: 3,view: 'text', type: 'string',}, + type: {title: '类型',order: 4,view: 'list', type: 'string',dictCode: 'applet_product_type',}, + classId: {title: '分类',order: 5,view: 'sel_tree', type: 'string',dict: 'applet_product_category,name,id', pidValue: '0',}, + originalPrice: {title: '原价',order: 6,view: 'number', type: 'number',}, + currentPrice: {title: '现价',order: 7,view: 'number', type: 'number',}, + unit: {title: '单位',order: 8,view: 'text', type: 'string',}, + sold: {title: '已出售',order: 10,view: 'number', type: 'number',}, + isCrossBorder: {title: '跨境商品',order: 12,view: 'switch', type: 'string',}, + homeRecommend: {title: '推荐',order: 13,view: 'switch', type: 'string',}, + subscribeType: {title: '检测预约类型',order: 14,view: 'checkbox', type: 'string',dictCode: 'applett_subscribe_type',}, + service: {title: '服务',order: 15,view: 'text', type: 'string',}, + //子表高级查询 + appletProductSpec: { + title: '产品规格表', + view: 'table', + fields: { + specName: {title: '规格名称',order: 0,view: 'text', type: 'string',}, + sortOrder: {title: '排序',order: 1,view: 'number', type: 'number',}, + price: {title: '价格',order: 2,view: 'number', type: 'number',}, + } + }, +}; diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.api.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.api.ts index 69c7317..896edb2 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.api.ts +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.api.ts @@ -1,17 +1,20 @@ -import {defHttp} from '/@/utils/http/axios'; +import {defHttp} from "/@/utils/http/axios"; import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/appletProductCategory/appletProductCategory/list', + list = '/appletProductCategory/appletProductCategory/rootList', save='/appletProductCategory/appletProductCategory/add', edit='/appletProductCategory/appletProductCategory/edit', - deleteOne = '/appletProductCategory/appletProductCategory/delete', - deleteBatch = '/appletProductCategory/appletProductCategory/deleteBatch', + deleteAppletProductCategory = '/appletProductCategory/appletProductCategory/delete', importExcel = '/appletProductCategory/appletProductCategory/importExcel', exportXls = '/appletProductCategory/appletProductCategory/exportXls', + loadTreeData = '/appletProductCategory/appletProductCategory/loadTreeRoot', + getChildList = '/appletProductCategory/appletProductCategory/childList', + getChildListBatch = '/appletProductCategory/appletProductCategory/getChildListBatch', } + /** * 导出api * @param params @@ -19,6 +22,7 @@ enum Api { export const getExportUrl = Api.exportXls; /** * 导入api + * @param params */ export const getImportUrl = Api.importExcel; /** @@ -27,12 +31,11 @@ export const getImportUrl = Api.importExcel; */ 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(() => { +export const deleteAppletProductCategory = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteAppletProductCategory, params}, {joinParamsToUrl: true}).then(() => { handleSuccess(); }); } @@ -40,7 +43,7 @@ export const deleteOne = (params,handleSuccess) => { * 批量删除 * @param params */ -export const batchDelete = (params, handleSuccess) => { +export const batchDeleteAppletProductCategory = (params, handleSuccess) => { createConfirm({ iconType: 'warning', title: '确认删除', @@ -48,7 +51,7 @@ export const batchDelete = (params, handleSuccess) => { okText: '确认', cancelText: '取消', onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + return defHttp.delete({url: Api.deleteAppletProductCategory, data: params}, {joinParamsToUrl: true}).then(() => { handleSuccess(); }); } @@ -58,7 +61,25 @@ export const batchDelete = (params, handleSuccess) => { * 保存或者更新 * @param params */ -export const saveOrUpdate = (params, isUpdate) => { +export const saveOrUpdateDict = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({url: url, params}); } +/** + * 查询全部树形节点数据 + * @param params + */ +export const loadTreeData = (params) => + defHttp.get({url: Api.loadTreeData,params}); +/** + * 查询子节点数据 + * @param params + */ +export const getChildList = (params) => + defHttp.get({url: Api.getChildList, params}); +/** + * 批量查询子节点数据 + * @param params + */ +export const getChildListBatch = (params) => + defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false}); diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.data.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.data.ts index 880491b..090ada7 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.data.ts +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategory.data.ts @@ -7,17 +7,17 @@ import { getWeekMonthQuarterYear } from '/@/utils'; export const columns: BasicColumn[] = [ { title: '分类名称', - align:"center", + align: 'left', dataIndex: 'name' }, { title: '排序', - align:"center", + align: 'center', dataIndex: 'sortOrder' }, { title: '类型', - align:"center", + align: 'center', dataIndex: 'type_dictText' }, ]; @@ -25,13 +25,13 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { label: "类型", - field: 'type', + field: "type", component: 'JSelectMultiple', componentProps:{ dictCode:"applet_product_type" }, //colProps: {span: 6}, - }, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -52,6 +52,17 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"applet_product_type" }, + }, + { + label: '父级节点', + field: 'pid', + component: 'JTreeSelect', + componentProps: { + dict: "applet_product_category,name,id", + pidField: "pid", + pidValue: "0", + hasChildField: "has_child", + }, }, // TODO 主键隐藏字段，目前写死为ID { @@ -69,6 +80,7 @@ export const superQuerySchema = { type: {title: '类型',order: 2,view: 'list', type: 'string',dictCode: 'applet_product_type',}, }; + /** * 流程表单调用这个方法获取formSchema * @param param @@ -76,4 +88,4 @@ export const superQuerySchema = { export function getBpmFormSchema(_formData): FormSchema[]{ // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema return formSchema; -} \ No newline at end of file +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategoryList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategoryList.vue index d836301..967884e 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategoryList.vue +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductCategoryList.vue @@ -1,30 +1,29 @@ @@ -203,4 +344,4 @@ :deep(.ant-picker),:deep(.ant-input-number){ width: 100%; } - \ No newline at end of file + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductList.vue new file mode 100644 index 0000000..5b2dd34 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/AppletProductList.vue @@ -0,0 +1,210 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250819_1__menu_insert_AppletProductCategory.sql b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250819_1__menu_insert_AppletProductCategory.sql new file mode 100644 index 0000000..1413a2f --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250819_1__menu_insert_AppletProductCategory.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/appletProductCategory文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2025081906004490360', NULL, '产品分类表', '/appletProductCategory/appletProductCategoryList', 'appletProductCategory/AppletProductCategoryList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490361', '2025081906004490360', '添加产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490362', '2025081906004490360', '编辑产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490363', '2025081906004490360', '删除产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490364', '2025081906004490360', '批量删除产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490365', '2025081906004490360', '导出excel_产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025081906004490366', '2025081906004490360', '导入excel_产品分类表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product_category:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-19 18:00:36', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250820_1__menu_insert_AppletProduct.sql b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250820_1__menu_insert_AppletProduct.sql new file mode 100644 index 0000000..d6fcf8b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/V20250820_1__menu_insert_AppletProduct.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/appletProductCategory文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2025082009443190230', NULL, '产品表', '/appletProductCategory/appletProductList', 'appletProductCategory/AppletProductList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190231', '2025082009443190230', '添加产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190232', '2025082009443190230', '编辑产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190233', '2025082009443190230', '删除产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190234', '2025082009443190230', '批量删除产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190235', '2025082009443190230', '导出excel_产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2025082009443190236', '2025082009443190230', '导入excel_产品表', NULL, NULL, 0, NULL, NULL, 2, 'appletProductCategory:applet_product:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 09:44:23', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryForm.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryForm.vue index b082b5e..ebfb196 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryForm.vue +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryForm.vue @@ -13,7 +13,7 @@ import {defHttp} from '/@/utils/http/axios'; import { propTypes } from '/@/utils/propTypes'; import {getBpmFormSchema} from '../AppletProductCategory.data'; - import {saveOrUpdate} from '../AppletProductCategory.api'; + import {saveOrUpdateDict} from '../AppletProductCategory.api'; export default defineComponent({ name: "AppletProductCategoryForm", @@ -29,7 +29,7 @@ labelWidth: 150, schemas: getBpmFormSchema(props.formData), showActionButtonGroup: false, - baseColProps: {span: 24} + baseColProps: {span: 24}, }); const formDisabled = computed(()=>{ @@ -55,7 +55,7 @@ let data = getFieldsValue(); let params = Object.assign({}, formData, data); console.log('表单数据', params) - await saveOrUpdate(params, true) + await saveOrUpdateDict(params, true) } initFormData(); diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryModal.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryModal.vue index 2f0bebc..64ba49d 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryModal.vue +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductCategoryModal.vue @@ -1,92 +1,133 @@ - - + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductModal.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductModal.vue new file mode 100644 index 0000000..5a60020 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductCategory/vue3/components/AppletProductModal.vue @@ -0,0 +1,240 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductSpec/entity/AppletProductSpec.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductSpec/entity/AppletProductSpec.java index 21071cb..5981ce0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductSpec/entity/AppletProductSpec.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProductSpec/entity/AppletProductSpec.java @@ -70,7 +70,7 @@ public class AppletProductSpec implements Serializable { @Schema(description = "产品") private java.lang.String productId; /**价格*/ -// @Excel(name = "价格", width = 15) -// @Schema(description = "价格") -// private java.math.BigDecimal price; + @Excel(name = "价格", width = 15) + @Schema(description = "价格") + private java.math.BigDecimal price; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java index 6e13451..64c6c2c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -33,7 +33,7 @@ public class JeecgSystemApplication extends SpringBootServletInitializer { app.setDefaultProperties(defaultProperties); log.info("[JEECG] Elasticsearch Health Check Enabled: false" ); - ConfigurableApplicationContext application = app.run(args);; + ConfigurableApplicationContext application = app.run(args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port");