ZongYue / lpg

Download as
Browse Code »

Commit dac84e3641680aa556b34322050e6a88b993256e

Authored by 陈威
1 parent 71b2bb79
Exists in dev

lpg 功能模块划分

Showing 34 changed files with 587 additions and 159 deletions   Show diff stats
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java
  Diff comments   View file @dac84e3
... ... @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
23 23 import java.util.List;
24 24  
25 25 @RestController
26   -@RequestMapping("/customer/aj/")
  26 +@RequestMapping("/user/safetyCheck/")
27 27 public class AjController {
28 28  
29 29 @Autowired
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java
  Diff comments   View file @dac84e3
... ... @@ -29,7 +29,7 @@ import javax.annotation.Resource;
29 29 */
30 30 @Slf4j
31 31 @RestController
32   -@RequestMapping("/customer/bx")
  32 +@RequestMapping("/user/warranty")
33 33 public class BxbController extends BaseController<BxbManager, WBxb> {
34 34  
35 35 @Resource
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzglController.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,45 @@
  1 +package com.hotent.lpg.user.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.metadata.IPage;
  4 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  5 +import com.hotent.base.controller.BaseController;
  6 +import com.hotent.base.model.CommonResult;
  7 +import com.hotent.base.util.StringUtil;
  8 +import com.hotent.lpg.common.model.WCzgl;
  9 +import com.hotent.lpg.user.manager.CzglManager;
  10 +import io.swagger.annotations.ApiOperation;
  11 +import lombok.extern.slf4j.Slf4j;
  12 +import org.springframework.web.bind.annotation.GetMapping;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +
  16 +/**
  17 + * 充装管理 前端控制器
  18 + *
  19 + * @author 超级管理员
  20 + * @company 广州宏天软件股份有限公司
  21 + * @since 2024-05-27
  22 + */
  23 +@Slf4j
  24 +@RestController
  25 +@RequestMapping("/user/filling/")
  26 +//@RequestMapping("/staff/wCzgl/v1/")
  27 +public class CzglController extends BaseController<CzglManager, WCzgl> {
  28 +
  29 + @GetMapping(value = "/qpczPage")
  30 + @ApiOperation(value = "气瓶充装信息", httpMethod = "GET", notes = "气瓶充装信息")
  31 + public CommonResult qplzPage(Page page, String qptm) throws Exception {
  32 + log.info("气瓶充装信息：page={},qptm={}", page, qptm);
  33 + if (StringUtil.isEmpty(qptm)) {
  34 + return CommonResult.error("请传入气瓶条码");
  35 + }
  36 + IPage<WCzgl> resultPage = new Page<>();
  37 + try {
  38 + resultPage = baseService.qpczPage(page, qptm);
  39 + } catch (Exception e) {
  40 + return new CommonResult(false, e.getMessage());
  41 + }
  42 + return CommonResult.ok().value(resultPage);
  43 + }
  44 +
  45 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/CzxxController.java
  Diff comments   View file @dac84e3
... ... @@ -31,7 +31,8 @@ import java.util.List;
31 31 */
32 32 @Slf4j
33 33 @RestController
34   -@RequestMapping("/customer/czxx/v1/")
  34 +//@RequestMapping("/customer/czxx/v1/")
  35 +@RequestMapping("/user/station/")
35 36 public class CzxxController extends BaseController<CzxxManager, WCzxx> {
36 37  
37 38 @Resource
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java
  Diff comments   View file @dac84e3
... ... @@ -24,7 +24,8 @@ import javax.annotation.Resource;
24 24 import java.util.List;
25 25  
26 26 @RestController
27   -@RequestMapping("/customer/dd/")
  27 +//@RequestMapping("/customer/dd/")
  28 +@RequestMapping("/user/order/")
28 29 @Validated
29 30 public class DdConroller {
30 31  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DzController.java
  Diff comments   View file @dac84e3
... ... @@ -32,7 +32,8 @@ import java.util.stream.Collectors;
32 32 * @since 2024-03-12
33 33 */
34 34 @RestController
35   -@RequestMapping("/customer/dz/")
  35 +//@RequestMapping("/customer/dz/")
  36 +@RequestMapping("/user/address/")
36 37 @Validated
37 38 public class DzController extends BaseController<HydzManager, WHydz> {
38 39  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java
  Diff comments   View file @dac84e3
... ... @@ -30,7 +30,8 @@ import javax.annotation.Resource;
30 30 * @since 2024-03-18
31 31 */
32 32 @RestController
33   -@RequestMapping("/customer/qp/")
  33 +//@RequestMapping("/customer/qp/")
  34 +@RequestMapping("/user/gasBottleRecord/")
34 35 public class HyyqjlController extends BaseController<HyyqjlManager, WHyyqjl> {
35 36  
36 37 /**
... ... @@ -55,4 +56,8 @@ public class HyyqjlController extends BaseController&lt;HyyqjlManager, WHyyqjl&gt; {
55 56 public CommonResult getYqjlDetail(@ApiParam(name = "yqjlid", value = "用气记录id", required = true) String yqjlid) {
56 57 return CommonResult.ok().value(baseService.getDetailYqjlid(yqjlid));
57 58 }
  59 +
  60 +
  61 +
  62 +
58 63 }
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QpxxController.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,79 @@
  1 +package com.hotent.lpg.user.controller;
  2 +
  3 +
  4 +import cn.hutool.core.bean.BeanUtil;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.hotent.base.controller.BaseController;
  7 +import com.hotent.base.model.CommonResult;
  8 +import com.hotent.lpg.common.model.WQpxx;
  9 +import com.hotent.lpg.user.manager.QpxxManager;
  10 +import com.hotent.lpg.user.vo.QpmclzxxVo;
  11 +import io.swagger.annotations.ApiOperation;
  12 +import io.swagger.annotations.ApiParam;
  13 +import lombok.extern.slf4j.Slf4j;
  14 +import org.springframework.web.bind.annotation.GetMapping;
  15 +import org.springframework.web.bind.annotation.RequestMapping;
  16 +import org.springframework.web.bind.annotation.RequestParam;
  17 +import org.springframework.web.bind.annotation.RestController;
  18 +
  19 +import java.util.ArrayList;
  20 +import java.util.List;
  21 +
  22 +/**
  23 + * 气瓶信息 前端控制器
  24 + *
  25 + * @author 超级管理员
  26 + * @company 广州宏天软件股份有限公司
  27 + * @since 2024-03-19
  28 + */
  29 +@Slf4j
  30 +@RestController
  31 +//@RequestMapping("/wQpxx/v1/")
  32 +@RequestMapping("/user/gasBottle/")
  33 +public class QpxxController extends BaseController<QpxxManager, WQpxx> {
  34 +
  35 + /**
  36 + * 根据气瓶条码查询气瓶信息
  37 + *
  38 + * @param qptm
  39 + * @return
  40 + * @throws Exception
  41 + * @throws
  42 + */
  43 + @GetMapping(value = "/getDetailByQuery")
  44 + @ApiOperation(value = "气瓶信息", httpMethod = "GET", notes = "气瓶信息")
  45 + public CommonResult qpxxDetail(@ApiParam(name = "qptm", value = "气瓶条码", required = true) @RequestParam String qptm) throws Exception {
  46 + WQpxx qpxx = baseService.getOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFDsfurl, qptm));
  47 + if (BeanUtil.isEmpty(qpxx)) {
  48 + qpxx = baseService.getOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFQptm, qptm));
  49 + if (BeanUtil.isEmpty(qpxx)) {
  50 + throw new RuntimeException("未查询到气瓶信息");
  51 + }
  52 + }
  53 + return CommonResult.ok().value(baseService.getQpxxByid(qpxx.getId()));
  54 + }
  55 +
  56 +
  57 +
  58 +
  59 + /**
  60 + * 气瓶末次流转节点
  61 + *
  62 + * @param qptm
  63 + * @return
  64 + * @throws Exception
  65 + * @throws
  66 + */
  67 + @GetMapping(value = "/lastCycle")
  68 + @ApiOperation(value = "气瓶末次流转节点", httpMethod = "GET", notes = "气瓶末次流转节点")
  69 + public CommonResult lastCycle(@ApiParam(name = "qptm", value = "气瓶条码", required = true) @RequestParam String qptm) throws Exception {
  70 +
  71 + List<QpmclzxxVo> lastCycle = new ArrayList<>();
  72 + try {
  73 + lastCycle = baseService.getLastCycle(qptm);
  74 + } catch (Exception e) {
  75 + return new CommonResult(false, e.getMessage());
  76 + }
  77 + return CommonResult.ok().value(lastCycle);
  78 + }
  79 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java
  Diff comments   View file @dac84e3
... ... @@ -26,7 +26,8 @@ import javax.annotation.Resource;
26 26 */
27 27 @Slf4j
28 28 @RestController
29   -@RequestMapping("/customer/wTqgl/v1/")
  29 +//@RequestMapping("/customer/wTqgl/v1/")
  30 +@RequestMapping("/user/gasBottleRefund/")
30 31 public class TqglController extends BaseController<TqglManager, WTqgl> {
31 32  
32 33 @Resource
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/UserInfoController.java
  Diff comments   View file @dac84e3
... ... @@ -27,7 +27,7 @@ import java.util.Map;
27 27 import java.util.Optional;
28 28  
29 29 @RestController
30   -@RequestMapping("/userInfo/v1")
  30 +@RequestMapping("/user/info/")
31 31 @Api(tags = "移动端")
32 32 @ApiGroup(group = {ApiGroupConsts.GROUP_PORTAL})
33 33 @Validated
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/WQplxController.java
  Diff comments   View file @dac84e3
... ... @@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
16 16 import javax.annotation.Resource;
17 17  
18 18 @RestController
19   -@RequestMapping("/wQplx/v1/")
  19 +//@RequestMapping("/wQplx/v1/")
  20 +@RequestMapping("/user/goods/")
20 21 public class WQplxController extends BaseController<QplxManager, WQplx> {
21 22  
22 23  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/CzglDao.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,19 @@
  1 +package com.hotent.lpg.user.dao;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  6 +import com.hotent.lpg.common.model.WCzgl;
  7 +import org.apache.ibatis.annotations.Param;
  8 +
  9 +/**
  10 + * 充装管理 Mapper 接口
  11 + *
  12 + * @company 广州宏天软件股份有限公司
  13 + * @author 超级管理员
  14 + * @since 2024-05-27
  15 + */
  16 +public interface CzglDao extends BaseMapper<WCzgl> {
  17 + IPage<WCzgl> page1(Page page, @Param("qptm") String qptm);
  18 +
  19 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QplzDao.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,14 @@
  1 +package com.hotent.lpg.user.dao;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.hotent.lpg.common.model.WQplz;
  5 +
  6 +/**
  7 + * 气瓶流转 Mapper 接口
  8 + *
  9 + * @company 广州宏天软件股份有限公司
  10 + * @author 超级管理员
  11 + * @since 2024-03-18
  12 + */
  13 +public interface QplzDao extends BaseMapper<WQplz> {
  14 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QpssxxDao.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,15 @@
  1 +package com.hotent.lpg.user.dao;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import com.hotent.lpg.common.model.WQpssxx;
  6 +
  7 +/**
  8 + * 气瓶实时信息 Mapper 接口
  9 + *
  10 + * @company 广州宏天软件股份有限公司
  11 + * @author 超级管理员
  12 + * @since 2024-03-18
  13 + */
  14 +public interface QpssxxDao extends BaseMapper<WQpssxx> {
  15 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/QyxxDao.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,14 @@
  1 +package com.hotent.lpg.user.dao;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.hotent.lpg.common.model.WQyxx;
  5 +
  6 +/**
  7 + * 企业信息 Mapper 接口
  8 + *
  9 + * @company 广州宏天软件股份有限公司
  10 + * @author 超级管理员
  11 + * @since 2024-03-12
  12 + */
  13 +public interface QyxxDao extends BaseMapper<WQyxx> {
  14 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/CzglManager.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,17 @@
  1 +package com.hotent.lpg.user.manager;
  2 +
  3 +import com.baomidou.mybatisplus.core.metadata.IPage;
  4 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  5 +import com.hotent.base.manager.BaseManager;
  6 +import com.hotent.lpg.common.model.WCzgl;
  7 +
  8 +/**
  9 + * 充装管理 服务类
  10 + *
  11 + * @company 广州宏天软件股份有限公司
  12 + * @author 超级管理员
  13 + * @since 2024-05-27
  14 + */
  15 +public interface CzglManager extends BaseManager<WCzgl> {
  16 + IPage<WCzgl> qpczPage(Page page, String qptm);
  17 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QplzManager.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,14 @@
  1 +package com.hotent.lpg.user.manager;
  2 +
  3 +import com.hotent.base.manager.BaseManager;
  4 +import com.hotent.lpg.common.model.WQplz;
  5 +
  6 +/**
  7 + * 气瓶流转 服务类
  8 + *
  9 + * @company 广州宏天软件股份有限公司
  10 + * @author 超级管理员
  11 + * @since 2024-03-18
  12 + */
  13 +public interface QplzManager extends BaseManager<WQplz> {
  14 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpssxxManager.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,16 @@
  1 +package com.hotent.lpg.user.manager;
  2 +
  3 +import com.hotent.base.manager.BaseManager;
  4 +import com.hotent.lpg.common.model.WQpssxx;
  5 +
  6 +
  7 +/**
  8 + * 气瓶实时信息 服务类
  9 + *
  10 + * @company 广州宏天软件股份有限公司
  11 + * @author 超级管理员
  12 + * @since 2024-03-18
  13 + */
  14 +public interface QpssxxManager extends BaseManager<WQpssxx> {
  15 +
  16 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QpxxManager.java
  Diff comments   View file @dac84e3
... ... @@ -2,6 +2,10 @@ package com.hotent.lpg.user.manager;
2 2  
3 3 import com.hotent.base.manager.BaseManager;
4 4 import com.hotent.lpg.common.model.WQpxx;
  5 +import com.hotent.lpg.user.vo.QpmclzxxVo;
  6 +import com.hotent.lpg.user.vo.QpxxVo;
  7 +
  8 +import java.util.List;
5 9  
6 10 /**
7 11 * 气瓶信息 服务类
... ... @@ -11,4 +15,12 @@ import com.hotent.lpg.common.model.WQpxx;
11 15 * @since 2024-03-19
12 16 */
13 17 public interface QpxxManager extends BaseManager<WQpxx> {
  18 + QpxxVo getQpxxByid(String qpid);
  19 +
  20 + /**
  21 + * 气瓶末次流转节点
  22 + * @param qptm 气瓶条码
  23 + * @return
  24 + */
  25 + List<QpmclzxxVo> getLastCycle(String qptm);
14 26 }
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/QyxxManager.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,14 @@
  1 +package com.hotent.lpg.user.manager;
  2 +
  3 +import com.hotent.base.manager.BaseManager;
  4 +import com.hotent.lpg.common.model.WQyxx;
  5 +
  6 +/**
  7 + * 企业信息 服务类
  8 + *
  9 + * @company 广州宏天软件股份有限公司
  10 + * @author 超级管理员
  11 + * @since 2024-03-12
  12 + */
  13 +public interface QyxxManager extends BaseManager<WQyxx> {
  14 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/CzglManagerImpl.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,30 @@
  1 +package com.hotent.lpg.user.manager.impl;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  6 +import com.hotent.base.manager.impl.BaseManagerImpl;
  7 +import com.hotent.lpg.common.model.WCzgl;
  8 +import com.hotent.lpg.user.dao.CzglDao;
  9 +import com.hotent.lpg.user.manager.CzglManager;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.transaction.annotation.Transactional;
  12 +
  13 +/**
  14 + * 充装管理 服务实现类
  15 + *
  16 + * @author 超级管理员
  17 + * @company 广州宏天软件股份有限公司
  18 + * @since 2024-05-27
  19 + */
  20 +@Transactional(rollbackFor = Exception.class)
  21 +@Service
  22 +public class CzglManagerImpl extends BaseManagerImpl<CzglDao, WCzgl> implements CzglManager {
  23 +
  24 + @Override
  25 + public IPage<WCzgl> qpczPage(Page page, String qptm) {
  26 + IPage<WCzgl> result = baseMapper.page1(page,qptm);
  27 + return result;
  28 + }
  29 +
  30 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QplzManagerImpl.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,20 @@
  1 +package com.hotent.lpg.user.manager.impl;
  2 +
  3 +import com.hotent.base.manager.impl.BaseManagerImpl;
  4 +import com.hotent.lpg.common.model.WQplz;
  5 +import com.hotent.lpg.user.dao.QplzDao;
  6 +import com.hotent.lpg.user.manager.QplzManager;
  7 +import org.springframework.stereotype.Service;
  8 +import org.springframework.transaction.annotation.Transactional;
  9 +
  10 +/**
  11 + * 气瓶流转 服务实现类
  12 + *
  13 + * @author 超级管理员
  14 + * @company 广州宏天软件股份有限公司
  15 + * @since 2024-03-18
  16 + */
  17 +@Transactional(rollbackFor = Exception.class)
  18 +@Service
  19 +public class QplzManagerImpl extends BaseManagerImpl<QplzDao, WQplz> implements QplzManager {
  20 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpssxxManagerImpl.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,15 @@
  1 +package com.hotent.lpg.user.manager.impl;
  2 +
  3 +import com.hotent.base.manager.impl.BaseManagerImpl;
  4 +import com.hotent.lpg.common.model.WQpssxx;
  5 +import com.hotent.lpg.user.dao.QpssxxDao;
  6 +import com.hotent.lpg.user.manager.QpssxxManager;
  7 +import lombok.extern.slf4j.Slf4j;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +@Slf4j
  12 +@Transactional(rollbackFor = Exception.class)
  13 +@Service
  14 +public class QpssxxManagerImpl extends BaseManagerImpl<QpssxxDao, WQpssxx> implements QpssxxManager {
  15 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QpxxManagerImpl.java
  Diff comments   View file @dac84e3
1 1 package com.hotent.lpg.user.manager.impl;
2 2  
  3 +import cn.hutool.core.bean.BeanUtil;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import com.hotent.base.manager.impl.BaseManagerImpl;
  6 +import com.hotent.base.util.StringUtil;
  7 +import com.hotent.lpg.common.model.WQplz;
  8 +import com.hotent.lpg.common.model.WQpssxx;
4 9 import com.hotent.lpg.common.model.WQpxx;
5 10 import com.hotent.lpg.user.dao.QpxxDao;
6   -import com.hotent.lpg.user.manager.QpxxManager;
  11 +import com.hotent.lpg.user.manager.*;
  12 +import com.hotent.lpg.user.vo.QpmclzxxVo;
  13 +import com.hotent.lpg.user.vo.QpxxVo;
7 14 import lombok.extern.slf4j.Slf4j;
8 15 import org.springframework.stereotype.Service;
9 16 import org.springframework.transaction.annotation.Transactional;
10 17  
  18 +import javax.annotation.Resource;
  19 +import java.time.LocalDateTime;
  20 +import java.time.format.DateTimeFormatter;
  21 +import java.util.ArrayList;
  22 +import java.util.List;
  23 +
11 24 /**
12 25 * 气瓶信息 服务实现类
13 26 *
... ... @@ -19,4 +32,56 @@ import org.springframework.transaction.annotation.Transactional;
19 32 @Slf4j
20 33 @Service
21 34 public class QpxxManagerImpl extends BaseManagerImpl<QpxxDao, WQpxx> implements QpxxManager {
  35 +
  36 + @Resource
  37 + private QpssxxManager wQpssxxManager;
  38 + @Resource
  39 + private QyxxManager wQyxxManager;
  40 + @Resource
  41 + private CzxxManager wCzxxManager;
  42 + @Resource
  43 + private QplzManager wQplzManager;
  44 +
  45 + @Override
  46 + public QpxxVo getQpxxByid(String qpid) {
  47 + QpxxVo qpxxVo = new QpxxVo();
  48 + WQpxx qpxx = this.get(qpid);
  49 + BeanUtil.copyProperties(qpxx, qpxxVo);
  50 + //气瓶实时信息
  51 + qpxxVo.setQpssxx(wQpssxxManager.getOne(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFQpid, qpid)));
  52 + //气瓶所属企业信息
  53 + qpxxVo.setSsqyxx(StringUtil.isEmpty(qpxx.getFSsqyid()) ? null : wQyxxManager.getById(qpxx.getFSsqyid()));
  54 + //气瓶所属厂站信息
  55 + qpxxVo.setSsczxx(StringUtil.isEmpty(qpxx.getFSsczid()) ? null : wCzxxManager.getById(qpxx.getFSsczid()));
  56 + //气瓶当前流转信息
  57 + qpxxVo.setQpdqlzs(BeanUtil.isNotEmpty(qpxxVo.getQpssxx()) && StringUtil.isNotEmpty(qpxxVo.getQpssxx().getFZqbh()) ? wQplzManager.list(Wrappers.<WQplz>lambdaQuery().eq(WQplz::getFZqbh, qpxxVo.getQpssxx().getFZqbh()).orderByAsc(WQplz::getFCzsj)) : null);
  58 + return qpxxVo;
  59 + }
  60 +
  61 + @Override
  62 + public List<QpmclzxxVo> getLastCycle(String qptm) {
  63 + WQpxx wQpxx = this.getOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFQptm, qptm));
  64 + if (wQpxx == null) {
  65 + log.info("气瓶信息不存在,气瓶条码={}", qptm);
  66 + throw new RuntimeException("气瓶信息不存在");
  67 + }
  68 + WQpssxx wQpssxx = wQpssxxManager.getOne(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFQpid, wQpxx.getId()));
  69 + if (wQpssxx == null) {
  70 + log.info("气瓶实时信息不存在,气瓶id={}", wQpxx.getId());
  71 + throw new RuntimeException("气瓶实时信息不存在");
  72 + }
  73 + List<WQplz> list = wQplzManager.list(Wrappers.<WQplz>lambdaQuery().eq(WQplz::getFZqbh, wQpssxx.getFZqbh()).eq(WQplz::getFQpid, wQpssxx.getFQpid()).orderByAsc(WQplz::getFCzsj));
  74 + List<QpmclzxxVo> qpmclzxxResponses = new ArrayList<>();
  75 + for (WQplz wQplz : list) {
  76 + QpmclzxxVo qpmclzxxResponse = new QpmclzxxVo();
  77 + qpmclzxxResponse.setFCzdd(wQplz.getFDqsf() + wQplz.getFDqs() + wQplz.getFDqq() + wQplz.getFDqjd() + wQplz.getFDqxxdz());
  78 + qpmclzxxResponse.setFCzr(wQplz.getFCzr());
  79 + qpmclzxxResponse.setFCzsj(LocalDateTime.parse(wQplz.getFCzsj(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
  80 + qpmclzxxResponse.setFJdmc(wQplz.getFLzmc());
  81 + qpmclzxxResponse.setFZt("已完成");
  82 + qpmclzxxResponse.setFCznr(wQplz.getFCzxq());
  83 + qpmclzxxResponses.add(qpmclzxxResponse);
  84 + }
  85 + return qpmclzxxResponses;
  86 + }
22 87 }
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/QyxxManagerImpl.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,22 @@
  1 +package com.hotent.lpg.user.manager.impl;
  2 +
  3 +import com.hotent.base.manager.impl.BaseManagerImpl;
  4 +import com.hotent.lpg.common.model.WQyxx;
  5 +import com.hotent.lpg.user.dao.QyxxDao;
  6 +import com.hotent.lpg.user.manager.QyxxManager;
  7 +import lombok.extern.slf4j.Slf4j;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +/**
  12 + * 企业信息 服务实现类
  13 + *
  14 + * @author 超级管理员
  15 + * @company 广州宏天软件股份有限公司
  16 + * @since 2024-03-12
  17 + */
  18 +@Slf4j
  19 +@Transactional(rollbackFor = Exception.class)
  20 +@Service
  21 +public class QyxxManagerImpl extends BaseManagerImpl<QyxxDao, WQyxx> implements QyxxManager {
  22 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpOrderInfoVo.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,34 @@
  1 +package com.hotent.lpg.user.vo;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.time.LocalDateTime;
  6 +
  7 +
  8 +@Data
  9 +public class QpOrderInfoVo {
  10 + /**
  11 + * 会员名称
  12 + */
  13 + private String hymc;
  14 + /**
  15 + * 会员电话
  16 + */
  17 + private String hydh;
  18 + /**
  19 + * 配送地址
  20 + */
  21 + private String hydz;
  22 + /**
  23 + * 订单单号
  24 + */
  25 + private String dddh;
  26 + /**
  27 + * 下单时间
  28 + */
  29 + private LocalDateTime xdsj;
  30 + /**
  31 + * 配送人
  32 + */
  33 + private String psr;
  34 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpmclzxxVo.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,36 @@
  1 +package com.hotent.lpg.user.vo;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.time.LocalDateTime;
  6 +
  7 +/**
  8 + * 气瓶末次流转信息
  9 + */
  10 +@Data
  11 +public class QpmclzxxVo {
  12 + /**
  13 + * 节点名称
  14 + */
  15 + private String fJdmc;
  16 + /**
  17 + * 操作时间
  18 + */
  19 + private LocalDateTime fCzsj;
  20 + /**
  21 + * 操作人
  22 + */
  23 + private String fCzr;
  24 + /**
  25 + * 操作地点
  26 + */
  27 + private String fCzdd;
  28 + /**
  29 + * 状态
  30 + */
  31 + private String fZt;
  32 + /**
  33 + * 操作内容
  34 + */
  35 + private String fCznr;
  36 +}
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/QpxxVo.java 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,33 @@
  1 +package com.hotent.lpg.user.vo;
  2 +
  3 +import com.hotent.lpg.common.model.*;
  4 +import lombok.Data;
  5 +
  6 +import java.util.ArrayList;
  7 +import java.util.List;
  8 +
  9 +@Data
  10 +public class QpxxVo extends WQpxx {
  11 +
  12 + /**
  13 + * 气瓶实时信息
  14 + */
  15 + private WQpssxx qpssxx = new WQpssxx();
  16 +
  17 + /**
  18 + * 当前流转信息
  19 + */
  20 + private List<WQplz> qpdqlzs = new ArrayList<WQplz>();
  21 + /**
  22 + * 所属企业信息
  23 + */
  24 + private WQyxx ssqyxx = new WQyxx();
  25 + /**
  26 + * 所属厂站信息
  27 + */
  28 + private WCzxx ssczxx = new WCzxx();
  29 + /**
  30 + * 气瓶实时订单信息
  31 + */
  32 + private QpOrderInfoVo qpOrderInfoVO;
  33 +}
... ...
backend/lpg-user/src/main/resources/mapper/CzglMapper.xml 0 → 100644
  Diff comments   View file @dac84e3
... ... @@ -0,0 +1,53 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.hotent.lpg.user.dao.CzglDao">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.hotent.lpg.common.model.WCzgl">
  7 + <id column="ID_" property="id"/>
  8 + <result column="REF_ID_" property="refId"/>
  9 + <result column="F_czsj" property="fCzsj"/>
  10 + <result column="F_czqzmc" property="fCzqzmc"/>
  11 + <result column="F_czxkzbh" property="fCzxkzbh"/>
  12 + <result column="F_czqz" property="fCzqz"/>
  13 + <result column="F_czhz" property="fCzhz"/>
  14 + <result column="F_czqwgjc" property="fCzqwgjc"/>
  15 + <result column="F_czqpfjc" property="fCzqpfjc"/>
  16 + <result column="F_czqfzjc" property="fCzqfzjc"/>
  17 + <result column="F_czqhjjc" property="fCzqhjjc"/>
  18 + <result column="F_czqjcxm" property="fCzqjcxm"/>
  19 + <result column="F_czqjcgh" property="fCzqjcgh"/>
  20 + <result column="F_czqczxm" property="fCzqczxm"/>
  21 + <result column="F_czqczgh" property="fCzqczgh"/>
  22 + <result column="F_czqjcsj" property="fCzqjcsj"/>
  23 + <result column="F_czhxljc" property="fCzhxljc"/>
  24 + <result column="F_czhpkjc" property="fCzhpkjc"/>
  25 + <result column="F_czhsjczl" property="fCzhsjczl"/>
  26 + <result column="F_czhfjjc" property="fCzhfjjc"/>
  27 + <result column="F_czhjsbq" property="fCzhjsbq"/>
  28 + <result column="F_czhxxbq" property="fCzhxxbq"/>
  29 + <result column="F_fcsj" property="fFcsj"/>
  30 + <result column="F_qplzID" property="fQplzid"/>
  31 + <result column="F_qptm" property="fQptm"/>
  32 + <result column="F_qpID" property="fQpid"/>
  33 + <result column="F_ssczmc" property="fSsczmc"/>
  34 + <result column="F_ssczID" property="fSsczid"/>
  35 + <result column="F_ssqymc" property="fSsqymc"/>
  36 + <result column="F_ssqyID" property="fSsqyid"/>
  37 + <result column="F_form_data_rev_" property="fFormDataRev"/>
  38 + </resultMap>
  39 +
  40 + <select id="page1" resultMap="BaseResultMap">
  41 + SELECT
  42 + *
  43 + FROM
  44 + w_czgl w_czgl
  45 + <where>
  46 + <if test="qptm != null and qptm != ''">
  47 + AND w_czgl.F_qptm = #{qptm}
  48 + </if>
  49 + </where>
  50 + ORDER BY w_czgl.F_czsj DESC
  51 + </select>
  52 +
  53 +</mapper>
... ...
backend/lpg/src/main/java/com/hotent/lpg/dao/WCzglDao.java
View file @71b2bb7
... ... @@ -1,26 +0,0 @@
1   -package com.hotent.lpg.dao;
2   -
3   -import com.baomidou.mybatisplus.core.metadata.IPage;
4   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5   -import com.hotent.lpg.model.WCzgl;
6   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
7   -import org.apache.ibatis.annotations.Param;
8   -
9   -import java.util.HashMap;
10   -import java.util.List;
11   -
12   -/**
13   - * 充装管理 Mapper 接口
14   - *
15   - * @company 广州宏天软件股份有限公司
16   - * @author 超级管理员
17   - * @since 2024-05-27
18   - */
19   -public interface WCzglDao extends BaseMapper<WCzgl> {
20   -
21   - IPage<WCzgl> page1(Page page, @Param("qptm") String qptm);
22   -
23   - IPage<HashMap> cpczPage(Page page, @Param("query")WCzgl wCzgl, @Param("list")List<String> orgIdList);
24   -
25   - IPage<WCzgl> cpczmxPage(Page page, @Param("query")WCzgl wCzgl);
26   -}
backend/lpg/src/main/java/com/hotent/lpg/dao/WQyxxDao.java
View file @71b2bb7
... ... @@ -1,20 +0,0 @@
1   -package com.hotent.lpg.dao;
2   -
3   -import com.hotent.lpg.model.WQyxx;
4   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5   -import com.hotent.lpg.model.vo.QyxxVO;
6   -import org.apache.ibatis.annotations.Param;
7   -
8   -import java.util.List;
9   -
10   -/**
11   - * 企业信息 Mapper 接口
12   - *
13   - * @company 广州宏天软件股份有限公司
14   - * @author 超级管理员
15   - * @since 2024-03-12
16   - */
17   -public interface WQyxxDao extends BaseMapper<WQyxx> {
18   -
19   - List<QyxxVO> qyList(@Param("list") List<String> qyIdList);
20   -}
backend/lpg/src/main/java/com/hotent/lpg/model/response/QpmclzxxResponse.java
View file @71b2bb7
... ... @@ -1,36 +0,0 @@
1   -package com.hotent.lpg.model.response;
2   -
3   -import lombok.Data;
4   -
5   -import java.time.LocalDateTime;
6   -
7   -/**
8   - * 气瓶末次流转信息
9   - */
10   -@Data
11   -public class QpmclzxxResponse {
12   - /**
13   - * 节点名称
14   - */
15   - private String fJdmc;
16   - /**
17   - * 操作时间
18   - */
19   - private LocalDateTime fCzsj;
20   - /**
21   - * 操作人
22   - */
23   - private String fCzr;
24   - /**
25   - * 操作地点
26   - */
27   - private String fCzdd;
28   - /**
29   - * 状态
30   - */
31   - private String fZt;
32   - /**
33   - * 操作内容
34   - */
35   - private String fCznr;
36   -}
backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpOrderInfoVO.java
View file @71b2bb7
... ... @@ -1,34 +0,0 @@
1   -package com.hotent.lpg.model.vo;
2   -
3   -import lombok.Data;
4   -
5   -import java.time.LocalDateTime;
6   -
7   -
8   -@Data
9   -public class QpOrderInfoVO {
10   - /**
11   - * 会员名称
12   - */
13   - private String hymc;
14   - /**
15   - * 会员电话
16   - */
17   - private String hydh;
18   - /**
19   - * 配送地址
20   - */
21   - private String hydz;
22   - /**
23   - * 订单单号
24   - */
25   - private String dddh;
26   - /**
27   - * 下单时间
28   - */
29   - private LocalDateTime xdsj;
30   - /**
31   - * 配送人
32   - */
33   - private String psr;
34   -}
backend/lpg/src/main/java/com/hotent/lpg/model/vo/QpxxVo.java
View file @71b2bb7
... ... @@ -1,33 +0,0 @@
1   -package com.hotent.lpg.model.vo;
2   -
3   -import com.hotent.lpg.model.*;
4   -import lombok.Data;
5   -
6   -import java.util.ArrayList;
7   -import java.util.List;
8   -
9   -@Data
10   -public class QpxxVo extends WQpxx {
11   -
12   - /**
13   - * 气瓶实时信息
14   - */
15   - private WQpssxx qpssxx = new WQpssxx();
16   -
17   - /**
18   - * 当前流转信息
19   - */
20   - private List<WQplz> qpdqlzs = new ArrayList<WQplz>();
21   - /**
22   - * 所属企业信息
23   - */
24   - private WQyxx ssqyxx = new WQyxx();
25   - /**
26   - * 所属厂站信息
27   - */
28   - private WCzxx ssczxx = new WCzxx();
29   - /**
30   - * 气瓶实时订单信息
31   - */
32   - private QpOrderInfoVO qpOrderInfoVO;
33   -}