syh 4 年 前
コミット
87213ec37a

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/RuleDataTargetController.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 18 - 28
module-common/src/main/java/cn/com/ctop/common/module/message/controller/SysMessageController.java

@@ -1,31 +1,21 @@
-package cn.com.ctop.common.module.message.controller;
+package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
 import cn.com.ctop.common.module.message.entity.SysMessage;
 import cn.com.ctop.common.module.message.service.ISysMessageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.ads.controller.JeecgController;
+import org.jeecg.modules.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 
 /**
  * @Description: 消息
@@ -42,7 +32,7 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 分页列表查询
-	 * 
+	 *
 	 * @param sysMessage
 	 * @param pageNo
 	 * @param pageSize
@@ -60,7 +50,7 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 添加
-	 * 
+	 *
 	 * @param sysMessage
 	 * @return
 	 */
@@ -72,12 +62,12 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 编辑
-	 * 
+	 *
 	 * @param sysMessage
 	 * @return
 	 */
 	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody SysMessage sysMessage) {	
+	public Result<?> edit(@RequestBody SysMessage sysMessage) {
 		sysMessageService.updateById(sysMessage);
         return Result.ok("修改成功!");
 
@@ -85,7 +75,7 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 通过id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -97,7 +87,7 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 批量删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -110,7 +100,7 @@ public class SysMessageController extends JeecgController<SysMessage, ISysMessag
 
 	/**
 	 * 通过id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */

+ 18 - 28
module-common/src/main/java/cn/com/ctop/common/module/message/controller/SysMessageTemplateController.java

@@ -1,35 +1,25 @@
-package cn.com.ctop.common.module.message.controller;
+package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
 import cn.com.ctop.common.module.message.entity.MsgParams;
 import cn.com.ctop.common.module.message.entity.SysMessageTemplate;
 import cn.com.ctop.common.module.message.service.ISysMessageTemplateService;
 import cn.com.ctop.common.module.message.util.PushMsgUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.ads.controller.JeecgController;
+import org.jeecg.modules.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Map;
 
 /**
  * @Description: 消息模板
@@ -48,7 +38,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 分页列表查询
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @param pageNo
 	 * @param pageSize
@@ -66,7 +56,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 添加
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @return
 	 */
@@ -78,7 +68,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 编辑
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @return
 	 */
@@ -90,7 +80,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 通过id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -102,7 +92,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 批量删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -114,7 +104,7 @@ public class SysMessageTemplateController extends JeecgController<SysMessageTemp
 
 	/**
 	 * 通过id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */