diff --git a/doc/api.md b/doc/api.md index d45bf50..23d7d46 100644 --- a/doc/api.md +++ b/doc/api.md @@ -77,7 +77,7 @@ ### 1. 列表 - 请求地址 -`GET` `/blade-business/serverDsiputeConf/getList` +`GET` `/blade-business/serverDisputeConf/getList` - 请求参数 @@ -109,7 +109,7 @@ ### 2. 禁用/启用 - 请求地址 -`POST` `/blade-business/serverDsiputeConf/enable` +`POST` `/blade-business/serverDisputeConf/enable` - 请求参数 @@ -129,7 +129,7 @@ ### 3. 删除 - 请求地址 -`POST` `/blade-business/serverDsiputeConf/delete` +`POST` `/blade-business/serverDisputeConf/delete` - 请求参数 @@ -149,7 +149,7 @@ ### 4. 获取根据id获取详情 - 请求地址 -`GET` `/blade-business/serverDsiputeConf/detail` +`GET` `/blade-business/serverDisputeConf/detail` - 请求参数 @@ -176,7 +176,7 @@ ### 5. 保存 - 请求地址 -`POST` `/blade-business/serverDsiputeConf/save` +`POST` `/blade-business/serverDisputeConf/save` - 请求参数 diff --git a/doc/sql/mysql/business_increase.sql b/doc/sql/mysql/business_increase.sql new file mode 100644 index 0000000..def16a6 --- /dev/null +++ b/doc/sql/mysql/business_increase.sql @@ -0,0 +1,2 @@ +alter table mp_appeal add column `source_type` int(4) default 0 COMMENT '数据来源 0:系统添加, 1:数据导入'; +alter table mp_appeal add column `handle_dept` bigint COMMENT '数据录入时, 处理部门'; diff --git a/src/main/java/org/springblade/appeal/controller/AppealMediationFileController.java b/src/main/java/org/springblade/appeal/controller/AppealMediationFileController.java deleted file mode 100644 index 24961bc..0000000 --- a/src/main/java/org/springblade/appeal/controller/AppealMediationFileController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package org.springblade.appeal.controller; - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 接口权限控制器 - * - * @author BladeX - */ -@NonDS -@RestController -@AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") -public class AppealMediationFileController extends BladeController { - - -} diff --git a/src/main/java/org/springblade/appeal/controller/LargeScreenController.java b/src/main/java/org/springblade/appeal/controller/LargeScreenController.java deleted file mode 100644 index bf83121..0000000 --- a/src/main/java/org/springblade/appeal/controller/LargeScreenController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.springblade.appeal.controller; - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.springblade.core.tenant.annotation.NonDS; -import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@NonDS -@RestController -@AllArgsConstructor -@RequestMapping("/blade-business/report") -@Api(value = "大屏", tags = "大屏") -public class LargeScreenController { - - /** - * 矛盾纠纷化解统计(左1) - */ - @GetMapping("/getMediateFinish") - public R getMediateFinish() { - // 总化解数 - // 本年化解数 - // 本季度化解数 - // 本月化解数 - return R.data(null); - } - - /** - * 矛盾纠纷上报处理列表(左2) - */ - @GetMapping("/getAppealList") - public R getAppealList() { - // - return R.data(null); - } - - /** - * 矛盾纠纷月份趋势统计(左3) - */ - @GetMapping("/getAppealByMon") - public R getAppealByMon() { - return R.data(null); - } - - /** - * 矛盾纠纷类型占比统计(左4) - */ - @GetMapping("/getAppealTypePercent") - public R getAppealTypePercent() { - // 先查所有 - // 根据纠纷类型分组（输入的纠纷类型算其他纠纷） - return R.data(null); - } - - /** - * 矛盾纠纷上报统计(中1) - */ - @GetMapping("/getAppealSubmit") - public R getAppealSubmit() { - return R.data(null); - } - - /** - * 事件上报热力图(中2) - */ - @GetMapping("/getAppealSubmitCountByLoc") - public R getAppealSubmitCountByLoc() { - return R.data(null); - } - - /** - * 矛盾化解热力图(中3) - */ - @GetMapping("/getAppealFinishCountByLoc") - public R getAppealFinishCountByLoc() { - return R.data(null); - } - - /** - * 越级上报热力图(中4) - */ - @GetMapping("/getImmediateCountByLoc") - public R getImmediateCountByLoc() { - return R.data(null); - } - - /** - * 越级上报事件列表(中5) - */ - @GetMapping("/getImmediateList") - public R getImmediateList() { - return R.data(null); - } - - /** - * 矛盾纠纷化解排行（街道/部门）统计(右1-2) - */ - @GetMapping("/getAppealHot") - public R getAppealHot() { - return R.data(null); - } - -} diff --git a/src/main/java/org/springblade/appeal/controller/ServerWindowsDisputeController.java b/src/main/java/org/springblade/appeal/controller/ServerWindowsDisputeController.java deleted file mode 100644 index e1b637b..0000000 --- a/src/main/java/org/springblade/appeal/controller/ServerWindowsDisputeController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package org.springblade.appeal.controller; - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 接口权限控制器 - * - * @author BladeX - */ -@NonDS -@RestController -@AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") -public class ServerWindowsDisputeController extends BladeController { - - -} diff --git a/src/main/java/org/springblade/common/constant/CommonConstant.java b/src/main/java/org/springblade/common/constant/CommonConstant.java index 19dd128..0d73155 100644 --- a/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -30,6 +30,8 @@ public interface CommonConstant { */ String APPLICATION_NAME = AppConstant.APPLICATION_NAME_PREFIX + "api"; + String APPLICATION_NAME_BUSINESS = AppConstant.APPLICATION_NAME_PREFIX + "business"; + /** * sword 系统名 */ diff --git a/src/main/java/org/springblade/appeal/controller/AppealMediationController.java b/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java similarity index 70% rename from src/main/java/org/springblade/appeal/controller/AppealMediationController.java rename to src/main/java/org/springblade/modules/business/controller/AppealMediateController.java index 648b682..d68d208 100644 --- a/src/main/java/org/springblade/appeal/controller/AppealMediationController.java +++ b/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java @@ -14,26 +14,29 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.controller; +package org.springblade.modules.business.controller; +import com.github.xiaoymin.knife4j.annotations.ApiSort; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tenant.annotation.TenantDS; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 接口权限控制器 + * 控制器 * - * @author BladeX + * @author Chill */ -@NonDS +@TenantDS @RestController +@RequestMapping(CommonConstant.APPLICATION_NAME_BUSINESS + "/appealMediate") @AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") -public class AppealMediationController extends BladeController { +@ApiSort(1) +@Api(value = "诉求调解管理", tags = "诉求调解管理接口") +public class AppealMediateController extends BladeController { } diff --git a/src/main/java/org/springblade/appeal/controller/AppealRegController.java b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java similarity index 74% rename from src/main/java/org/springblade/appeal/controller/AppealRegController.java rename to src/main/java/org/springblade/modules/business/controller/AppealRegController.java index 966a9fc..2f9289e 100644 --- a/src/main/java/org/springblade/appeal/controller/AppealRegController.java +++ b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java @@ -14,25 +14,28 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.controller; +package org.springblade.modules.business.controller; +import com.github.xiaoymin.knife4j.annotations.ApiSort; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tenant.annotation.TenantDS; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 接口权限控制器 + * 控制器 * - * @author BladeX + * @author Chill */ -@NonDS +@TenantDS @RestController +@RequestMapping(CommonConstant.APPLICATION_NAME_BUSINESS + "/appealReg") @AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") +@ApiSort(1) +@Api(value = "诉求登记管理", tags = "诉求登记管理接口") public class AppealRegController extends BladeController { diff --git a/src/main/java/org/springblade/appeal/controller/AppealVisitorController.java b/src/main/java/org/springblade/modules/business/controller/ReportController.java similarity index 71% rename from src/main/java/org/springblade/appeal/controller/AppealVisitorController.java rename to src/main/java/org/springblade/modules/business/controller/ReportController.java index 54c0ae4..02dbd47 100644 --- a/src/main/java/org/springblade/appeal/controller/AppealVisitorController.java +++ b/src/main/java/org/springblade/modules/business/controller/ReportController.java @@ -14,26 +14,29 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.controller; +package org.springblade.modules.business.controller; +import com.github.xiaoymin.knife4j.annotations.ApiSort; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tenant.annotation.TenantDS; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 接口权限控制器 + * 控制器 * - * @author BladeX + * @author Chill */ -@NonDS +@TenantDS @RestController +@RequestMapping(CommonConstant.APPLICATION_NAME_BUSINESS + "/report") @AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") -public class AppealVisitorController extends BladeController { +@ApiSort(1) +@Api(value = "统计报表", tags = "统计报表接口") +public class ReportController extends BladeController { } diff --git a/src/main/java/org/springblade/appeal/controller/AppealController.java b/src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java similarity index 66% rename from src/main/java/org/springblade/appeal/controller/AppealController.java rename to src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java index 6e09e95..45a898b 100644 --- a/src/main/java/org/springblade/appeal/controller/AppealController.java +++ b/src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java @@ -14,25 +14,28 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.controller; +package org.springblade.modules.business.controller; -import io.swagger.annotations.Api; +import com.github.xiaoymin.knife4j.annotations.ApiSort; +import io.swagger.annotations.*; import lombok.AllArgsConstructor; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tenant.annotation.TenantDS; import org.springframework.web.bind.annotation.*; /** - * 接口权限控制器 + * 控制器 * - * @author BladeX + * @author Chill */ -@NonDS +@TenantDS @RestController +@RequestMapping(CommonConstant.APPLICATION_NAME_BUSINESS + "/serverDisputeConf") @AllArgsConstructor -@RequestMapping("") -@Api(value = "", tags = "") -public class AppealController extends BladeController { +@ApiSort(1) +@Api(value = "诉求类型管理", tags = "诉求类型管理接口") +public class ServerDisputeConfController extends BladeController { } diff --git a/src/main/java/org/springblade/appeal/entity/Appeal.java b/src/main/java/org/springblade/modules/business/entity/Appeal.java similarity index 97% rename from src/main/java/org/springblade/appeal/entity/Appeal.java rename to src/main/java/org/springblade/modules/business/entity/Appeal.java index 6f012b9..fffd882 100644 --- a/src/main/java/org/springblade/appeal/entity/Appeal.java +++ b/src/main/java/org/springblade/modules/business/entity/Appeal.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/org/springblade/appeal/entity/AppealMediation.java b/src/main/java/org/springblade/modules/business/entity/AppealMediation.java similarity index 97% rename from src/main/java/org/springblade/appeal/entity/AppealMediation.java rename to src/main/java/org/springblade/modules/business/entity/AppealMediation.java index fe6434d..323aead 100644 --- a/src/main/java/org/springblade/appeal/entity/AppealMediation.java +++ b/src/main/java/org/springblade/modules/business/entity/AppealMediation.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/org/springblade/appeal/entity/AppealMediationFile.java b/src/main/java/org/springblade/modules/business/entity/AppealMediationFile.java similarity index 95% rename from src/main/java/org/springblade/appeal/entity/AppealMediationFile.java rename to src/main/java/org/springblade/modules/business/entity/AppealMediationFile.java index a369e62..0b1e53f 100644 --- a/src/main/java/org/springblade/appeal/entity/AppealMediationFile.java +++ b/src/main/java/org/springblade/modules/business/entity/AppealMediationFile.java @@ -14,15 +14,13 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.util.Date; - /** * 调解附件表 * @author Chill diff --git a/src/main/java/org/springblade/appeal/entity/AppealReg.java b/src/main/java/org/springblade/modules/business/entity/AppealReg.java similarity index 97% rename from src/main/java/org/springblade/appeal/entity/AppealReg.java rename to src/main/java/org/springblade/modules/business/entity/AppealReg.java index 0a87cd7..3eab7cb 100644 --- a/src/main/java/org/springblade/appeal/entity/AppealReg.java +++ b/src/main/java/org/springblade/modules/business/entity/AppealReg.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/org/springblade/appeal/entity/AppealVisitor.java b/src/main/java/org/springblade/modules/business/entity/AppealVisitor.java similarity index 96% rename from src/main/java/org/springblade/appeal/entity/AppealVisitor.java rename to src/main/java/org/springblade/modules/business/entity/AppealVisitor.java index 5885508..5eed251 100644 --- a/src/main/java/org/springblade/appeal/entity/AppealVisitor.java +++ b/src/main/java/org/springblade/modules/business/entity/AppealVisitor.java @@ -14,15 +14,13 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.util.Date; - /** * 诉求调解表 * @author Chill diff --git a/src/main/java/org/springblade/appeal/entity/ServerWindowsDispute.java b/src/main/java/org/springblade/modules/business/entity/ServerWindowsDispute.java similarity index 96% rename from src/main/java/org/springblade/appeal/entity/ServerWindowsDispute.java rename to src/main/java/org/springblade/modules/business/entity/ServerWindowsDispute.java index ebe42bd..254c13a 100644 --- a/src/main/java/org/springblade/appeal/entity/ServerWindowsDispute.java +++ b/src/main/java/org/springblade/modules/business/entity/ServerWindowsDispute.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.entity; +package org.springblade.modules.business.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.java similarity index 90% rename from src/main/java/org/springblade/appeal/mapper/AppealMapper.java rename to src/main/java/org/springblade/modules/business/mapper/AppealMapper.java index ae2f8a3..9e0cb25 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.Appeal; +import org.springblade.modules.business.entity.Appeal; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml similarity index 68% rename from src/main/java/org/springblade/appeal/mapper/AppealMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml index 43f1c51..df1ac63 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.java similarity index 89% rename from src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.java rename to src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.java index 61e8aa7..9f8d6b7 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.AppealMediationFile; +import org.springblade.modules.business.entity.AppealMediationFile; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.xml similarity index 64% rename from src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.xml index 85c1bfb..09836a1 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMediationFileMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMediationFileMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.java similarity index 89% rename from src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.java rename to src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.java index eab4762..57a220d 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.AppealMediation; +import org.springblade.modules.business.entity.AppealMediation; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.xml similarity index 65% rename from src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.xml index 768e20d..19ec7c7 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealMediationMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealMediationMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/mapper/AppealRegMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java similarity index 90% rename from src/main/java/org/springblade/appeal/mapper/AppealRegMapper.java rename to src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java index 8fa6d3d..235157c 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealRegMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.AppealReg; +import org.springblade.modules.business.entity.AppealReg; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/AppealRegMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml similarity index 67% rename from src/main/java/org/springblade/appeal/mapper/AppealRegMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml index e13ebbc..6c4145e 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealRegMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.java similarity index 88% rename from src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.java rename to src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.java index 2fff151..f8659ba 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.java @@ -14,11 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.Appeal; -import org.springblade.appeal.entity.AppealVisitor; +import org.springblade.modules.business.entity.AppealVisitor; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.xml similarity index 66% rename from src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.xml index cee6b51..4e9a016 100644 --- a/src/main/java/org/springblade/appeal/mapper/AppealVisitorMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealVisitorMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.java b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java similarity index 89% rename from src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.java rename to src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java index 52ca059..f6f94d0 100644 --- a/src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.mapper; +package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.appeal.entity.ServerWindowsDispute; +import org.springblade.modules.business.entity.ServerWindowsDispute; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.xml similarity index 64% rename from src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.xml rename to src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.xml index a9d708f..00d7a74 100644 --- a/src/main/java/org/springblade/appeal/mapper/ServerWindowsDisputeMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/springblade/appeal/service/IAppealMediationFileService.java b/src/main/java/org/springblade/modules/business/service/IAppealMediationFileService.java similarity index 89% rename from src/main/java/org/springblade/appeal/service/IAppealMediationFileService.java rename to src/main/java/org/springblade/modules/business/service/IAppealMediationFileService.java index 1faa55b..c5be887 100644 --- a/src/main/java/org/springblade/appeal/service/IAppealMediationFileService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealMediationFileService.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.AppealMediationFile; +import org.springblade.modules.business.entity.AppealMediationFile; import org.springblade.core.mp.base.BaseService; /** diff --git a/src/main/java/org/springblade/appeal/service/IAppealMediationService.java b/src/main/java/org/springblade/modules/business/service/IAppealMediationService.java similarity index 89% rename from src/main/java/org/springblade/appeal/service/IAppealMediationService.java rename to src/main/java/org/springblade/modules/business/service/IAppealMediationService.java index 27a4bbc..9d26a86 100644 --- a/src/main/java/org/springblade/appeal/service/IAppealMediationService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealMediationService.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.AppealMediation; +import org.springblade.modules.business.entity.AppealMediation; import org.springblade.core.mp.base.BaseService; /** diff --git a/src/main/java/org/springblade/appeal/service/IAppealRegService.java b/src/main/java/org/springblade/modules/business/service/IAppealRegService.java similarity index 90% rename from src/main/java/org/springblade/appeal/service/IAppealRegService.java rename to src/main/java/org/springblade/modules/business/service/IAppealRegService.java index eef069f..7475ab7 100644 --- a/src/main/java/org/springblade/appeal/service/IAppealRegService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealRegService.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.AppealReg; import org.springblade.core.mp.base.BaseService; +import org.springblade.modules.business.entity.AppealReg; /** * 服务类 diff --git a/src/main/java/org/springblade/appeal/service/IAppealService.java b/src/main/java/org/springblade/modules/business/service/IAppealService.java similarity index 90% rename from src/main/java/org/springblade/appeal/service/IAppealService.java rename to src/main/java/org/springblade/modules/business/service/IAppealService.java index c82b1f5..9d9e0bf 100644 --- a/src/main/java/org/springblade/appeal/service/IAppealService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealService.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.Appeal; +import org.springblade.modules.business.entity.Appeal; import org.springblade.core.mp.base.BaseService; /** diff --git a/src/main/java/org/springblade/appeal/service/IAppealVisitorService.java b/src/main/java/org/springblade/modules/business/service/IAppealVisitorService.java similarity index 89% rename from src/main/java/org/springblade/appeal/service/IAppealVisitorService.java rename to src/main/java/org/springblade/modules/business/service/IAppealVisitorService.java index 1681706..3728465 100644 --- a/src/main/java/org/springblade/appeal/service/IAppealVisitorService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealVisitorService.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.AppealVisitor; +import org.springblade.modules.business.entity.AppealVisitor; import org.springblade.core.mp.base.BaseService; /** diff --git a/src/main/java/org/springblade/appeal/service/IServerWindowsDisputeService.java b/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java similarity index 89% rename from src/main/java/org/springblade/appeal/service/IServerWindowsDisputeService.java rename to src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java index 4d29d94..33d0980 100644 --- a/src/main/java/org/springblade/appeal/service/IServerWindowsDisputeService.java +++ b/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service; +package org.springblade.modules.business.service; -import org.springblade.appeal.entity.ServerWindowsDispute; +import org.springblade.modules.business.entity.ServerWindowsDispute; import org.springblade.core.mp.base.BaseService; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/AppealMediationFileServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationFileServiceImpl.java similarity index 80% rename from src/main/java/org/springblade/appeal/service/impl/AppealMediationFileServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/AppealMediationFileServiceImpl.java index 740c909..462a684 100644 --- a/src/main/java/org/springblade/appeal/service/impl/AppealMediationFileServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationFileServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.AppealMediationFile; -import org.springblade.appeal.mapper.AppealMediationFileMapper; -import org.springblade.appeal.service.IAppealMediationFileService; +import org.springblade.modules.business.entity.AppealMediationFile; +import org.springblade.modules.business.mapper.AppealMediationFileMapper; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.service.IAppealMediationFileService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/AppealMediationServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java similarity index 81% rename from src/main/java/org/springblade/appeal/service/impl/AppealMediationServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java index 4c33e95..37d09e6 100644 --- a/src/main/java/org/springblade/appeal/service/impl/AppealMediationServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.AppealMediation; -import org.springblade.appeal.mapper.AppealMediationMapper; -import org.springblade.appeal.service.IAppealMediationService; +import org.springblade.modules.business.entity.AppealMediation; +import org.springblade.modules.business.mapper.AppealMediationMapper; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.service.IAppealMediationService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/AppealRegServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java similarity index 81% rename from src/main/java/org/springblade/appeal/service/impl/AppealRegServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java index 16b1392..f7ced64 100644 --- a/src/main/java/org/springblade/appeal/service/impl/AppealRegServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.AppealReg; -import org.springblade.appeal.mapper.AppealRegMapper; -import org.springblade.appeal.service.IAppealRegService; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.entity.AppealReg; +import org.springblade.modules.business.mapper.AppealRegMapper; +import org.springblade.modules.business.service.IAppealRegService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/AppealServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealServiceImpl.java similarity index 82% rename from src/main/java/org/springblade/appeal/service/impl/AppealServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/AppealServiceImpl.java index d23f486..83e25ae 100644 --- a/src/main/java/org/springblade/appeal/service/impl/AppealServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.Appeal; -import org.springblade.appeal.mapper.AppealMapper; -import org.springblade.appeal.service.IAppealService; +import org.springblade.modules.business.entity.Appeal; +import org.springblade.modules.business.mapper.AppealMapper; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.service.IAppealService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/AppealVisitorServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealVisitorServiceImpl.java similarity index 81% rename from src/main/java/org/springblade/appeal/service/impl/AppealVisitorServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/AppealVisitorServiceImpl.java index f032d08..3e1951f 100644 --- a/src/main/java/org/springblade/appeal/service/impl/AppealVisitorServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealVisitorServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.AppealVisitor; -import org.springblade.appeal.mapper.AppealVisitorMapper; -import org.springblade.appeal.service.IAppealVisitorService; +import org.springblade.modules.business.entity.AppealVisitor; +import org.springblade.modules.business.mapper.AppealVisitorMapper; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.service.IAppealVisitorService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/springblade/appeal/service/impl/ServerWindowsDisputeServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java similarity index 80% rename from src/main/java/org/springblade/appeal/service/impl/ServerWindowsDisputeServiceImpl.java rename to src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java index 4256e72..0901a3c 100644 --- a/src/main/java/org/springblade/appeal/service/impl/ServerWindowsDisputeServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.appeal.service.impl; +package org.springblade.modules.business.service.impl; -import org.springblade.appeal.entity.ServerWindowsDispute; -import org.springblade.appeal.mapper.ServerWindowsDisputeMapper; -import org.springblade.appeal.service.IServerWindowsDisputeService; +import org.springblade.modules.business.entity.ServerWindowsDispute; +import org.springblade.modules.business.mapper.ServerWindowsDisputeMapper; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.service.IServerWindowsDisputeService; import org.springframework.stereotype.Service; /**