edit

xumiao
1 parent b305f573
Showing 3 changed files with 187 additions and 99 deletions
src/main/java/com/huaheng/api/jindie/InvokeHelper.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
@@ -19,11 +19,14 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.DateUtils;
 import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.aspectj.ApiLogAspect;
 import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.supplier.domain.Supplier;
 import com.huaheng.pc.config.supplier.service.SupplierService;
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.huaheng.pc.monitor.apilog.service.IApiLogService;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
@@ -34,7 +37,9 @@ import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.system.config.service.IConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
@@ -64,15 +69,22 @@ public class InvokeHelper {
     private IConfigService configService;
     @Autowired
     private SupplierService supplierService;
+    @Autowired
+    private IApiLogService apiLogService;
+    @Autowired
+    private ApiLogAspect apiLogAspect;
  
     public static String POST_K3CloudURL = "http://219.137.250.36:8999/K3Cloud/";
  
+    private ApiLog apiLog;
+
     // Cookie 值
     // private static String CookieVal = null;
  
     // HttpURLConnection
-    public  HttpURLConnection initUrlConn(String url, JSONObject paras)
+    public synchronized HttpURLConnection initUrlConn(String url, JSONObject paras)
             throws Exception {
+
         System.out.println(paras.toString());
         URL postUrl = new URL(POST_K3CloudURL.concat(url));
         HttpURLConnection connection = (HttpURLConnection) postUrl
@@ -90,6 +102,7 @@ public class InvokeHelper {
         out.writeBytes(paras.toString());
         out.flush();
         out.close();
+        apiLog = ApiLogAspect.initApiLog(connection, paras.toString(), "CS0001");
         return connection;
     }
  
@@ -99,7 +112,6 @@ public class InvokeHelper {
      */
  
     // 收料通知单下推采购入库单
-    @Transactional(rollbackFor = Exception.class)
     public void push(String billCode) throws Exception {
         PurchasePush purchasePush=new PurchasePush();
         PurchasePushData purchasePushData=new PurchasePushData();
@@ -112,16 +124,51 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.setFormid("PUR_ReceiveBill");
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity = Invoke(JinDieApiUri.PURCHASE_PUSH.getApiUri(), jsonObject);
-        Integer id = successEntity.getId();
-        String number = successEntity.getNumber();
-        Integer dIndex = successEntity.getDIndex();
+        Results.ResultDTO.ResponseStatusDTO responseStatusDTO = Invoke(JinDieApiUri.PURCHASE_PUSH.getApiUri(), jsonObject);
+        receiptResultHandle(responseStatusDTO,billCode,"push");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void receiptResultHandle(Results.ResultDTO.ResponseStatusDTO responseStatusDTO,String billCode,String flag){
+        List<Results.ResultDTO.ResponseStatusDTO.SuccessEntitys> successEntitys = responseStatusDTO.getSuccessEntitys();
+        List<Results.ResultDTO.ResponseStatusDTO.ErrorsDTO> errors = responseStatusDTO.getErrors();
+        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity=null;
+        Results.ResultDTO.ResponseStatusDTO.ErrorsDTO errorsDTO=null;
         ReceiptHeader receiptHeader = receiptHeaderService.getOne(new LambdaQueryWrapper<ReceiptHeader>().eq(ReceiptHeader::getReferCode, billCode));
-        receiptHeader.setUserDef1(id.toString());
-        receiptHeader.setUserDef2(number);
-        receiptHeaderService.updateById(receiptHeader);
+        if(!CollectionUtils.isEmpty(successEntitys)){
+            successEntity = successEntitys.get(0);
+            if(flag.equals("push")){
+                Integer id = successEntity.getId();
+                String number = successEntity.getNumber();
+                Integer dIndex = successEntity.getDIndex();
+                receiptHeader.setUserDef1(id.toString());
+                receiptHeader.setUserDef2(number);
+                receiptHeader.setUserDef3("成功");
+            }else if(flag.equals("save")){
+                receiptHeader.setUserDef4("成功");
+            }else if(flag.equals("submit")){
+                receiptHeader.setUserDef5("成功");
+            }else if(flag.equals("audit")){
+                receiptHeader.setUserDef6("成功");
+            }
+            receiptHeaderService.updateById(receiptHeader);
+        }else {
+            errorsDTO = errors.get(0);
+            String message = errorsDTO.getMessage();
+            if(flag.equals("push")){
+                receiptHeader.setUserDef3(message);
+            }else if(flag.equals("save")){
+                receiptHeader.setUserDef4(message);
+            }else if(flag.equals("submit")){
+                receiptHeader.setUserDef5(message);
+            }else if(flag.equals("audit")){
+                receiptHeader.setUserDef6(message);
+            }
+            receiptHeaderService.updateById(receiptHeader);
+        }
     }
  
+
     // 采购入库单查询
     @Transactional(rollbackFor = Exception.class)
     public void select(String billCode) throws Exception {
@@ -161,7 +208,8 @@ public class InvokeHelper {
             }
         });
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseBatchSave);
-        Invoke(JinDieApiUri.PURCHASE_SAVE.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_SAVE.getApiUri(), jsonObject);
+        receiptResultHandle(invoke,billCode,"save");
         System.out.println("Save:"+"单号"+billCode+"成功！");
     }
  
@@ -174,7 +222,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(receiptHeader.getUserDef1());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.PURCHASE_SUBMIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_SUBMIT.getApiUri(), jsonObject);
+        receiptResultHandle(invoke,billCode,"submit");
         System.out.println("Submit:"+"单号"+billCode+"成功！");
     }
  
