Commit 2470d9b9d1ad9ae5e42c67eb7b4ba327cc2efe18
1 parent
f3c368e1
Exists in
dev
遗漏提交
Showing
7 changed files
with
187 additions
and
4 deletions
Show diff stats
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/statemachine/QpEventEnum.java
0 → 100644
@@ -0,0 +1,53 @@ | @@ -0,0 +1,53 @@ | ||
1 | +package com.hotent.lpg.common.enums.statemachine; | ||
2 | + | ||
3 | +import lombok.AllArgsConstructor; | ||
4 | +import lombok.Getter; | ||
5 | + | ||
6 | +/** | ||
7 | + * 动作类型 | ||
8 | + */ | ||
9 | +@AllArgsConstructor | ||
10 | +@Getter | ||
11 | +public enum QpEventEnum { | ||
12 | + | ||
13 | + /** | ||
14 | + * 充装 | ||
15 | + */ | ||
16 | + cz("cz", "充装"), | ||
17 | + | ||
18 | + /** | ||
19 | + * 入库 | ||
20 | + */ | ||
21 | + rk("rk", "入库"), | ||
22 | + | ||
23 | + | ||
24 | + /** | ||
25 | + * 出库 | ||
26 | + */ | ||
27 | + ck("ck", "出库"), | ||
28 | + | ||
29 | + | ||
30 | + /** | ||
31 | + * 领取 | ||
32 | + */ | ||
33 | + lq("lq", "领取"), | ||
34 | + | ||
35 | + | ||
36 | + /** | ||
37 | + * 回收 | ||
38 | + */ | ||
39 | + hs("hs", "回收"), | ||
40 | + | ||
41 | + /** | ||
42 | + * 配送 | ||
43 | + */ | ||
44 | + ps("ps", "配送"), | ||
45 | + | ||
46 | + /** | ||
47 | + * 安检 | ||
48 | + */ | ||
49 | + aj("aj", "安检"); | ||
50 | + | ||
51 | + private final String code;//流转名称标识 | ||
52 | + private final String info;//流转名称 | ||
53 | +} |
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/statemachine/QpHolderEnum.java
0 → 100644
@@ -0,0 +1,37 @@ | @@ -0,0 +1,37 @@ | ||
1 | +package com.hotent.lpg.common.enums.statemachine; | ||
2 | + | ||
3 | +import lombok.AllArgsConstructor; | ||
4 | +import lombok.Getter; | ||
5 | + | ||
6 | +/** | ||
7 | + * 气瓶持有者类型 | ||
8 | + */ | ||
9 | +@AllArgsConstructor | ||
10 | +@Getter | ||
11 | +public enum QpHolderEnum { | ||
12 | + | ||
13 | + | ||
14 | + /** | ||
15 | + * 充装站/储配站 | ||
16 | + */ | ||
17 | + czz("czz", "充装站"), | ||
18 | + /** | ||
19 | + * 供应站 | ||
20 | + */ | ||
21 | + gyz("gyz", "供应站"), | ||
22 | + | ||
23 | + /** | ||
24 | + * 会员 | ||
25 | + */ | ||
26 | + hy("hy", "会员"), | ||
27 | + /** | ||
28 | + * 车辆 | ||
29 | + */ | ||
30 | + cl("cl", "车辆"), | ||
31 | + /** | ||
32 | + * 员工 | ||
33 | + */ | ||
34 | + yg("yg", "员工"); | ||
35 | + private final String code; | ||
36 | + private final String info; | ||
37 | +} |
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/statemachine/QpStateEnum.java
0 → 100644
@@ -0,0 +1,26 @@ | @@ -0,0 +1,26 @@ | ||
1 | +package com.hotent.lpg.common.enums.statemachine; | ||
2 | + | ||
3 | +import lombok.AllArgsConstructor; | ||
4 | +import lombok.Getter; | ||
5 | + | ||
6 | +/** | ||
7 | + * 状态类型 | ||
8 | + */ | ||
9 | +@AllArgsConstructor | ||
10 | +@Getter | ||
11 | +public enum QpStateEnum { | ||
12 | + | ||
13 | + /** | ||
14 | + * 满瓶 | ||
15 | + */ | ||
16 | + mp("mp", "满瓶"), | ||
17 | + | ||
18 | + /** | ||
19 | + * 空瓶 | ||
20 | + */ | ||
21 | + kp("kp", "空瓶"); | ||
22 | + | ||
23 | + | ||
24 | + private final String code; | ||
25 | + private final String info; | ||
26 | +} |
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/statemachine/QpStateMachineNext.java
0 → 100644
@@ -0,0 +1,47 @@ | @@ -0,0 +1,47 @@ | ||
1 | +package com.hotent.lpg.common.enums.statemachine; | ||
2 | + | ||
3 | +import com.hotent.lpg.common.enums.QplzjdmcEnum; | ||
4 | + | ||
5 | +import java.util.ArrayList; | ||
6 | +import java.util.Optional; | ||
7 | + | ||
8 | +public class QpStateMachineNext { | ||
9 | + | ||
10 | + public static QplzjdmcEnum getNext(QpEventEnum qpEventEnum, QpHolderEnum qpHolderEnum, QpStateEnum qpStateEnum, QpHolderEnum stationEnum) { | ||
11 | + ArrayList<QplzMachine> qplzMachines = new ArrayList<>(); | ||
12 | + //充装 | ||
13 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.cz).qpHolderEnum(QpHolderEnum.gyz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.qpcz).build()); | ||
14 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.cz).qpHolderEnum(QpHolderEnum.gyz).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.qpcz).build()); | ||
15 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.cz).qpHolderEnum(QpHolderEnum.czz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.qpcz).build()); | ||
16 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.cz).qpHolderEnum(QpHolderEnum.czz).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.qpcz).build()); | ||
17 | + //入库 | ||
18 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.rk).qpHolderEnum(QpHolderEnum.cl).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.czzkphs).build()); | ||
19 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.rk).qpHolderEnum(QpHolderEnum.cl).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.gyzmprk).build()); | ||
20 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.rk).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.czzkphs).build()); | ||
21 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.rk).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.kphsgyz).build()); | ||
22 | + //出库 | ||
23 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.ck).qpHolderEnum(QpHolderEnum.gyz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.kphscl).build()); | ||
24 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.ck).qpHolderEnum(QpHolderEnum.czz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.mpczcl).build()); | ||
25 | + //领取 | ||
26 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.lq).qpHolderEnum(QpHolderEnum.gyz).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.sqglmp).build()); | ||
27 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.lq).qpHolderEnum(QpHolderEnum.gyz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.sqglkp).build()); | ||
28 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.lq).qpHolderEnum(QpHolderEnum.czz).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.sqglmp).build()); | ||
29 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.lq).qpHolderEnum(QpHolderEnum.czz).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.sqglkp).build()); | ||
30 | + //回收 | ||
31 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.hs).qpHolderEnum(QpHolderEnum.hy).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.kphssqg).build()); | ||
32 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.hs).qpHolderEnum(QpHolderEnum.hy).qpStateEnum(QpStateEnum.kp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.kphssqg).build()); | ||
33 | + //上门配送 | ||
34 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.ps).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.smps).build()); | ||
35 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.ps).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.smps).build()); | ||
36 | + //入户安检 | ||
37 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.aj).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.gyz).qplzjdmcEnum(QplzjdmcEnum.rhaj).build()); | ||
38 | + qplzMachines.add(QplzMachine.builder().qpEventEnum(QpEventEnum.aj).qpHolderEnum(QpHolderEnum.yg).qpStateEnum(QpStateEnum.mp).stationEnum(QpHolderEnum.czz).qplzjdmcEnum(QplzjdmcEnum.rhaj).build()); | ||
39 | + | ||
40 | + Optional<QplzMachine> optional = qplzMachines.stream().filter(a -> qpEventEnum.equals(a.getQpEventEnum()) && qpHolderEnum.equals(a.getQpHolderEnum()) && qpStateEnum.equals(a.getQpStateEnum()) && stationEnum.equals(a.getStationEnum())).findFirst(); | ||
41 | + if (optional.isPresent()) { | ||
42 | + return optional.get().getQplzjdmcEnum(); | ||
43 | + } else { | ||
44 | + throw new IllegalArgumentException("未找到状态"); | ||
45 | + } | ||
46 | + } | ||
47 | +} |
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/statemachine/QplzMachine.java
0 → 100644
@@ -0,0 +1,15 @@ | @@ -0,0 +1,15 @@ | ||
1 | +package com.hotent.lpg.common.enums.statemachine; | ||
2 | + | ||
3 | +import com.hotent.lpg.common.enums.QplzjdmcEnum; | ||
4 | +import lombok.Builder; | ||
5 | +import lombok.Data; | ||
6 | + | ||
7 | +@Data | ||
8 | +@Builder | ||
9 | +public class QplzMachine { | ||
10 | + private QpEventEnum qpEventEnum;//动作 | ||
11 | + private QpHolderEnum qpHolderEnum;//持有者类型 | ||
12 | + private QpStateEnum qpStateEnum;//气瓶状态 | ||
13 | + private QpHolderEnum stationEnum;//厂站类型 | ||
14 | + private QplzjdmcEnum qplzjdmcEnum;//气瓶流转节点 | ||
15 | +} |
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java
1 | package com.hotent.lpg.user.controller; | 1 | package com.hotent.lpg.user.controller; |
2 | 2 | ||
3 | 3 | ||
4 | +import cn.hutool.core.util.ObjectUtil; | ||
4 | import com.baomidou.mybatisplus.core.metadata.IPage; | 5 | import com.baomidou.mybatisplus.core.metadata.IPage; |
5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | 6 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
6 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | 7 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
7 | import com.hotent.base.controller.BaseController; | 8 | import com.hotent.base.controller.BaseController; |
8 | import com.hotent.base.model.CommonResult; | 9 | import com.hotent.base.model.CommonResult; |
10 | +import com.hotent.lpg.common.enums.AjlxEnum; | ||
9 | import com.hotent.lpg.common.enums.BxztEnum; | 11 | import com.hotent.lpg.common.enums.BxztEnum; |
10 | import com.hotent.lpg.common.model.WBxb; | 12 | import com.hotent.lpg.common.model.WBxb; |
11 | import com.hotent.lpg.common.model.WHyxx; | 13 | import com.hotent.lpg.common.model.WHyxx; |
@@ -20,6 +22,7 @@ import lombok.extern.slf4j.Slf4j; | @@ -20,6 +22,7 @@ import lombok.extern.slf4j.Slf4j; | ||
20 | import org.springframework.web.bind.annotation.*; | 22 | import org.springframework.web.bind.annotation.*; |
21 | 23 | ||
22 | import javax.annotation.Resource; | 24 | import javax.annotation.Resource; |
25 | +import java.util.Arrays; | ||
23 | 26 | ||
24 | /** | 27 | /** |
25 | * 会员端:报修管理 | 28 | * 会员端:报修管理 |
@@ -87,7 +90,9 @@ public class BxbController extends BaseController<BxbManager, WBxb> { | @@ -87,7 +90,9 @@ public class BxbController extends BaseController<BxbManager, WBxb> { | ||
87 | @GetMapping(value = "/bxbPage", produces = {"application/json; charset=utf-8"}) | 90 | @GetMapping(value = "/bxbPage", produces = {"application/json; charset=utf-8"}) |
88 | @ApiOperation(value = "会员报修列表", httpMethod = "GET", notes = "会员报修列表") | 91 | @ApiOperation(value = "会员报修列表", httpMethod = "GET", notes = "会员报修列表") |
89 | public CommonResult bxbPage(Page page, WBxb wBxb) { | 92 | public CommonResult bxbPage(Page page, WBxb wBxb) { |
90 | - wBxb.setFZt(BxztEnum.valueOf(wBxb.getFZt()).getCode()); | 93 | + if (ObjectUtil.isNotEmpty(wBxb.getFZt())) { |
94 | + wBxb.setFZt(Arrays.stream(BxztEnum.values()).filter(a->a.getInfo().equals(wBxb.getFZt())).findFirst().get().getCode()); | ||
95 | + } | ||
91 | log.info("保修列表参数,page={},wBxb={}", page, wBxb); | 96 | log.info("保修列表参数,page={},wBxb={}", page, wBxb); |
92 | String currentUserId = scriptImpl.getCurrentUserId(); | 97 | String currentUserId = scriptImpl.getCurrentUserId(); |
93 | WHyxx wHyxx = wHyxxManager.getOne(Wrappers.<WHyxx>lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); | 98 | WHyxx wHyxx = wHyxxManager.getOne(Wrappers.<WHyxx>lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); |
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/BxbManagerImpl.java
@@ -53,14 +53,14 @@ public class BxbManagerImpl extends BaseManagerImpl<BxbDao, WBxb> implements Bxb | @@ -53,14 +53,14 @@ public class BxbManagerImpl extends BaseManagerImpl<BxbDao, WBxb> implements Bxb | ||
53 | if (wBxb == null) { | 53 | if (wBxb == null) { |
54 | throw new RuntimeException("报修工单不存在"); | 54 | throw new RuntimeException("报修工单不存在"); |
55 | } | 55 | } |
56 | - if (BxztEnum.ycl.getInfo().equals(wBxb.getFZt())) { | 56 | + if (BxztEnum.ycl.getCode().equals(wBxb.getFZt())) { |
57 | throw new RuntimeException("报修工单已处理"); | 57 | throw new RuntimeException("报修工单已处理"); |
58 | } | 58 | } |
59 | - if (BxztEnum.yqx.getInfo().equals(wBxb.getFZt())) { | 59 | + if (BxztEnum.yqx.getCode().equals(wBxb.getFZt())) { |
60 | throw new RuntimeException("报修工单已取消"); | 60 | throw new RuntimeException("报修工单已取消"); |
61 | } | 61 | } |
62 | wBxb.setFQxsj(LocalDateTime.now()); | 62 | wBxb.setFQxsj(LocalDateTime.now()); |
63 | - wBxb.setFZt(BxztEnum.yqx.getInfo()); | 63 | + wBxb.setFZt(BxztEnum.yqx.getCode()); |
64 | this.updateById(wBxb); | 64 | this.updateById(wBxb); |
65 | } | 65 | } |
66 | 66 |