合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
package com.java110.api.bmo.parkingArea.impl;
 
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.parkingArea.IParkingAreaBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.po.parking.ParkingAreaPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.stereotype.Service;
 
/**
 * @ClassName ParkingAreaBMOImpl
 * @Description TODO
 * @Author wuxw
 * @Date 2020/3/9 23:24
 * @Version 1.0
 * add by wuxw 2020/3/9
 **/
@Service("parkingAreaBMOImpl")
public class ParkingAreaBMOImpl extends ApiBaseBMO implements IParkingAreaBMO {
 
    /**
     * 添加小区信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void deleteParkingArea(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
        ParkingAreaPo parkingAreaPo = BeanConvertUtil.covertBean(paramInJson, ParkingAreaPo.class);
        super.delete(dataFlowContext, parkingAreaPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_PARKING_AREA);
    }
 
    /**
     * 添加小区信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void addParkingArea(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
        JSONObject businessParkingArea = new JSONObject();
        businessParkingArea.putAll(paramInJson);
        businessParkingArea.put("paId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_paId));
        ParkingAreaPo parkingAreaPo = BeanConvertUtil.covertBean(businessParkingArea, ParkingAreaPo.class);
        super.insert(dataFlowContext, parkingAreaPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_PARKING_AREA);
        paramInJson.put("paId", businessParkingArea.getString("paId"));
    }
 
    /**
     * 添加停车场信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void updateParkingArea(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
        JSONObject businessParkingArea = new JSONObject();
        businessParkingArea.putAll(paramInJson);
        ParkingAreaPo parkingAreaPo = BeanConvertUtil.covertBean(businessParkingArea, ParkingAreaPo.class);
        super.update(dataFlowContext, parkingAreaPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_AREA);
    }
}