@@ -187,7 +236,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(receiptHeader.getUserDef1());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.PURCHASE_AUDIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_AUDIT.getApiUri(), jsonObject);
+        receiptResultHandle(invoke,billCode,"audit");
         System.out.println("Audit:"+"单号"+billCode+"成功！");
     }
  
@@ -217,7 +267,6 @@ public class InvokeHelper {
      * @param FDestStockId    调入仓库编码
      * @throws Exception
      */
-    @Transactional(rollbackFor = Exception.class)
     public void allocateSave(String referCode,String FSrcStockId,String FDestStockId) throws Exception {
         ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode, referCode));
         List<ShipmentDetail> shipmentDetails = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getReferCode, referCode));
@@ -253,15 +302,46 @@ public class InvokeHelper {
             allocate.getData().getModel().setFBillEntry(fBillEntryDTOS);
         }));
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(allocate);
-        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys invoke = Invoke(JinDieApiUri.ALLOCATE_SAVE.getApiUri(), jsonObject);
-        Integer id = invoke.getId();
-        String number = invoke.getNumber();
-        shipmentHeader.setUserDef1(id.toString());
-        shipmentHeader.setUserDef2(number);
-        shipmentHeaderService.updateById(shipmentHeader);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.ALLOCATE_SAVE.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"save");
         System.out.println("allocateSave:"+"单号"+referCode+"成功！");
     }
  
+    @Transactional(rollbackFor = Exception.class)
+    public void shipmentResultHandle(Results.ResultDTO.ResponseStatusDTO responseStatusDTO,String billCode,String flag){
+        List<Results.ResultDTO.ResponseStatusDTO.SuccessEntitys> successEntitys = responseStatusDTO.getSuccessEntitys();
+        List<Results.ResultDTO.ResponseStatusDTO.ErrorsDTO> errors = responseStatusDTO.getErrors();
+        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity=null;
+        Results.ResultDTO.ResponseStatusDTO.ErrorsDTO errorsDTO=null;
+        ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode, billCode));
+        if(!CollectionUtils.isEmpty(successEntitys)){
+            successEntity = successEntitys.get(0);
+            if(flag.equals("save")){
+                Integer id = successEntity.getId();
+                String number = successEntity.getNumber();
+                shipmentHeader.setUserDef1(id.toString());
+                shipmentHeader.setUserDef2(number);
+                shipmentHeader.setUserDef4("成功");
+            }else if(flag.equals("submit")){
+                shipmentHeader.setUserDef5("成功");
+            }else if(flag.equals("audit")){
+                shipmentHeader.setUserDef6("成功");
+            }
+            shipmentHeaderService.updateById(shipmentHeader);
+        }else {
+            errorsDTO = errors.get(0);
+            String message = errorsDTO.getMessage();
+            if(flag.equals("save")){
+                shipmentHeader.setUserDef4(message);
+            }else if(flag.equals("submit")){
+                shipmentHeader.setUserDef5(message);
+            }else if(flag.equals("audit")){
+                shipmentHeader.setUserDef6(message);
+            }
+            shipmentHeaderService.updateById(shipmentHeader);
+        }
+    }
+
     //直接调拨单提交
     public void allocateSubmit(String referCode) throws Exception {
         ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode, referCode));
