优化 房屋创建费用 的功能

java110-bean/src/main/java/com/java110/dto/fee/FeeAttrDto.java

@@ -29,6 +29,7 @@ public class FeeAttrDto extends PageDto implements Serializable {
     public static final String SPEC_CD_OWNER_NAME = "390008";//业主名称
     public static final String SPEC_CD_OWNER_LINK = "390009";//业主联系方式
     public static final String SPEC_CD_CAR_INOUT_ID = "390011";//车辆进场编号
+    public static final String SPEC_CD_PAY_OBJECT_NAME = "390012";//付费对象名称
 
 
     private String attrId;

java110-interface/src/main/java/com/java110/intf/fee/IPayFeeNewV1InnerServiceSMO.java

@@ -34,18 +34,18 @@ import java.util.List;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/payFeeNewV1Api")
-public interface IPayFeeNewV1InnerServiceSMO {
+@RequestMapping("/payFeeV1Api")
+public interface IPayFeeV1InnerServiceSMO {
 
 
-    @RequestMapping(value = "/savePayFeeNew", method = RequestMethod.POST)
-    public int savePayFeeNew(@RequestBody PayFeePo PayFeePo);
+    @RequestMapping(value = "/savePayFee", method = RequestMethod.POST)
+    public int savePayFee(@RequestBody PayFeePo PayFeePo);
 
-    @RequestMapping(value = "/updatePayFeeNew", method = RequestMethod.POST)
-    public int updatePayFeeNew(@RequestBody  PayFeePo PayFeePo);
+    @RequestMapping(value = "/updatePayFee", method = RequestMethod.POST)
+    public int updatePayFee(@RequestBody  PayFeePo PayFeePo);
 
-    @RequestMapping(value = "/deletePayFeeNew", method = RequestMethod.POST)
-    public int deletePayFeeNew(@RequestBody  PayFeePo PayFeePo);
+    @RequestMapping(value = "/deletePayFee", method = RequestMethod.POST)
+    public int deletePayFee(@RequestBody  PayFeePo PayFeePo);
 
     /**
      * <p>查询小区楼信息</p>
@@ -54,8 +54,8 @@ public interface IPayFeeNewV1InnerServiceSMO {
      * @param payFeeDto 数据对象分享
      * @return PayFeeDto 对象数据
      */
-    @RequestMapping(value = "/queryPayFeeNews", method = RequestMethod.POST)
-    List<PayFeeDto> queryPayFeeNews(@RequestBody PayFeeDto payFeeDto);
+    @RequestMapping(value = "/queryPayFees", method = RequestMethod.POST)
+    List<PayFeeDto> queryPayFees(@RequestBody PayFeeDto payFeeDto);
 
     /**
      * 查询<p>小区楼</p>总记录数
@@ -63,6 +63,6 @@ public interface IPayFeeNewV1InnerServiceSMO {
      * @param payFeeDto 数据对象分享
      * @return 小区下的小区楼记录数
      */
-    @RequestMapping(value = "/queryPayFeeNewsCount", method = RequestMethod.POST)
-    int queryPayFeeNewsCount(@RequestBody PayFeeDto payFeeDto);
+    @RequestMapping(value = "/queryPayFeesCount", method = RequestMethod.POST)
+    int queryPayFeesCount(@RequestBody PayFeeDto payFeeDto);
 }

service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/SaveParkingSpaceApplyCmd.java

@@ -27,7 +27,7 @@ import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.intf.user.IBuildingOwnerV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
 import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
@@ -38,8 +38,6 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 
@@ -65,7 +63,7 @@ public class SaveParkingSpaceApplyCmd extends AbstractServiceCmdListener {
     @Autowired
     private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
     @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    private IPayFeeV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
     @Autowired
     private IBuildingOwnerV1InnerServiceSMO buildingOwnerV1InnerServiceSMOImpl;
 

service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java

@@ -25,13 +25,12 @@ import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
-import com.java110.dto.fee.PayFeeDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
 import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
 import com.java110.po.car.OwnerCarPo;
 import com.java110.po.fee.PayFeePo;
@@ -40,7 +39,6 @@ import com.java110.utils.constant.CommonConstant;
 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.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
@@ -70,7 +68,7 @@ public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
     @Autowired
     private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
     @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    private IPayFeeV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
     @Autowired
     private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
     @Autowired

service-fee/src/main/java/com/java110/fee/bmo/fee/IFeeBMO.java

@@ -2,10 +2,12 @@ package com.java110.fee.bmo.fee;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.dto.RoomDto;
 import com.java110.dto.contract.ContractDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.fee.bmo.IApiBaseBMO;
+import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.feeReceipt.FeeReceiptPo;
@@ -155,7 +157,7 @@ public interface IFeeBMO extends IApiBaseBMO {
      * @param dataFlowContext 数据上下文
      * @return 订单服务能够接受的报文
      */
-    public JSONObject addFeeAttr( JSONObject paramInJson, DataFlowContext dataFlowContext,String specCd,String value);
+    public FeeAttrPo addFeeAttr(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext, String specCd, String value);
 
 
     /**
@@ -174,7 +176,7 @@ public interface IFeeBMO extends IApiBaseBMO {
      * @param dataFlowContext 数据上下文
      * @return 订单服务能够接受的报文
      */
-    public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) throws ParseException;   /**
+    public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) ;   /**
      * 添加物业费用
      *
      * @param paramInJson     接口调用放传入入参

service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java

@@ -2,10 +2,10 @@ package com.java110.fee.bmo.fee.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.dto.RoomDto;
-import com.java110.dto.attendanceClasses.AttendanceClassesDto;
 import com.java110.dto.contract.ContractDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
@@ -20,7 +20,7 @@ import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailNewV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.po.car.CarInoutPo;
 import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeeConfigPo;
@@ -80,7 +80,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
     private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
 
     @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
 
     /**
      * 添加小区信息
@@ -363,7 +363,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
     /**
      * 添加费用明细信息
      *
-     * @param paramInJson     接口调用放传入入参
+     * @param paramInJson 接口调用放传入入参
      * @param
      * @return 订单服务能够接受的报文
      */
@@ -411,12 +411,12 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         }
         businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
         businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
-        businessFeeDetail.put("receivedAmount",paramInJson.getString("receivedAmount"));
+        businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
 
-        PayFeeDetailPo payFeeDetail = BeanConvertUtil.covertBean(businessFeeDetail,PayFeeDetailPo.class);
+        PayFeeDetailPo payFeeDetail = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
         payFeeDetail.setbId("-1");
         int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetail);
-        if(flag < 1){
+        if (flag < 1) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "保存费用明细失败");
         }
 
