From dac84e3641680aa556b34322050e6a88b993256e Mon Sep 17 00:00:00 2001 From: chenwei Date: Tue, 20 Aug 2024 14:44:41 +0800 Subject: [PATCH] lpg 功能模块划分 --- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java | 2 +- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java | 2 +- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java | 3 ++- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java | 3 ++- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java | 3 ++- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java | 7 ++++++- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java | 3 ++- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java | 2 +- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java | 3 ++- backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java | 19 +++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java | 15 +++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java | 17 +++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java | 16 ++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java | 12 ++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java | 30 ++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java | 20 ++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java | 15 +++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java | 22 ++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java | 34 ++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java | 36 ++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java | 33 +++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/resources/mapper/CzglMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java | 26 -------------------------- backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java | 20 -------------------- backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java | 36 ------------------------------------ backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java | 34 ---------------------------------- backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java | 33 --------------------------------- 34 files changed, 587 insertions(+), 159 deletions(-) create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java create mode 100644 backend/lpg-user/src/main/resources/mapper/CzglMapper.xml delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java index 9b277f7..0e5a99f 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController -@RequestMapping("/customer/aj/") +@RequestMapping("/user/safetyCheck/") public class AjController { @Autowired diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java index 8ee6a8e..03a888c 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; */ @Slf4j @RestController -@RequestMapping("/customer/bx") +@RequestMapping("/user/warranty") public class BxbController extends BaseController { @Resource diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java new file mode 100644 index 0000000..6d0b35d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java @@ -0,0 +1,45 @@ +package com.hotent.lpg.user.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.controller.BaseController; +import com.hotent.base.model.CommonResult; +import com.hotent.base.util.StringUtil; +import com.hotent.lpg.common.model.WCzgl; +import com.hotent.lpg.user.manager.CzglManager; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 充装管理 前端控制器 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-05-27 + */ +@Slf4j +@RestController +@RequestMapping("/user/filling/") +//@RequestMapping("/staff/wCzgl/v1/") +public class CzglController extends BaseController { + + @GetMapping(value = "/qpczPage") + @ApiOperation(value = "气瓶充装信息", httpMethod = "GET", notes = "气瓶充装信息") + public CommonResult qplzPage(Page page, String qptm) throws Exception { + log.info("气瓶充装信息：page={},qptm={}", page, qptm); + if (StringUtil.isEmpty(qptm)) { + return CommonResult.error("请传入气瓶条码"); + } + IPage resultPage = new Page<>(); + try { + resultPage = baseService.qpczPage(page, qptm); + } catch (Exception e) { + return new CommonResult(false, e.getMessage()); + } + return CommonResult.ok().value(resultPage); + } + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java index 44be7e0..0fdc326 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java @@ -31,7 +31,8 @@ import java.util.List; */ @Slf4j @RestController -@RequestMapping("/customer/czxx/v1/") +//@RequestMapping("/customer/czxx/v1/") +@RequestMapping("/user/station/") public class CzxxController extends BaseController { @Resource diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java index 5efe04e..a3e646f 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java @@ -24,7 +24,8 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/customer/dd/") +//@RequestMapping("/customer/dd/") +@RequestMapping("/user/order/") @Validated public class DdConroller { diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java index ec12833..be1fdcc 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java @@ -32,7 +32,8 @@ import java.util.stream.Collectors; * @since 2024-03-12 */ @RestController -@RequestMapping("/customer/dz/") +//@RequestMapping("/customer/dz/") +@RequestMapping("/user/address/") @Validated public class DzController extends BaseController { diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java index 28bc717..7fe6e89 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java @@ -30,7 +30,8 @@ import javax.annotation.Resource; * @since 2024-03-18 */ @RestController -@RequestMapping("/customer/qp/") +//@RequestMapping("/customer/qp/") +@RequestMapping("/user/gasBottleRecord/") public class HyyqjlController extends BaseController { /** @@ -55,4 +56,8 @@ public class HyyqjlController extends BaseController { public CommonResult getYqjlDetail(@ApiParam(name = "yqjlid", value = "用气记录id", required = true) String yqjlid) { return CommonResult.ok().value(baseService.getDetailYqjlid(yqjlid)); } + + + + } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java new file mode 100644 index 0000000..21ec763 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java @@ -0,0 +1,79 @@ +package com.hotent.lpg.user.controller; + + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hotent.base.controller.BaseController; +import com.hotent.base.model.CommonResult; +import com.hotent.lpg.common.model.WQpxx; +import com.hotent.lpg.user.manager.QpxxManager; +import com.hotent.lpg.user.vo.QpmclzxxVo; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +/** + * 气瓶信息 前端控制器 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-19 + */ +@Slf4j +@RestController +//@RequestMapping("/wQpxx/v1/") +@RequestMapping("/user/gasBottle/") +public class QpxxController extends BaseController { + + /** + * 根据气瓶条码查询气瓶信息 + * + * @param qptm + * @return + * @throws Exception + * @throws + */ + @GetMapping(value = "/getDetailByQuery") + @ApiOperation(value = "气瓶信息", httpMethod = "GET", notes = "气瓶信息") + public CommonResult qpxxDetail(@ApiParam(name = "qptm", value = "气瓶条码", required = true) @RequestParam String qptm) throws Exception { + WQpxx qpxx = baseService.getOne(Wrappers.lambdaQuery().eq(WQpxx::getFDsfurl, qptm)); + if (BeanUtil.isEmpty(qpxx)) { + qpxx = baseService.getOne(Wrappers.lambdaQuery().eq(WQpxx::getFQptm, qptm)); + if (BeanUtil.isEmpty(qpxx)) { + throw new RuntimeException("未查询到气瓶信息"); + } + } + return CommonResult.ok().value(baseService.getQpxxByid(qpxx.getId())); + } + + + + + /** + * 气瓶末次流转节点 + * + * @param qptm + * @return + * @throws Exception + * @throws + */ + @GetMapping(value = "/lastCycle") + @ApiOperation(value = "气瓶末次流转节点", httpMethod = "GET", notes = "气瓶末次流转节点") + public CommonResult lastCycle(@ApiParam(name = "qptm", value = "气瓶条码", required = true) @RequestParam String qptm) throws Exception { + + List lastCycle = new ArrayList<>(); + try { + lastCycle = baseService.getLastCycle(qptm); + } catch (Exception e) { + return new CommonResult(false, e.getMessage()); + } + return CommonResult.ok().value(lastCycle); + } +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java index 1856856..3f4b3f5 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java @@ -26,7 +26,8 @@ import javax.annotation.Resource; */ @Slf4j @RestController -@RequestMapping("/customer/wTqgl/v1/") +//@RequestMapping("/customer/wTqgl/v1/") +@RequestMapping("/user/gasBottleRefund/") public class TqglController extends BaseController { @Resource diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java index 165225a..680fc14 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Optional; @RestController -@RequestMapping("/userInfo/v1") +@RequestMapping("/user/info/") @Api(tags = "移动端") @ApiGroup(group = {ApiGroupConsts.GROUP_PORTAL}) @Validated diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java index fc6fd0c..bf0f6df 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java @@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @RestController -@RequestMapping("/wQplx/v1/") +//@RequestMapping("/wQplx/v1/") +@RequestMapping("/user/goods/") public class WQplxController extends BaseController { diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java new file mode 100644 index 0000000..5312778 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java @@ -0,0 +1,19 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.lpg.common.model.WCzgl; +import org.apache.ibatis.annotations.Param; + +/** + * 充装管理 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-05-27 + */ +public interface CzglDao extends BaseMapper { + IPage page1(Page page, @Param("qptm") String qptm); + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java new file mode 100644 index 0000000..7cc9819 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WQplz; + +/** + * 气瓶流转 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +public interface QplzDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java new file mode 100644 index 0000000..e821cbe --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java @@ -0,0 +1,15 @@ +package com.hotent.lpg.user.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WQpssxx; + +/** + * 气瓶实时信息 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +public interface QpssxxDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java new file mode 100644 index 0000000..cca71ed --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WQyxx; + +/** + * 企业信息 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-12 + */ +public interface QyxxDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java new file mode 100644 index 0000000..f45560d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java @@ -0,0 +1,17 @@ +package com.hotent.lpg.user.manager; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WCzgl; + +/** + * 充装管理 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-05-27 + */ +public interface CzglManager extends BaseManager { + IPage qpczPage(Page page, String qptm); +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java new file mode 100644 index 0000000..6b591c3 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WQplz; + +/** + * 气瓶流转 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +public interface QplzManager extends BaseManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java new file mode 100644 index 0000000..bd68f73 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java @@ -0,0 +1,16 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WQpssxx; + + +/** + * 气瓶实时信息 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +public interface QpssxxManager extends BaseManager { + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java index 19c665d..cf7acfa 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java @@ -2,6 +2,10 @@ package com.hotent.lpg.user.manager; import com.hotent.base.manager.BaseManager; import com.hotent.lpg.common.model.WQpxx; +import com.hotent.lpg.user.vo.QpmclzxxVo; +import com.hotent.lpg.user.vo.QpxxVo; + +import java.util.List; /** * 气瓶信息 服务类 @@ -11,4 +15,12 @@ import com.hotent.lpg.common.model.WQpxx; * @since 2024-03-19 */ public interface QpxxManager extends BaseManager { + QpxxVo getQpxxByid(String qpid); + + /** + * 气瓶末次流转节点 + * @param qptm 气瓶条码 + * @return + */ + List getLastCycle(String qptm); } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java new file mode 100644 index 0000000..ed0b661 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WQyxx; + +/** + * 企业信息 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-12 + */ +public interface QyxxManager extends BaseManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java new file mode 100644 index 0000000..821bd4e --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java @@ -0,0 +1,30 @@ +package com.hotent.lpg.user.manager.impl; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WCzgl; +import com.hotent.lpg.user.dao.CzglDao; +import com.hotent.lpg.user.manager.CzglManager; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 充装管理 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-05-27 + */ +@Transactional(rollbackFor = Exception.class) +@Service +public class CzglManagerImpl extends BaseManagerImpl implements CzglManager { + + @Override + public IPage qpczPage(Page page, String qptm) { + IPage result = baseMapper.page1(page,qptm); + return result; + } + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java new file mode 100644 index 0000000..101e748 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java @@ -0,0 +1,20 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WQplz; +import com.hotent.lpg.user.dao.QplzDao; +import com.hotent.lpg.user.manager.QplzManager; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 气瓶流转 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-18 + */ +@Transactional(rollbackFor = Exception.class) +@Service +public class QplzManagerImpl extends BaseManagerImpl implements QplzManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java new file mode 100644 index 0000000..40bbe3e --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java @@ -0,0 +1,15 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WQpssxx; +import com.hotent.lpg.user.dao.QpssxxDao; +import com.hotent.lpg.user.manager.QpssxxManager; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Transactional(rollbackFor = Exception.class) +@Service +public class QpssxxManagerImpl extends BaseManagerImpl implements QpssxxManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java index 66ef3e8..094acaf 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java @@ -1,13 +1,26 @@ package com.hotent.lpg.user.manager.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.StringUtil; +import com.hotent.lpg.common.model.WQplz; +import com.hotent.lpg.common.model.WQpssxx; import com.hotent.lpg.common.model.WQpxx; import com.hotent.lpg.user.dao.QpxxDao; -import com.hotent.lpg.user.manager.QpxxManager; +import com.hotent.lpg.user.manager.*; +import com.hotent.lpg.user.vo.QpmclzxxVo; +import com.hotent.lpg.user.vo.QpxxVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + /** * 气瓶信息 服务实现类 * @@ -19,4 +32,56 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j @Service public class QpxxManagerImpl extends BaseManagerImpl implements QpxxManager { + + @Resource + private QpssxxManager wQpssxxManager; + @Resource + private QyxxManager wQyxxManager; + @Resource + private CzxxManager wCzxxManager; + @Resource + private QplzManager wQplzManager; + + @Override + public QpxxVo getQpxxByid(String qpid) { + QpxxVo qpxxVo = new QpxxVo(); + WQpxx qpxx = this.get(qpid); + BeanUtil.copyProperties(qpxx, qpxxVo); + //气瓶实时信息 + qpxxVo.setQpssxx(wQpssxxManager.getOne(Wrappers.lambdaQuery().eq(WQpssxx::getFQpid, qpid))); + //气瓶所属企业信息 + qpxxVo.setSsqyxx(StringUtil.isEmpty(qpxx.getFSsqyid()) ? null : wQyxxManager.getById(qpxx.getFSsqyid())); + //气瓶所属厂站信息 + qpxxVo.setSsczxx(StringUtil.isEmpty(qpxx.getFSsczid()) ? null : wCzxxManager.getById(qpxx.getFSsczid())); + //气瓶当前流转信息 + qpxxVo.setQpdqlzs(BeanUtil.isNotEmpty(qpxxVo.getQpssxx()) && StringUtil.isNotEmpty(qpxxVo.getQpssxx().getFZqbh()) ? wQplzManager.list(Wrappers.lambdaQuery().eq(WQplz::getFZqbh, qpxxVo.getQpssxx().getFZqbh()).orderByAsc(WQplz::getFCzsj)) : null); + return qpxxVo; + } + + @Override + public List getLastCycle(String qptm) { + WQpxx wQpxx = this.getOne(Wrappers.lambdaQuery().eq(WQpxx::getFQptm, qptm)); + if (wQpxx == null) { + log.info("气瓶信息不存在,气瓶条码={}", qptm); + throw new RuntimeException("气瓶信息不存在"); + } + WQpssxx wQpssxx = wQpssxxManager.getOne(Wrappers.lambdaQuery().eq(WQpssxx::getFQpid, wQpxx.getId())); + if (wQpssxx == null) { + log.info("气瓶实时信息不存在,气瓶id={}", wQpxx.getId()); + throw new RuntimeException("气瓶实时信息不存在"); + } + List list = wQplzManager.list(Wrappers.lambdaQuery().eq(WQplz::getFZqbh, wQpssxx.getFZqbh()).eq(WQplz::getFQpid, wQpssxx.getFQpid()).orderByAsc(WQplz::getFCzsj)); + List qpmclzxxResponses = new ArrayList<>(); + for (WQplz wQplz : list) { + QpmclzxxVo qpmclzxxResponse = new QpmclzxxVo(); + qpmclzxxResponse.setFCzdd(wQplz.getFDqsf() + wQplz.getFDqs() + wQplz.getFDqq() + wQplz.getFDqjd() + wQplz.getFDqxxdz()); + qpmclzxxResponse.setFCzr(wQplz.getFCzr()); + qpmclzxxResponse.setFCzsj(LocalDateTime.parse(wQplz.getFCzsj(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + qpmclzxxResponse.setFJdmc(wQplz.getFLzmc()); + qpmclzxxResponse.setFZt("已完成"); + qpmclzxxResponse.setFCznr(wQplz.getFCzxq()); + qpmclzxxResponses.add(qpmclzxxResponse); + } + return qpmclzxxResponses; + } } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java new file mode 100644 index 0000000..e55eb14 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java @@ -0,0 +1,22 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WQyxx; +import com.hotent.lpg.user.dao.QyxxDao; +import com.hotent.lpg.user.manager.QyxxManager; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 企业信息 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-12 + */ +@Slf4j +@Transactional(rollbackFor = Exception.class) +@Service +public class QyxxManagerImpl extends BaseManagerImpl implements QyxxManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java new file mode 100644 index 0000000..a5da327 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java @@ -0,0 +1,34 @@ +package com.hotent.lpg.user.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + + +@Data +public class QpOrderInfoVo { + /** + * 会员名称 + */ + private String hymc; + /** + * 会员电话 + */ + private String hydh; + /** + * 配送地址 + */ + private String hydz; + /** + * 订单单号 + */ + private String dddh; + /** + * 下单时间 + */ + private LocalDateTime xdsj; + /** + * 配送人 + */ + private String psr; +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java new file mode 100644 index 0000000..09f0bfb --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java @@ -0,0 +1,36 @@ +package com.hotent.lpg.user.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 气瓶末次流转信息 + */ +@Data +public class QpmclzxxVo { + /** + * 节点名称 + */ + private String fJdmc; + /** + * 操作时间 + */ + private LocalDateTime fCzsj; + /** + * 操作人 + */ + private String fCzr; + /** + * 操作地点 + */ + private String fCzdd; + /** + * 状态 + */ + private String fZt; + /** + * 操作内容 + */ + private String fCznr; +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java new file mode 100644 index 0000000..8fff9d2 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java @@ -0,0 +1,33 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.*; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QpxxVo extends WQpxx { + + /** + * 气瓶实时信息 + */ + private WQpssxx qpssxx = new WQpssxx(); + + /** + * 当前流转信息 + */ + private List qpdqlzs = new ArrayList(); + /** + * 所属企业信息 + */ + private WQyxx ssqyxx = new WQyxx(); + /** + * 所属厂站信息 + */ + private WCzxx ssczxx = new WCzxx(); + /** + * 气瓶实时订单信息 + */ + private QpOrderInfoVo qpOrderInfoVO; +} diff --git a/backend/lpg-user/src/main/resources/mapper/CzglMapper.xml b/backend/lpg-user/src/main/resources/mapper/CzglMapper.xml new file mode 100644 index 0000000..7e25f6a --- /dev/null +++ b/backend/lpg-user/src/main/resources/mapper/CzglMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java b/backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java deleted file mode 100644 index f6c20b2..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hotent.lpg.dao; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hotent.lpg.model.WCzgl; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.HashMap; -import java.util.List; - -/** - * 充装管理 Mapper 接口 - * - * @company 广州宏天软件股份有限公司 - * @author 超级管理员 - * @since 2024-05-27 - */ -public interface WCzglDao extends BaseMapper { - - IPage page1(Page page, @Param("qptm") String qptm); - - IPage cpczPage(Page page, @Param("query")WCzgl wCzgl, @Param("list")List orgIdList); - - IPage cpczmxPage(Page page, @Param("query")WCzgl wCzgl); -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java b/backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java deleted file mode 100644 index 1201e30..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hotent.lpg.dao; - -import com.hotent.lpg.model.WQyxx; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hotent.lpg.model.vo.QyxxVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 企业信息 Mapper 接口 - * - * @company 广州宏天软件股份有限公司 - * @author 超级管理员 - * @since 2024-03-12 - */ -public interface WQyxxDao extends BaseMapper { - - List qyList(@Param("list") List qyIdList); -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java b/backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java deleted file mode 100644 index 7ccdfa9..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hotent.lpg.model.response; - -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 气瓶末次流转信息 - */ -@Data -public class QpmclzxxResponse { - /** - * 节点名称 - */ - private String fJdmc; - /** - * 操作时间 - */ - private LocalDateTime fCzsj; - /** - * 操作人 - */ - private String fCzr; - /** - * 操作地点 - */ - private String fCzdd; - /** - * 状态 - */ - private String fZt; - /** - * 操作内容 - */ - private String fCznr; -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java b/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java deleted file mode 100644 index cc90b5c..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hotent.lpg.model.vo; - -import lombok.Data; - -import java.time.LocalDateTime; - - -@Data -public class QpOrderInfoVO { - /** - * 会员名称 - */ - private String hymc; - /** - * 会员电话 - */ - private String hydh; - /** - * 配送地址 - */ - private String hydz; - /** - * 订单单号 - */ - private String dddh; - /** - * 下单时间 - */ - private LocalDateTime xdsj; - /** - * 配送人 - */ - private String psr; -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java b/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java deleted file mode 100644 index 60a19b9..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hotent.lpg.model.vo; - -import com.hotent.lpg.model.*; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class QpxxVo extends WQpxx { - - /** - * 气瓶实时信息 - */ - private WQpssxx qpssxx = new WQpssxx(); - - /** - * 当前流转信息 - */ - private List qpdqlzs = new ArrayList(); - /** - * 所属企业信息 - */ - private WQyxx ssqyxx = new WQyxx(); - /** - * 所属厂站信息 - */ - private WCzxx ssczxx = new WCzxx(); - /** - * 气瓶实时订单信息 - */ - private QpOrderInfoVO qpOrderInfoVO; -} -- libgit2 0.21.2