ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

包结构修改

This commit is contained in:
dy 2021-03-25 14:55:20 +08:00
parent cc9d3d353c
commit 1cdc1042e0
13 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -200,6 +200,12 @@
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>sino-activity</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* *
* @author ruoyi * @author ruoyi
*/ */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = "com")
public class RuoYiApplication public class RuoYiApplication
{ {
public static void main(String[] args) public static void main(String[] args)

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -73,7 +73,7 @@ spring:
# MyBatis # MyBatis
mybatis: mybatis:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件 # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
View File

@ -13,7 +13,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
// 表示通过aop框架暴露该代理对象,AopContext能够访问 // 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true) @EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径 // 指定要扫描的Mapper类的包的路径
@MapperScan("com.ruoyi.**.mapper") @MapperScan("com.**.mapper")
public class ApplicationConfig public class ApplicationConfig
{ {

8
sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java → sino-activity/src/main/java/com/sinosoft/activity/controller/DrawPrizeInfoController.java
View File

@ -1,4 +1,4 @@
package cn.com.sinosoft.activity.controller; package com.sinosoft.activity.controller;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; 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 org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import cn.com.sinosoft.activity.domain.DrawPrizeInfo; import com.sinosoft.activity.domain.DrawPrizeInfo;
import cn.com.sinosoft.activity.service.IDrawPrizeInfoService; import com.sinosoft.activity.service.IDrawPrizeInfoService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @date 2021-03-25 * @date 2021-03-25
*/ */
@Controller @Controller
@RequestMapping("/activity/info") @RequestMapping("/activity/prize")
public class DrawPrizeInfoController extends BaseController public class DrawPrizeInfoController extends BaseController
{ {
private String prefix = "activity/prizeInfo"; private String prefix = "activity/prizeInfo";

2
sino-activity/src/main/java/cn/com/sinosoft/activity/domain/DrawPrizeInfo.java → sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java
View File

@ -1,4 +1,4 @@
package cn.com.sinosoft.activity.domain; package com.sinosoft.activity.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

4
sino-activity/src/main/java/cn/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java → sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java
View File

@ -1,7 +1,7 @@
package cn.com.sinosoft.activity.mapper; package com.sinosoft.activity.mapper;
import java.util.List; import java.util.List;
import cn.com.sinosoft.activity.domain.DrawPrizeInfo; import com.sinosoft.activity.domain.DrawPrizeInfo;
/** /**
* 存储奖品的基础信息Mapper接口 * 存储奖品的基础信息Mapper接口

4
sino-activity/src/main/java/cn/com/sinosoft/activity/service/IDrawPrizeInfoService.java → sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java
View File

@ -1,7 +1,7 @@
package cn.com.sinosoft.activity.service; package com.sinosoft.activity.service;
import java.util.List; import java.util.List;
import cn.com.sinosoft.activity.domain.DrawPrizeInfo; import com.sinosoft.activity.domain.DrawPrizeInfo;
/** /**
* 存储奖品的基础信息Service接口 * 存储奖品的基础信息Service接口

8
sino-activity/src/main/java/cn/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java → sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java
View File

@ -1,11 +1,11 @@
package cn.com.sinosoft.activity.service.impl; package com.sinosoft.activity.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import cn.com.sinosoft.activity.mapper.DrawPrizeInfoMapper; import com.sinosoft.activity.mapper.DrawPrizeInfoMapper;
import cn.com.sinosoft.activity.domain.DrawPrizeInfo; import com.sinosoft.activity.domain.DrawPrizeInfo;
import cn.com.sinosoft.activity.service.IDrawPrizeInfoService; import com.sinosoft.activity.service.IDrawPrizeInfoService;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
/** /**

10
sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.sinosoft.activity.mapper.DrawPrizeInfoMapper"> <mapper namespace="com.sinosoft.activity.mapper.DrawPrizeInfoMapper">
<resultMap type="cn.com.sinosoft.activity.domain.DrawPrizeInfo" id="DrawPrizeInfoResult"> <resultMap type="com.sinosoft.activity.domain.DrawPrizeInfo" id="DrawPrizeInfoResult">
<result property="PRIZEID" column="PRIZEID" /> <result property="PRIZEID" column="PRIZEID" />
<result property="PRIZECODE" column="PRIZECODE" /> <result property="PRIZECODE" column="PRIZECODE" />
<result property="PRIZENAME" column="PRIZENAME" /> <result property="PRIZENAME" column="PRIZENAME" />
@ -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 select PRIZEID, PRIZECODE, PRIZENAME, PRIZETYPE, PRIZEVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, INTEGRALPROJECTCODE from draw_prize_info
</sql> </sql>
<select id="selectDrawPrizeInfoList" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo" resultMap="DrawPrizeInfoResult"> <select id="selectDrawPrizeInfoList" parameterType="com.sinosoft.activity.domain.DrawPrizeInfo" resultMap="DrawPrizeInfoResult">
<include refid="selectDrawPrizeInfoVo"/> <include refid="selectDrawPrizeInfoVo"/>
<where> <where>
<if test="PRIZECODE != null and PRIZECODE != ''"> and PRIZECODE = #{PRIZECODE}</if> <if test="PRIZECODE != null and PRIZECODE != ''"> and PRIZECODE = #{PRIZECODE}</if>
@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where PRIZEID = #{PRIZEID} where PRIZEID = #{PRIZEID}
</select> </select>
<insert id="insertDrawPrizeInfo" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo"> <insert id="insertDrawPrizeInfo" parameterType="com.sinosoft.activity.domain.DrawPrizeInfo">
insert into draw_prize_info insert into draw_prize_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="PRIZEID != null">PRIZEID,</if> <if test="PRIZEID != null">PRIZEID,</if>
@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateDrawPrizeInfo" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo"> <update id="updateDrawPrizeInfo" parameterType="com.sinosoft.activity.domain.DrawPrizeInfo">
update draw_prize_info update draw_prize_info
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="PRIZECODE != null">PRIZECODE = #{PRIZECODE},</if> <if test="PRIZECODE != null">PRIZECODE = #{PRIZECODE},</if>

2
sino-activity/src/main/resources/templates/activity/prizeInfo/add.html
View File

@ -79,7 +79,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "activity/info" var prefix = ctx + "activity/prize"
$("#form-info-add").validate({ $("#form-info-add").validate({
focusCleanup: true focusCleanup: true
}); });

2
sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html
View File

@ -80,7 +80,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "activity/info"; var prefix = ctx + "activity/prize";
$("#form-info-edit").validate({ $("#form-info-edit").validate({
focusCleanup: true focusCleanup: true
}); });

2
sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
View File

@ -80,7 +80,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('activity:info:edit')}]]; var editFlag = [[${@permission.hasPermi('activity:info:edit')}]];
var removeFlag = [[${@permission.hasPermi('activity:info:remove')}]]; var removeFlag = [[${@permission.hasPermi('activity:info:remove')}]];
var prefix = ctx + "activity/info"; var prefix = ctx + "activity/prize";
$(function() { $(function() {
var options = { var options = {