@@ -426,7 +426,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
     /**
      * 修改费用信息
      *
-     * @param paramInJson     接口调用放传入入参
+     * @param paramInJson 接口调用放传入入参
      * @param
      * @return 订单服务能够接受的报文
      */
@@ -447,10 +447,10 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
         feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
         businessFee.putAll(feeMap);
-       // business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
-        PayFeePo payFee = BeanConvertUtil.covertBean(businessFee,PayFeePo.class);
-        int flag = payFeeNewV1InnerServiceSMOImpl.updatePayFeeNew(payFee);
-        if(flag < 1){
+        // business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
+        PayFeePo payFee = BeanConvertUtil.covertBean(businessFee, PayFeePo.class);
+        int flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFee);
+        if (flag < 1) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "保存费用明细失败");
         }
         //为停车费单独处理
@@ -626,20 +626,14 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
     }
 
     @Override
-    public JSONObject addFeeAttr(JSONObject paramInJson, DataFlowContext dataFlowContext, String specCd, String value) {
-
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+    public FeeAttrPo addFeeAttr(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext, String specCd, String value) {
         FeeAttrPo feeAttrPo = new FeeAttrPo();
         feeAttrPo.setCommunityId(paramInJson.getString("communityId"));
         feeAttrPo.setSpecCd(specCd);
         feeAttrPo.setValue(value);
         feeAttrPo.setFeeId(paramInJson.getString("feeId"));
-        feeAttrPo.setAttrId("-1");
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(FeeAttrPo.class.getSimpleName(), JSONObject.parseObject(JSONObject.toJSONString(feeAttrPo)));
-        return business;
+        feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+        return feeAttrPo;
 
     }
 
@@ -669,7 +663,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
      * @param dataFlowContext 数据上下文
      * @return 订单服务能够接受的报文
      */
-    public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) throws ParseException {
+    public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, ICmdDataFlowContext dataFlowContext)  {
         String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
         if (paramInJson.containsKey("feeEndDate")) {
             time = paramInJson.getString("feeEndDate");
@@ -683,10 +677,6 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         feeConfigDto.setConfigId(paramInJson.getString("configId"));
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
         Assert.listOnlyOne(feeConfigDtos, "查询费用项错误！");
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessUnit = new JSONObject();
         businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
         businessUnit.put("configId", paramInJson.getString("configId"));
@@ -704,10 +694,10 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
         businessUnit.put("state", "2008001");
         businessUnit.put("batchId", paramInJson.getString("batchId"));
-        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
+        businessUnit.put("userId", dataFlowContext.getReqHeaders().get(CommonConstant.HTTP_USER_ID));
+
         paramInJson.put("feeId", businessUnit.getString("feeId"));
-        return business;
+        return businessUnit;
     }
 
     /**

service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java

@@ -1,12 +1,10 @@
-package com.java110.api.listener.fee;
+package com.java110.fee.cmd.fee;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-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.annotation.Java110Cmd;
+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.dto.RoomDto;
 import com.java110.dto.fee.FeeAttrDto;
@@ -15,23 +13,23 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.payFeeBatch.PayFeeBatchDto;
 import com.java110.dto.user.UserDto;
-import com.java110.entity.center.AppService;
+import com.java110.fee.bmo.fee.IFeeBMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.fee.FeeAttrPo;
+import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFeeBatch.PayFeeBatchPo;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 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.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -40,21 +38,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**
- * @ClassName SaveRoomCreateFeeListener
- * @Description TODO
- * @Author wuxw
- * @Date 2020/1/31 15:57
- * @Version 1.0
- * add by wuxw 2020/1/31
- **/
-@Java110Listener("saveRoomCreateFeeListener")
-public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveRoomCreateFeeListener.class);
-
-    @Autowired
-    private IFeeBMO feeBMOImpl;
+@Java110Cmd(serviceCode = "fee.saveRoomCreateFee")
+public class SaveRoomCreateFeeCmd extends AbstractServiceCmdListener {
 
     private static final int DEFAULT_ADD_FEE_COUNT = 200;
 
@@ -73,18 +58,18 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_SAVE_ROOM_CREATE_FEE;
-    }
+    @Autowired
+    private IFeeBMO feeBMOImpl;
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
 
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
 
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         // super.validatePageInfo(pd);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
         Assert.hasKeyAndValue(reqJson, "locationTypeCd", "未包含收费范围");