@@ -271,7 +351,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(shipmentHeader.getUserDef1());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.ALLOCATE_SUBMIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.ALLOCATE_SUBMIT.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"submit");
         System.out.println("allocateSubmit:"+"单号"+referCode+"成功！");
     }
  
@@ -284,7 +365,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(shipmentHeader.getUserDef1());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.ALLOCATE_AUDIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.ALLOCATE_AUDIT.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"audit");
         System.out.println("allocateAudit:"+"单号"+referCode+"成功！");
     }
  
@@ -294,7 +376,6 @@ public class InvokeHelper {
      */
  
     //采购退货单保存
-    @Transactional(rollbackFor = Exception.class)
     public void purchase_return_save(String referCode) throws Exception {
         ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode, referCode));
         List<ShipmentDetail> shipmentDetails = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getReferCode, referCode));
@@ -319,12 +400,8 @@ public class InvokeHelper {
            // }
         });
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseReturnSave);
-        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity = Invoke(JinDieApiUri.PURCHASE_RETURN_SAVE.getApiUri(), jsonObject);
-        Integer id = successEntity.getId();
-        String number = successEntity.getNumber();
-        shipmentHeader.setUserDef1(id.toString());
-        shipmentHeader.setUserDef2(number);
-        shipmentHeaderService.updateById(shipmentHeader);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_RETURN_SAVE.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"save");
         System.out.println("PURCHASE_RETURN_SAVE:"+"单号"+referCode+"成功！");
     }
  
@@ -337,7 +414,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(shipmentHeader.getReferLineId().toString());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.PURCHASE_RETURN_SUBMIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_RETURN_SUBMIT.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"submit");
         System.out.println("PURCHASE_RETURN_SUBMIT:"+"单号"+referCode+"成功！");
     }
  
@@ -350,7 +428,8 @@ public class InvokeHelper {
         purchasePush.setData(purchasePushData);
         purchasePush.getData().setIds(shipmentHeader.getReferLineId().toString());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush);
-        Invoke(JinDieApiUri.PURCHASE_RETURN_AUDIT.getApiUri(), jsonObject);
+        Results.ResultDTO.ResponseStatusDTO invoke = Invoke(JinDieApiUri.PURCHASE_RETURN_AUDIT.getApiUri(), jsonObject);
+        shipmentResultHandle(invoke,referCode,"audit");
         System.out.println("PURCHASE_RETURN_AUDIT:"+"单号"+referCode+"成功！");
     }
  
