Explorar o código

优化修改车辆功能

java110 %!s(int64=3) %!d(string=hai) anos
pai
achega
db8939d026

+ 0 - 97
service-api/src/main/java/com/java110/api/listener/owner/EditOwnerCarListener.java

@@ -1,97 +0,0 @@
-package com.java110.api.listener.owner;
-
-import com.alibaba.fastjson.JSONObject;
-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.dto.owner.OwnerCarDto;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.po.car.OwnerCarPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-import java.util.List;
-
-/**
- * @ClassName editOwnerCarListener
- * @Description 修改业主车辆信息
- * @Author wuxw
- * @Date 2019/4/26 14:51
- * @Version 1.0
- * @site http://www.homecommunity.cn
- * add by wuxw 2019/4/26
- **/
-
-@Java110Listener("editOwnerCarListener")
-public class EditOwnerCarListener extends AbstractServiceApiPlusListener {
-
-
-    private static Logger logger = LoggerFactory.getLogger(EditOwnerCarListener.class);
-
-    @Autowired
-    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_EDIT_OWNER_CAR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-
-    /**
-     * @param event   事件对象
-     * @param reqJson 请求报文数据
-     */
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.jsonObjectHaveKey(reqJson, "communityId", "未包含小区ID");
-        Assert.jsonObjectHaveKey(reqJson, "carNum", "请求报文中未包含carNum");
-        Assert.jsonObjectHaveKey(reqJson, "carId", "请求报文中未包含carId");
-        Assert.jsonObjectHaveKey(reqJson, "memberId", "请求报文中未包含memberId");
-        Assert.jsonObjectHaveKey(reqJson, "carBrand", "请求报文中未包含carBrand");
-        Assert.jsonObjectHaveKey(reqJson, "carType", "请求报文中未包含carType");
-        Assert.jsonObjectHaveKey(reqJson, "carColor", "未包含carColor");
-        Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
-
-        OwnerCarDto ownerCarDto = new OwnerCarDto();
-        ownerCarDto.setMemberId(reqJson.getString("memberId"));
-        ownerCarDto.setCommunityId(reqJson.getString("communityId"));
-        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-
-        Assert.listOnlyOne(ownerCarDtos, "未找到车辆信息");
-
-        String psId = ownerCarDtos.get(0).getPsId();
-
-        if (StringUtil.isEmpty(psId) || "-1".equals(psId)) {
-            throw new IllegalArgumentException("车位已经被释放,不允许修改车辆信息");
-        }
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(reqJson, OwnerCarPo.class);
-        super.update(context, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR);
-
-    }
-
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
-
-}

+ 97 - 0
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.cmd.owner;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 类表述:保存
+ * 服务编码:ownerCar.saveOwnerCar
+ * 请求路劲:/app/ownerCar.SaveOwnerCar
+ * add by 吴学文 at 2021-10-13 16:58:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "owner.editOwnerCar")
+public class EditOwnerCarCmd extends AbstractServiceCmdListener {
+
+    private static Logger logger = LoggerFactory.getLogger(EditOwnerCarCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "未包含小区ID");
+        Assert.jsonObjectHaveKey(reqJson, "carNum", "请求报文中未包含carNum");
+        Assert.jsonObjectHaveKey(reqJson, "carId", "请求报文中未包含carId");
+        Assert.jsonObjectHaveKey(reqJson, "memberId", "请求报文中未包含memberId");
+        Assert.jsonObjectHaveKey(reqJson, "carType", "请求报文中未包含carType");
+        Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
+
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setMemberId(reqJson.getString("memberId"));
+        ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+        Assert.listOnlyOne(ownerCarDtos, "未找到车辆信息");
+
+        String psId = ownerCarDtos.get(0).getPsId();
+
+        if (StringUtil.isEmpty(psId) || "-1".equals(psId)) {
+            throw new IllegalArgumentException("车位已经被释放,不允许修改车辆信息");
+        }
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(reqJson, OwnerCarPo.class);
+        ownerCarPo.setMemberId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = ownerCarV1InnerServiceSMOImpl.updateOwnerCar(ownerCarPo);
+
+        if (flag < 1) {
+            throw new CmdException("修改数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 0 - 2
service-user/src/main/java/com/java110/user/cmd/ownerCar/SaveOwnerCarCmd.java

@@ -56,9 +56,7 @@ public class SaveOwnerCarCmd extends AbstractServiceCmdListener {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "carId", "请求报文中未包含carId");
         Assert.hasKeyAndValue(reqJson, "carNum", "请求报文中未包含carNum");
-        Assert.hasKeyAndValue(reqJson, "carBrand", "请求报文中未包含carBrand");
         Assert.hasKeyAndValue(reqJson, "carType", "请求报文中未包含carType");
-        Assert.hasKeyAndValue(reqJson, "carColor", "请求报文中未包含carColor");
         Assert.hasKeyAndValue(reqJson, "psId", "请求报文中未包含psId");
         Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
         Assert.hasKeyAndValue(reqJson, "statusCd", "请求报文中未包含statusCd");