java110
2020-11-24 299027f9c2bb7814f581060d65aee0b894a549bc
优化代码
5个文件已修改
144 ■■■■ 已修改文件
service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/store/SaveStoreServiceListener.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/workflow/ListWorkflowsListener.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java
@@ -14,6 +14,7 @@
public interface IStoreBMO extends IApiBaseBMO {
    public JSONObject addStaffOrg(JSONObject paramInJson);
    /**
     * 添加总部办公室
     *
@@ -21,6 +22,7 @@
     * @return 订单服务能够接受的报文
     */
    public JSONObject addOrgHeadPart(JSONObject paramInJson);
    /**
     * 添加公司总部
     *
@@ -28,6 +30,7 @@
     * @return 订单服务能够接受的报文
     */
    public JSONObject addOrgHeadCompany(JSONObject paramInJson);
    /**
     * 添加一级组织信息
     *
@@ -35,6 +38,7 @@
     * @return 订单服务能够接受的报文
     */
    public JSONObject addOrg(JSONObject paramInJson);
    /**
     * 添加员工
     *
@@ -42,6 +46,7 @@
     * @return
     */
    public JSONObject addStaff(JSONObject paramInJson);
    /**
     * 添加商户
     *
@@ -52,4 +57,8 @@
    public JSONObject updateStore(JSONObject paramInJson);
    public JSONObject addPurchase(JSONObject paramInJson);
    public JSONObject addCollection(JSONObject paramInJson);
}
service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
@@ -5,15 +5,13 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.store.IStoreBMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.dto.store.StoreDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.po.org.OrgPo;
import com.java110.po.org.OrgStaffRelPo;
import com.java110.po.store.StoreAttrPo;
import com.java110.po.store.StoreCerdentialPo;
import com.java110.po.store.StorePhotoPo;
import com.java110.po.store.StorePo;
import com.java110.po.store.StoreUserPo;
import com.java110.po.store.*;
import com.java110.po.workflow.WorkflowPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
@@ -261,4 +259,44 @@
        return business;
    }
    public JSONObject addPurchase(JSONObject paramInJson) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 7);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONArray businessOrgStaffRels = new JSONArray();
        WorkflowPo workflowPo = new WorkflowPo();
        workflowPo.setCommunityId("9999"); //所有小区
        workflowPo.setFlowId("-1");
        workflowPo.setFlowName("采购流程");
        workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
        workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
        workflowPo.setStoreId(paramInJson.getString("storeId"));
        businessOrgStaffRels.add(JSONObject.toJSONString(workflowPo));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), businessOrgStaffRels);
        return business;
    }
    public JSONObject addCollection(JSONObject paramInJson) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 8);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONArray businessOrgStaffRels = new JSONArray();
        WorkflowPo workflowPo = new WorkflowPo();
        workflowPo.setCommunityId("9999"); //所有小区
        workflowPo.setFlowId("-2");
        workflowPo.setFlowName("物品领用");
        workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COLLECTION);
        workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
        workflowPo.setStoreId(paramInJson.getString("storeId"));
        businessOrgStaffRels.add(JSONObject.toJSONString(workflowPo));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), businessOrgStaffRels);
        return business;
    }
}
service-api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java
@@ -6,6 +6,10 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.po.workflow.WorkflowPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +25,9 @@
    @Autowired
    private ICommunityBMO communityBMOImpl;
    @Autowired
    private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -28,6 +35,8 @@
        Assert.hasKeyAndValue(reqJson, "name", "必填,请填写小区名称");
        Assert.hasKeyAndValue(reqJson, "address", "必填,请填写小区地址");
        Assert.hasKeyAndValue(reqJson, "nearbyLandmarks", "必填,请填写小区附近地标");
    }
@@ -40,14 +49,17 @@
        //产生物业费配置信息
        communityBMOImpl.addFeeConfigProperty(reqJson, context);
        communityBMOImpl.addFeeConfigRepair(reqJson, context); // 报修费用
//       communityBMOImpl.addFeeConfigParkingSpaceUpSell(reqJson, context); // 地上出售
//        communityBMOImpl.addFeeConfigParkingSpaceDownSell(reqJson, context); // 地下出售
//        communityBMOImpl.addFeeConfigParkingSpaceUpHire(reqJson, context);//地上出租
//        communityBMOImpl.addFeeConfigParkingSpaceDownHire(reqJson, context);//地下出租
        communityBMOImpl.addFeeConfigParkingSpaceTemp(reqJson, context);//地下出租
        WorkflowPo workflowPo = null;
        workflowPo = new WorkflowPo();
        workflowPo.setCommunityId(reqJson.getString("communityId"));
        workflowPo.setFlowId("-1");
        workflowPo.setFlowName("投诉建议流程");
        workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
        workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
        workflowPo.setStoreId(reqJson.getString("storeId"));
        super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
    }
service-api/src/main/java/com/java110/api/listener/store/SaveStoreServiceListener.java
@@ -6,19 +6,15 @@
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.factory.DataFlowFactory;
import com.java110.entity.center.AppService;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.po.store.StorePo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.*;
/**
 * 保存商户信息
@@ -77,7 +73,8 @@
        //总部办公室
        businesses.add(storeBMOImpl.addOrgHeadPart(paramObj));
        businesses.add(storeBMOImpl.addStaffOrg(paramObj));
        businesses.add(storeBMOImpl.addPurchase(paramObj));
        businesses.add(storeBMOImpl.addCollection(paramObj));
        //super.doResponse(dataFlowContext);
        ResponseEntity<String> responseEntity = storeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
@@ -87,6 +84,7 @@
            return;
        }
        //赋权
        privilegeUserDefault(dataFlowContext, paramObj);
    }
service-api/src/main/java/com/java110/api/listener/workflow/ListWorkflowsListener.java
@@ -71,56 +71,7 @@
            context.setResponseEntity(responseEntity);
            return;
        }
        WorkflowPo workflowPo = null;
        workflowDto = new WorkflowDto();
        workflowDto.setStoreId(reqJson.getString("storeId"));
        workflowDto.setCommunityId(reqJson.getString("communityId"));
        workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
        count = workflowInnerServiceSMOImpl.queryWorkflowsCount(workflowDto);
        if (count < 1) {
            //插入默认的工作信息  投诉流程
            workflowPo = new WorkflowPo();
            workflowPo.setCommunityId(reqJson.getString("communityId"));
            workflowPo.setFlowId("-1");
            workflowPo.setFlowName("投诉建议流程");
            workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
            workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
            workflowPo.setStoreId(reqJson.getString("storeId"));
            super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
        }
        workflowDto = new WorkflowDto();
        workflowDto.setStoreId(reqJson.getString("storeId"));
        workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
        count = workflowInnerServiceSMOImpl.queryWorkflowsCount(workflowDto);
        if (count < 1) {
            workflowPo = new WorkflowPo();
            workflowPo.setCommunityId("9999"); //所有小区
            workflowPo.setFlowId("-3");
            workflowPo.setFlowName("采购流程");
            workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
            workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
            workflowPo.setStoreId(reqJson.getString("storeId"));
            super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
        }
        workflowDto = new WorkflowDto();
        workflowDto.setStoreId(reqJson.getString("storeId"));
        workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COLLECTION);
        count = workflowInnerServiceSMOImpl.queryWorkflowsCount(workflowDto);
        if (count < 1) {
            workflowPo = new WorkflowPo();
            workflowPo.setCommunityId("9999"); //所有小区
            workflowPo.setFlowId("-4");
            workflowPo.setFlowName("物品领用");
            workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COLLECTION);
            workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
            workflowPo.setStoreId(reqJson.getString("storeId"));
            super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
        }
        commit(context);
        workflowDto = BeanConvertUtil.covertBean(reqJson, WorkflowDto.class);
        count = workflowInnerServiceSMOImpl.queryWorkflowsCount(workflowDto);