@@ -400,7 +479,7 @@ public class InvokeHelper {
      * @return  Results.ResultDTO.ResponseStatusDTO.SuccessEntitys
      * @throws Exception
      */
-    public  Results.ResultDTO.ResponseStatusDTO.SuccessEntitys Invoke(String uri,JSONObject jParas)
+    public  Results.ResultDTO.ResponseStatusDTO Invoke(String uri,JSONObject jParas)
             throws Exception {
         HttpURLConnection connectionInvoke = initUrlConn(uri, jParas);
         BufferedReader reader = new BufferedReader(new InputStreamReader(connectionInvoke.getInputStream()));
@@ -410,24 +489,25 @@ public class InvokeHelper {
             sResult = new String(line.getBytes(), "utf-8");
             System.out.println(sResult);
         }
+        ApiLogAspect.finishApiLog(apiLog,connectionInvoke,sResult);
         Results results = JSONObject.parseObject(sResult, Results.class);
-        List<Results.ResultDTO.ResponseStatusDTO.SuccessEntitys> successEntitys = results.getResult().getResponseStatus().getSuccessEntitys();
-        List<Results.ResultDTO.ResponseStatusDTO.ErrorsDTO> errors = results.getResult().getResponseStatus().getErrors();
-        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity=null;
-        Results.ResultDTO.ResponseStatusDTO.ErrorsDTO errorsDTO=null;
-        if(!CollectionUtils.isEmpty(successEntitys)){
-            successEntity = successEntitys.get(0);
-        }else {
-            errorsDTO = errors.get(0);
-        }
+//        List<Results.ResultDTO.ResponseStatusDTO.SuccessEntitys> successEntitys = results.getResult().getResponseStatus().getSuccessEntitys();
+//        List<Results.ResultDTO.ResponseStatusDTO.ErrorsDTO> errors = results.getResult().getResponseStatus().getErrors();
+//        Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity=null;
+//        Results.ResultDTO.ResponseStatusDTO.ErrorsDTO errorsDTO=null;
+//        if(!CollectionUtils.isEmpty(successEntitys)){
+//            successEntity = successEntitys.get(0);
+//        }else {
+//            errorsDTO = errors.get(0);
+//        }
         reader.close();
         connectionInvoke.disconnect();
-        if(StringUtils.isNotNull(successEntity)){
-            return successEntity;
-        }else {
-            throw new ServiceException(errorsDTO.getMessage());
-        }
-
+//        if(StringUtils.isNotNull(successEntity)){
+//            return successEntity;
+//        }else {
+//            throw new ServiceException(errorsDTO.getMessage());
+//        }
+        return results.getResult().getResponseStatus();
     }
  
     /**
@@ -394,15 +394,19 @@ public class RyTask extends BaseController {
                         invokeHelper.select(referCode);
                     }else {
                         invokeHelper.save(referCode);
-                        invokeHelper.submit(referCode);
-                        invokeHelper.audit(referCode);
-                        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
-                        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
-                        receiptHeaderService.updateById(receiptHeader);
-                        receiptDetails.forEach(receiptDetail -> {
-                            receiptDetail.setProcessStamp(QuantityConstant.RECEIPT_HEADER_RETURN.toString());
-                            receiptDetailService.updateById(receiptDetail);
-                        });
+                        if(receiptHeader.getUserDef4().equals("成功")){
+                            invokeHelper.submit(referCode);
+                        }
+                        if(receiptHeader.getUserDef5().equals("成功")){
+                            invokeHelper.audit(referCode);
+                            receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+                            receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+                            receiptHeaderService.updateById(receiptHeader);
+                            receiptDetails.forEach(receiptDetail -> {
+                                receiptDetail.setProcessStamp(QuantityConstant.RECEIPT_HEADER_RETURN.toString());
+                                receiptDetailService.updateById(receiptDetail);
+                            });
+                        }
                     }
                 }
             }
@@ -430,16 +434,20 @@ public class RyTask extends BaseController {
                         invokeHelper.allocateSave(referCode,shipmentHeader.getFSrcStockId(),shipmentHeader.getFDestStockId());
                     }
                 }else {
-                    invokeHelper.allocateSubmit(referCode);
-                    invokeHelper.allocateAudit(referCode);
-                    shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-                    shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-                    shipmentHeaderService.updateById(shipmentHeader);
-                    List<ShipmentDetail> shipmentDetails = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
-                    shipmentDetails.forEach(shipmentDetail -> {
-                        shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-                        shipmentDetailService.updateById(shipmentDetail);
-                    });
+                    if(shipmentHeader.getUserDef4().equals("成功")){
+                        invokeHelper.allocateSubmit(referCode);
+                    }
+                    if(shipmentHeader.getUserDef5().equals("成功")){
+                        invokeHelper.allocateAudit(referCode);
+                        shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+                        shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+                        shipmentHeaderService.updateById(shipmentHeader);
+                        List<ShipmentDetail> shipmentDetails = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
+                        shipmentDetails.forEach(shipmentDetail -> {
+                            shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+                            shipmentDetailService.updateById(shipmentDetail);
+                        });
+                    }
                 }
             }
         }
@@ -399,40 +399,40 @@ public class ShipmentHeader implements Serializable {
     @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
-//    /**
-//     * 自定义字段4
-//     */
-//    @TableField(value = "userDef4")
-//    @ApiModelProperty(value = "自定义字段4")
-//    private String userDef4;
-//
-//    /**
-//     * 自定义字段5
-//     */
-//    @TableField(value = "userDef5")
-//    @ApiModelProperty(value = "自定义字段5")
-//    private String userDef5;
-//
-//    /**
-//     * 自定义字段6
-//     */
-//    @TableField(value = "userDef6")
-//    @ApiModelProperty(value = "自定义字段6")
-//    private String userDef6;
-//
-//    /**
-//     * 自定义字段7
-//     */
-//    @TableField(value = "userDef7")
-//    @ApiModelProperty(value = "自定义字段7")
-//    private String userDef7;
-//
-//    /**
-//     * 自定义字段8
-//     */
-//    @TableField(value = "userDef8")
-//    @ApiModelProperty(value = "自定义字段8")
-//    private String userDef8;
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value = "自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value = "自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value = "自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value = "自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value = "自定义字段8")
+    private String userDef8;
  
     /**
      * 处理标记