合并代码 并且解决冲突

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
package com.java110.api.bmo.ownerCarAttr.impl;
 
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.ownerCarAttr.IOwnerCarAttrBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
 
@Service("ownerCarAttrBMOImpl")
public class OwnerCarAttrBMOImpl extends ApiBaseBMO implements IOwnerCarAttrBMO {
 
    @Autowired
    private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
 
    /**
     * 添加小区信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void addOwnerCarAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
        paramInJson.put("attrId", "-1");
        OwnerCarAttrPo ownerCarAttrPo = BeanConvertUtil.covertBean(paramInJson, OwnerCarAttrPo.class);
        super.insert(dataFlowContext, ownerCarAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR_ATTR);
    }
 
 
    /**
     * 添加活动信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void updateOwnerCarAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        OwnerCarAttrPo ownerCarAttrPo = BeanConvertUtil.covertBean(paramInJson, OwnerCarAttrPo.class);
        super.update(dataFlowContext, ownerCarAttrPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR_ATTR);
    }
 
 
    /**
     * 添加小区信息
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public void deleteOwnerCarAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
        OwnerCarAttrPo ownerCarAttrPo = BeanConvertUtil.covertBean(paramInJson, OwnerCarAttrPo.class);
        super.update(dataFlowContext, ownerCarAttrPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_CAR_ATTR);
    }
 
}