From a6868ffbff3fb71be6848c77eab7ea2061e39110 Mon Sep 17 00:00:00 2001 From: wang-hao-jie <1550036656@qq.com> Date: 星期四, 11 十一月 2021 09:05:22 +0800 Subject: [PATCH] 修改 --- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java | 3 + xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java | 20 ++++++++++ xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 60 +++++++++++++++++++++++++++++ xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java | 6 +++ xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java | 3 + 5 files changed, 91 insertions(+), 1 deletions(-) diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java index d9f2fea..a84a445 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java +++ b/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) { diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java index 76f8f75..4ba488b 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java @@ -35,6 +35,9 @@ @ApiModelProperty(value = "鍟嗘埛鎺ユ敹浜篿d") private String customerReceiveId; + @ApiModelProperty(value = "鐗囧尯id") + private String areaId; + @ApiModelProperty(value = "鎸囩汗缂栧彿") private Integer code; diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java index 23f1f73..1dd3f99 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java +++ b/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); } \ No newline at end of file diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java index 52e2529..897f37b 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java +++ b/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); } \ No newline at end of file diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java index 634a647..7292409 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java +++ b/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; + } + } } \ No newline at end of file -- Gitblit v1.9.1