From 816022de986f97869923dc8024e4985242a9068e Mon Sep 17 00:00:00 2001 From: liufan9527 <937359084@qq.com> Date: 星期三, 27 十一月 2024 09:39:49 +0800 Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud --- se-modules/se-system/src/main/java/com/se/system/controller/GenController.java | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/se-modules/se-gen/src/main/java/com/se/gen/controller/GenController.java b/se-modules/se-system/src/main/java/com/se/system/controller/GenController.java similarity index 88% rename from se-modules/se-gen/src/main/java/com/se/gen/controller/GenController.java rename to se-modules/se-system/src/main/java/com/se/system/controller/GenController.java index 7a5dc12..48eea6e 100644 --- a/se-modules/se-gen/src/main/java/com/se/gen/controller/GenController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/GenController.java @@ -1,23 +1,5 @@ -package com.se.gen.controller; +package com.se.system.controller; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - -import com.se.gen.domain.GenTableColumn; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.se.common.core.text.Convert; import com.se.common.core.web.controller.BaseController; import com.se.common.core.web.domain.AjaxResult; @@ -25,9 +7,20 @@ import com.se.common.log.annotation.Log; import com.se.common.log.enums.BusinessType; import com.se.common.security.annotation.RequiresPermissions; -import com.se.gen.domain.GenTable; -import com.se.gen.service.IGenTableColumnService; -import com.se.gen.service.IGenTableService; +import com.se.system.domain.GenTable; +import com.se.system.domain.GenTableColumn; +import com.se.system.service.inte.IGenTableColumnService; +import com.se.system.service.inte.IGenTableService; +import org.apache.commons.io.IOUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 浠g爜鐢熸垚 鎿嶄綔澶勭悊 @@ -38,10 +31,10 @@ @RestController public class GenController extends BaseController { - @Autowired + @Resource private IGenTableService genTableService; - @Autowired + @Resource private IGenTableColumnService genTableColumnService; /** -- Gitblit v1.9.3