From 1cdc1042e0462e0825bd07ceda95b236c7cf6d0d Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Thu, 25 Mar 2021 14:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ .../src/main/java/com/ruoyi/RuoYiApplication.java | 2 +- ruoyi-admin/src/main/resources/application.yml | 2 +- .../com/ruoyi/framework/config/ApplicationConfig.java | 2 +- .../activity/controller/DrawPrizeInfoController.java | 8 ++++---- .../com/sinosoft/activity/domain/DrawPrizeInfo.java | 2 +- .../sinosoft/activity/mapper/DrawPrizeInfoMapper.java | 4 ++-- .../activity/service/IDrawPrizeInfoService.java | 4 ++-- .../service/impl/DrawPrizeInfoServiceImpl.java | 8 ++++---- .../resources/mapper/activity/DrawPrizeInfoMapper.xml | 10 +++++----- .../resources/templates/activity/prizeInfo/add.html | 2 +- .../resources/templates/activity/prizeInfo/edit.html | 2 +- .../resources/templates/activity/prizeInfo/info.html | 2 +- 13 files changed, 30 insertions(+), 24 deletions(-) rename sino-activity/src/main/java/{cn => }/com/sinosoft/activity/controller/DrawPrizeInfoController.java (95%) rename sino-activity/src/main/java/{cn => }/com/sinosoft/activity/domain/DrawPrizeInfo.java (98%) rename sino-activity/src/main/java/{cn => }/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java (93%) rename sino-activity/src/main/java/{cn => }/com/sinosoft/activity/service/IDrawPrizeInfoService.java (93%) rename sino-activity/src/main/java/{cn => }/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java (91%) diff --git a/pom.xml b/pom.xml index 4c53c85a1..d29292ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -200,6 +200,12 @@ ${ruoyi.version} + + com.ruoyi + sino-activity + ${ruoyi.version} + + com.ruoyi diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd4..1a736e1f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author ruoyi */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = "com") public class RuoYiApplication { public static void main(String[] args) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d013a3f1e..2461f46a6 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -73,7 +73,7 @@ spring: # MyBatis mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index b6b0e88c6..ddbc26fa3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.**.mapper") public class ApplicationConfig { diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawPrizeInfoController.java similarity index 95% rename from sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java rename to sino-activity/src/main/java/com/sinosoft/activity/controller/DrawPrizeInfoController.java index adf2c8eb6..9b251e326 100644 --- a/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawPrizeInfoController.java @@ -1,4 +1,4 @@ -package cn.com.sinosoft.activity.controller; +package com.sinosoft.activity.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; -import cn.com.sinosoft.activity.domain.DrawPrizeInfo; -import cn.com.sinosoft.activity.service.IDrawPrizeInfoService; +import com.sinosoft.activity.domain.DrawPrizeInfo; +import com.sinosoft.activity.service.IDrawPrizeInfoService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2021-03-25 */ @Controller -@RequestMapping("/activity/info") +@RequestMapping("/activity/prize") public class DrawPrizeInfoController extends BaseController { private String prefix = "activity/prizeInfo"; diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/domain/DrawPrizeInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java similarity index 98% rename from sino-activity/src/main/java/cn/com/sinosoft/activity/domain/DrawPrizeInfo.java rename to sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java index 1f7378f11..dff2a7242 100644 --- a/sino-activity/src/main/java/cn/com/sinosoft/activity/domain/DrawPrizeInfo.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java @@ -1,4 +1,4 @@ -package cn.com.sinosoft.activity.domain; +package com.sinosoft.activity.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java similarity index 93% rename from sino-activity/src/main/java/cn/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java rename to sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java index df986e730..208b366e6 100644 --- a/sino-activity/src/main/java/cn/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java @@ -1,7 +1,7 @@ -package cn.com.sinosoft.activity.mapper; +package com.sinosoft.activity.mapper; import java.util.List; -import cn.com.sinosoft.activity.domain.DrawPrizeInfo; +import com.sinosoft.activity.domain.DrawPrizeInfo; /** * 存储奖品的基础信息Mapper接口 diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/service/IDrawPrizeInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java similarity index 93% rename from sino-activity/src/main/java/cn/com/sinosoft/activity/service/IDrawPrizeInfoService.java rename to sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java index 6d953dcca..9de3daee9 100644 --- a/sino-activity/src/main/java/cn/com/sinosoft/activity/service/IDrawPrizeInfoService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java @@ -1,7 +1,7 @@ -package cn.com.sinosoft.activity.service; +package com.sinosoft.activity.service; import java.util.List; -import cn.com.sinosoft.activity.domain.DrawPrizeInfo; +import com.sinosoft.activity.domain.DrawPrizeInfo; /** * 存储奖品的基础信息Service接口 diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java similarity index 91% rename from sino-activity/src/main/java/cn/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java rename to sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java index d45f1b3c2..f48a57ded 100644 --- a/sino-activity/src/main/java/cn/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java @@ -1,11 +1,11 @@ -package cn.com.sinosoft.activity.service.impl; +package com.sinosoft.activity.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import cn.com.sinosoft.activity.mapper.DrawPrizeInfoMapper; -import cn.com.sinosoft.activity.domain.DrawPrizeInfo; -import cn.com.sinosoft.activity.service.IDrawPrizeInfoService; +import com.sinosoft.activity.mapper.DrawPrizeInfoMapper; +import com.sinosoft.activity.domain.DrawPrizeInfo; +import com.sinosoft.activity.service.IDrawPrizeInfoService; import com.ruoyi.common.core.text.Convert; /** diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml index 3906e103a..078f4d919 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select PRIZEID, PRIZECODE, PRIZENAME, PRIZETYPE, PRIZEVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, INTEGRALPROJECTCODE from draw_prize_info - and PRIZECODE = #{PRIZECODE} @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where PRIZEID = #{PRIZEID} - + insert into draw_prize_info PRIZEID, @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update draw_prize_info PRIZECODE = #{PRIZECODE}, diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html index 68f841b55..75f5c8692 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html @@ -79,7 +79,7 @@