xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java
@@ -21,6 +21,12 @@ User findByUsername(String username); /** * 查询所有用户 * @return */ List<User> findAll(); /** * 通过手机获取用户 * @param mobile * @return xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
@@ -27,6 +27,12 @@ User findByUsername(String username); /** * 查询所有用户信息 * @return */ List<User> findAll(); /** * 通过手机获取用户 * @param mobile * @return xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java
@@ -63,6 +63,11 @@ } @Override public List<User> findAll() { return userDao.findAll(); } @Override public User findByMobile(String mobile) { User user = userDao.findByMobile(mobile); xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
New file @@ -0,0 +1,79 @@ package cn.exrick.xboot.your.controller; import cn.exrick.xboot.core.common.utils.PageUtil; import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.Area; import cn.exrick.xboot.your.service.IAreaService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * @author zhangzeli */ @Slf4j @RestController @Api(tags = "配送片区管理接口") @RequestMapping("/xboot/area") @Transactional public class AreaController { @Autowired private IAreaService iAreaService; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) @ApiOperation(value = "通过id获取") public Result<Area> get(@PathVariable String id) { Area area = iAreaService.getById(id); return new ResultUtil<Area>().setData(area); } @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "获取全部数据") public Result<List<Area>> getAll() { List<Area> list = iAreaService.list(); return new ResultUtil<List<Area>>().setData(list); } @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<Area>> getByPage(String name,PageVo page) { QueryWrapper<Area> wrapper = new QueryWrapper<>(); if (!StrUtil.isEmpty(name)) wrapper.like("name","%"+name+"%"); IPage<Area> data = iAreaService.page2(PageUtil.initMpPage(page),wrapper); return new ResultUtil<IPage<Area>>().setData(data); } @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "编辑或更新数据") public Result<Area> saveOrUpdate(Area area) { if (iAreaService.saveOrUpdate(area)) { return new ResultUtil<Area>().setData(area); } return new ResultUtil<Area>().setErrorMsg("操作失败"); } @RequestMapping(value = "/delByIds", method = RequestMethod.POST) @ApiOperation(value = "批量通过id删除") public Result<Object> delAllByIds(@RequestParam String[] ids) { for (String id : ids) { iAreaService.removeById(id); } return ResultUtil.success("批量通过id删除数据成功"); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
New file @@ -0,0 +1,79 @@ package cn.exrick.xboot.your.controller; import cn.exrick.xboot.core.common.utils.PageUtil; import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.AreaSection; import cn.exrick.xboot.your.service.IAreaSectionService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * @author zhangzeli */ @Slf4j @RestController @Api(tags = "片区段管理接口") @RequestMapping("/xboot/areaSection") @Transactional public class AreaSectionController { @Autowired private IAreaSectionService iAreaSectionService; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) @ApiOperation(value = "通过id获取") public Result<AreaSection> get(@PathVariable String id) { AreaSection areaSection = iAreaSectionService.getById(id); return new ResultUtil<AreaSection>().setData(areaSection); } @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "获取全部数据") public Result<List<AreaSection>> getAll() { List<AreaSection> list = iAreaSectionService.list(); return new ResultUtil<List<AreaSection>>().setData(list); } @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<AreaSection>> getByPage(String areaId,PageVo page) { QueryWrapper<AreaSection> wrapper = new QueryWrapper<>(); if (!StrUtil.isEmpty(areaId)) wrapper.eq("area_id",areaId); IPage<AreaSection> data = iAreaSectionService.page(PageUtil.initMpPage(page),wrapper); return new ResultUtil<IPage<AreaSection>>().setData(data); } @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "编辑或更新数据") public Result<AreaSection> saveOrUpdate(AreaSection areaSection) { if (iAreaSectionService.saveOrUpdate(areaSection)) { return new ResultUtil<AreaSection>().setData(areaSection); } return new ResultUtil<AreaSection>().setErrorMsg("操作失败"); } @RequestMapping(value = "/delByIds", method = RequestMethod.POST) @ApiOperation(value = "批量通过id删除") public Result<Object> delAllByIds(@RequestParam String[] ids) { for (String id : ids) { iAreaSectionService.removeById(id); } return ResultUtil.success("批量通过id删除数据成功"); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java
New file @@ -0,0 +1,45 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_area") @TableName("t_area") @ApiModel(value = "片区") public class Area extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "片区名称") private String name; @ApiModelProperty(value = "片区描述") private String description; @ApiModelProperty(value = "配送人id") private String userId; @Transient @TableField(exist = false) private String userName; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java
New file @@ -0,0 +1,40 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_area_ection") @TableName("t_area_ection") @ApiModel(value = "片区段") public class AreaSection extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "片区名称") private String name; @ApiModelProperty(value = "分段编号或名称") private String code; @ApiModelProperty(value = "区域id") private String areaId; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
New file @@ -0,0 +1,72 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_customer") @TableName("t_customer") @ApiModel(value = "商户表") public class Customer extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "商户名称") private String name; @ApiModelProperty(value = "商户编号(扩展字段)") private String code; @ApiModelProperty(value = "门头照片") private String headImg; @ApiModelProperty(value = "联系方式") private String phone; @ApiModelProperty(value = "经度") private String lng; @ApiModelProperty(value = "纬度") private String lat; @ApiModelProperty(value = "关联配送区域ID") private String areaId; @ApiModelProperty(value = "0:正常 1:不活跃(默认=0)") private int status; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "上次配送日期") private Date lastTime; @ApiModelProperty(value = "商户注册地址") private String registeredAddress; @ApiModelProperty(value = "联系人") private String linker; @ApiModelProperty(value = "零售许可证信息(图片?文字?)") private String licence; @ApiModelProperty(value = "接货人名称") private String recvName; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java
New file @@ -0,0 +1,27 @@ package cn.exrick.xboot.your.mapper; import cn.exrick.xboot.your.entity.AddOil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.Area; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.type.JdbcType; import java.util.List; /** * 配送片区数据处理层 * @author zhangzeli */ public interface AreaMapper extends BaseMapper<Area> { @Select("SELECT a.*,b.username as temp FROM t_area a LEFT JOIN t_user b ON a.user_id=b.id ${ew.customSqlSegment} ") @Results({@Result(column="temp", property="userName", jdbcType = JdbcType.VARCHAR)}) IPage<Area> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Area> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaSectionMapper.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.AreaSection; import java.util.List; /** * 片区段数据处理层 * @author zhangzeli */ public interface AreaSectionMapper extends BaseMapper<AreaSection> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaSectionService.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.exrick.xboot.your.entity.AreaSection; import java.util.List; /** * 片区段接口 * @author zhangzeli */ public interface IAreaSectionService extends IService<AreaSection> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java
New file @@ -0,0 +1,17 @@ package cn.exrick.xboot.your.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.exrick.xboot.your.entity.Area; import java.util.List; /** * 配送片区接口 * @author zhangzeli */ public interface IAreaService extends IService<Area> { IPage<Area> page2(Page initMpPage, QueryWrapper<Area> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaSectionServiceImpl.java
New file @@ -0,0 +1,26 @@ package cn.exrick.xboot.your.serviceimpl; import cn.exrick.xboot.your.mapper.AreaSectionMapper; import cn.exrick.xboot.your.entity.AreaSection; import cn.exrick.xboot.your.service.IAreaSectionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * 片区段接口实现 * @author zhangzeli */ @Slf4j @Service @Transactional public class IAreaSectionServiceImpl extends ServiceImpl<AreaSectionMapper, AreaSection> implements IAreaSectionService { @Autowired private AreaSectionMapper areaSectionMapper; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java
New file @@ -0,0 +1,34 @@ package cn.exrick.xboot.your.serviceimpl; import cn.exrick.xboot.your.mapper.AreaMapper; import cn.exrick.xboot.your.entity.Area; import cn.exrick.xboot.your.service.IAreaService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * 配送片区接口实现 * @author zhangzeli */ @Slf4j @Service @Transactional public class IAreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IAreaService { @Autowired private AreaMapper areaMapper; @Override public IPage<Area> page2(Page initMpPage, QueryWrapper<Area> wrapper) { return areaMapper.page2(initMpPage,wrapper); } } xboot-modules/xboot-your/src/main/resources/mapper/AreaMapper.xml
New file @@ -0,0 +1,5 @@ <?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="cn.exrick.xboot.your.mapper.AreaMapper"> </mapper> xboot-modules/xboot-your/src/main/resources/mapper/AreaSectionMapper.xml
New file @@ -0,0 +1,5 @@ <?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="cn.exrick.xboot.your.mapper.AreaSectionMapper"> </mapper>