Browse code Merge remote-tracking branch 'dxCardService/master' master
commit c9322d9815f95ac564175a1aebc8f91f30c0be30 2 parents 1efa180 + dac97b1 YFJ authored on 26 Sep

Showing 5 changed files

• jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java
• jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/mapper/CardApplicationCustomersMapper.java
• jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/mapper/xml/CardApplicationCustomersMapper.xml
• jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/ICardApplicationCustomersService.java
• jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/impl/CardApplicationCustomersServiceImpl.java

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java

package org.jeecg.modules.system.controller; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import cn.hutool.core.date.DateUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; 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 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.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.vo.AreaCardDeliveryPersonVO; import org.jeecg.modules.system.vo.CardApplicationCustomersVO; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; 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-09-24 * @Version: V1.0 */ @Tag(name="办卡客户") @RestController @RequestMapping("/customers/cardApplicationCustomers") @Slf4j public class CardApplicationCustomersController extends JeecgController<CardApplicationCustomers, ICardApplicationCustomersService> { @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; /** * 分页列表查询 * * @param cardApplicationCustomers * @param pageNo * @param pageSize * @param req * @return */ //@AutoLog(value = "办卡客户-分页列表查询") @Operation(summary="办卡客户-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CardApplicationCustomersVO>> queryPageList(CardApplicationCustomers cardApplicationCustomers, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { // 参数校验 if (pageNo <= 0) { pageNo = 1; } if (pageSize <= 0 || pageSize > 100) { pageSize = 10; } try { // 构建查询条件 QueryWrapper<CardApplicationCustomers> queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); // 分页查询 Page<CardApplicationCustomers> page = new Page<>(pageNo, pageSize); IPage<CardApplicationCustomers> pageList = cardApplicationCustomersService.page(page, queryWrapper); // 转换为VO对象 Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> { CardApplicationCustomersVO vo = new CardApplicationCustomersVO(); BeanUtils.copyProperties(record, vo); //处理预约时间 vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); //处理返还时间 if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } //TODO:点击次数 vo.setClickCount(0); return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询办卡客户列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } /** * 通过id删除 * * @param id * @return */ @AutoLog(value = "办卡客户-通过id删除") @Operation(summary="办卡客户-通过id删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { cardApplicationCustomersService.removeById(id); return Result.OK("删除成功!"); } /** * 批量删除 * * @param ids * @return */ @AutoLog(value = "办卡客户-批量删除") @Operation(summary="办卡客户-批量删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.cardApplicationCustomersService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } /** * 通过id查询 * * @param id * @return */ //@AutoLog(value = "办卡客户-通过id查询") @Operation(summary="办卡客户-通过id查询") @GetMapping(value = "/queryById") public Result<CardApplicationCustomers> queryById(@RequestParam(name="id",required=true) String id) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(id); if(cardApplicationCustomers==null) { return Result.error("未找到对应数据"); } return Result.OK(cardApplicationCustomers); } /** * 导出excel * * @param request * @param cardApplicationCustomers */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) { return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.class, "办卡客户"); } /** * 通过excel导入数据 * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CardApplicationCustomers.class); } /** * 派单 */ @PostMapping(value = "/dispatch") public Result<String> dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getCardDeliveryPerson())){ return Result.error("指定送卡人不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); entry.setCardDeliveryPerson(dto.getCardDeliveryPerson()); entry.setStatus("1"); //已派单 cardApplicationCustomersService.updateById(entry); return Result.OK("派单成功！"); } /** * 获取指定区域的送卡人列表 */ @GetMapping(value = "/getAreaCardDeliveryPersonList") public Result<List<AreaCardDeliveryPersonVO>> getAreaCardDeliveryPersonList(@RequestParam(value = "province") String province, @RequestParam(value = "city") String city, @RequestParam(value = "area") String area, @RequestParam(value = "address") String address) { QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(province)){ queryWrapper.eq("province", province); } if (StringUtils.isNotBlank(city)){ queryWrapper.eq("city", city); } if (StringUtils.isNotBlank(area)){ queryWrapper.eq("area", area); } if (StringUtils.isNotBlank(address)){ queryWrapper.like("address",address); } List<CardDeliveryPerson> list = cardDeliveryPersonService.list(queryWrapper); List<AreaCardDeliveryPersonVO> voList = new ArrayList<>(); if (CollectionUtils.isNotEmpty( list)){ voList = list.stream().map(record -> { AreaCardDeliveryPersonVO vo = new AreaCardDeliveryPersonVO(); vo.setId(record.getId()); vo.setName(record.getName()); return vo; }).collect(Collectors.toList()); } return Result.OK(voList); } } package org.jeecg.modules.system.controller; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import cn.hutool.core.date.DateUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; 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 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.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.vo.AreaCardDeliveryPersonVO; import org.jeecg.modules.system.vo.CardApplicationCustomersVO; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; 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-09-24 * @Version: V1.0 */ @Tag(name="办卡客户") @RestController @RequestMapping("/card/cardApplicationCustomers") @Slf4j public class CardApplicationCustomersController extends JeecgController<CardApplicationCustomers, ICardApplicationCustomersService> { @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; /** * 分页列表查询 * * @param cardApplicationCustomers * @param pageNo * @param pageSize * @param req * @return */ //@AutoLog(value = "办卡客户-分页列表查询") @Operation(summary="办卡客户-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CardApplicationCustomersVO>> queryPageList(CardApplicationCustomers cardApplicationCustomers, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { // 参数校验 if (pageNo <= 0) { pageNo = 1; } if (pageSize <= 0 || pageSize > 100) { pageSize = 10; } try { // 构建查询条件 QueryWrapper<CardApplicationCustomers> queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); // 分页查询 Page<CardApplicationCustomers> page = new Page<>(pageNo, pageSize); IPage<CardApplicationCustomers> pageList = cardApplicationCustomersService.page(page, queryWrapper); // 转换为VO对象 Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> { CardApplicationCustomersVO vo = new CardApplicationCustomersVO(); BeanUtils.copyProperties(record, vo); //处理预约时间 vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); //处理返还时间 if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } //TODO:点击次数 vo.setClickCount(0); return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询办卡客户列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } /** * 通过id删除 * * @param id * @return */ @AutoLog(value = "办卡客户-通过id删除") @Operation(summary="办卡客户-通过id删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { cardApplicationCustomersService.removeById(id); return Result.OK("删除成功!"); } /** * 批量删除 * * @param ids * @return */ @AutoLog(value = "办卡客户-批量删除") @Operation(summary="办卡客户-批量删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.cardApplicationCustomersService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } /** * 通过id查询 * * @param id * @return */ //@AutoLog(value = "办卡客户-通过id查询") @Operation(summary="办卡客户-通过id查询") @GetMapping(value = "/queryById") public Result<CardApplicationCustomers> queryById(@RequestParam(name="id",required=true) String id) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(id); if(cardApplicationCustomers==null) { return Result.error("未找到对应数据"); } return Result.OK(cardApplicationCustomers); } /** * 导出excel * * @param request * @param cardApplicationCustomers */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) { return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.class, "办卡客户"); } /** * 通过excel导入数据 * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CardApplicationCustomers.class); } /** * 派单 */ @PostMapping(value = "/dispatch") public Result<String> dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getCardDeliveryPerson())){ return Result.error("指定送卡人不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); entry.setCardDeliveryPerson(dto.getCardDeliveryPerson()); entry.setStatus("1"); //已派单 cardApplicationCustomersService.updateById(entry); return Result.OK("派单成功！"); } /** * 获取指定区域的送卡人列表 */ @GetMapping(value = "/getAreaCardDeliveryPersonList") public Result<List<AreaCardDeliveryPersonVO>> getAreaCardDeliveryPersonList(@RequestParam(value = "province") String province, @RequestParam(value = "city") String city, @RequestParam(value = "area") String area, @RequestParam(value = "address") String address) { QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(province)){ queryWrapper.eq("province", province); } if (StringUtils.isNotBlank(city)){ queryWrapper.eq("city", city); } if (StringUtils.isNotBlank(area)){ queryWrapper.eq("area", area); } if (StringUtils.isNotBlank(address)){ queryWrapper.like("address",address); } List<CardDeliveryPerson> list = cardDeliveryPersonService.list(queryWrapper); List<AreaCardDeliveryPersonVO> voList = new ArrayList<>(); if (CollectionUtils.isNotEmpty( list)){ voList = list.stream().map(record -> { AreaCardDeliveryPersonVO vo = new AreaCardDeliveryPersonVO(); vo.setId(record.getId()); vo.setName(record.getName()); return vo; }).collect(Collectors.toList()); } return Result.OK(voList); } }

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/mapper/CardApplicationCustomersMapper.java

package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.CardApplicationCustomers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ public interface CardApplicationCustomersMapper extends BaseMapper<CardApplicationCustomers> { } package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.entity.CardApplicationCustomers; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 */ public interface CardApplicationCustomersMapper extends BaseMapper<CardApplicationCustomers> { }

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/mapper/xml/CardApplicationCustomersMapper.xml

<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.system.mapper.CardApplicationCustomersMapper"> </mapper> <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.system.mapper.CardApplicationCustomersMapper"> </mapper>

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/ICardApplicationCustomersService.java

package org.jeecg.modules.system.service; import org.jeecg.modules.system.entity.CardApplicationCustomers; import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ public interface ICardApplicationCustomersService extends IService<CardApplicationCustomers> { } package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.system.entity.CardApplicationCustomers; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 */ public interface ICardApplicationCustomersService extends IService<CardApplicationCustomers> { }

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/impl/CardApplicationCustomersServiceImpl.java

package org.jeecg.modules.system.service.impl; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ @Service public class CardApplicationCustomersServiceImpl extends ServiceImpl<CardApplicationCustomersMapper, CardApplicationCustomers> implements ICardApplicationCustomersService { } package org.jeecg.modules.system.service.impl; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 */ @Service public class CardApplicationCustomersServiceImpl extends ServiceImpl<CardApplicationCustomersMapper, CardApplicationCustomers> implements ICardApplicationCustomersService { }

Show line notes below