优化代码

service-api/src/main/java/com/java110/api/listener/store/UpdateStoreListener.java

@@ -1,65 +0,0 @@
-package com.java110.api.listener.store;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.store.IStoreBMO;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.AppService;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-
-
-/**
- * 保存商户侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateStoreListener")
-public class UpdateStoreListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IStoreBMO storeBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        HttpHeaders header = new HttpHeaders();
-        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
-        JSONArray businesses = new JSONArray();
-
-        AppService service = event.getAppService();
-
-        businesses.add(storeBMOImpl.updateStore(reqJson));
-        ResponseEntity<String> responseEntity = storeBMOImpl.callService(context, service.getServiceCode(), businesses);
-
-        context.setResponseEntity(responseEntity);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_UPDATE_STORE_INFO;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-}

service-api/src/main/java/com/java110/api/listener/unit/DeleteUnitAttrListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.unit;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeUnitAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteUnitAttrListener")
-public class DeleteUnitAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IUnitAttrBMO unitAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        unitAttrBMOImpl.deleteUnitAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeUnitAttrConstant.DELETE_UNITATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/unit/ListUnitAttrsListener.java

@@ -1,82 +0,0 @@
-package com.java110.api.listener.unit;
-
-import com.alibaba.fastjson.JSONObject;
-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.intf.community.IUnitAttrInnerServiceSMO;
-import com.java110.dto.unitAttr.UnitAttrDto;
-import com.java110.utils.constant.ServiceCodeUnitAttrConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listUnitAttrsListener")
-public class ListUnitAttrsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IUnitAttrInnerServiceSMO unitAttrInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeUnitAttrConstant.LIST_UNITATTRS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IUnitAttrInnerServiceSMO getUnitAttrInnerServiceSMOImpl() {
-        return unitAttrInnerServiceSMOImpl;
-    }
-
-    public void setUnitAttrInnerServiceSMOImpl(IUnitAttrInnerServiceSMO unitAttrInnerServiceSMOImpl) {
-        this.unitAttrInnerServiceSMOImpl = unitAttrInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        UnitAttrDto unitAttrDto = BeanConvertUtil.covertBean(reqJson, UnitAttrDto.class);
-
-        int count = unitAttrInnerServiceSMOImpl.queryUnitAttrsCount(unitAttrDto);
-
-        List<UnitAttrDto> unitAttrDtos = null;
-
-        if (count > 0) {
-            unitAttrDtos = unitAttrInnerServiceSMOImpl.queryUnitAttrs(unitAttrDto);
-        } else {
-            unitAttrDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, unitAttrDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/unit/SaveUnitAttrListener.java

@@ -1,47 +0,0 @@
-package com.java110.api.listener.unit;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeUnitAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存商户侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveUnitAttrListener")
-public class SaveUnitAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IUnitAttrBMO unitAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        unitAttrBMOImpl.addUnitAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeUnitAttrConstant.ADD_UNITATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/unit/UpdateUnitAttrListener.java

@@ -1,48 +0,0 @@
-package com.java110.api.listener.unit;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeUnitAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存单元属性侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateUnitAttrListener")
-public class UpdateUnitAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IUnitAttrBMO unitAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        unitAttrBMOImpl.updateUnitAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeUnitAttrConstant.UPDATE_UNITATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-}

service-store/src/main/java/com/java110/store/cmd/store/UpdateStoreInfoCmd.java

@@ -0,0 +1,49 @@
+package com.java110.store.cmd.store;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.store.StoreDto;
+import com.java110.intf.store.IStoreInnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.po.store.StorePo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "update.store.info")
+public class UpdateStoreInfoCmd extends Cmd {
+
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(reqJson.getString("storeId"));
+        List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
+        Assert.listOnlyOne(storeDtos, "未找到需要修改的商户或多条数据");
+
+        JSONObject businessStore = new JSONObject();
+        businessStore.putAll(BeanConvertUtil.beanCovertMap(storeDtos.get(0)));
+        businessStore.putAll(reqJson);
+        StorePo storePo = BeanConvertUtil.covertBean(businessStore, StorePo.class);
+        int flag = storeV1InnerServiceSMOImpl.updateStore(storePo);
+        if (flag < 1) {
+            throw new CmdException("修改商户失败");
+        }
+    }
+}