diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/controller/AppCarTreeController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/controller/AppCarTreeController.java new file mode 100644 index 0000000..1cc1d02 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/controller/AppCarTreeController.java @@ -0,0 +1,298 @@ +package org.jeecg.modules.demo.car.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.common.system.vo.SelectTreeModel; +import org.jeecg.modules.demo.car.entity.AppCarTree; +import org.jeecg.modules.demo.car.service.IAppCarTreeService; + +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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 汽车品牌 + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +@Api(tags="汽车品牌") +@RestController +@RequestMapping("/car/appCarTree") +@Slf4j +public class AppCarTreeController extends JeecgController{ + @Autowired + private IAppCarTreeService appCarTreeService; + + /** + * 分页列表查询 + * + * @param appCarTree + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "汽车品牌-分页列表查询") + @ApiOperation(value="汽车品牌-分页列表查询", notes="汽车品牌-分页列表查询") + @GetMapping(value = "/rootList") + public Result> queryPageList(AppCarTree appCarTree, + @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(appCarTree, req.getParameterMap()); + List list = appCarTreeService.queryTreeListNoPage(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + }else{ + String parentId = appCarTree.getPid(); + if (oConvertUtils.isEmpty(parentId)) { + parentId = "0"; + } + appCarTree.setPid(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appCarTree, req.getParameterMap()); + // 使用 eq 防止模糊查询 + queryWrapper.eq("pid", parentId); + Page page = new Page(pageNo, pageSize); + IPage pageList = appCarTreeService.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 = appCarTreeService.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 = appCarTreeService.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; + } + + /** + * 【vue3专用】递归求子节点 同步加载用到 + * + * @param ls + */ + private void loadAllChildren(List ls) { + for (SelectTreeModel tsm : ls) { + List temp = appCarTreeService.queryListByPid(tsm.getKey()); + if (temp != null && temp.size() > 0) { + tsm.setChildren(temp); + loadAllChildren(temp); + } + } + } + + /** + * 获取子数据 + * @param appCarTree + * @param req + * @return + */ + //@AutoLog(value = "汽车品牌-获取子数据") + @ApiOperation(value="汽车品牌-获取子数据", notes="汽车品牌-获取子数据") + @GetMapping(value = "/childList") + public Result> queryPageList(AppCarTree appCarTree,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appCarTree, req.getParameterMap()); + List list = appCarTreeService.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 = "汽车品牌-批量获取子数据") + @ApiOperation(value="汽车品牌-批量获取子数据", notes="汽车品牌-批量获取子数据") + @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 = appCarTreeService.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()); + } + } + + /** + * 添加 + * + * @param appCarTree + * @return + */ + @AutoLog(value = "汽车品牌-添加") + @ApiOperation(value="汽车品牌-添加", notes="汽车品牌-添加") + @RequiresPermissions("car:app_car_tree:add") + @PostMapping(value = "/add") + public Result add(@RequestBody AppCarTree appCarTree) { + appCarTreeService.addAppCarTree(appCarTree); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param appCarTree + * @return + */ + @AutoLog(value = "汽车品牌-编辑") + @ApiOperation(value="汽车品牌-编辑", notes="汽车品牌-编辑") + @RequiresPermissions("car:app_car_tree:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AppCarTree appCarTree) { + appCarTreeService.updateAppCarTree(appCarTree); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "汽车品牌-通过id删除") + @ApiOperation(value="汽车品牌-通过id删除", notes="汽车品牌-通过id删除") + @RequiresPermissions("car:app_car_tree:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + appCarTreeService.deleteAppCarTree(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "汽车品牌-批量删除") + @ApiOperation(value="汽车品牌-批量删除", notes="汽车品牌-批量删除") + @RequiresPermissions("car:app_car_tree:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.appCarTreeService.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) { + AppCarTree appCarTree = appCarTreeService.getById(id); + if(appCarTree==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(appCarTree); + } + + /** + * 导出excel + * + * @param request + * @param appCarTree + */ + @RequiresPermissions("car:app_car_tree:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AppCarTree appCarTree) { + return super.exportXls(request, appCarTree, AppCarTree.class, "汽车品牌"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("car:app_car_tree:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AppCarTree.class); + } + +} diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/entity/AppCarTree.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/entity/AppCarTree.java new file mode 100644 index 0000000..719c81c --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/entity/AppCarTree.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.demo.car.entity; + +import java.io.Serializable; +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.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.UnsupportedEncodingException; + +/** + * @Description: 汽车品牌 + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +@Data +@TableName("app_car_tree") +@ApiModel(value="app_car_tree对象", description="汽车品牌") +public class AppCarTree implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**父级节点*/ + @Excel(name = "父级节点", width = 15) + @ApiModelProperty(value = "父级节点") + private java.lang.String pid; + /**是否有子节点*/ + @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否有子节点") + private java.lang.String hasChild; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private java.lang.String name; + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private java.lang.String description; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/AppCarTreeMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/AppCarTreeMapper.java new file mode 100644 index 0000000..8126b1b --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/AppCarTreeMapper.java @@ -0,0 +1,35 @@ +package org.jeecg.modules.demo.car.mapper; + +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.car.entity.AppCarTree; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 汽车品牌 + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +public interface AppCarTreeMapper 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-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/xml/AppCarTreeMapper.xml b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/xml/AppCarTreeMapper.xml new file mode 100644 index 0000000..0ea9223 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/mapper/xml/AppCarTreeMapper.xml @@ -0,0 +1,25 @@ + + + + + + update app_car_tree set has_child = #{status} where id = #{id} + + + + + + \ No newline at end of file diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/service/IAppCarTreeService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/service/IAppCarTreeService.java new file mode 100644 index 0000000..125438f --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/service/IAppCarTreeService.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.demo.car.service; + +import org.jeecg.common.system.vo.SelectTreeModel; +import org.jeecg.modules.demo.car.entity.AppCarTree; +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-02-19 + * @Version: V1.0 + */ +public interface IAppCarTreeService extends IService { + + /**根节点父ID的值*/ + public static final String ROOT_PID_VALUE = "0"; + + /**树节点有子节点状态值*/ + public static final String HASCHILD = "1"; + + /**树节点无子节点状态值*/ + public static final String NOCHILD = "0"; + + /** + * 新增节点 + * + * @param appCarTree + */ + void addAppCarTree(AppCarTree appCarTree); + + /** + * 修改节点 + * + * @param appCarTree + * @throws JeecgBootException + */ + void updateAppCarTree(AppCarTree appCarTree) throws JeecgBootException; + + /** + * 删除节点 + * + * @param id + * @throws JeecgBootException + */ + void deleteAppCarTree(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-module-demo/src/main/java/org/jeecg/modules/demo/car/service/impl/AppCarTreeServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/service/impl/AppCarTreeServiceImpl.java new file mode 100644 index 0000000..a604695 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/service/impl/AppCarTreeServiceImpl.java @@ -0,0 +1,219 @@ +package org.jeecg.modules.demo.car.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.car.entity.AppCarTree; +import org.jeecg.modules.demo.car.mapper.AppCarTreeMapper; +import org.jeecg.modules.demo.car.service.IAppCarTreeService; +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-02-19 + * @Version: V1.0 + */ +@Service +public class AppCarTreeServiceImpl extends ServiceImpl implements IAppCarTreeService { + + @Override + public void addAppCarTree(AppCarTree appCarTree) { + //新增时设置hasChild为0 + appCarTree.setHasChild(IAppCarTreeService.NOCHILD); + if(oConvertUtils.isEmpty(appCarTree.getPid())){ + appCarTree.setPid(IAppCarTreeService.ROOT_PID_VALUE); + }else{ + //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 + AppCarTree parent = baseMapper.selectById(appCarTree.getPid()); + if(parent!=null && !"1".equals(parent.getHasChild())){ + parent.setHasChild("1"); + baseMapper.updateById(parent); + } + } + baseMapper.insert(appCarTree); + } + + @Override + public void updateAppCarTree(AppCarTree appCarTree) { + AppCarTree entity = this.getById(appCarTree.getId()); + if(entity==null) { + throw new JeecgBootException("未找到对应实体"); + } + String old_pid = entity.getPid(); + String new_pid = appCarTree.getPid(); + if(!old_pid.equals(new_pid)) { + updateOldParentNode(old_pid); + if(oConvertUtils.isEmpty(new_pid)){ + appCarTree.setPid(IAppCarTreeService.ROOT_PID_VALUE); + } + if(!IAppCarTreeService.ROOT_PID_VALUE.equals(appCarTree.getPid())) { + baseMapper.updateTreeNodeStatus(appCarTree.getPid(), IAppCarTreeService.HASCHILD); + } + } + baseMapper.updateById(appCarTree); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAppCarTree(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){ + AppCarTree appCarTree = this.getById(idVal); + String pidVal = appCarTree.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{ + AppCarTree appCarTree = this.getById(id); + if(appCarTree==null) { + throw new JeecgBootException("未找到对应实体"); + } + updateOldParentNode(appCarTree.getPid()); + baseMapper.deleteById(id); + } + } + + @Override + public List queryTreeListNoPage(QueryWrapper queryWrapper) { + List dataList = baseMapper.selectList(queryWrapper); + List mapList = new ArrayList<>(); + for(AppCarTree data : dataList){ + String pidVal = data.getPid(); + //递归查询子节点的根节点 + if(pidVal != null && !IAppCarTreeService.NOCHILD.equals(pidVal)){ + AppCarTree 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(AppCarTree::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(!IAppCarTreeService.ROOT_PID_VALUE.equals(pid)) { + Long count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); + if(count==null || count<=1) { + baseMapper.updateTreeNodeStatus(pid, IAppCarTreeService.NOCHILD); + } + } + } + + /** + * 递归查询节点的根节点 + * @param pidVal + * @return + */ + private AppCarTree getTreeRoot(String pidVal){ + AppCarTree data = baseMapper.selectById(pidVal); + if(data != null && !IAppCarTreeService.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(AppCarTree tree : dataList) { + if(!sb.toString().contains(tree.getId())){ + sb.append(",").append(tree.getId()); + } + this.getTreeChildIds(tree.getId(),sb); + } + } + return sb; + } + +} diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.api.ts b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.api.ts new file mode 100644 index 0000000..f116f23 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.api.ts @@ -0,0 +1,85 @@ +import {defHttp} from "/@/utils/http/axios"; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/car/appCarTree/rootList', + save='/car/appCarTree/add', + edit='/car/appCarTree/edit', + deleteAppCarTree = '/car/appCarTree/delete', + importExcel = '/car/appCarTree/importExcel', + exportXls = '/car/appCarTree/exportXls', + loadTreeData = '/car/appCarTree/loadTreeRoot', + getChildList = '/car/appCarTree/childList', + getChildListBatch = '/car/appCarTree/getChildListBatch', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + * @param params + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); +/** + * 删除 + */ +export const deleteAppCarTree = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteAppCarTree, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDeleteAppCarTree = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteAppCarTree, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +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-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.data.ts b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.data.ts new file mode 100644 index 0000000..e11114f --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTree.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'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '名称', + align: 'left', + dataIndex: 'name' + }, + { + title: '描述', + align: 'center', + dataIndex: 'description' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "名称", + field: "name", + component: 'JInput', + }, + { + label: "描述", + field: "description", + component: 'JInput', + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '父级节点', + field: 'pid', + component: 'JTreeSelect', + componentProps: { + dict: "app_car_tree,name,id", + pidField: "pid", + pidValue: "0", + hasChildField: "has_child", + }, + }, + { + label: '名称', + field: 'name', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入名称!'}, + ]; + }, + }, + { + label: '描述', + field: 'description', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + name: {title: '名称',order: 1,view: 'text', type: 'string',}, + description: {title: '描述',order: 2,view: 'text', type: 'string',}, +}; + + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTreeList.vue b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTreeList.vue new file mode 100644 index 0000000..4704805 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/AppCarTreeList.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/V20250219_1__menu_insert_AppCarTree.sql b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/V20250219_1__menu_insert_AppCarTree.sql new file mode 100644 index 0000000..2de5cce --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/V20250219_1__menu_insert_AppCarTree.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/car文件夹下 +-- 如果你想更改到其他目录，请修改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 ('2025021909297880500', NULL, '汽车品牌', '/car/appCarTreeList', 'miniapp/car/AppCarTreeList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880501', '2025021909297880500', '添加汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880502', '2025021909297880500', '编辑汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880503', '2025021909297880500', '删除汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880504', '2025021909297880500', '批量删除汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880505', '2025021909297880500', '导出excel_汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', 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 ('2025021909297880506', '2025021909297880500', '导入excel_汽车品牌', NULL, NULL, 0, NULL, NULL, 2, 'car:app_car_tree:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:29:50', NULL, NULL, 0, 0, '1', 0); diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeForm.vue b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeForm.vue new file mode 100644 index 0000000..4013048 --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeModal.vue b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeModal.vue new file mode 100644 index 0000000..3b3350c --- /dev/null +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/car/vue3/components/AppCarTreeModal.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/controller/AppStoreController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/controller/AppStoreController.java index 3b7406b..832cbc0 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/controller/AppStoreController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/controller/AppStoreController.java @@ -28,7 +28,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 门店管理 * @Author: jeecg-boot - * @Date: 2025-02-16 + * @Date: 2025-02-19 * @Version: V1.0 */ @Api(tags="门店管理") diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/entity/AppStore.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/entity/AppStore.java index d89598a..63a6209 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/entity/AppStore.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/entity/AppStore.java @@ -1,10 +1,15 @@ package org.jeecg.modules.sysMiniapp.store.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; @@ -18,7 +23,7 @@ import lombok.experimental.Accessors; /** * @Description: 门店管理 * @Author: jeecg-boot - * @Date: 2025-02-16 + * @Date: 2025-02-19 * @Version: V1.0 */ @Data @@ -30,7 +35,7 @@ public class AppStore implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.Integer id; /**门店名称*/ @@ -42,6 +47,10 @@ public class AppStore implements Serializable { @Dict(dicCode = "dict_item_status") @ApiModelProperty(value = "状态") private java.lang.Integer status; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String address; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/AppStoreMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/AppStoreMapper.java index e210bf2..2c64233 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/AppStoreMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/AppStoreMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 门店管理 * @Author: jeecg-boot - * @Date: 2025-02-16 + * @Date: 2025-02-19 * @Version: V1.0 */ public interface AppStoreMapper extends BaseMapper { diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/IAppStoreService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/IAppStoreService.java index d35f22a..a6252f8 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/IAppStoreService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/IAppStoreService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 门店管理 * @Author: jeecg-boot - * @Date: 2025-02-16 + * @Date: 2025-02-19 * @Version: V1.0 */ public interface IAppStoreService extends IService { diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/impl/AppStoreServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/impl/AppStoreServiceImpl.java index 958425f..6945474 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/impl/AppStoreServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/impl/AppStoreServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 门店管理 * @Author: jeecg-boot - * @Date: 2025-02-16 + * @Date: 2025-02-19 * @Version: V1.0 */ @Service diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/uniapp/AppStoreForm.vue b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/uniapp/AppStoreForm.vue index 31611b1..39addbc 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/uniapp/AppStoreForm.vue +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/uniapp/AppStoreForm.vue @@ -20,6 +20,12 @@ + + + 地址： + + + 备注： diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/AppStore.data.ts b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/AppStore.data.ts index 557dfdf..6e4e48e 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/AppStore.data.ts +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/AppStore.data.ts @@ -16,9 +16,9 @@ export const columns: BasicColumn[] = [ dataIndex: 'status_dictText' }, { - title: '备注', + title: '地址', align:"center", - dataIndex: 'remark' + dataIndex: 'address' }, { title: '创建日期', @@ -42,6 +42,11 @@ export const searchFormSchema: FormSchema[] = [ }, //colProps: {span: 6}, }, + { + label: "地址", + field: "address", + component: 'JInput', + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -70,6 +75,16 @@ export const formSchema: FormSchema[] = [ ]; }, }, + { + label: '地址', + field: 'address', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入地址!'}, + ]; + }, + }, { label: '备注', field: 'remark', @@ -88,8 +103,8 @@ export const formSchema: FormSchema[] = [ export const superQuerySchema = { storeName: {title: '门店名称',order: 0,view: 'text', type: 'string',}, status: {title: '状态',order: 1,view: 'number', type: 'number',dictCode: 'dict_item_status',}, - remark: {title: '备注',order: 2,view: 'text', type: 'string',}, - createTime: {title: '创建日期',order: 3,view: 'datetime', type: 'string',}, + address: {title: '地址',order: 2,view: 'text', type: 'string',}, + createTime: {title: '创建日期',order: 4,view: 'datetime', type: 'string',}, }; /** diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250216_1__menu_insert_AppStore.sql b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250219_1__menu_insert_AppStore.sql similarity index 72% rename from jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250216_1__menu_insert_AppStore.sql rename to jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250219_1__menu_insert_AppStore.sql index 76a2b3d..e58864d 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250216_1__menu_insert_AppStore.sql +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/vue3/V20250219_1__menu_insert_AppStore.sql @@ -2,25 +2,25 @@ -- 如果你想更改到其他目录，请修改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 ('2025021602224080490', NULL, '门店管理', '/app/appStoreList', 'miniapp/store/AppStoreList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0); +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 ('2025021909084040110', NULL, '门店管理', '/store/appStoreList', 'store/AppStoreList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080491', '2025021602224080490', '添加门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040111', '2025021909084040110', '添加门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080492', '2025021602224080490', '编辑门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040112', '2025021909084040110', '编辑门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080493', '2025021602224080490', '删除门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040113', '2025021909084040110', '删除门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080494', '2025021602224080490', '批量删除门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040114', '2025021909084040110', '批量删除门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080495', '2025021602224080490', '导出excel_门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040115', '2025021909084040110', '导出excel_门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', 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 ('2025021602224080496', '2025021602224080490', '导入excel_门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-16 14:22:49', NULL, NULL, 0, 0, '1', 0); +VALUES ('2025021909084040116', '2025021909084040110', '导入excel_门店管理', NULL, NULL, 0, NULL, NULL, 2, 'store:app_store:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-02-19 21:08:11', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/BaiduOCRUtil.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/BaiduOCRUtil.java index c201ae9..dd3bcf3 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/BaiduOCRUtil.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/BaiduOCRUtil.java @@ -2,6 +2,7 @@ package org.jeecg.modules.miniapp.utils; import cn.hutool.core.codec.Base64; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -19,8 +20,8 @@ import java.nio.file.Files; @Slf4j public class BaiduOCRUtil { - private static final String API_KEY = "ILgowCd9vTRSAEPRPhVvn0Oy"; // API Key - private static final String SECRET_KEY = "pqRPRjUaHvpgupAiPw7YtHaoj2GnE74S"; // Secret Key + private static final String API_KEY = "DtvxZu6pHU7dVzxavJUnLWuQ"; // API Key + private static final String SECRET_KEY = "BqwTCWaTLbICQWTPWcX0DDlLk1zD0nQR"; // Secret Key private static final String ACCESS_TOKEN_URL = "https://aip.baidubce.com/oauth/2.0/token"; @@ -120,7 +121,7 @@ public class BaiduOCRUtil { private static String makePostRequest(String apiUrl, String accessToken, JSONObject params) { String url = apiUrl + "?access_token=" + accessToken; log.info("百度 POST 请求的 URL：" + url); -// log.info("百度 POST 请求的参数：" + params.toString()); + log.info("百度 POST 请求的参数：" + params.toString()); String response = HttpRequest.post(url) .body(jsonToQueryString(params),"application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded") @@ -153,8 +154,8 @@ public class BaiduOCRUtil { */ public static void main(String[] args) throws IOException { // 示例：调用身份证识别API（图片URL） - String idCardResultUrl = recognizeIdCardWithImage("/Users/tanzs/Pictures/cert/font.jpg","front",true); -// String idCardResultUrl = recognizeIdCardWithImage("https://jf.sh.189.cn/minio/gov-miniapp/order_pdf/font.jpg","front",false); +// String idCardResultUrl = recognizeIdCardWithImage("/Users/tanzs/Pictures/cert/font.jpg","front",true); + String idCardResultUrl = recognizeIdCardWithImage("https://jf.sh.189.cn/minio/gov-miniapp/order_pdf/font.jpg","front",false); System.out.println("身份证识别结果： " + idCardResultUrl); // 示例：调用营业执照识别API（图片URL）