From 47e3087067abd35e6337c011f96d2338c0bb1aae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2024 13:39:31 +0800
Subject: [PATCH] 优化自动化代码

---
 src/main/java/org/yeshi/utils/generater/vo/service/ServiceInfoVO.java |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/yeshi/utils/generater/vo/service/ServiceInfoVO.java b/src/main/java/org/yeshi/utils/generater/vo/service/ServiceInfoVO.java
index 3e7610e..e78d87f 100644
--- a/src/main/java/org/yeshi/utils/generater/vo/service/ServiceInfoVO.java
+++ b/src/main/java/org/yeshi/utils/generater/vo/service/ServiceInfoVO.java
@@ -1,28 +1,32 @@
 package org.yeshi.utils.generater.vo.service;
 
 import org.yeshi.utils.StringUtil;
+import org.yeshi.utils.bean.BeanUtil;
 import org.yeshi.utils.generater.entity.BaseData;
 import org.yeshi.utils.generater.entity.ClassInfo;
 import org.yeshi.utils.generater.util.EntityUtil;
 
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class ServiceInfoVO extends BaseData {
+    private List<String> importList;
     private ClassInfo service;
-    private ClassInfo dao;
     //鏂规硶鍒楄〃
     private List<ServiceMetodInfoVO> metodInfoList;
-    private ClassInfo query;
+    private ClassInfo query;;
 
 
     public static class Builder {
         private Class entity;
         private String packageName;
-        private ClassInfo dao;
         private ClassInfo service;
         private ClassInfo query;
+        private ClassInfo exception;
+
 
 
         public Builder setEntity(Class entity) {
@@ -35,11 +39,6 @@
             return this;
         }
 
-        public Builder setDao(ClassInfo dao) {
-            this.dao = dao;
-            return this;
-        }
-
         public Builder setService(ClassInfo service) {
             this.service = service;
             return this;
@@ -47,6 +46,11 @@
 
         public Builder setQuery(ClassInfo query) {
             this.query = query;
+            return this;
+        }
+
+        public Builder setException(ClassInfo exception) {
+            this.exception = exception;
             return this;
         }
 
@@ -82,9 +86,6 @@
             if (packageName == null) {
                 throw new Exception("packageName涓嶈兘涓虹┖");
             }
-            if (dao == null) {
-                throw new Exception("dao涓嶈兘涓虹┖");
-            }
             if (service == null) {
                 throw new Exception("service涓嶈兘涓虹┖");
             }
@@ -102,13 +103,13 @@
                 throw new Exception("灏氭湭鎵惧埌涓婚敭灞炴��");
             }
             ServiceInfoVO serviceData = new ServiceInfoVO();
-            serviceData.setDao(dao);
             serviceData.setService(service);
             serviceData.setEntity(new ClassInfo(entity.getSimpleName(), entity.getName()));
             serviceData.setPackageName(packageName);
             serviceData.setQuery(query);
             //璁剧疆鎺ュ彛
             List<ServiceMetodInfoVO> metodInfoVOList = new ArrayList<>();
+            List<String> importList = new ArrayList<>();
             /*******娣诲姞鏂规硶寮�濮�*******/
             List<String> params = null;
             ServiceMetodInfoVO metodInfo = null;
@@ -132,12 +133,20 @@
             params.add(identifyId.getType().getSimpleName() + " id");
             metodInfo = new ServiceMetodInfoVO("public", serviceData.getEntity().getName(), "get", StringUtil.concat(params, ","));
             metodInfo.setNote(getMethodRemarks("get"));
+
             metodInfoVOList.add(metodInfo);
             //add鏂规硶
             params = new ArrayList<>();
             params.add(serviceData.getEntity().getName() + " " + StringUtil.firstCharToLower(serviceData.getEntity().getName()));
             metodInfo = new ServiceMetodInfoVO("public", "void", "add", StringUtil.concat(params, ","));
             metodInfo.setNote(getMethodRemarks("add"));
+            if (exception != null) {
+                metodInfo.setExceptions(exception.getName());
+                importList.add(exception.getClazz());
+            } else {
+                metodInfo.setExceptions("Exception");
+                importList.add(Exception.class.getName());
+            }
             metodInfoVOList.add(metodInfo);
             //update鏂规硶
             params = new ArrayList<>();
@@ -155,6 +164,17 @@
             /*******娣诲姞鏂规硶缁撴潫*******/
             serviceData.setMetodInfoList(metodInfoVOList);
 
+
+            importList.add(Resource.class.getName());
+            importList.add(Date.class.getName());
+            importList.add(BeanUtil.class.getName());
+            importList.add(List.class.getName());
+            importList.add(entity.getName());
+            importList.add(service.getClazz());
+            importList.add(query.getClazz());
+
+            serviceData.setImportList(importList);
+
             return serviceData;
         }
 
@@ -166,14 +186,6 @@
 
     public void setService(ClassInfo service) {
         this.service = service;
-    }
-
-    public ClassInfo getDao() {
-        return dao;
-    }
-
-    public void setDao(ClassInfo dao) {
-        this.dao = dao;
     }
 
     public List<ServiceMetodInfoVO> getMetodInfoList() {
@@ -191,4 +203,13 @@
     public void setQuery(ClassInfo query) {
         this.query = query;
     }
+
+    public List<String> getImportList() {
+        return importList;
+    }
+
+    public void setImportList(List<String> importList) {
+        this.importList = importList;
+    }
+
 }

--
Gitblit v1.8.0