wang-hao-jie
2021-11-11 a6868ffbff3fb71be6848c77eab7ea2061e39110
修改
5个文件已修改
92 ■■■■■ 已修改文件
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -10,7 +10,11 @@
import cn.exrick.xboot.core.entity.User;
import cn.exrick.xboot.core.service.SettingService;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Customer;
import cn.exrick.xboot.your.entity.CustomerReceive;
import cn.exrick.xboot.your.entity.Fingerprint;
import cn.exrick.xboot.your.service.ICustomerReceiveService;
import cn.exrick.xboot.your.service.ICustomerService;
import cn.exrick.xboot.your.service.IFingerprintService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,6 +47,12 @@
    @Autowired
    private UserService userService;
    @Autowired
    private ICustomerReceiveService iCustomerReceiveService;
    @Autowired
    private ICustomerService iCustomerService;
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<Fingerprint> get(@PathVariable String id) {
@@ -52,10 +62,19 @@
    }
    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部数据")
    @ApiOperation(value = "获取全部司机和配送员指纹数据")
    public Result<List<Fingerprint>> getAll() {
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.isNotNull("user_id");
        List<Fingerprint> list = iFingerprintService.list(wrapper);
        return new ResultUtil<List<Fingerprint>>().setData(list);
    }
    @RequestMapping(value = "/getAllByAreaId", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部片区内指纹数据")
    public Result<List<Fingerprint>> getAllByAreaId(String areaId) {
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.eq("area_id",areaId);
        List<Fingerprint> list = iFingerprintService.list(wrapper);
        return new ResultUtil<List<Fingerprint>>().setData(list);
    }
@@ -77,6 +96,44 @@
        return new ResultUtil<IPage<Fingerprint>>().setData(data);
    }
    @RequestMapping(value = "/getUserByCode", method = RequestMethod.GET)
    @ApiOperation(value = "用指纹编号司机或配送员的登录名和密码")
    public Result<Object> getUserByCode(String code) {
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.eq("code",code);
        wrapper.isNotNull("user_id");
        Fingerprint one = iFingerprintService.getOne(wrapper);
        return new ResultUtil<Object>().setData(one);
    }
    @RequestMapping(value = "/getCustomerByCode", method = RequestMethod.GET)
    @ApiOperation(value = "用指纹编号和商户id获取接货人信息")
    public Result<Object> getCustomerByCode(String code,String customerId) {
        Customer c = iCustomerService.getById(customerId);
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.eq("code",code);
        wrapper.eq("area_id",c.getAreaId());
        Fingerprint one = iFingerprintService.getOne(wrapper);
        CustomerReceive customerReceive = iCustomerReceiveService.getById(one.getCustomerReceiveId());
        return new ResultUtil<Object>().setData(customerReceive);
    }
    @RequestMapping(value = "/getCode2", method = RequestMethod.GET)
    @ApiOperation(value = "根据商户id获取接货人编号")
    public Result<Object> getCode2(String customerId) {
        Customer c = iCustomerService.getById(customerId);
        int code = iFingerprintService.maxCode2(c.getAreaId());
        return new ResultUtil<Object>().setData(code);
    }
    @RequestMapping(value = "/getCode", method = RequestMethod.GET)
    @ApiOperation(value = "获取司机或配送员指纹编号")
    public Result<Object> getCode() {
        int code = iFingerprintService.maxCode();
        return new ResultUtil<Object>().setData(code);
    }
    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {
@@ -91,6 +148,7 @@
        return new ResultUtil<Fingerprint>().setErrorMsg("操作失败");
    }
    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
    @ApiOperation(value = "批量通过id删除")
    public Result<Object> delAllByIds(@RequestParam String[] ids) {
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java
@@ -35,6 +35,9 @@
    @ApiModelProperty(value = "商户接收人id")
    private String customerReceiveId;
    @ApiModelProperty(value = "片区id")
    private String areaId;
    @ApiModelProperty(value = "指纹编号")
    private Integer code;
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.Fingerprint;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -11,4 +12,9 @@
 */
public interface FingerprintMapper extends BaseMapper<Fingerprint> {
    @Select("select max(code) from t_fingerprint where user_id is not null")
    Integer maxCode();
    @Select("select max(code) from t_fingerprint where area_id=#{areaId}")
    Integer maxCode2(String areaId);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java
@@ -11,4 +11,7 @@
 */
public interface IFingerprintService extends IService<Fingerprint> {
    int maxCode();
    int maxCode2(String areaId);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java
@@ -23,4 +23,24 @@
    @Autowired
    private FingerprintMapper fingerprintMapper;
    @Override
    public int maxCode() {
        Integer s = fingerprintMapper.maxCode();
        if(s==null){
            return 1;
        }else{
            return s;
        }
    }
    @Override
    public int maxCode2(String areaId) {
        Integer s = fingerprintMapper.maxCode2(areaId);
        if(s==null){
            return 1000;
        }else{
            return s;
        }
    }
}