@@ -96,9 +81,8 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) throws ParseException {
-        logger.debug("ServiceDataFlowEvent : {}", event);
-        String userId = context.getRequestHeaders().get("user-id");
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        String userId = cmdDataFlowContext.getResHeaders().get("user-id");
         reqJson.put("userId", userId);
         List<RoomDto> roomDtos = null;
         FeeConfigDto feeConfigDto = new FeeConfigDto();
@@ -169,7 +153,7 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
         if (roomDtos == null || roomDtos.size() < 1) {
             throw new IllegalArgumentException("未查到需要付费的房屋或未绑定业主");
         }
-        dealRoomFee(roomDtos, context, reqJson, event);
+        dealRoomFee(roomDtos, cmdDataFlowContext, reqJson, event);
     }
 
     /**
@@ -199,8 +183,7 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
         reqJson.put("batchId", payFeeBatchPo.getBatchId());
     }
 
-    private void dealRoomFee(List<RoomDto> roomDtos, DataFlowContext context, JSONObject reqJson, ServiceDataFlowEvent event) throws ParseException {
-        AppService service = event.getAppService();
+    private void dealRoomFee(List<RoomDto> roomDtos, ICmdDataFlowContext context, JSONObject reqJson, CmdEvent event) {
         List<String> roomIds = new ArrayList<>();
         for (RoomDto roomDto : roomDtos) {
             roomIds.add(roomDto.getRoomId());
@@ -219,40 +202,47 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
                 }
             }
         }
-        HttpHeaders header = new HttpHeaders();
-        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
-        JSONArray businesses = new JSONArray();
-        JSONObject paramInObj = null;
+        List<PayFeePo> feePos = new ArrayList<>();
+        List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
         ResponseEntity<String> responseEntity = null;
         int failRooms = 0;
         //添加单元信息
         int curFailRoomCount = 0;
+        int saveFlag = 0;
         for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
             curFailRoomCount++;
-            businesses.add(feeBMOImpl.addRoomFee(roomDtos.get(roomIndex), reqJson, context));
+            //businesses.add();
+
+            //加入 房屋费用
+            feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addRoomFee(roomDtos.get(roomIndex), reqJson, context), PayFeePo.class));
             if (!StringUtil.isEmpty(roomDtos.get(roomIndex).getOwnerId())) {
                 if (FeeDto.FEE_FLAG_ONCE.equals(reqJson.getString("feeFlag"))) {
-                    businesses.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+                    feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
                             reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
                 }
-                businesses.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, roomDtos.get(roomIndex).getOwnerId()));
-                businesses.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDtos.get(roomIndex).getLink()));
-                businesses.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDtos.get(roomIndex).getOwnerName()));
+                feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, roomDtos.get(roomIndex).getOwnerId()));
+                feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDtos.get(roomIndex).getLink()));
+                feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDtos.get(roomIndex).getOwnerName()));
+                //付费对象名称
+                feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
+                        roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum()));
+
             }
             if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
-                responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
-                if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
+                feePos = new ArrayList<>();
+                feeAttrsPos = new ArrayList<>();
+                if (saveFlag > 0) {
                     failRooms += curFailRoomCount;
                 } else {
                     curFailRoomCount = 0;
                 }
-                businesses = new JSONArray();
             }
         }
-        if (businesses != null && businesses.size() > 0) {
-            responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
-            if (responseEntity.getStatusCode() != HttpStatus.OK) {
-                failRooms += businesses.size();
+        if (feePos != null && feePos.size() > 0) {
+            saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
+            if (saveFlag > 0) {
+                failRooms += curFailRoomCount;
             }
         }
         JSONObject paramOut = new JSONObject();
@@ -263,16 +253,14 @@ public class SaveRoomCreateFeeListener extends AbstractServiceApiListener {
         context.setResponseEntity(responseEntity);
     }
 
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
+    private int saveFeeAndAttrs(List<PayFeePo> feePos, List<FeeAttrPo> feeAttrsPos) {
+        int flag = feeInnerServiceSMOImpl.saveFee(feePos);
+        if (flag < 1) {
+            return flag;
+        }
 
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
+        flag = feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
 
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
+        return flag;
     }
 }

service-fee/src/main/java/com/java110/fee/cmd/payFeeNew/DeletePayFeeNewCmd.java

@@ -1,71 +0,0 @@
-/*
- * 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.fee.cmd.payFeeNew;
-
-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.intf.fee.IPayFeeNewV1InnerServiceSMO;
-import com.java110.po.fee.PayFeePo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-/**
- * 类表述：删除
- * 服务编码：payFeeNew.deletePayFeeNew
- * 请求路劲：/app/payFeeNew.DeletePayFeeNew
- * add by 吴学文 at 2021-12-06 21:31:24 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 = "payFeeNew.deletePayFeeNew")
-public class DeletePayFeeNewCmd extends AbstractServiceCmdListener {
-  private static Logger logger = LoggerFactory.getLogger(DeletePayFeeNewCmd.class);
-
-    @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "feeId", "feeId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       PayFeePo payFeeNewPo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
-        int flag = payFeeNewV1InnerServiceSMOImpl.deletePayFeeNew(payFeeNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/payFeeNew/ListPayFeeNewCmd.java

@@ -1,82 +0,0 @@
-/*
- * 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.fee.cmd.payFeeNew;
-
-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.intf.fee.IPayFeeNewV1InnerServiceSMO;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：查询
- * 服务编码：payFeeNew.listPayFeeNew
- * 请求路劲：/app/payFeeNew.ListPayFeeNew
- * add by 吴学文 at 2021-12-06 21:31:24 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 = "payFeeNew.listPayFeeNew")
-public class ListPayFeeNewCmd extends AbstractServiceCmdListener {
-
-  private static Logger logger = LoggerFactory.getLogger(ListPayFeeNewCmd.class);
-    @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-//
-//           PayFeeNewDto payFeeNewDto = BeanConvertUtil.covertBean(reqJson, PayFeeNewDto.class);
-//
-//           int count = payFeeNewV1InnerServiceSMOImpl.queryPayFeeNewsCount(payFeeNewDto);
-//
-//           List<PayFeeNewDto> payFeeNewDtos = null;
-//
-//           if (count > 0) {
-//               payFeeNewDtos = payFeeNewV1InnerServiceSMOImpl.queryPayFeeNews(payFeeNewDto);
-//           } else {
-//               payFeeNewDtos = new ArrayList<>();
-//           }
-//
-//           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, payFeeNewDtos);
-//
-//           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-//
-//           cmdDataFlowContext.setResponseEntity(responseEntity);
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/payFeeNew/SavePayFeeNewCmd.java

@@ -1,88 +0,0 @@
-/*
- * 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.fee.cmd.payFeeNew;
-
-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.intf.fee.IPayFeeNewV1InnerServiceSMO;
-import com.java110.po.fee.PayFeePo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-/**
- * 类表述：保存
- * 服务编码：payFeeNew.savePayFeeNew
- * 请求路劲：/app/payFeeNew.SavePayFeeNew
- * add by 吴学文 at 2021-12-06 21:31:24 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 = "payFeeNew.savePayFeeNew")
-public class SavePayFeeNewCmd extends AbstractServiceCmdListener {
-
-    private static Logger logger = LoggerFactory.getLogger(SavePayFeeNewCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
-Assert.hasKeyAndValue(reqJson, "feeTypeCd", "请求报文中未包含feeTypeCd");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "payerObjId", "请求报文中未包含payerObjId");
-Assert.hasKeyAndValue(reqJson, "incomeObjId", "请求报文中未包含incomeObjId");
-Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
-Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
-Assert.hasKeyAndValue(reqJson, "feeFlag", "请求报文中未包含feeFlag");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
-Assert.hasKeyAndValue(reqJson, "payerObjType", "请求报文中未包含payerObjType");
-Assert.hasKeyAndValue(reqJson, "batchId", "请求报文中未包含batchId");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       PayFeePo payFeeNewPo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
-        payFeeNewPo.setFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = payFeeNewV1InnerServiceSMOImpl.savePayFeeNew(payFeeNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/payFeeNew/UpdatePayFeeNewCmd.java

@@ -1,75 +0,0 @@
-/*
- * 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.fee.cmd.payFeeNew;
-
-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.intf.fee.IPayFeeNewV1InnerServiceSMO;
-import com.java110.po.fee.PayFeePo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：payFeeNew.updatePayFeeNew
- * 请求路劲：/app/payFeeNew.UpdatePayFeeNew
- * add by 吴学文 at 2021-12-06 21:31:24 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 = "payFeeNew.updatePayFeeNew")
-public class UpdatePayFeeNewCmd extends AbstractServiceCmdListener {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdatePayFeeNewCmd.class);
-
-
-    @Autowired
-    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "feeId", "feeId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       PayFeePo payFeeNewPo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
-        int flag = payFeeNewV1InnerServiceSMOImpl.updatePayFeeNew(payFeeNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairPoolNew/DeleteRepairPoolNewCmd.java

@@ -1,71 +0,0 @@
-/*
- * 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.fee.cmd.repairPoolNew;
-
-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.intf.fee.IRepairPoolNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairPoolPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-/**
- * 类表述：删除
- * 服务编码：repairPoolNew.deleteRepairPoolNew
- * 请求路劲：/app/repairPoolNew.DeleteRepairPoolNew
- * add by 吴学文 at 2021-12-06 22:28:18 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 = "repairPoolNew.deleteRepairPoolNew")
-public class DeleteRepairPoolNewCmd extends AbstractServiceCmdListener {
-  private static Logger logger = LoggerFactory.getLogger(DeleteRepairPoolNewCmd.class);
-
-    @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "repairId", "repairId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       RepairPoolPo repairPoolNewPo = BeanConvertUtil.covertBean(reqJson, RepairPoolPo.class);
-        int flag = repairPoolNewV1InnerServiceSMOImpl.deleteRepairPoolNew(repairPoolNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairPoolNew/ListRepairPoolNewCmd.java

@@ -1,82 +0,0 @@
-/*
- * 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.fee.cmd.repairPoolNew;
-
-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.intf.fee.IRepairPoolNewV1InnerServiceSMO;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：查询
- * 服务编码：repairPoolNew.listRepairPoolNew
- * 请求路劲：/app/repairPoolNew.ListRepairPoolNew
- * add by 吴学文 at 2021-12-06 22:28:18 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 = "repairPoolNew.listRepairPoolNew")
-public class ListRepairPoolNewCmd extends AbstractServiceCmdListener {
-
-  private static Logger logger = LoggerFactory.getLogger(ListRepairPoolNewCmd.class);
-    @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-//
-//           RepairPoolDto repairPoolNewDto = BeanConvertUtil.covertBean(reqJson, RepairPoolDto.class);
-//
-//           int count = repairPoolNewV1InnerServiceSMOImpl.queryRepairPoolNewsCount(repairPoolNewDto);
-//
-//           List<RepairPoolNewDto> repairPoolNewDtos = null;
-//
-//           if (count > 0) {
-//               repairPoolNewDtos = repairPoolNewV1InnerServiceSMOImpl.queryRepairPoolNews(repairPoolNewDto);
-//           } else {
-//               repairPoolNewDtos = new ArrayList<>();
-//           }
-//
-//           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, repairPoolNewDtos);
-//
-//           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-//
-//           cmdDataFlowContext.setResponseEntity(responseEntity);
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairPoolNew/SaveRepairPoolNewCmd.java

@@ -1,85 +0,0 @@
-/*
- * 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.fee.cmd.repairPoolNew;
-
-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.intf.fee.IRepairPoolNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairPoolPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-/**
- * 类表述：保存
- * 服务编码：repairPoolNew.saveRepairPoolNew
- * 请求路劲：/app/repairPoolNew.SaveRepairPoolNew
- * add by 吴学文 at 2021-12-06 22:28:18 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 = "repairPoolNew.saveRepairPoolNew")
-public class SaveRepairPoolNewCmd extends AbstractServiceCmdListener {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveRepairPoolNewCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "repairId", "请求报文中未包含repairId");
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "repairType", "请求报文中未包含repairType");
-        Assert.hasKeyAndValue(reqJson, "repairName", "请求报文中未包含repairName");
-        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
-        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");
-        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-        Assert.hasKeyAndValue(reqJson, "repairObjType", "请求报文中未包含repairObjType");
-        Assert.hasKeyAndValue(reqJson, "repairObjId", "请求报文中未包含repairObjId");
-        Assert.hasKeyAndValue(reqJson, "repairObjName", "请求报文中未包含repairObjName");
-        Assert.hasKeyAndValue(reqJson, "appointmentTime", "请求报文中未包含appointmentTime");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        RepairPoolPo repairPoolNewPo = BeanConvertUtil.covertBean(reqJson, RepairPoolPo.class);
-        repairPoolNewPo.setRepairId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = repairPoolNewV1InnerServiceSMOImpl.saveRepairPoolNew(repairPoolNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairPoolNew/UpdateRepairPoolNewCmd.java

@@ -1,75 +0,0 @@
-/*
- * 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.fee.cmd.repairPoolNew;
-
-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.intf.fee.IRepairPoolNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairPoolPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：repairPoolNew.updateRepairPoolNew
- * 请求路劲：/app/repairPoolNew.UpdateRepairPoolNew
- * add by 吴学文 at 2021-12-06 22:28:18 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 = "repairPoolNew.updateRepairPoolNew")
-public class UpdateRepairPoolNewCmd extends AbstractServiceCmdListener {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateRepairPoolNewCmd.class);
-
-
-    @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "repairId", "repairId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        RepairPoolPo repairPoolNewPo = BeanConvertUtil.covertBean(reqJson, RepairPoolPo.class);
-        int flag = repairPoolNewV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairUserNew/DeleteRepairUserNewCmd.java

@@ -1,72 +0,0 @@
-/*
- * 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.fee.cmd.repairUserNew;
-
-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.intf.fee.IRepairUserNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairUserPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-/**
- * 类表述：删除
- * 服务编码：repairUserNew.deleteRepairUserNew
- * 请求路劲：/app/repairUserNew.DeleteRepairUserNew
- * add by 吴学文 at 2021-12-06 22:33:06 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 = "repairUserNew.deleteRepairUserNew")
-public class DeleteRepairUserNewCmd extends AbstractServiceCmdListener {
-    private static Logger logger = LoggerFactory.getLogger(DeleteRepairUserNewCmd.class);
-
-    @Autowired
-    private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "ruId", "ruId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        RepairUserPo repairUserNewPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
-        int flag = repairUserNewV1InnerServiceSMOImpl.deleteRepairUserNew(repairUserNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairUserNew/ListRepairUserNewCmd.java

@@ -1,83 +0,0 @@
-/*
- * 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.fee.cmd.repairUserNew;
-
-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.dto.repair.RepairUserDto;
-import com.java110.intf.fee.IRepairUserNewV1InnerServiceSMO;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：查询
- * 服务编码：repairUserNew.listRepairUserNew
- * 请求路劲：/app/repairUserNew.ListRepairUserNew
- * add by 吴学文 at 2021-12-06 22:33:06 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 = "repairUserNew.listRepairUserNew")
-public class ListRepairUserNewCmd extends AbstractServiceCmdListener {
-
-  private static Logger logger = LoggerFactory.getLogger(ListRepairUserNewCmd.class);
-    @Autowired
-    private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-           RepairUserDto repairUserNewDto = BeanConvertUtil.covertBean(reqJson, RepairUserDto.class);
-
-           int count = repairUserNewV1InnerServiceSMOImpl.queryRepairUserNewsCount(repairUserNewDto);
-
-           List<RepairUserDto> repairUserNewDtos = null;
-
-           if (count > 0) {
-               repairUserNewDtos = repairUserNewV1InnerServiceSMOImpl.queryRepairUserNews(repairUserNewDto);
-           } else {
-               repairUserNewDtos = new ArrayList<>();
-           }
-
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, repairUserNewDtos);
-
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-           cmdDataFlowContext.setResponseEntity(responseEntity);
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairUserNew/SaveRepairUserNewCmd.java

@@ -1,85 +0,0 @@
-/*
- * 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.fee.cmd.repairUserNew;
-
-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.intf.fee.IRepairUserNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairUserPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 类表述：保存
- * 服务编码：repairUserNew.saveRepairUserNew
- * 请求路劲：/app/repairUserNew.SaveRepairUserNew
- * add by 吴学文 at 2021-12-06 22:33:06 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 = "repairUserNew.saveRepairUserNew")
-public class SaveRepairUserNewCmd extends AbstractServiceCmdListener {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveRepairUserNewCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "ruId", "请求报文中未包含ruId");
-        Assert.hasKeyAndValue(reqJson, "repairId", "请求报文中未包含repairId");
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
-        Assert.hasKeyAndValue(reqJson, "staffName", "请求报文中未包含staffName");
-        Assert.hasKeyAndValue(reqJson, "preStaffId", "请求报文中未包含preStaffId");
-        Assert.hasKeyAndValue(reqJson, "preStaffName", "请求报文中未包含preStaffName");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "repairEvent", "请求报文中未包含repairEvent");
-        Assert.hasKeyAndValue(reqJson, "preRuId", "请求报文中未包含preRuId");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        RepairUserPo repairUserNewPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
-        repairUserNewPo.setRuId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = repairUserNewV1InnerServiceSMOImpl.saveRepairUserNew(repairUserNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/repairUserNew/UpdateRepairUserNewCmd.java

@@ -1,75 +0,0 @@
-/*
- * 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.fee.cmd.repairUserNew;
-
-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.intf.fee.IRepairUserNewV1InnerServiceSMO;
-import com.java110.po.owner.RepairUserPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：repairUserNew.updateRepairUserNew
- * 请求路劲：/app/repairUserNew.UpdateRepairUserNew
- * add by 吴学文 at 2021-12-06 22:33:06 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 = "repairUserNew.updateRepairUserNew")
-public class UpdateRepairUserNewCmd extends AbstractServiceCmdListener {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateRepairUserNewCmd.class);
-
-
-    @Autowired
-    private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "ruId", "ruId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       RepairUserPo repairUserNewPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
-        int flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserNewPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-fee/src/main/java/com/java110/fee/dao/IPayFeeNewV1ServiceDao.java

@@ -34,7 +34,7 @@ import java.util.Map;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-public interface IPayFeeNewV1ServiceDao {
+public interface IPayFeeV1ServiceDao {
 
 
     /**
@@ -42,7 +42,7 @@ public interface IPayFeeNewV1ServiceDao {
      * @param info
      * @throws DAOException DAO异常
      */
