优化创建费用工鞥呢

java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java

@@ -3,6 +3,7 @@ package com.java110.core.event.cmd;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.center.DataFlowListenerOrderComparator;
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.CmdListenerDto;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
@@ -13,8 +14,6 @@ import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.log.LoggerEngine;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-
 import sun.misc.ProxyGenerator;
 
 import java.io.File;
@@ -198,32 +197,32 @@ public class ServiceCmdEventPublishing {
     protected static void invokeListener(ServiceCmdListener listener, CmdEvent event) {
         try {
             //        //这里处理业务逻辑数据
-        ICmdDataFlowContext dataFlowContext = event.getCmdDataFlowContext();
-        //获取请求数据
-        JSONObject reqJson = dataFlowContext.getReqJson();
+            ICmdDataFlowContext dataFlowContext = event.getCmdDataFlowContext();
+            //获取请求数据
+            JSONObject reqJson = dataFlowContext.getReqJson();
 
-        logger.debug("API服务 --- 请求参数为：{}", reqJson.toJSONString());
+            logger.debug("API服务 --- 请求参数为：{}", reqJson.toJSONString());
 
             listener.validate(event, dataFlowContext, reqJson);
 
             listener.doCmd(event, dataFlowContext, reqJson);
 
-        //logger.debug("API服务 --- 返回报文信息：{}", dataFlowContext.getResponseEntity());
-         //   listener.cmd(event);
+            //logger.debug("API服务 --- 返回报文信息：{}", dataFlowContext.getResponseEntity());
+            //   listener.cmd(event);
         } catch (CmdException e) {
             LoggerEngine.error("发布侦听失败", e);
             throw e;
         }
     }
 
-    public static void testPoxy(Class clazz){
+    public static void testPoxy(Class clazz) {
         byte[] bytes = ProxyGenerator.generateProxyClass("$Proxy", new Class[]{clazz});
-        try(
-                FileOutputStream fos =new FileOutputStream(new File("D:/$Proxy.class"))
-        ){
+        try (
+                FileOutputStream fos = new FileOutputStream(new File("D:/$Proxy.class"))
+        ) {
             fos.write(bytes);
             fos.flush();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java

@@ -26,24 +26,20 @@ public class Java110TraceLogAop {
         TraceParamDto traceParamDto = new TraceParamDto();
         JSONObject paramIn = new JSONObject();
         JSONObject paramOut = new JSONObject();
-        try {
-            Object[] args = pjp.getArgs();
-            for (int paramIndex = 0; paramIndex < args.length; paramIndex++) {
-                paramIn.put("param" + paramIndex, args[paramIndex]);
-            }
-            traceParamDto.setReqParam(paramIn.toJSONString());
-            out = pjp.proceed();
-            if (paramOut != null) {
-                paramOut.put("param", out);
-            } else {
-                paramOut.put("param", new JSONObject());
-            }
-            traceParamDto.setResParam(paramOut.toJSONString());
-            Java110TraceFactory.putParams(traceParamDto);
-        } catch (Throwable e) {
-            throw e;
-        } finally {
-            return out;
+
+        Object[] args = pjp.getArgs();
+        for (int paramIndex = 0; paramIndex < args.length; paramIndex++) {
+            paramIn.put("param" + paramIndex, args[paramIndex]);
+        }
+        traceParamDto.setReqParam(paramIn.toJSONString());
+        out = pjp.proceed();
+        if (paramOut != null) {
+            paramOut.put("param", out);
+        } else {
+            paramOut.put("param", new JSONObject());
         }
+        traceParamDto.setResParam(paramOut.toJSONString());
+        Java110TraceFactory.putParams(traceParamDto);
+        return out;
     }
 }

java110-service/src/main/java/com/java110/service/init/ServiceStartInit.java

@@ -1,10 +1,11 @@
 package com.java110.service.init;
 
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.system.SystemLogDto;
+import com.java110.utils.constant.EnvironmentConstant;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 
@@ -23,7 +24,7 @@ public class ServiceStartInit {
             ApplicationContextFactory.setApplicationContext(context);
             env = context.getEnvironment();
 
-            String logSwitch = env.getProperty("LogSwitch");
+            String logSwitch = env.getProperty(EnvironmentConstant.LOG_SWITCH);
             if (!StringUtil.isEmpty(logSwitch)) {
                 //设置日志级别
                 SystemLogDto.setLogSwatch(logSwitch);
@@ -36,7 +37,7 @@ public class ServiceStartInit {
 
     public static void preInitSystemConfig() {
         //加载配置文件，注册订单处理侦听
-        String logSwitch = System.getenv("LogSwitch");
+        String logSwitch = System.getenv(EnvironmentConstant.LOG_SWITCH);
         if (!StringUtil.isEmpty(logSwitch)) {
             //设置日志级别
             SystemLogDto.setLogSwatch(logSwitch);

java110-utils/src/main/java/com/java110/utils/constant/EnvironmentConstant.java

@@ -7,4 +7,7 @@ public class EnvironmentConstant {
 
     // 调用链打开
     public static final String TRACE_SWITCH_ON = "ON";
+
+    // 日志开关
+    public static final String LOG_SWITCH = "LogSwitch";
 }

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

@@ -63,7 +63,7 @@ public class SaveParkingSpaceApplyCmd extends AbstractServiceCmdListener {
     @Autowired
     private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
     @Autowired
-    private IPayFeeV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
     @Autowired
     private IBuildingOwnerV1InnerServiceSMO buildingOwnerV1InnerServiceSMOImpl;
 
@@ -121,7 +121,7 @@ public class SaveParkingSpaceApplyCmd extends AbstractServiceCmdListener {
             PayFeeDto payFeeDto = new PayFeeDto();
             payFeeDto.setPayerObjId(ownerCarDtos.get(0).getCarId());
             payFeeDto.setState("2008001");
-            List<PayFeeDto> payFeeDtos = payFeeNewV1InnerServiceSMOImpl.queryPayFeeNews(payFeeDto);
+            List<PayFeeDto> payFeeDtos = payFeeV1InnerServiceSMOImpl.queryPayFees(payFeeDto);
             if (payFeeDtos != null && payFeeDtos.size() > 0) {
                 throw new CmdException("该车辆已经有相关费用，请到停车费中续费。或者联系管理员");
             }

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

@@ -166,7 +166,7 @@ public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
         payFeePo.setBatchId("-1");
         payFeePo.setbId("-1");
         payFeePo.setUserId(userId);
-        flag = payFeeNewV1InnerServiceSMOImpl.savePayFeeNew(payFeePo);
+        flag = payFeeNewV1InnerServiceSMOImpl.savePayFee(payFeePo);
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }

service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java

@@ -24,6 +24,7 @@ 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.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -82,7 +83,7 @@ public class SaveRoomCreateFeeCmd extends AbstractServiceCmdListener {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-        String userId = cmdDataFlowContext.getResHeaders().get("user-id");
+        String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
         reqJson.put("userId", userId);
         List<RoomDto> roomDtos = null;
         FeeConfigDto feeConfigDto = new FeeConfigDto();