-    int savePayFeeNewInfo(Map info) throws DAOException;
+    int savePayFeeInfo(Map info) throws DAOException;
 
 
 
@@ -54,7 +54,7 @@ public interface IPayFeeNewV1ServiceDao {
      * @return 费用明细信息
      * @throws DAOException DAO异常
      */
-    List<Map> getPayFeeNewInfo(Map info) throws DAOException;
+    List<Map> getPayFeeInfo(Map info) throws DAOException;
 
 
 
@@ -63,7 +63,7 @@ public interface IPayFeeNewV1ServiceDao {
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
-    int updatePayFeeNewInfo(Map info) throws DAOException;
+    int updatePayFeeInfo(Map info) throws DAOException;
 
 
     /**
@@ -72,6 +72,6 @@ public interface IPayFeeNewV1ServiceDao {
      * @param info 费用明细信息
      * @return 费用明细数量
      */
-    int queryPayFeeNewsCount(Map info);
+    int queryPayFeesCount(Map info);
 
 }

service-fee/src/main/java/com/java110/fee/dao/impl/PayFeeNewV1ServiceDaoImpl.java

@@ -15,16 +15,12 @@
  */
 package com.java110.fee.dao.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.fee.dao.IPayFeeNewV1ServiceDao;
+import com.java110.fee.dao.IPayFeeV1ServiceDao;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -37,10 +33,10 @@ import java.util.Map;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Service("payFeeNewV1ServiceDaoImpl")
-public class PayFeeNewV1ServiceDaoImpl extends BaseServiceDao implements IPayFeeNewV1ServiceDao {
+@Service("payFeeV1ServiceDaoImpl")
+public class PayFeeV1ServiceDaoImpl extends BaseServiceDao implements IPayFeeV1ServiceDao {
 
-    private static Logger logger = LoggerFactory.getLogger(PayFeeNewV1ServiceDaoImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(PayFeeV1ServiceDaoImpl.class);
 
 
 
@@ -52,10 +48,10 @@ public class PayFeeNewV1ServiceDaoImpl extends BaseServiceDao implements IPayFee
      * @throws DAOException DAO异常
      */
     @Override
-    public int savePayFeeNewInfo(Map info) throws DAOException {
-        logger.debug("保存 savePayFeeNewInfo 入参 info : {}",info);
+    public int savePayFeeInfo(Map info) throws DAOException {
+        logger.debug("保存 savePayFeeInfo 入参 info : {}",info);
 
-        int saveFlag = sqlSessionTemplate.insert("payFeeNewV1ServiceDaoImpl.savePayFeeNewInfo",info);
+        int saveFlag = sqlSessionTemplate.insert("payFeeV1ServiceDaoImpl.savePayFeeInfo",info);
 
         return saveFlag;
     }
@@ -68,12 +64,12 @@ public class PayFeeNewV1ServiceDaoImpl extends BaseServiceDao implements IPayFee
      * @throws DAOException DAO异常
      */
     @Override
-    public List<Map> getPayFeeNewInfo(Map info) throws DAOException {
-        logger.debug("查询 getPayFeeNewInfo 入参 info : {}",info);
+    public List<Map> getPayFeeInfo(Map info) throws DAOException {
+        logger.debug("查询 getPayFeeInfo 入参 info : {}",info);
 
-        List<Map> businessPayFeeNewInfos = sqlSessionTemplate.selectList("payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo",info);
+        List<Map> businessPayFeeInfos = sqlSessionTemplate.selectList("payFeeV1ServiceDaoImpl.getPayFeeInfo",info);
 
-        return businessPayFeeNewInfos;
+        return businessPayFeeInfos;
     }
 
 
@@ -83,10 +79,10 @@ public class PayFeeNewV1ServiceDaoImpl extends BaseServiceDao implements IPayFee
      * @throws DAOException DAO异常
      */
     @Override
-    public int updatePayFeeNewInfo(Map info) throws DAOException {
-        logger.debug("修改 updatePayFeeNewInfo 入参 info : {}",info);
+    public int updatePayFeeInfo(Map info) throws DAOException {
+        logger.debug("修改 updatePayFeeInfo 入参 info : {}",info);
 
-        int saveFlag = sqlSessionTemplate.update("payFeeNewV1ServiceDaoImpl.updatePayFeeNewInfo",info);
+        int saveFlag = sqlSessionTemplate.update("payFeeV1ServiceDaoImpl.updatePayFeeInfo",info);
 
         return saveFlag;
     }
@@ -97,15 +93,15 @@ public class PayFeeNewV1ServiceDaoImpl extends BaseServiceDao implements IPayFee
      * @return 费用明细数量
      */
     @Override
-    public int queryPayFeeNewsCount(Map info) {
-        logger.debug("查询 queryPayFeeNewsCount 入参 info : {}",info);
+    public int queryPayFeesCount(Map info) {
+        logger.debug("查询 queryPayFeesCount 入参 info : {}",info);
 
-        List<Map> businessPayFeeNewInfos = sqlSessionTemplate.selectList("payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount", info);
-        if (businessPayFeeNewInfos.size() < 1) {
+        List<Map> businessPayFeeInfos = sqlSessionTemplate.selectList("payFeeV1ServiceDaoImpl.queryPayFeesCount", info);
+        if (businessPayFeeInfos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessPayFeeNewInfos.get(0).get("count").toString());
+        return Integer.parseInt(businessPayFeeInfos.get(0).get("count").toString());
     }
 
 

service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java

@@ -17,18 +17,16 @@ package com.java110.fee.smo.impl;
 
 
 import com.java110.dto.fee.PayFeeDto;
-import com.java110.fee.dao.IPayFeeNewV1ServiceDao;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.fee.dao.IPayFeeV1ServiceDao;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
 import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,50 +38,50 @@ import java.util.List;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @RestController
-public class PayFeeNewV1InnerServiceSMOImpl extends BaseServiceSMO implements IPayFeeNewV1InnerServiceSMO {
+public class PayFeeV1InnerServiceSMOImpl extends BaseServiceSMO implements IPayFeeV1InnerServiceSMO {
 
     @Autowired
-    private IPayFeeNewV1ServiceDao payFeeNewV1ServiceDaoImpl;
+    private IPayFeeV1ServiceDao payFeeV1ServiceDaoImpl;
 
 
     @Override
-    public int savePayFeeNew(@RequestBody  PayFeePo PayFeePo) {
-        int saveFlag = payFeeNewV1ServiceDaoImpl.savePayFeeNewInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
+    public int savePayFee(@RequestBody  PayFeePo PayFeePo) {
+        int saveFlag = payFeeV1ServiceDaoImpl.savePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
         return saveFlag;
     }
 
      @Override
-    public int updatePayFeeNew(@RequestBody PayFeePo PayFeePo) {
-        int saveFlag = payFeeNewV1ServiceDaoImpl.updatePayFeeNewInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
+    public int updatePayFee(@RequestBody PayFeePo PayFeePo) {
+        int saveFlag = payFeeV1ServiceDaoImpl.updatePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
         return saveFlag;
     }
 
      @Override
-    public int deletePayFeeNew(@RequestBody  PayFeePo PayFeePo) {
+    public int deletePayFee(@RequestBody  PayFeePo PayFeePo) {
        PayFeePo.setStatusCd("1");
-       int saveFlag = payFeeNewV1ServiceDaoImpl.updatePayFeeNewInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
+       int saveFlag = payFeeV1ServiceDaoImpl.updatePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
        return saveFlag;
     }
 
     @Override
-    public List<PayFeeDto> queryPayFeeNews(@RequestBody  PayFeeDto payFeeNewDto) {
+    public List<PayFeeDto> queryPayFees(@RequestBody  PayFeeDto payFeeDto) {
 
         //校验是否传了 分页信息
 
-        int page = payFeeNewDto.getPage();
+        int page = payFeeDto.getPage();
 
         if (page != PageDto.DEFAULT_PAGE) {
-            payFeeNewDto.setPage((page - 1) * payFeeNewDto.getRow());
+            payFeeDto.setPage((page - 1) * payFeeDto.getRow());
         }
 
-        List<PayFeeDto> payFeeNews = BeanConvertUtil.covertBeanList(payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo(BeanConvertUtil.beanCovertMap(payFeeNewDto)), PayFeeDto.class);
+        List<PayFeeDto> payFees = BeanConvertUtil.covertBeanList(payFeeV1ServiceDaoImpl.getPayFeeInfo(BeanConvertUtil.beanCovertMap(payFeeDto)), PayFeeDto.class);
 
-        return payFeeNews;
+        return payFees;
     }
 
 
     @Override
-    public int queryPayFeeNewsCount(@RequestBody PayFeeDto payFeeNewDto) {
-        return payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount(BeanConvertUtil.beanCovertMap(payFeeNewDto));    }
+    public int queryPayFeesCount(@RequestBody PayFeeDto payFeeDto) {
+        return payFeeV1ServiceDaoImpl.queryPayFeesCount(BeanConvertUtil.beanCovertMap(payFeeDto));    }
 
 }