Merge branch 'distribution-0306' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into distribution-0306

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateController.java

@@ -4,11 +4,11 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -28,18 +28,18 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/distribution/temp")
-public class DistributionActivityTempController extends BaseController {
+public class DistributionActivityTemplateController extends BaseController {
 
-    private final IDistributionActivityTempService iDistributionActivityTempService;
+    private final IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
     /**
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询分销活动模板列表")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempVo> list(DistributionActivityTempQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateVo> list(DistributionActivityTemplateQueryBo bo) {
         startPage();
-        List<DistributionActivityTempVo> list = iDistributionActivityTempService.queryList(bo);
+        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -48,9 +48,9 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("导出【请填写功能名称】列表")
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempVo> export(DistributionActivityTempQueryBo bo) {
-        List<DistributionActivityTempVo> list = iDistributionActivityTempService.queryList(bo);
-        ExcelUtil<DistributionActivityTempVo> util = new ExcelUtil<DistributionActivityTempVo>(DistributionActivityTempVo.class);
+    public AjaxResult<DistributionActivityTemplateVo> export(DistributionActivityTemplateQueryBo bo) {
+        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateVo> util = new ExcelUtil<DistributionActivityTemplateVo>(DistributionActivityTemplateVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -59,8 +59,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("获取分销活动模板详细信息")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateService.queryById(id));
     }
 
     /**
@@ -68,8 +68,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("新增分销活动模板")
     @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempAddBo bo) {
-        return toAjax(iDistributionActivityTempService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateAddBo bo) {
+        return toAjax(iDistributionActivityTemplateService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("修改分销活动模板")
     @PutMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempEditBo bo) {
-        return toAjax(iDistributionActivityTempService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateEditBo bo) {
+        return toAjax(iDistributionActivityTemplateService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -87,6 +87,6 @@ public class DistributionActivityTempController extends BaseController {
     @ApiOperation("删除【请填写功能名称】")
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempGoodsController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateGoodsController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/goods")
-public class DistributionActivityTempGoodsController extends BaseController {
+public class DistributionActivityTemplateGoodsController extends BaseController {
 
-    private final IDistributionActivityTempGoodsService iDistributionActivityTempGoodsService;
+    private final IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempGoodsVo> list(DistributionActivityTempGoodsQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateGoodsVo> list(DistributionActivityTemplateGoodsQueryBo bo) {
         startPage();
-        List<DistributionActivityTempGoodsVo> list = iDistributionActivityTempGoodsService.queryList(bo);
+        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempGoodsVo> export(DistributionActivityTempGoodsQueryBo bo) {
-        List<DistributionActivityTempGoodsVo> list = iDistributionActivityTempGoodsService.queryList(bo);
-        ExcelUtil<DistributionActivityTempGoodsVo> util = new ExcelUtil<DistributionActivityTempGoodsVo>(DistributionActivityTempGoodsVo.class);
+    public AjaxResult<DistributionActivityTemplateGoodsVo> export(DistributionActivityTemplateGoodsQueryBo bo) {
+        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateGoodsVo> util = new ExcelUtil<DistributionActivityTemplateGoodsVo>(DistributionActivityTemplateGoodsVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @ApiOperation("获取【请填写功能名称】详细信息")
     @PreAuthorize("@ss.hasPermi('system:goods:query')")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempGoodsVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempGoodsService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateGoodsVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateGoodsService.queryById(id));
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempGoodsAddBo bo) {
-        return toAjax(iDistributionActivityTempGoodsService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateGoodsAddBo bo) {
+        return toAjax(iDistributionActivityTemplateGoodsService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -88,8 +88,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempGoodsEditBo bo) {
-        return toAjax(iDistributionActivityTempGoodsService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateGoodsEditBo bo) {
+        return toAjax(iDistributionActivityTemplateGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -100,6 +100,6 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempPosterController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplatePosterController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempPosterService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/distribution/poster")
-public class DistributionActivityTempPosterController extends BaseController {
+public class DistributionActivityTemplatePosterController extends BaseController {
 
-    private final IDistributionActivityTempPosterService iDistributionActivityTempPosterService;
+    private final IDistributionActivityTemplatePosterService iDistributionActivityTemplatePosterService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempPosterController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:poster:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempPosterVo> list(DistributionActivityTempPosterQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplatePosterVo> list(DistributionActivityTemplatePosterQueryBo bo) {
         startPage();
-        List<DistributionActivityTempPosterVo> list = iDistributionActivityTempPosterService.queryList(bo);
+        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempPosterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:poster:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempPosterVo> export(DistributionActivityTempPosterQueryBo bo) {
-        List<DistributionActivityTempPosterVo> list = iDistributionActivityTempPosterService.queryList(bo);
-        ExcelUtil<DistributionActivityTempPosterVo> util = new ExcelUtil<DistributionActivityTempPosterVo>(DistributionActivityTempPosterVo.class);
+    public AjaxResult<DistributionActivityTemplatePosterVo> export(DistributionActivityTemplatePosterQueryBo bo) {
+        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplatePosterVo> util = new ExcelUtil<DistributionActivityTemplatePosterVo>(DistributionActivityTemplatePosterVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempPosterController extends BaseController {
     @ApiOperation("获取海报模板详细信息")
     @PreAuthorize("@ss.hasPermi('system:poster:query')")
     @GetMapping("/{posterTempId}")
-    public AjaxResult<DistributionActivityTempPosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
-        return AjaxResult.success(iDistributionActivityTempPosterService.queryById(posterTempId));
+    public AjaxResult<DistributionActivityTemplatePosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
+        return AjaxResult.success(iDistributionActivityTemplatePosterService.queryById(posterTempId));
     }
 
     /**
@@ -75,8 +75,8 @@ public class DistributionActivityTempPosterController extends BaseController {
      */
     @ApiOperation("新增海报模板")
     @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempPosterAddBo bo) {
-        return toAjax(iDistributionActivityTempPosterService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplatePosterAddBo bo) {
+        return toAjax(iDistributionActivityTemplatePosterService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -84,8 +84,8 @@ public class DistributionActivityTempPosterController extends BaseController {
      */
     @ApiOperation("修改海报模板")
     @PutMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempPosterEditBo bo) {
-        return toAjax(iDistributionActivityTempPosterService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody distributionActivityTemplatePosterEditBo bo) {
+        return toAjax(iDistributionActivityTemplatePosterService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -96,6 +96,6 @@ public class DistributionActivityTempPosterController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{posterTempIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] posterTempIds) {
-        return toAjax(iDistributionActivityTempPosterService.deleteWithValidByIds(Arrays.asList(posterTempIds), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplatePosterService.deleteWithValidByIds(Arrays.asList(posterTempIds), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempRelationController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateRelationController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/relation")
-public class DistributionActivityTempRelationController extends BaseController {
+public class DistributionActivityTemplateRelationController extends BaseController {
 
-    private final IDistributionActivityTempRelationService iDistributionActivityTempRelationService;
+    private final IDistributionActivityTemplateRelationService iDistributionActivityTemplateRelationService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempRelationController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:relation:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempRelationVo> list(DistributionActivityTempRelationQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateRelationVo> list(DistributionActivityTemplateRelationQueryBo bo) {
         startPage();
-        List<DistributionActivityTempRelationVo> list = iDistributionActivityTempRelationService.queryList(bo);
+        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempRelationVo> export(DistributionActivityTempRelationQueryBo bo) {
-        List<DistributionActivityTempRelationVo> list = iDistributionActivityTempRelationService.queryList(bo);
-        ExcelUtil<DistributionActivityTempRelationVo> util = new ExcelUtil<DistributionActivityTempRelationVo>(DistributionActivityTempRelationVo.class);
+    public AjaxResult<DistributionActivityTemplateRelationVo> export(DistributionActivityTemplateRelationQueryBo bo) {
+        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateRelationVo> util = new ExcelUtil<DistributionActivityTemplateRelationVo>(DistributionActivityTemplateRelationVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @ApiOperation("获取【请填写功能名称】详细信息")
     @PreAuthorize("@ss.hasPermi('system:relation:query')")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempRelationVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempRelationService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateRelationVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateRelationService.queryById(id));
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempRelationAddBo bo) {
-        return toAjax(iDistributionActivityTempRelationService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateRelationAddBo bo) {
+        return toAjax(iDistributionActivityTemplateRelationService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -88,8 +88,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempRelationEditBo bo) {
-        return toAjax(iDistributionActivityTempRelationService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateRelationEditBo bo) {
+        return toAjax(iDistributionActivityTemplateRelationService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -100,6 +100,6 @@ public class DistributionActivityTempRelationController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SuperSysLoginController.java

@@ -2,35 +2,29 @@ package com.zhongzheng.controller.system;
 
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.model.LoginBody;
-import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
-import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.manager.AsyncManager;
-import com.zhongzheng.framework.manager.factory.AsyncFactory;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.TopSysLoginService;
+import com.zhongzheng.framework.web.service.TopSysPermissionService;
 import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.framework.web.service.SysPermissionService;
-import com.zhongzheng.modules.system.service.ISysMenuService;
-import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.service.ITopSysMenuService;
+import com.zhongzheng.modules.top.service.ITopSysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -45,10 +39,10 @@ public class SuperSysLoginController
     private TopSysLoginService loginService;
 
     @Autowired
-    private ISysMenuService menuService;
+    private ITopSysMenuService menuService;
 
     @Autowired
-    private SysPermissionService permissionService;
+    private TopSysPermissionService permissionService;
 
     @Autowired
     private TopTokenService topTokenService;
@@ -59,7 +53,7 @@ public class SuperSysLoginController
     private TokenService tokenService;
 
     @Autowired
-    private ISysUserService userService;
+    private ITopSysUserService userService;
     /**
      * 登录方法
      *
@@ -89,17 +83,18 @@ public class SuperSysLoginController
     {
         TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
         TopSysUser user = loginUser.getUser();
+
         // 角色集合
-        Set<String> roles = new HashSet<String>();
-        roles.add("admin");
+        Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
-        Set<String> permissions = new HashSet<String>();
-        permissions.add("*:*:*");
+        Set<String> permissions = permissionService.getMenuPermission(user);
         Map<String,Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roles", roles);
         map.put("permissions", permissions);
+
         return AjaxResult.success(map);
+
     }
 
     /**
@@ -114,7 +109,7 @@ public class SuperSysLoginController
         TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息
         TopSysUser user = loginUser.getUser();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        List<TopSysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 
@@ -128,9 +123,9 @@ public class SuperSysLoginController
     public AjaxResult getChildToken()
     {
         //普通系统用户
-        SysUser user = userService.selectUserByUserName("admin");
-        LoginUser loginUser = new LoginUser(user, permissionService.getMenuPermission(user));
-        String token = tokenService.createToken(loginUser);
+        TopSysUser user = userService.selectUserByUserName("admin");
+        TopLoginUser loginUser = new TopLoginUser(user, permissionService.getMenuPermission(user));
+        String token = tokenService.createTopToken(loginUser);
         AjaxResult ajax = AjaxResult.success();
         ajax.put(Constants.TOKEN, token);
         return ajax;

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysConfigController.java

@@ -1,12 +1,15 @@
 package com.zhongzheng.controller.top;
 
 import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.annotation.RepeatSubmit;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
+import com.zhongzheng.modules.top.service.ITopSysConfigService;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Controller
  * 
@@ -27,7 +32,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/system/top/config")
 public class TopSysConfigController extends BaseController {
     @Autowired
-    private ISysConfigService configService;
+    private ITopSysConfigService topConfigService;
 
     /**
      * 获取参数配置列表
@@ -35,10 +40,10 @@ public class TopSysConfigController extends BaseController {
     @ApiOperation("配置列表")
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfigVo config)
+    public TableDataInfo list(TopSysConfigVo config)
     {
         startPage();
-        List<SysConfigVo> list = configService.selectConfigList(config);
+        List<TopSysConfigVo> list = topConfigService.selectConfigList(config);
         return getDataTable(list);
     }
 
@@ -47,7 +52,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(SysConfig config)
     {
-        List<SysConfig> list = configService.selectConfigList(config);
+        List<SysConfig> list = topConfigService.selectConfigList(config);
         ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
         return util.exportExcel(list, "参数数据");
     }*/
@@ -60,7 +65,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping(value = "/{configId}")
     public AjaxResult getInfo(@PathVariable Long configId)
     {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return AjaxResult.success(topConfigService.selectConfigById(configId));
     }
 
     /**
@@ -70,7 +75,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping(value = "/configKey/{configKey}")
     public AjaxResult getConfigKey(@PathVariable String configKey)
     {
-        return AjaxResult.success("配置内容",configService.selectConfigByKey(configKey));
+        return AjaxResult.success("配置内容",topConfigService.selectConfigByKey(configKey));
     }
 
     /**
@@ -81,14 +86,14 @@ public class TopSysConfigController extends BaseController {
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfigVo config)
+    public AjaxResult add(@Validated @RequestBody TopSysConfigVo config)
     {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
         {
             return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(configService.insertConfig(config));
+        return toAjax(topConfigService.insertConfig(config));
     }
 
     /**
@@ -98,14 +103,14 @@ public class TopSysConfigController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfigVo config)
+    public AjaxResult edit(@Validated @RequestBody TopSysConfigVo config)
     {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
         {
             return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(configService.updateConfig(config));
+        return toAjax(topConfigService.updateConfig(config));
     }
 
     /**
@@ -117,7 +122,7 @@ public class TopSysConfigController extends BaseController {
     @DeleteMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
-        return toAjax(configService.deleteConfigByIds(configIds));
+        return toAjax(topConfigService.deleteConfigByIds(configIds));
     }
 
     /**
@@ -129,7 +134,7 @@ public class TopSysConfigController extends BaseController {
     @DeleteMapping("/clearCache")
     public AjaxResult clearCache()
     {
-        configService.clearCache();
+        topConfigService.clearCache();
         return AjaxResult.success();
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDeptController.java

@@ -1,16 +1,27 @@
 package com.zhongzheng.controller.top;
 
+import cn.hutool.core.util.StrUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.service.ITopSysDeptService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +36,7 @@ import java.util.Map;
 @RequestMapping("/system/top/dept")
 public class TopSysDeptController extends BaseController {
     @Autowired
-    private ISysDeptService deptService;
+    private ITopSysDeptService topDeptService;
 
     /**
      * 获取部门列表
@@ -33,9 +44,9 @@ public class TopSysDeptController extends BaseController {
     @ApiOperation("部门列表")
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
+    public AjaxResult list(TopSysDept dept)
     {
-        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
 
@@ -47,11 +58,11 @@ public class TopSysDeptController extends BaseController {
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Iterator<SysDept> it = depts.iterator();
+        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
+        Iterator<TopSysDept> it = depts.iterator();
         while (it.hasNext())
         {
-            SysDept d = (SysDept) it.next();
+            TopSysDept d = (TopSysDept) it.next();
             if (d.getDeptId().intValue() == deptId
                     || ArrayUtils.contains(StrUtil.split(d.getAncestors(), ","), deptId + ""))
             {
@@ -69,7 +80,7 @@ public class TopSysDeptController extends BaseController {
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return AjaxResult.success(topDeptService.selectDeptById(deptId));
     }
 
     /**
@@ -77,10 +88,10 @@ public class TopSysDeptController extends BaseController {
      */
     @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
+    public AjaxResult treeselect(TopSysDept dept)
     {
-        List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
+        return AjaxResult.success(topDeptService.buildDeptTreeSelect(depts));
     }
 
     /**
@@ -90,10 +101,10 @@ public class TopSysDeptController extends BaseController {
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
     public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
     {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
         Map<String,Object> map = new HashMap<>();
-        map.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        map.put("depts", deptService.buildDeptTreeSelect(depts));
+        map.put("checkedKeys", topDeptService.selectDeptListByRoleId(roleId));
+        map.put("depts", topDeptService.buildDeptTreeSelect(depts));
         return AjaxResult.success(map);
     }
 
@@ -105,14 +116,14 @@ public class TopSysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    public AjaxResult add(@Validated @RequestBody TopSysDept dept)
     {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.insertDept(dept));
+        return toAjax(topDeptService.insertDept(dept));
     }
 
     /**
@@ -122,9 +133,9 @@ public class TopSysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    public AjaxResult edit(@Validated @RequestBody TopSysDept dept)
     {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
@@ -133,12 +144,12 @@ public class TopSysDeptController extends BaseController {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }
         else if (StrUtil.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+                && topDeptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
         {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.updateDept(dept));
+        return toAjax(topDeptService.updateDept(dept));
     }
 
     /**
@@ -150,14 +161,14 @@ public class TopSysDeptController extends BaseController {
     @PostMapping("/delete")
     public AjaxResult remove(@PathVariable Long deptId)
     {
-        if (deptService.hasChildByDeptId(deptId))
+        if (topDeptService.hasChildByDeptId(deptId))
         {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (topDeptService.checkDeptExistUser(deptId))
         {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
-        return toAjax(deptService.deleteDeptById(deptId));
+        return toAjax(topDeptService.deleteDeptById(deptId));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictDataController.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.controller.top;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.bo.TopSysDictDataAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataQueryBo;
+import com.zhongzheng.modules.top.service.ITopSysDictDataService;
+import com.zhongzheng.modules.top.vo.TopSysDictDataVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/top/dict/data")
+public class TopSysDictDataController extends BaseController {
+
+    private final ITopSysDictDataService iTopSysDictDataService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @GetMapping("/list")
+    public AjaxResult<List<TopSysDictDataVo>> list(TopSysDictDataQueryBo bo) {
+        List<TopSysDictDataVo> list = iTopSysDictDataService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:data:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopSysDictDataVo> export(TopSysDictDataQueryBo bo) {
+        List<TopSysDictDataVo> list = iTopSysDictDataService.queryList(bo);
+        ExcelUtil<TopSysDictDataVo> util = new ExcelUtil<TopSysDictDataVo>(TopSysDictDataVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:data:query')")
+    @GetMapping("/{dictCode}")
+    public AjaxResult<TopSysDictDataVo> getInfo(@PathVariable("dictCode" ) Long dictCode) {
+        return AjaxResult.success(iTopSysDictDataService.queryById(dictCode));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopSysDictDataAddBo bo) {
+        return toAjax(iTopSysDictDataService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopSysDictDataEditBo bo) {
+        return toAjax(iTopSysDictDataService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
+        return toAjax(iTopSysDictDataService.deleteWithValidByIds(Arrays.asList(dictCodes), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictTypeController.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.controller.top;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeQueryBo;
+import com.zhongzheng.modules.top.service.ITopSysDictTypeService;
+import com.zhongzheng.modules.top.vo.TopSysDictTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/top/type")
+public class TopSysDictTypeController extends BaseController {
+
+    private final ITopSysDictTypeService iTopSysDictTypeService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:type:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopSysDictTypeVo> list(TopSysDictTypeQueryBo bo) {
+        startPage();
+        List<TopSysDictTypeVo> list = iTopSysDictTypeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:type:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopSysDictTypeVo> export(TopSysDictTypeQueryBo bo) {
+        List<TopSysDictTypeVo> list = iTopSysDictTypeService.queryList(bo);
+        ExcelUtil<TopSysDictTypeVo> util = new ExcelUtil<TopSysDictTypeVo>(TopSysDictTypeVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:type:query')")
+    @GetMapping("/{dictId}")
+    public AjaxResult<TopSysDictTypeVo> getInfo(@PathVariable("dictId" ) Long dictId) {
+        return AjaxResult.success(iTopSysDictTypeService.queryById(dictId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopSysDictTypeAddBo bo) {
+        return toAjax(iTopSysDictTypeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopSysDictTypeEditBo bo) {
+        return toAjax(iTopSysDictTypeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] dictIds) {
+        return toAjax(iTopSysDictTypeService.deleteWithValidByIds(Arrays.asList(dictIds), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysMenuController.java

@@ -7,13 +7,13 @@ import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.system.service.ISysMenuService;
+import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.service.ITopSysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -36,7 +36,7 @@ import java.util.List;
 @RequestMapping("/system/top/menu")
 public class TopSysMenuController extends BaseController {
     @Autowired
-    private ISysMenuService menuService;
+    private ITopSysMenuService topMenuService;
 
     @Autowired
     private TokenService tokenService;
@@ -47,11 +47,11 @@ public class TopSysMenuController extends BaseController {
     @ApiOperation("获取菜单列表")
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
+    public AjaxResult list(TopSysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
         return AjaxResult.success(menus);
     }
 
@@ -63,7 +63,7 @@ public class TopSysMenuController extends BaseController {
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId)
     {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return AjaxResult.success(topMenuService.selectMenuById(menuId));
     }
 
     /**
@@ -72,12 +72,12 @@ public class TopSysMenuController extends BaseController {
     @ApiOperation("获取菜单下拉树列表")
     @ApiOperationSupport(includeParameters = {})
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
+    public AjaxResult treeselect(TopSysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
+        return AjaxResult.success(topMenuService.buildMenuTreeSelect(menus));
     }
 
     /**
@@ -88,10 +88,10 @@ public class TopSysMenuController extends BaseController {
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        List<TopSysMenu> menus = topMenuService.selectMenuList(loginUser.getUser().getUserId());
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        ajax.put("checkedKeys", topMenuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", topMenuService.buildMenuTreeSelect(menus));
         return ajax;
     }
 
@@ -104,9 +104,9 @@ public class TopSysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    public AjaxResult add(@Validated @RequestBody TopSysMenu menu)
     {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
         {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -116,7 +116,7 @@ public class TopSysMenuController extends BaseController {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.insertMenu(menu));
+        return toAjax(topMenuService.insertMenu(menu));
     }
 
     /**
@@ -128,9 +128,9 @@ public class TopSysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    public AjaxResult edit(@Validated @RequestBody TopSysMenu menu)
     {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -144,7 +144,7 @@ public class TopSysMenuController extends BaseController {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.updateMenu(menu));
+        return toAjax(topMenuService.updateMenu(menu));
     }
 
     /**
@@ -156,14 +156,14 @@ public class TopSysMenuController extends BaseController {
     @PostMapping("/delete/{menuId}")
     public AjaxResult remove(@PathVariable Long menuId)
     {
-        if (menuService.hasChildByMenuId(menuId))
+        if (topMenuService.hasChildByMenuId(menuId))
         {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (topMenuService.checkMenuExistRole(menuId))
         {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
-        return toAjax(menuService.deleteMenuById(menuId));
+        return toAjax(topMenuService.deleteMenuById(menuId));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleController.java

@@ -6,8 +6,7 @@ import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysRole;
-import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
@@ -15,6 +14,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.TopSysPermissionService;
+import com.zhongzheng.modules.top.domain.TopSysRole;
 import com.zhongzheng.modules.top.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.service.ITopSysUserService;
 import io.swagger.annotations.Api;
@@ -53,20 +53,20 @@ public class TopSysRoleController extends BaseController {
     @ApiOperation("角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
+    public TableDataInfo list(TopSysRole role)
     {
         startPage();
-        List<SysRole> list = topSysRoleService.selectRoleList(role);
+        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
         return getDataTable(list);
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysRole role)
+    public AjaxResult export(TopSysRole role)
     {
-        List<SysRole> list = topSysRoleService.selectRoleList(role);
-        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
+        ExcelUtil<TopSysRole> util = new ExcelUtil<TopSysRole>(TopSysRole.class);
         return util.exportExcel(list, "角色数据");
     }
 
@@ -90,7 +90,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public AjaxResult add(@Validated @RequestBody TopSysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
         {
@@ -112,7 +112,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public AjaxResult edit(@Validated @RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
@@ -128,12 +128,12 @@ public class TopSysRoleController extends BaseController {
         if (topSysRoleService.updateRole(role) > 0)
         {
             // 更新缓存用户权限
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            TopLoginUser loginUser = tokenService.getTopLoginUser(ServletUtils.getRequest());
             if (Validator.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
             {
                 loginUser.setPermissions(topSysPermissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(topSysUserService.selectUserByUserName(loginUser.getUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
+                tokenService.setTopLoginUser(loginUser);
             }
             return AjaxResult.success();
         }
@@ -147,7 +147,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    public AjaxResult dataScope(@RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         return toAjax(topSysRoleService.authDataScope(role));
@@ -160,7 +160,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    public AjaxResult changeStatus(@RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         role.setUpdateBy(SecurityUtils.getUsername());

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleMenuController.java

@@ -1,22 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/menu")
-public class TopSysRoleMenuController extends BaseController {
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserController.java

@@ -118,7 +118,7 @@ public class TopSysUserController extends BaseController
         AjaxResult ajax = AjaxResult.success();
         List<TopSysRole> roles = topSysRoleService.selectRoleAll();
         TopSysUser sysUser = topSysUserService.selectUserById(userId);
-        ajax.put("roles", TopSysUser.isAdmin(sysUser.getUserId()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", TopSysUser.isAdmin(sysUser.getUserName()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", topSysPostService.selectPostAll());
         if (Validator.isNotNull(userId))
         {

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserRoleController.java

@@ -1,21 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 用户和角色关联Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "用户和角色关联控制器", tags = {"用户和角色关联管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/role")
-public class TopSysUserRoleController extends BaseController {
-}

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
-                password: zhongzheng2021
+                password:  zhongzheng2021
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -85,13 +85,65 @@ aliyun:
         bucketName: zhongzheng-test # oss的存储空间
         policy:
             expire: 30 # 签名有效期(S)
-        maxSize: 10 # 上传文件大小(M)
+        maxSize: 100 # 上传文件大小(M)
         callback: http://120.79.166.78:19004/aliyun/oss/callback # 文件上传成功后的回调地址
         dir:
             prefix: oss/images/ # 上传文件夹路径前缀 `
+
 poliv:
     token:
         userid: d5f6d309fe
         writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
         secretkey: xpPrYdcbA1
+
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+        studyNoteTpId: DndIixcAp15Sqgb4KOGTMf73VLF09NlCUifPSel5Y_s
+        qdyTpId: s981yq3SyIODNUEXFzVSWn0OYj90E72aKdtKtSp05_E
+        qdySubTpId: gzE6zddD7OzDLUtOO4GfU-KPCxpMqWFhCj86uXExqB8
+        qdySubStatusTpId: 7oKaAHmc4P7jqfonuiM1wnjfNLh9T662Ywm1OAFaUFA
+        qdyExamTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
+        qdyExamStatusTpId: J7nNogGhD38OD20gI-3CzwawfEMu7lOjR8fsi4LgJ5g
+        signatureTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: http://120.79.166.78:19012/wx/pay/callback
+    scanLogin:
+        host: https://testm.xyyxt.net/
+
+wisdomExamRoom:
+    mchid: 10001
+    appid: ZZ-YXT-GZ-20220820-0001
+    app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
+    host:  http://bg.sam457.site:9020
+
+certificate:
+    host: http://192.168.1.38:8000/
+
+liveGotoURL: http://120.79.166.78:19014/
+
+enCodeVersion: develop
+
+oldStudySys:
+    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
+    sharePath: http://192.168.1.210:8086/witsystem/dataapi/SaleOrder
+    shareCanclePath: http://192.168.1.210:8086/witsystem/dataapi/ordercance
+    searchGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCount
+    pushGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCountAuto
+    educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
+    classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
+    classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
+
+officialPush:
+    infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
+    periodPath: http://jypt-dev.gdcic.net/organjxjy/XueshiShenqing
+    infoAccount: peixunjigou
+    token: 0ca175b9c0f726a831d895e26933246

zhongzheng-admin-saas/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 zhongzheng:
   # 名称
-  name: zhongzheng-admin-saas
+  name: zhongzheng
   # 版本
   version: 3.4.0
   # 版权年份
@@ -61,6 +61,9 @@ logging:
 
 # Spring配置
 spring:
+  mvc:
+    async:
+      request-timeout: 30000
   main:
     allow-bean-definition-overriding: true
   # 资源信息
@@ -71,11 +74,11 @@ spring:
     active: @profiles.active@
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -109,12 +112,12 @@ management:
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: AuthorizationToken
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 360
+  # 令牌自定义标识
+  header: AuthorizationToken
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 360
 
 # MyBatis配置
 # https://baomidou.com/config/
@@ -138,6 +141,7 @@ mybatis-plus:
   executorType: SIMPLE
   # 指定外部化 MyBatis Properties 配置，通过该配置可以抽离配置，实现不同环境的配置部署
   configurationProperties: null
+  typeHandlersPackage: com.zhongzheng.common.type
   configuration:
     # 自动驼峰命名规则（camel case）映射
     # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
@@ -205,20 +209,23 @@ mybatis-plus:
       selectStrategy: NOT_EMPTY
   # 开启多租户
   tenant:
-    enabled-tenant: false
+    enabled-tenant: true
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql
-
 # Swagger配置
 swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
   pathMapping:
+knife4j:
+  enable: true
+  setting:
+    enableFooter: false
 
 # 防止XSS攻击
 xss:
@@ -241,23 +248,17 @@ feign:
   hystrix:
     enabled: true
 
-wx:
-  small:
-    appid: wx8295c6fa6b0b3106
-    appsecret: 2a95e366da4c4b17a3963e9756b878fd
-  gzh:
-    appid: wx6f48f721d18244eb
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-  wepay:
-    mchid: 1342013901
-    key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-    notifyUrl: http://42.192.164.187:19005/wx/pay/callback
+poliv:
+  sdk:
+    userid: egsxlptzdq
+    appId: ezl5uy4zei
+    appSecret: 2bf5bb3c31d34531943df10284edd50b
 
 tencent:
   cloud:
     SecretId: AKIDd6XkjTw9D1atwkJceS2NSIuHPK1ThfOr
     SecretKey: GG2ZqrdCWcS6Yx72h6F7k7E4ey2qPnwq
+
 aliyun:
   sms:
     signName: 祥粤学校
@@ -265,13 +266,14 @@ aliyun:
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033
     pwdTemplateCode: SMS_230220381
+    bindNewTelCode: SMS_232178371
     accessKeyId: LTAIgC8O2WUXvXuR
     accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX
     OpenTheGoodsCode: SMS_230970155     #商品开通提醒
     informationNotificationCode: SMS_230965149  #完善报名资料通知
     materialReviewCode: SMS_230980165         #报名资料审核通过通知
     NotificationOfFailureCode: SMS_230980172  #报名资料审核不通过通知
-    remainingDaysValidityCode: SMS_230960174  #开通班级有效期还剩天数
+    remainingDaysValidityCode: SMS_236566823  #开通班级有效期还剩天数
     completionReminderCode: SMS_230965157   #学时学习完成提醒
     schoolHoursCode: SMS_230970166    #学时机构审核通过提醒
     auditFailedCode: SMS_230970167  #学时机构审核不通过提醒
@@ -282,7 +284,7 @@ aliyun:
     reservationSuccess: SMS_230980186 #考试预约成功提醒
     examinationRemind: SMS_230960195  #考试提醒
     newExamPass: SMS_230970179  #七大员新考考试通过提醒
-    newExamFail: SMS_230960198  #七大员新考考试不通过提醒
+    newExamFail: SMS_235491082  #七大员新考考试不通过提醒
     openingReminder: SMS_230970209  #七大员题库开通提醒（12-22
     classRemind: SMS_230965224  #二建继教开班提醒
     OverdueReminder: SMS_230980259  #班级过期提醒
@@ -292,4 +294,12 @@ aliyun:
     commitmentFailsCode: SMS_231215516     #承诺书审核不通过通知
     mockBookingReminder: SMS_243430276     #模考预约提醒
     mockRemind: SMS_243355276      #模考开始提醒
-    liveStartRemind: SMS_243345514      #直播开课提醒
+    liveStartRemind: SMS_243345514      #直播开课提醒
+    buyNotStudyStudentRemind : SMS_247745294  #学生购买未学习
+    buyNotStudyTeacherRemind : SMS_247935257  #学生购买未学习老师
+    longNotStudyStudentRemind: SMS_247910221  #学生长时间未学习
+    longNotStudyTeacherRemind: SMS_247765294  #学生长时间未学习老师
+    signCommitmentRemind: SMS_250390195  #签署承诺书提醒
+    todayExamNotRecordWarn: SMS_257713140  #学员打卡提醒（每日一练）
+    todayExamNotRecordTeachWarn: SMS_257702971  #学员打卡教务提醒（每日一练）
+    noFinishExamNoteCode: SMS_262460267  #未做完试卷通知

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/TopSysUser.java

@@ -150,15 +150,19 @@ public class TopSysUser implements Serializable
     @TableField(exist = false)
     private Long[] postIds;
 
+    public TopSysUser(Long userId)
+    {
+        this.userId = userId;
+    }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return isAdmin(this.userName);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(String userName)
     {
-        return userId != null && 1L == userId;
+        return userName != null && "admin".equals(userName) ;
     }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -43,6 +43,13 @@ public class CustomTenantLineHandler implements TenantLineHandler {
         add("top_sys_dept");
         add("top_sys_role");
         add("top_sys_user_role");
+        add("top_sys_user_post");
+        add("top_sys_role_menu");
+        add("top_sys_role_dept");
+        add("top_sys_menu");
+        add("top_sys_dict_type");
+        add("top_sys_dict_data");
+        add("top_sys_config");
         add("tables");
         add("columns");
         add("sys_logininfor");

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -223,6 +223,24 @@ public class TokenService
         return createToken(claims);
     }
 
+    /**
+     * 创建令牌
+     *
+     * @param loginUser 用户信息
+     * @return 令牌
+     */
+    public String createTopToken(TopLoginUser loginUser)
+    {
+        String token = IdUtil.fastUUID();
+        loginUser.setToken(token);
+        setTopUserAgent(loginUser);
+        refreshTopToken(loginUser);
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        return createToken(claims);
+    }
+
     /**
      * 验证令牌有效期，相差不足20分钟，自动刷新缓存
      *
@@ -282,6 +300,21 @@ public class TokenService
         loginUser.setOs(userAgent.getOs().getName());
     }
 
+    /**
+     * 设置用户代理信息
+     *
+     * @param loginUser 登录信息
+     */
+    public void setTopUserAgent(TopLoginUser loginUser)
+    {
+        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        loginUser.setIpaddr(ip);
+        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        loginUser.setBrowser(userAgent.getBrowser().getName());
+        loginUser.setOs(userAgent.getOs().getName());
+    }
+
     /**
      * 从数据声明生成令牌
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopSysLoginService.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
 import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
+import com.zhongzheng.modules.top.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -36,6 +37,9 @@ public class TopSysLoginService
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ITopSysUserService iSysUserService;
+
     /**
      * 登录验证
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopSysPermissionService.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.framework.web.service;
 
-import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.modules.top.service.ITopSysMenuService;
 import com.zhongzheng.modules.top.service.ITopSysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class TopSysPermissionService
      * @param user 用户信息
      * @return 角色权限信息
      */
-    public Set<String> getRolePermission(SysUser user)
+    public Set<String> getRolePermission(TopSysUser user)
     {
         Set<String> roles = new HashSet<String>();
         // 管理员拥有所有权限
@@ -50,7 +50,7 @@ public class TopSysPermissionService
      * @param user 用户信息
      * @return 菜单权限信息
      */
-    public Set<String> getMenuPermission(SysUser user)
+    public Set<String> getMenuPermission(TopSysUser user)
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopUserDetailsServiceImpl.java

@@ -14,9 +14,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * 用户验证处理
  *
@@ -31,6 +28,9 @@ public class TopUserDetailsServiceImpl implements UserDetailsService
     @Autowired
     private ITopSysUserService topUserService;
 
+    @Autowired
+    private TopSysPermissionService permissionService;
+
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
@@ -56,9 +56,9 @@ public class TopUserDetailsServiceImpl implements UserDetailsService
 
     public UserDetails createTopLoginUser(TopSysUser user)
     {
-        Set<String> perms = new HashSet<String>();
-        //拥有所有权限
-        perms.add("*:*:*");
-        return new TopLoginUser(user, perms);
+//        Set<String> perms = new HashSet<String>();
+//        //拥有所有权限
+//        perms.add("*:*:*");
+        return new TopLoginUser(user, permissionService.getMenuPermission(user));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterAddBo.java

@@ -22,30 +22,9 @@ public class DistributionActivityPosterAddBo {
     /** 海报模板名称 */
     @ApiModelProperty("海报模板名称")
     private String name;
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterEditBo.java

@@ -27,30 +27,9 @@ public class DistributionActivityPosterEditBo {
     @ApiModelProperty("海报模板地址")
     private String url;
 
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityQueryBo.java

@@ -59,7 +59,7 @@ public class DistributionActivityQueryBo extends BaseEntity {
 	private Long tempId;
 	/** 海报模板ID */
 	@ApiModelProperty("海报模板ID")
-	private Long posterTempId;
+	private Long posterId;
 	/** 海报标题 */
 	@ApiModelProperty("海报标题")
 	private String posterHead;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateAddBo.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempAddBo {
+public class DistributionActivityTemplateAddBo {
 
     /** 活动编码 */
     @ApiModelProperty("活动编码")
@@ -64,5 +64,5 @@ public class DistributionActivityTempAddBo {
     private List<Long> tenantIds;
 
     @ApiModelProperty("活动商品集合")
-    private List<DistributionActivityTempGoodsAddBo> goodsList;
+    private List<DistributionActivityTemplateGoodsAddBo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateEditBo.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempEditBo {
+public class DistributionActivityTemplateEditBo {
 
     /** 模板ID */
     @ApiModelProperty("模板ID")
@@ -69,6 +69,6 @@ public class DistributionActivityTempEditBo {
     private List<Long> tenantIds;
 
     @ApiModelProperty("活动商品集合")
-    private List<DistributionActivityTempGoodsAddBo> goodsList;
+    private List<DistributionActivityTemplateGoodsAddBo> goodsList;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsAddBo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempGoodsAddBo {
+public class DistributionActivityTemplateGoodsAddBo {
 
     /** 分销模板ID */
     @ApiModelProperty("分销模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsEditBo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempGoodsEditBo {
+public class DistributionActivityTemplateGoodsEditBo {
 
     /** 主键 */
     @ApiModelProperty("主键")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsQueryBo.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempGoodsQueryBo extends BaseEntity {
+public class DistributionActivityTemplateGoodsQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplatePosterAddBo.java

@@ -14,7 +14,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempPosterAddBo {
+public class DistributionActivityTemplatePosterAddBo {
 
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
@@ -28,30 +28,9 @@ public class DistributionActivityTempPosterAddBo {
     /** 使用状态：1启用，0关闭 */
     @ApiModelProperty("使用状态：1启用，0关闭")
     private Integer useStatus;
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplatePosterQueryBo.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempPosterQueryBo extends BaseEntity {
+public class DistributionActivityTemplatePosterQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateQueryBo.java

@@ -20,7 +20,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempQueryBo extends BaseEntity {
+public class DistributionActivityTemplateQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationAddBo.java

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempRelationAddBo {
+public class DistributionActivityTemplateRelationAddBo {
 
     /** 分销模板ID */
     @ApiModelProperty("分销模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationEditBo.java

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempRelationEditBo {
+public class DistributionActivityTemplateRelationEditBo {
 
     /** 主键 */
     @ApiModelProperty("主键")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationQueryBo.java

@@ -20,7 +20,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempRelationQueryBo extends BaseEntity {
+public class DistributionActivityTemplateRelationQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/distributionActivityTemplatePosterEditBo.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempPosterEditBo {
+public class distributionActivityTemplatePosterEditBo {
 
     /** 活动海报模板ID */
     @ApiModelProperty("活动海报模板ID")
@@ -25,30 +25,9 @@ public class DistributionActivityTempPosterEditBo {
     @ApiModelProperty("海报模板地址")
     private String posterUrl;
 
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityPoster.java

@@ -35,22 +35,8 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 使用状态：1启用，0关闭 */
     private Integer useStatus;
-    /** 海报标题 */
-    private String posterHead;
-    /** 海报广告语 */
-    private String posterSlogan;
-    /** 海报商品图片 */
-    private String posterGoods;
-    /** 海报标题配置 */
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    private String posterConfig;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemp.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplate.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp")
-public class DistributionActivityTemp implements Serializable {
+@TableName("distribution_activity_template")
+public class DistributionActivityTemplate implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempGoods.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateGoods.java

@@ -20,8 +20,8 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_goods")
-public class DistributionActivityTempGoods implements Serializable {
+@TableName("distribution_activity_template_goods")
+public class DistributionActivityTemplateGoods implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateImage.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.distribution.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 distribution_activity_template_image
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_activity_template_image")
+public class DistributionActivityTemplateImage implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 名称 */
+    private String name;
+    /** 图片地址 */
+    private String url;
+    /** 状态：1有效，-1无效 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempPoster.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplatePoster.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_poster")
-public class DistributionActivityTempPoster implements Serializable {
+@TableName("distribution_activity_template_poster")
+public class DistributionActivityTemplatePoster implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -31,22 +31,8 @@ private static final long serialVersionUID=1L;
     private String name;
     /** 海报模板地址 */
     private String posterUrl;
-    /** 海报标题 */
-    private String posterHead;
-    /** 海报广告语 */
-    private String posterSlogan;
-    /** 海报商品图片 */
-    private String posterGoods;
-    /** 海报标题配置 */
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    private String posterConfig;
     /** 状态：1有效，0无效 */
     private Integer status;
     /** 使用状态：1启用，0关闭 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempRelation.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateRelation.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_relation")
-public class DistributionActivityTempRelation implements Serializable {
+@TableName("distribution_activity_template_relation")
+public class DistributionActivityTemplateRelation implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempGoodsMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempGoodsMapper extends BaseMapper<DistributionActivityTempGoods> {
+public interface DistributionActivityTempGoodsMapper extends BaseMapper<DistributionActivityTemplateGoods> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempMapper extends BaseMapper<DistributionActivityTemp> {
+public interface DistributionActivityTempMapper extends BaseMapper<DistributionActivityTemplate> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempPosterMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempPosterMapper extends BaseMapper<DistributionActivityTempPoster> {
+public interface DistributionActivityTempPosterMapper extends BaseMapper<DistributionActivityTemplatePoster> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempRelationMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelati
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempRelationMapper extends BaseMapper<DistributionActivityTempRelation> {
+public interface DistributionActivityTempRelationMapper extends BaseMapper<DistributionActivityTemplateRelation> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTemplateImageMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface DistributionActivityTemplateImageMapper extends BaseMapper<DistributionActivityTemplateImage> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempRelationService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateGoodsService.java

@@ -1,12 +1,11 @@
 package com.zhongzheng.modules.distribution.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,31 +16,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempRelationService extends IService<DistributionActivityTempRelation> {
+public interface IDistributionActivityTemplateGoodsService extends IService<DistributionActivityTemplateGoods> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempRelationVo queryById(Long id);
+	DistributionActivityTemplateGoodsVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempRelationVo> queryList(DistributionActivityTempRelationQueryBo bo);
+	List<DistributionActivityTemplateGoodsVo> queryList(DistributionActivityTemplateGoodsQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempRelationAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateGoodsAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempRelationEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateGoodsEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateImageService.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface IDistributionActivityTemplateImageService extends IService<DistributionActivityTemplateImage> {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempPosterService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplatePosterService.java

@@ -1,11 +1,11 @@
 package com.zhongzheng.modules.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,31 +16,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempPosterService extends IService<DistributionActivityTempPoster> {
+public interface IDistributionActivityTemplatePosterService extends IService<DistributionActivityTemplatePoster> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempPosterVo queryById(Long posterTempId);
+	DistributionActivityTemplatePosterVo queryById(Long posterTempId);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempPosterVo> queryList(DistributionActivityTempPosterQueryBo bo);
+	List<DistributionActivityTemplatePosterVo> queryList(DistributionActivityTemplatePosterQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempPosterAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplatePosterAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempPosterEditBo bo);
+	Boolean updateByEditBo(distributionActivityTemplatePosterEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempGoodsService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateRelationService.java

@@ -1,11 +1,12 @@
 package com.zhongzheng.modules.distribution.service;
 
+
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,31 +17,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempGoodsService extends IService<DistributionActivityTempGoods> {
+public interface IDistributionActivityTemplateRelationService extends IService<DistributionActivityTemplateRelation> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempGoodsVo queryById(Long id);
+	DistributionActivityTemplateRelationVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempGoodsVo> queryList(DistributionActivityTempGoodsQueryBo bo);
+	List<DistributionActivityTemplateRelationVo> queryList(DistributionActivityTemplateRelationQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempGoodsAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateRelationAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempGoodsEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateRelationEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateService.java

@@ -2,11 +2,11 @@ package com.zhongzheng.modules.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,31 +17,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempService extends IService<DistributionActivityTemp> {
+public interface IDistributionActivityTemplateService extends IService<DistributionActivityTemplate> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempVo queryById(Long id);
+	DistributionActivityTemplateVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempVo> queryList(DistributionActivityTempQueryBo bo);
+	List<DistributionActivityTemplateVo> queryList(DistributionActivityTemplateQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -44,7 +44,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         lqw.eq(bo.getStartTime() != null, DistributionActivity::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, DistributionActivity::getEndTime, bo.getEndTime());
         lqw.eq(bo.getTempId() != null, DistributionActivity::getTempId, bo.getTempId());
-        lqw.eq(bo.getPosterTempId() != null, DistributionActivity::getPosterTempId, bo.getPosterTempId());
+        lqw.eq(bo.getPosterId() != null, DistributionActivity::getPosterId, bo.getPosterId());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempGoodsServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateGoodsServiceImpl.java

@@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempGoodsMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -25,21 +26,21 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<DistributionActivityTempGoodsMapper, DistributionActivityTempGoods> implements IDistributionActivityTempGoodsService {
+public class DistributionActivityTemplateGoodsServiceImpl extends ServiceImpl<DistributionActivityTempGoodsMapper, DistributionActivityTemplateGoods> implements IDistributionActivityTemplateGoodsService {
 
     @Override
-    public DistributionActivityTempGoodsVo queryById(Long id){
-        DistributionActivityTempGoods db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionActivityTempGoodsVo.class);
+    public DistributionActivityTemplateGoodsVo queryById(Long id){
+        DistributionActivityTemplateGoods db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionActivityTemplateGoodsVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempGoodsVo> queryList(DistributionActivityTempGoodsQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempGoods> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTempGoods::getDistributionTempId, bo.getDistributionTempId());
-        lqw.eq(bo.getGoodsId() != null, DistributionActivityTempGoods::getGoodsId, bo.getGoodsId());
-        lqw.eq(bo.getProfitMax() != null, DistributionActivityTempGoods::getProfitMax, bo.getProfitMax());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempGoods::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplateGoodsVo> queryList(DistributionActivityTemplateGoodsQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplateGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTemplateGoods::getDistributionTempId, bo.getDistributionTempId());
+        lqw.eq(bo.getGoodsId() != null, DistributionActivityTemplateGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getProfitMax() != null, DistributionActivityTemplateGoods::getProfitMax, bo.getProfitMax());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplateGoods::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -49,13 +50,13 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempGoodsVo> entity2Vo(Collection<DistributionActivityTempGoods> collection) {
-        List<DistributionActivityTempGoodsVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempGoodsVo.class))
+    private List<DistributionActivityTemplateGoodsVo> entity2Vo(Collection<DistributionActivityTemplateGoods> collection) {
+        List<DistributionActivityTemplateGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateGoodsVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempGoods> page = (Page<DistributionActivityTempGoods>)collection;
-            Page<DistributionActivityTempGoodsVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplateGoods> page = (Page<DistributionActivityTemplateGoods>)collection;
+            Page<DistributionActivityTemplateGoodsVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -64,8 +65,8 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempGoodsAddBo bo) {
-        DistributionActivityTempGoods add = BeanUtil.toBean(bo, DistributionActivityTempGoods.class);
+    public Boolean insertByAddBo(DistributionActivityTemplateGoodsAddBo bo) {
+        DistributionActivityTemplateGoods add = BeanUtil.toBean(bo, DistributionActivityTemplateGoods.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -73,8 +74,8 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempGoodsEditBo bo) {
-        DistributionActivityTempGoods update = BeanUtil.toBean(bo, DistributionActivityTempGoods.class);
+    public Boolean updateByEditBo(DistributionActivityTemplateGoodsEditBo bo) {
+        DistributionActivityTemplateGoods update = BeanUtil.toBean(bo, DistributionActivityTemplateGoods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -85,7 +86,7 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempGoods entity){
+    private void validEntityBeforeSave(DistributionActivityTemplateGoods entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateImageServiceImpl.java

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.distribution.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.distribution.mapper.DistributionActivityTemplateImageMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateImageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Service
+public class DistributionActivityTemplateImageServiceImpl extends ServiceImpl<DistributionActivityTemplateImageMapper, DistributionActivityTemplateImage> implements IDistributionActivityTemplateImageService {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempPosterServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplatePosterServiceImpl.java

@@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempPosterMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempPosterService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,22 +31,22 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<DistributionActivityTempPosterMapper, DistributionActivityTempPoster> implements IDistributionActivityTempPosterService {
+public class DistributionActivityTemplatePosterServiceImpl extends ServiceImpl<DistributionActivityTempPosterMapper, DistributionActivityTemplatePoster> implements IDistributionActivityTemplatePosterService {
 
     @Autowired
-    private IDistributionActivityTempService iDistributionActivityTempService;
+    private IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
     @Override
-    public DistributionActivityTempPosterVo queryById(Long posterTempId){
-        DistributionActivityTempPoster db = this.baseMapper.selectById(posterTempId);
-        return BeanUtil.toBean(db, DistributionActivityTempPosterVo.class);
+    public DistributionActivityTemplatePosterVo queryById(Long posterTempId){
+        DistributionActivityTemplatePoster db = this.baseMapper.selectById(posterTempId);
+        return BeanUtil.toBean(db, DistributionActivityTemplatePosterVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempPosterVo> queryList(DistributionActivityTempPosterQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempPoster> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterUrl()), DistributionActivityTempPoster::getPosterUrl, bo.getPosterUrl());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempPoster::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplatePosterVo> queryList(DistributionActivityTemplatePosterQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplatePoster> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getPosterUrl()), DistributionActivityTemplatePoster::getPosterUrl, bo.getPosterUrl());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplatePoster::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -56,13 +56,13 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempPosterVo> entity2Vo(Collection<DistributionActivityTempPoster> collection) {
-        List<DistributionActivityTempPosterVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempPosterVo.class))
+    private List<DistributionActivityTemplatePosterVo> entity2Vo(Collection<DistributionActivityTemplatePoster> collection) {
+        List<DistributionActivityTemplatePosterVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplatePosterVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempPoster> page = (Page<DistributionActivityTempPoster>)collection;
-            Page<DistributionActivityTempPosterVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplatePoster> page = (Page<DistributionActivityTemplatePoster>)collection;
+            Page<DistributionActivityTemplatePosterVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -71,8 +71,8 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempPosterAddBo bo) {
-        DistributionActivityTempPoster add = BeanUtil.toBean(bo, DistributionActivityTempPoster.class);
+    public Boolean insertByAddBo(DistributionActivityTemplatePosterAddBo bo) {
+        DistributionActivityTemplatePoster add = BeanUtil.toBean(bo, DistributionActivityTemplatePoster.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -80,16 +80,16 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempPosterEditBo bo) {
+    public Boolean updateByEditBo(distributionActivityTemplatePosterEditBo bo) {
         //校验是否有绑定活动
-        int count = iDistributionActivityTempService.count(new LambdaQueryWrapper<DistributionActivityTemp>()
-                .eq(DistributionActivityTemp::getPosterTempId, bo.getPosterTempId())
-                .eq(DistributionActivityTemp::getStatus, 1)
-                .eq(DistributionActivityTemp::getPublishStatus, 1));
+        int count = iDistributionActivityTemplateService.count(new LambdaQueryWrapper<DistributionActivityTemplate>()
+                .eq(DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId())
+                .eq(DistributionActivityTemplate::getStatus, 1)
+                .eq(DistributionActivityTemplate::getPublishStatus, 1));
         if (count > 0 ){
             throw new CustomException("该海报模板已绑定发布的分销活动，请勿修改！");
         }
-        DistributionActivityTempPoster update = BeanUtil.toBean(bo, DistributionActivityTempPoster.class);
+        DistributionActivityTemplatePoster update = BeanUtil.toBean(bo, DistributionActivityTemplatePoster.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -100,7 +100,7 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempPoster entity){
+    private void validEntityBeforeSave(DistributionActivityTemplatePoster entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempRelationServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateRelationServiceImpl.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempRelationMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -26,19 +26,19 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<DistributionActivityTempRelationMapper, DistributionActivityTempRelation> implements IDistributionActivityTempRelationService {
+public class DistributionActivityTemplateRelationServiceImpl extends ServiceImpl<DistributionActivityTempRelationMapper, DistributionActivityTemplateRelation> implements IDistributionActivityTemplateRelationService {
 
     @Override
-    public DistributionActivityTempRelationVo queryById(Long id){
-        DistributionActivityTempRelation db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionActivityTempRelationVo.class);
+    public DistributionActivityTemplateRelationVo queryById(Long id){
+        DistributionActivityTemplateRelation db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionActivityTemplateRelationVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempRelationVo> queryList(DistributionActivityTempRelationQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempRelation> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTempRelation::getDistributionTempId, bo.getDistributionTempId());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempRelation::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplateRelationVo> queryList(DistributionActivityTemplateRelationQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplateRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTemplateRelation::getDistributionTempId, bo.getDistributionTempId());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplateRelation::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -48,13 +48,13 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempRelationVo> entity2Vo(Collection<DistributionActivityTempRelation> collection) {
-        List<DistributionActivityTempRelationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempRelationVo.class))
+    private List<DistributionActivityTemplateRelationVo> entity2Vo(Collection<DistributionActivityTemplateRelation> collection) {
+        List<DistributionActivityTemplateRelationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateRelationVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempRelation> page = (Page<DistributionActivityTempRelation>)collection;
-            Page<DistributionActivityTempRelationVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplateRelation> page = (Page<DistributionActivityTemplateRelation>)collection;
+            Page<DistributionActivityTemplateRelationVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -63,8 +63,8 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempRelationAddBo bo) {
-        DistributionActivityTempRelation add = BeanUtil.toBean(bo, DistributionActivityTempRelation.class);
+    public Boolean insertByAddBo(DistributionActivityTemplateRelationAddBo bo) {
+        DistributionActivityTemplateRelation add = BeanUtil.toBean(bo, DistributionActivityTemplateRelation.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -72,8 +72,8 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempRelationEditBo bo) {
-        DistributionActivityTempRelation update = BeanUtil.toBean(bo, DistributionActivityTempRelation.class);
+    public Boolean updateByEditBo(DistributionActivityTemplateRelationEditBo bo) {
+        DistributionActivityTemplateRelation update = BeanUtil.toBean(bo, DistributionActivityTemplateRelation.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -84,7 +84,7 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempRelation entity){
+    private void validEntityBeforeSave(DistributionActivityTemplateRelation entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -10,17 +10,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,23 +37,23 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemp> implements IDistributionActivityTempService {
+public class DistributionActivityTemplateServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemplate> implements IDistributionActivityTemplateService {
 
     @Autowired
-    private IDistributionActivityTempRelationService iDistributionActivityTempRelationService;
+    private IDistributionActivityTemplateRelationService iDistributionActivityTemplateRelationService;
     @Autowired
-    private IDistributionActivityTempGoodsService iDistributionActivityTempGoodsService;
+    private IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
     @Autowired
     private ISysOldOrgService iSysOldOrgService;
 
     @Override
-    public DistributionActivityTempVo queryById(Long id){
-        DistributionActivityTemp db = this.baseMapper.selectById(id);
-        DistributionActivityTempVo vo = BeanUtil.toBean(db, DistributionActivityTempVo.class);
+    public DistributionActivityTemplateVo queryById(Long id){
+        DistributionActivityTemplate db = this.baseMapper.selectById(id);
+        DistributionActivityTemplateVo vo = BeanUtil.toBean(db, DistributionActivityTemplateVo.class);
         //获取商品和机构信息
-        List<DistributionActivityTempRelation> relationList = iDistributionActivityTempRelationService
-                .list(new LambdaQueryWrapper<DistributionActivityTempRelation>()
-                .eq(DistributionActivityTempRelation::getDistributionTempId, vo.getId()));
+        List<DistributionActivityTemplateRelation> relationList = iDistributionActivityTemplateRelationService
+                .list(new LambdaQueryWrapper<DistributionActivityTemplateRelation>()
+                .eq(DistributionActivityTemplateRelation::getDistributionTempId, vo.getId()));
 //        if (CollectionUtils.isNotEmpty(relationList)){
 //            relationList.stream().map(item -> {
 //                DistributionActivityTenantVo tenantVo = new DistributionActivityTenantVo();
@@ -65,15 +65,15 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     }
 
     @Override
-    public List<DistributionActivityTempVo> queryList(DistributionActivityTempQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTemp> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionActivityTemp::getCode, bo.getCode());
-        lqw.eq(bo.getType() != null, DistributionActivityTemp::getType, bo.getType());
-        lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemp::getName, bo.getName());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTemp::getStatus, bo.getStatus());
-        lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemp::getPosterTempId, bo.getPosterTempId());
-        lqw.eq(bo.getStartTime() != null, DistributionActivityTemp::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, DistributionActivityTemp::getEndTime, bo.getEndTime());
+    public List<DistributionActivityTemplateVo> queryList(DistributionActivityTemplateQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionActivityTemplate::getCode, bo.getCode());
+        lqw.eq(bo.getType() != null, DistributionActivityTemplate::getType, bo.getType());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemplate::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplate::getStatus, bo.getStatus());
+        lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId());
+        lqw.eq(bo.getStartTime() != null, DistributionActivityTemplate::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, DistributionActivityTemplate::getEndTime, bo.getEndTime());
         return entity2Vo(this.list(lqw));
     }
 
@@ -83,13 +83,13 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempVo> entity2Vo(Collection<DistributionActivityTemp> collection) {
-        List<DistributionActivityTempVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempVo.class))
+    private List<DistributionActivityTemplateVo> entity2Vo(Collection<DistributionActivityTemplate> collection) {
+        List<DistributionActivityTemplateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTemp> page = (Page<DistributionActivityTemp>)collection;
-            Page<DistributionActivityTempVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplate> page = (Page<DistributionActivityTemplate>)collection;
+            Page<DistributionActivityTemplateVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -99,9 +99,9 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByAddBo(DistributionActivityTempAddBo bo) {
+    public Boolean insertByAddBo(DistributionActivityTemplateAddBo bo) {
         //活动模板基本信息
-        DistributionActivityTemp add = BeanUtil.toBean(bo, DistributionActivityTemp.class);
+        DistributionActivityTemplate add = BeanUtil.toBean(bo, DistributionActivityTemplate.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -111,60 +111,60 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     }
 
     //添加关联信息
-    private void saveRelation(DistributionActivityTempAddBo bo,Long tempId){
+    private void saveRelation(DistributionActivityTemplateAddBo bo, Long tempId){
         //机构信息
         if (ObjectUtils.isNotNull(bo.getIsAllOrg()) && bo.getIsAllOrg() == 1){
             //发布所有机构
-            DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
+            DistributionActivityTemplateRelation entity = new DistributionActivityTemplateRelation();
             entity.setDistributionTempId(tempId);
             entity.setTenantId(0L);
             entity.setCreateTime(DateUtils.getNowTime());
             entity.setUpdateTime(DateUtils.getNowTime());
-            iDistributionActivityTempRelationService.save(entity);
+            iDistributionActivityTemplateRelationService.save(entity);
         }
         if (CollectionUtils.isNotEmpty(bo.getTenantIds())){
-            List<DistributionActivityTempRelation> entitys = bo.getTenantIds().stream().map(id -> {
-                DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
+            List<DistributionActivityTemplateRelation> entitys = bo.getTenantIds().stream().map(id -> {
+                DistributionActivityTemplateRelation entity = new DistributionActivityTemplateRelation();
                 entity.setDistributionTempId(tempId);
                 entity.setTenantId(id);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
             }).collect(Collectors.toList());
-            iDistributionActivityTempRelationService.saveBatch(entitys);
+            iDistributionActivityTemplateRelationService.saveBatch(entitys);
         }
         //活动商品
         if (CollectionUtils.isNotEmpty(bo.getGoodsList())){
-            List<DistributionActivityTempGoods> collect = bo.getGoodsList().stream().map(item -> {
-                DistributionActivityTempGoods entity = BeanUtil.toBean(item, DistributionActivityTempGoods.class);
+            List<DistributionActivityTemplateGoods> collect = bo.getGoodsList().stream().map(item -> {
+                DistributionActivityTemplateGoods entity = BeanUtil.toBean(item, DistributionActivityTemplateGoods.class);
                 entity.setDistributionTempId(tempId);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
             }).collect(Collectors.toList());
-            iDistributionActivityTempGoodsService.saveBatch(collect);
+            iDistributionActivityTemplateGoodsService.saveBatch(collect);
         }
     }
 
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(DistributionActivityTempEditBo bo) {
+    public Boolean updateByEditBo(DistributionActivityTemplateEditBo bo) {
         //校验
-        DistributionActivityTemp activityTemp = getById(bo.getId());
+        DistributionActivityTemplate activityTemp = getById(bo.getId());
         if (activityTemp.getPublishStatus() == 1){
             throw new CustomException("活动已发布，不能修改！");
         }
-        DistributionActivityTemp update = BeanUtil.toBean(bo, DistributionActivityTemp.class);
+        DistributionActivityTemplate update = BeanUtil.toBean(bo, DistributionActivityTemplate.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         this.updateById(update);
         //删除活动商品和下发机构重新绑定
-        iDistributionActivityTempGoodsService.remove(new LambdaQueryWrapper<DistributionActivityTempGoods>()
-        .eq(DistributionActivityTempGoods::getDistributionTempId,bo.getId()));
-        iDistributionActivityTempRelationService.remove(new LambdaQueryWrapper<DistributionActivityTempRelation>()
-        .eq(DistributionActivityTempRelation::getDistributionTempId,bo.getId()));
-        DistributionActivityTempAddBo addBo = new DistributionActivityTempAddBo();
+        iDistributionActivityTemplateGoodsService.remove(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
+        .eq(DistributionActivityTemplateGoods::getDistributionTempId,bo.getId()));
+        iDistributionActivityTemplateRelationService.remove(new LambdaQueryWrapper<DistributionActivityTemplateRelation>()
+        .eq(DistributionActivityTemplateRelation::getDistributionTempId,bo.getId()));
+        DistributionActivityTemplateAddBo addBo = new DistributionActivityTemplateAddBo();
         addBo.setIsAllOrg(bo.getIsAllOrg());
         addBo.setGoodsList(bo.getGoodsList());
         addBo.setTenantIds(bo.getTenantIds());
@@ -177,7 +177,7 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTemp entity){
+    private void validEntityBeforeSave(DistributionActivityTemplate entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanAccountServiceImpl.java

@@ -1,95 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanAccountServiceImpl extends ServiceImpl<DistributionSalesmanAccountMapper, DistributionSalesmanAccount> implements IDistributionSalesmanAccountService {
-
-    @Override
-    public DistributionSalesmanAccountVo queryById(Long id){
-        DistributionSalesmanAccount db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanAccountVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanAccountVo> queryList(DistributionSalesmanAccountQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanAccount> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanAccount::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(bo.getType() != null, DistributionSalesmanAccount::getType, bo.getType());
-        lqw.eq(StrUtil.isNotBlank(bo.getOpenId()), DistributionSalesmanAccount::getOpenId, bo.getOpenId());
-        lqw.eq(StrUtil.isNotBlank(bo.getUnionId()), DistributionSalesmanAccount::getUnionId, bo.getUnionId());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanAccount::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanAccountVo> entity2Vo(Collection<DistributionSalesmanAccount> collection) {
-        List<DistributionSalesmanAccountVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanAccountVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanAccount> page = (Page<DistributionSalesmanAccount>)collection;
-            Page<DistributionSalesmanAccountVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanAccountAddBo bo) {
-        DistributionSalesmanAccount add = BeanUtil.toBean(bo, DistributionSalesmanAccount.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanAccountEditBo bo) {
-        DistributionSalesmanAccount update = BeanUtil.toBean(bo, DistributionSalesmanAccount.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanAccount entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanPosterServiceImpl.java

@@ -1,96 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanPosterServiceImpl extends ServiceImpl<DistributionSalesmanPosterMapper, DistributionSalesmanPoster> implements IDistributionSalesmanPosterService {
-
-    @Override
-    public DistributionSalesmanPosterVo queryById(Long id){
-        DistributionSalesmanPoster db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanPosterVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanPosterVo> queryList(DistributionSalesmanPosterQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanPoster> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getPosterId() != null, DistributionSalesmanPoster::getPosterId, bo.getPosterId());
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanPoster::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterHead()), DistributionSalesmanPoster::getPosterHead, bo.getPosterHead());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterSlogan()), DistributionSalesmanPoster::getPosterSlogan, bo.getPosterSlogan());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterConfig()), DistributionSalesmanPoster::getPosterConfig, bo.getPosterConfig());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanPoster::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanPosterVo> entity2Vo(Collection<DistributionSalesmanPoster> collection) {
-        List<DistributionSalesmanPosterVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanPosterVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanPoster> page = (Page<DistributionSalesmanPoster>)collection;
-            Page<DistributionSalesmanPosterVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanPosterAddBo bo) {
-        DistributionSalesmanPoster add = BeanUtil.toBean(bo, DistributionSalesmanPoster.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanPosterEditBo bo) {
-        DistributionSalesmanPoster update = BeanUtil.toBean(bo, DistributionSalesmanPoster.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanPoster entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanRelationServiceImpl.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanRelationServiceImpl extends ServiceImpl<DistributionSalesmanRelationMapper, DistributionSalesmanRelation> implements IDistributionSalesmanRelationService {
-
-    @Override
-    public DistributionSalesmanRelationVo queryById(Long id){
-        DistributionSalesmanRelation db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanRelationVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanRelationVo> queryList(DistributionSalesmanRelationQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanRelation> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionId() != null, DistributionSalesmanRelation::getDistributionId, bo.getDistributionId());
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanRelation::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanRelation::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanRelationVo> entity2Vo(Collection<DistributionSalesmanRelation> collection) {
-        List<DistributionSalesmanRelationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanRelationVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanRelation> page = (Page<DistributionSalesmanRelation>)collection;
-            Page<DistributionSalesmanRelationVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanRelationAddBo bo) {
-        DistributionSalesmanRelation add = BeanUtil.toBean(bo, DistributionSalesmanRelation.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanRelationEditBo bo) {
-        DistributionSalesmanRelation update = BeanUtil.toBean(bo, DistributionSalesmanRelation.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanRelation entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanServiceImpl.java

@@ -1,103 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanServiceImpl extends ServiceImpl<DistributionSalesmanMapper, DistributionSalesman> implements IDistributionSalesmanService {
-
-    @Override
-    public DistributionSalesmanVo queryById(Long salesmanId){
-        DistributionSalesman db = this.baseMapper.selectById(salesmanId);
-        return BeanUtil.toBean(db, DistributionSalesmanVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanVo> queryList(DistributionSalesmanQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesman> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getUserAccount()), DistributionSalesman::getUserAccount, bo.getUserAccount());
-        lqw.like(StrUtil.isNotBlank(bo.getNickname()), DistributionSalesman::getNickname, bo.getNickname());
-        lqw.like(StrUtil.isNotBlank(bo.getRealname()), DistributionSalesman::getRealname, bo.getRealname());
-        lqw.eq(bo.getSex() != null, DistributionSalesman::getSex, bo.getSex());
-        lqw.eq(StrUtil.isNotBlank(bo.getIdCard()), DistributionSalesman::getIdCard, bo.getIdCard());
-        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), DistributionSalesman::getTelphone, bo.getTelphone());
-        lqw.eq(bo.getUserLevel() != null, DistributionSalesman::getUserLevel, bo.getUserLevel());
-        lqw.eq(StrUtil.isNotBlank(bo.getUserBirth()), DistributionSalesman::getUserBirth, bo.getUserBirth());
-        lqw.eq(bo.getParentId() != null, DistributionSalesman::getParentId, bo.getParentId());
-        lqw.eq(bo.getBrokerageTotal() != null, DistributionSalesman::getBrokerageTotal, bo.getBrokerageTotal());
-        lqw.eq(bo.getBrokeragePractical() != null, DistributionSalesman::getBrokeragePractical, bo.getBrokeragePractical());
-        lqw.eq(bo.getBrokerageFreeze() != null, DistributionSalesman::getBrokerageFreeze, bo.getBrokerageFreeze());
-        lqw.eq(bo.getStatus() != null, DistributionSalesman::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanVo> entity2Vo(Collection<DistributionSalesman> collection) {
-        List<DistributionSalesmanVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesman> page = (Page<DistributionSalesman>)collection;
-            Page<DistributionSalesmanVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanAddBo bo) {
-        DistributionSalesman add = BeanUtil.toBean(bo, DistributionSalesman.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanEditBo bo) {
-        DistributionSalesman update = BeanUtil.toBean(bo, DistributionSalesman.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesman entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityPosterVo.java

@@ -29,30 +29,9 @@ public class DistributionActivityPosterVo {
 	/** 海报模板名称 */
 	@ApiModelProperty("海报模板名称")
 	private String name;
-	/** 海报标题 */
-	@ApiModelProperty("海报标题")
-	private String posterHead;
-	/** 海报广告语 */
-	@ApiModelProperty("海报广告语")
-	private String posterSlogan;
-	/** 海报商品图片 */
-	@ApiModelProperty("海报商品图片")
-	private String posterGoods;
-	/** 海报标题配置 */
-	@ApiModelProperty("海报标题配置")
-	private String posterHeadConfig;
-	/** 海报广告语配置 */
-	@ApiModelProperty("海报广告语配置")
-	private String posterSloganConfig;
-	/** 海报商品图片配置 */
-	@ApiModelProperty("海报商品图片配置")
-	private String posterGoodsConfig;
-	/** 海报个人信息码配置 */
-	@ApiModelProperty("海报个人信息码配置")
-	private String posterSalesmanConfig;
-	/** 海报分销码配置 */
-	@ApiModelProperty("海报分销码配置")
-	private String posterDistributionConfig;
+	/** 海报配置 */
+	@ApiModelProperty("海报配置")
+	private String posterConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
 	@ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempGoodsVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateGoodsVo.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempGoodsVo {
+public class DistributionActivityTemplateGoodsVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 主键 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempPosterVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplatePosterVo.java

@@ -15,7 +15,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempPosterVo {
+public class DistributionActivityTemplatePosterVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 活动海报模板ID */
@@ -26,30 +26,9 @@ public class DistributionActivityTempPosterVo {
 	@Excel(name = "海报模板地址")
 	@ApiModelProperty("海报模板地址")
 	private String posterUrl;
-	/** 海报标题 */
-	@ApiModelProperty("海报标题")
-	private String posterHead;
-	/** 海报广告语 */
-	@ApiModelProperty("海报广告语")
-	private String posterSlogan;
-	/** 海报商品图片 */
-	@ApiModelProperty("海报商品图片")
-	private String posterGoods;
-	/** 海报标题配置 */
-	@ApiModelProperty("海报标题配置")
-	private String posterHeadConfig;
-	/** 海报广告语配置 */
-	@ApiModelProperty("海报广告语配置")
-	private String posterSloganConfig;
-	/** 海报商品图片配置 */
-	@ApiModelProperty("海报商品图片配置")
-	private String posterGoodsConfig;
-	/** 海报个人信息码配置 */
-	@ApiModelProperty("海报个人信息码配置")
-	private String posterSalesmanConfig;
-	/** 海报分销码配置 */
-	@ApiModelProperty("海报分销码配置")
-	private String posterDistributionConfig;
+	/** 海报配置 */
+	@ApiModelProperty("海报配置")
+	private String posterConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
 	@ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempRelationVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateRelationVo.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempRelationVo {
+public class DistributionActivityTemplateRelationVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 主键 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateVo.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempVo {
+public class DistributionActivityTemplateVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 模板ID */
@@ -65,5 +65,5 @@ public class DistributionActivityTempVo {
 	private List<DistributionActivityTenantVo> tenantList;
 
 	@ApiModelProperty("活动商品集合")
-	private List<DistributionActivityTempGoodsVo> goodsList;
+	private List<DistributionActivityTemplateGoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataAddBo.java

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class TopSysDictDataAddBo {
+
+    /** 字典排序 */
+    @ApiModelProperty("字典排序")
+    private Long dictSort;
+    /** 字典标签 */
+    @ApiModelProperty("字典标签")
+    private String dictLabel;
+    /** 字典键值 */
+    @ApiModelProperty("字典键值")
+    private String dictValue;
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty("样式属性（其他样式扩展）")
+    private String cssClass;
+    /** 表格回显样式 */
+    @ApiModelProperty("表格回显样式")
+    private String listClass;
+    /** 是否默认（Y是 N否） */
+    @ApiModelProperty("是否默认（Y是 N否）")
+    private String isDefault;
+    /** 状态（1正常0停用） */
+    @ApiModelProperty("状态（1正常0停用）")
+    private String status;
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 字典类型ID */
+    @ApiModelProperty("字典类型ID")
+    private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataEditBo.java

@@ -0,0 +1,73 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class TopSysDictDataEditBo {
+
+    /** 字典编码 */
+    @ApiModelProperty("字典编码")
+    private Long dictCode;
+
+    /** 字典排序 */
+    @ApiModelProperty("字典排序")
+    private Long dictSort;
+
+    /** 字典标签 */
+    @ApiModelProperty("字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @ApiModelProperty("字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty("样式属性（其他样式扩展）")
+    private String cssClass;
+
+    /** 表格回显样式 */
+    @ApiModelProperty("表格回显样式")
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @ApiModelProperty("是否默认（Y是 N否）")
+    private String isDefault;
+
+    /** 状态（1正常0停用） */
+    @ApiModelProperty("状态（1正常0停用）")
+    private String status;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 字典类型ID */
+    @ApiModelProperty("字典类型ID")
+    private Long dictTypeId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataQueryBo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】分页查询对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class TopSysDictDataQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 字典排序 */
+	@ApiModelProperty("字典排序")
+	private Long dictSort;
+	/** 字典标签 */
+	@ApiModelProperty("字典标签")
+	private String dictLabel;
+	/** 字典键值 */
+	@ApiModelProperty("字典键值")
+	private String dictValue;
+	/** 字典类型 */
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 样式属性（其他样式扩展） */
+	@ApiModelProperty("样式属性（其他样式扩展）")
+	private String cssClass;
+	/** 表格回显样式 */
+	@ApiModelProperty("表格回显样式")
+	private String listClass;
+	/** 是否默认（Y是 N否） */
+	@ApiModelProperty("是否默认（Y是 N否）")
+	private String isDefault;
+	/** 状态（1正常0停用） */
+	@ApiModelProperty("状态（1正常0停用）")
+	private String status;
+	/** 字典类型ID */
+	@ApiModelProperty("字典类型ID")
+	private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeAddBo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class TopSysDictTypeAddBo {
+
+    /** 字典名称 */
+    @ApiModelProperty("字典名称")
+    private String dictName;
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+    /** 状态（1正常 0停用） */
+    @ApiModelProperty("状态（1正常 0停用）")
+    private String status;
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class TopSysDictTypeEditBo {
+
+    /** 字典主键 */
+    @ApiModelProperty("字典主键")
+    private Long dictId;
+
+    /** 字典名称 */
+    @ApiModelProperty("字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    /** 状态（1正常 0停用） */
+    @ApiModelProperty("状态（1正常 0停用）")
+    private String status;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】分页查询对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class TopSysDictTypeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 字典名称 */
+	@ApiModelProperty("字典名称")
+	private String dictName;
+	/** 字典类型 */
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 状态（1正常 0停用） */
+	@ApiModelProperty("状态（1正常 0停用）")
+	private String status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDept.java

@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
+import java.util.*;
 
 /**
  * 部门对象 top_sys_dept
@@ -57,4 +56,20 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    /** 父部门名称 */
+    @TableField(exist = false)
+    private String parentName;
+
+    /** 子部门 */
+    @TableField(exist = false)
+    private List<TopSysDept> children = new ArrayList<TopSysDept>();
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    @TableField(exist = false)
+    private List<String> statusArray;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDictData.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.top.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【请填写功能名称】对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_sys_dict_data")
+public class TopSysDictData implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 字典编码 */
+    @TableId(value = "dict_code")
+    private Long dictCode;
+    /** 字典排序 */
+    private Long dictSort;
+    /** 字典标签 */
+    private String dictLabel;
+    /** 字典键值 */
+    private String dictValue;
+    /** 字典类型 */
+    private String dictType;
+    /** 样式属性（其他样式扩展） */
+    private String cssClass;
+    /** 表格回显样式 */
+    private String listClass;
+    /** 是否默认（Y是 N否） */
+    private String isDefault;
+    /** 状态（1正常0停用） */
+    private String status;
+    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    /** 备注 */
+    private String remark;
+    /** 字典类型ID */
+    private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDictType.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.top.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【请填写功能名称】对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_sys_dict_type")
+public class TopSysDictType implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 字典主键 */
+    @TableId(value = "dict_id")
+    private Long dictId;
+    /** 字典名称 */
+    private String dictName;
+    /** 字典类型 */
+    private String dictType;
+    /** 状态（1正常 0停用） */
+    private String status;
+    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    /** 备注 */
+    private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysMenu.java

@@ -1,13 +1,15 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
+import java.util.*;
 
 /**
  * 【请填写功能名称】对象 top_sys_menu
@@ -64,4 +66,12 @@ private static final long serialVersionUID=1L;
     private Date updateTime;
     /** 备注 */
     private String remark;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /** 子菜单 */
+    @TableField(exist = false)
+    private List<TopSysMenu> children = new ArrayList<TopSysMenu>();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysPost.java

@@ -10,6 +10,9 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】对象 top_sys_post
@@ -50,4 +53,19 @@ private static final long serialVersionUID=1L;
     private Date updateTime;
     /** 备注 */
     private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
+     * 用户是否存在此岗位标识 默认不存在
+     */
+    @TableField(exist = false)
+    private boolean flag = false;
+
+    @TableField(exist = false)
+    private List<String> statusArray;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRole.java

@@ -1,10 +1,12 @@
 package com.zhongzheng.modules.top.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,12 +37,17 @@ private static final long serialVersionUID=1L;
     private String roleKey;
     /** 显示顺序 */
     private Long roleSort;
-    /** 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） */
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
     private String dataScope;
-    /** 菜单树选择项是否关联显示 */
-    private Integer menuCheckStrictly;
-    /** 部门树选择项是否关联显示 */
-    private Integer deptCheckStrictly;
+
+    @Value("true")
+    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    private boolean menuCheckStrictly;
+
+    @Value("true")
+    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    private boolean deptCheckStrictly;
     /** 角色状态（1正常 0停用） */
     private String status;
     /** 删除标志（0代表存在 2代表删除） */
@@ -75,6 +82,8 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private Long[] menuIds;
 
+
+
     /** 部门组（数据权限） */
     @TableField(exist = false)
     private Long[] deptIds;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRoleDept.java

@@ -1,13 +1,13 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 top_sys_role_dept
@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "role_id")
     private Long roleId;
     /** 部门ID */
-    @TableId(value = "dept_id")
+    @TableField(value = "dept_id")
     private Long deptId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRoleMenu.java

@@ -1,13 +1,13 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 top_sys_role_menu
@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "role_id")
     private Long roleId;
     /** 菜单ID */
-    @TableId(value = "menu_id")
+    @TableField(value = "menu_id")
     private Long menuId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysUserPost.java

@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "user_id")
     private Long userId;
     /** 岗位ID */
-    @TableId(value = "post_id")
+    @TableField(value = "post_id")
     private Long postId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysUserRole.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -26,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "user_id")
     private Long userId;
     /** 角色ID */
-    @TableId(value = "role_id")
+    @TableField(value = "role_id")
     private Long roleId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysConfigMapper.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.top.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -10,5 +12,6 @@ import com.zhongzheng.modules.top.domain.TopSysConfig;
  * @date 2023-03-10
  */
 public interface TopSysConfigMapper extends BaseMapper<TopSysConfig> {
-
+    @InterceptorIgnore(tenantLine = "true")
+    TopSysConfig getSysConfigByKeyTenant(@Param("key") String key);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDeptMapper.java

@@ -2,6 +2,9 @@ package com.zhongzheng.modules.top.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 部门Mapper接口
@@ -10,5 +13,12 @@ import com.zhongzheng.modules.top.domain.TopSysDept;
  * @date 2023-03-10
  */
 public interface TopSysDeptMapper extends BaseMapper<TopSysDept> {
-
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId            角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+     List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDictDataMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.domain.TopSysDictData;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface TopSysDictDataMapper extends BaseMapper<TopSysDictData> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDictTypeMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.domain.TopSysDictType;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface TopSysDictTypeMapper extends BaseMapper<TopSysDictType> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysMenuMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.top.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysMenu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -10,5 +14,56 @@ import com.zhongzheng.modules.top.domain.TopSysMenu;
  * @date 2023-03-10
  */
 public interface TopSysMenuMapper extends BaseMapper<TopSysMenu> {
+    /**
+     * 根据用户所有权限
+     *
+     * @return 权限列表
+     */
+     List<String> selectMenuPerms();
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuListByUserId(TopSysMenu menu);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+     List<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuTreeAll();
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId            角色ID
+     * @param menuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+     List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<TopSysMenu> listSysMenuByTenant(Long tenantId);
 
+    @InterceptorIgnore(tenantLine = "true")
+    Integer updateParentById(@Param("newMenus") TopSysMenu newMenus);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysPostMapper.java

@@ -4,6 +4,8 @@ package com.zhongzheng.modules.top.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysPost;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  *
@@ -11,5 +13,19 @@ import com.zhongzheng.modules.top.domain.TopSysPost;
  * @date 2023-03-10
  */
 public interface TopSysPostMapper extends BaseMapper<TopSysPost> {
+    /**
+     * 根据用户ID获取岗位选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    List<Integer> selectPostListByUserId(Long userId);
 
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userName 用户名
+     * @return 结果
+     */
+    List<TopSysPost> selectPostsByUserName(String userName);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysRoleMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-10
  */
- interface TopSysRoleMapper extends BaseMapper<TopSysRole> {
+ public interface TopSysRoleMapper extends BaseMapper<TopSysRole> {
 
     /**
      * 根据用户ID查询角色
@@ -20,7 +20,7 @@ import java.util.List;
      * @param userId 用户ID
      * @return 角色列表
      */
-     List<SysRole> selectRolePermissionByUserId(Long userId);
+     List<TopSysRole> selectRolePermissionByUserId(Long userId);
 
 
     /**
@@ -37,5 +37,5 @@ import java.util.List;
      * @param userName 用户名
      * @return 角色列表
      */
-     List<SysRole> selectRolesByUserName(String userName);
+     List<TopSysRole> selectRolesByUserName(String userName);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysUserMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-08-04
  */
-interface TopSysUserMapper extends BaseMapper<TopSysUser> {
+public interface TopSysUserMapper extends BaseMapper<TopSysUser> {
 
     /**
      * 通过用户名查询用户

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysConfigService.java

@@ -2,9 +2,10 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.system.domain.SysConfig;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
+
+import java.util.List;
 
 /**
  * 【请填写功能名称】Service接口
@@ -19,7 +20,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configId 参数配置ID
      * @return 参数配置信息
      */
-    public SysConfig selectConfigById(Long configId);
+     TopSysConfig selectConfigById(Long configId);
 
     /**
      * 根据键名查询参数配置信息
@@ -27,9 +28,9 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configKey 参数键名
      * @return 参数键值
      */
-    public String selectConfigByKey(String configKey);
+     String selectConfigByKey(String configKey);
 
-    public String selectConfigByKeyNoCache(String configKey);
+     String selectConfigByKeyNoCache(String configKey);
 
     /**
      * 查询参数配置列表
@@ -37,7 +38,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 参数配置集合
      */
-    public List<SysConfigVo> selectConfigList(SysConfigVo config);
+     List<TopSysConfigVo> selectConfigList(TopSysConfigVo config);
 
     /**
      * 新增参数配置
@@ -45,7 +46,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 结果
      */
-    public int insertConfig(SysConfigVo config);
+     int insertConfig(TopSysConfigVo config);
 
     /**
      * 修改参数配置
@@ -53,7 +54,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 结果
      */
-    public int updateConfig(SysConfigVo config);
+     int updateConfig(TopSysConfigVo config);
 
     /**
      * 批量删除参数信息
@@ -61,12 +62,12 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configIds 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+     int deleteConfigByIds(Long[] configIds);
 
     /**
      * 清空缓存数据
      */
-    public void clearCache();
+     void clearCache();
 
     /**
      * 校验参数键名是否唯一
@@ -74,7 +75,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数信息
      * @return 结果
      */
-    public String checkConfigKeyUnique(SysConfigVo config);
+     String checkConfigKeyUnique(TopSysConfigVo config);
 
-    SysConfig getSysConfigByKeyTenant(String key, Long tenantId);
+    TopSysConfig getSysConfigByKeyTenant(String key);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDeptService.java

@@ -2,9 +2,8 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysDept;
 import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 
 import java.util.List;
 
@@ -21,7 +20,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+     List<TopSysDept> selectDeptList(TopSysDept dept);
 
     /**
      * 构建前端所需要树结构
@@ -29,7 +28,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param depts 部门列表
      * @return 树结构列表
      */
-    public List<SysDept> buildDeptTree(List<SysDept> depts);
+     List<TopSysDept> buildDeptTree(List<TopSysDept> depts);
 
     /**
      * 构建前端所需要下拉树结构
@@ -37,7 +36,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
+     List<TreeSelectTop> buildDeptTreeSelect(List<TopSysDept> depts);
 
     /**
      * 根据角色ID查询部门树信息
@@ -45,7 +44,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param roleId 角色ID
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(Long roleId);
+     List<Integer> selectDeptListByRoleId(Long roleId);
 
     /**
      * 根据部门ID查询信息
@@ -53,7 +52,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+     TopSysDept selectDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -61,7 +60,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+     int selectNormalChildrenDeptById(Long deptId);
 
     /**
      * 是否存在部门子节点
@@ -69,7 +68,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+     boolean hasChildByDeptId(Long deptId);
 
     /**
      * 查询部门是否存在用户
@@ -77,7 +76,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+     boolean checkDeptExistUser(Long deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -85,7 +84,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public String checkDeptNameUnique(SysDept dept);
+     String checkDeptNameUnique(TopSysDept dept);
 
     /**
      * 新增保存部门信息
@@ -93,7 +92,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public int insertDept(SysDept dept);
+     int insertDept(TopSysDept dept);
 
     /**
      * 修改保存部门信息
@@ -101,7 +100,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public int updateDept(SysDept dept);
+     int updateDept(TopSysDept dept);
 
     /**
      * 删除部门管理信息
@@ -109,5 +108,5 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+     int deleteDeptById(Long deptId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDictDataService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.bo.TopSysDictDataAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictData;
+import com.zhongzheng.modules.top.vo.TopSysDictDataVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface ITopSysDictDataService extends IService<TopSysDictData> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopSysDictDataVo queryById(Long dictCode);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopSysDictDataVo> queryList(TopSysDictDataQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopSysDictDataAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopSysDictDataEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDictTypeService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictType;
+import com.zhongzheng.modules.top.vo.TopSysDictTypeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface ITopSysDictTypeService extends IService<TopSysDictType> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopSysDictTypeVo queryById(Long dictId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopSysDictTypeVo> queryList(TopSysDictTypeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopSysDictTypeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopSysDictTypeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysMenuService.java

@@ -2,10 +2,9 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.modules.system.domain.vo.RouterVo;
 import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 
 import java.util.List;
 import java.util.Set;
@@ -23,7 +22,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(Long userId);
+     List<TopSysMenu> selectMenuList(Long userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -32,7 +31,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+     List<TopSysMenu> selectMenuList(TopSysMenu menu, Long userId);
 
     /**
      * 根据用户ID查询权限
@@ -40,7 +39,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+     Set<String> selectMenuPermsByUserId(Long userId);
 
     /**
      * 根据用户ID查询菜单树信息
@@ -48,7 +47,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+     List<TopSysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -56,7 +55,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param roleId 角色ID
      * @return 选中菜单列表
      */
-    public List<Integer> selectMenuListByRoleId(Long roleId);
+     List<Integer> selectMenuListByRoleId(Long roleId);
 
     /**
      * 构建前端路由所需要的菜单
@@ -64,7 +63,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 路由列表
      */
-    public List<RouterVo> buildMenus(List<SysMenu> menus);
+     List<RouterVo> buildMenus(List<TopSysMenu> menus);
 
     /**
      * 构建前端所需要树结构
@@ -72,7 +71,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 树结构列表
      */
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus);
+     List<TopSysMenu> buildMenuTree(List<TopSysMenu> menus);
 
     /**
      * 构建前端所需要下拉树结构
@@ -80,7 +79,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
+     List<TreeSelectTop> buildMenuTreeSelect(List<TopSysMenu> menus);
 
     /**
      * 根据菜单ID查询信息
@@ -88,7 +87,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+     TopSysMenu selectMenuById(Long menuId);
 
     /**
      * 是否存在菜单子节点
@@ -96,7 +95,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId(Long menuId);
+     boolean hasChildByMenuId(Long menuId);
 
     /**
      * 查询菜单是否存在角色
@@ -104,7 +103,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole(Long menuId);
+     boolean checkMenuExistRole(Long menuId);
 
     /**
      * 新增保存菜单信息
@@ -112,7 +111,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public int insertMenu(SysMenu menu);
+     int insertMenu(TopSysMenu menu);
 
     /**
      * 修改保存菜单信息
@@ -120,7 +119,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public int updateMenu(SysMenu menu);
+     int updateMenu(TopSysMenu menu);
 
     /**
      * 删除菜单管理信息
@@ -128,7 +127,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+     int deleteMenuById(Long menuId);
 
     /**
      * 校验菜单名称是否唯一
@@ -136,9 +135,9 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public String checkMenuNameUnique(SysMenu menu);
+     String checkMenuNameUnique(TopSysMenu menu);
 
-    List<SysMenu> listSysMenuByTenant(Long tenantId);
+    List<TopSysMenu> listSysMenuByTenant(Long tenantId);
 
-    Integer updateParentById(SysMenu newMenus);
+    Integer updateParentById(TopSysMenu newMenus);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysPostService.java

@@ -1,7 +1,6 @@
 package com.zhongzheng.modules.top.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.top.domain.TopSysPost;
 
 import java.util.List;
@@ -19,14 +18,14 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 岗位列表
      */
-    public List<SysPost> selectPostList(SysPost post);
+     List<TopSysPost> selectPostList(TopSysPost post);
 
     /**
      * 查询所有岗位
      *
      * @return 岗位列表
      */
-    public List<SysPost> selectPostAll();
+     List<TopSysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
@@ -34,7 +33,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 角色对象信息
      */
-    public SysPost selectPostById(Long postId);
+     TopSysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -42,7 +41,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+     List<Integer> selectPostListByUserId(Long userId);
 
     /**
      * 校验岗位名称
@@ -50,7 +49,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public String checkPostNameUnique(SysPost post);
+     String checkPostNameUnique(TopSysPost post);
 
     /**
      * 校验岗位编码
@@ -58,7 +57,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public String checkPostCodeUnique(SysPost post);
+     String checkPostCodeUnique(TopSysPost post);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -66,7 +65,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 结果
      */
-    public int countUserPostById(Long postId);
+     int countUserPostById(Long postId);
 
     /**
      * 删除岗位信息
@@ -74,7 +73,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 结果
      */
-    public int deletePostById(Long postId);
+     int deletePostById(Long postId);
 
     /**
      * 批量删除岗位信息
@@ -83,7 +82,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @return 结果
      * @throws Exception 异常
      */
-    public int deletePostByIds(Long[] postIds);
+     int deletePostByIds(Long[] postIds);
 
     /**
      * 新增保存岗位信息
@@ -91,7 +90,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public int insertPost(SysPost post);
+     int insertPost(TopSysPost post);
 
     /**
      * 修改保存岗位信息
@@ -99,5 +98,5 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public int updatePost(SysPost post);
+     int updatePost(TopSysPost post);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysRoleService.java

@@ -12,7 +12,7 @@ import java.util.Set;
  * @author ruoyi
  * @date 2023-03-10
  */
- interface ITopSysRoleService extends IService<TopSysRole> {
+ public interface ITopSysRoleService extends IService<TopSysRole> {
     /**
      * 根据条件分页查询角色数据
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysConfigServiceImpl.java

@@ -13,12 +13,11 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.DataSourceType;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.system.service.ISysTenantService;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
 import com.zhongzheng.modules.top.mapper.TopSysConfigMapper;
 import com.zhongzheng.modules.top.service.ITopSysConfigService;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,8 +45,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      */
     @PostConstruct
     public void init() {
-      /*  List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
-        for (SysConfig config : configsList) {
+      /*  List<TopSysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
+        for (TopSysConfig config : configsList) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }*/
     }
@@ -60,7 +59,7 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      */
     @Override
     @DataSource(DataSourceType.MASTER)
-    public SysConfig selectConfigById(Long configId) {
+    public TopSysConfig selectConfigById(Long configId) {
         return baseMapper.selectById(configId);
     }
 
@@ -76,8 +75,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
         if (Validator.isNotEmpty(configValue)) {
             return configValue;
         }
-        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getConfigKey, configKey));
+        TopSysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>()
+                .eq(TopSysConfig::getConfigKey, configKey));
         if (Validator.isNotNull(retConfig)) {
             redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue(),120, TimeUnit.MINUTES);
             return retConfig.getConfigValue();
@@ -87,8 +86,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
 
     @Override
     public String selectConfigByKeyNoCache(String configKey) {
-        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getConfigKey, configKey));
+        TopSysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>()
+                .eq(TopSysConfig::getConfigKey, configKey));
         if (Validator.isNotNull(retConfig)) {
             return retConfig.getConfigValue();
         }
@@ -102,12 +101,12 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 参数配置集合
      */
     @Override
-    public List<SysConfigVo> selectConfigList(SysConfigVo config) {
-        LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
-        lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
-        lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
-        lqw.eq(StrUtil.isNotBlank(config.getConfigModule()), SysConfig::getConfigModule, config.getConfigModule());
-        lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
+    public List<TopSysConfigVo> selectConfigList(TopSysConfigVo config) {
+        LambdaQueryWrapper<TopSysConfig> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StrUtil.isNotBlank(config.getConfigName()), TopSysConfig::getConfigName, config.getConfigName());
+        lqw.eq(StrUtil.isNotBlank(config.getConfigType()), TopSysConfig::getConfigType, config.getConfigType());
+        lqw.eq(StrUtil.isNotBlank(config.getConfigModule()), TopSysConfig::getConfigModule, config.getConfigModule());
+        lqw.like(StrUtil.isNotBlank(config.getConfigKey()), TopSysConfig::getConfigKey, config.getConfigKey());
         Map<String, Object> params = config.getParams();
         lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
                 "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
@@ -115,11 +114,11 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
         lqw.apply(Validator.isNotEmpty(params.get("endTime")),
                 "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
                 params.get("endTime"));
-        List<SysConfig> sysConfigs = baseMapper.selectList(lqw);
+        List<TopSysConfig> sysConfigs = baseMapper.selectList(lqw);
         if (CollectionUtils.isEmpty(sysConfigs)){
             return new ArrayList<>();
         }
-        return sysConfigs.stream().map(x -> BeanUtil.toBean(x,SysConfigVo.class)).collect(Collectors.toList());
+        return sysConfigs.stream().map(x -> BeanUtil.toBean(x,TopSysConfigVo.class)).collect(Collectors.toList());
     }
 
     /**
@@ -129,9 +128,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public int insertConfig(SysConfigVo config) {
-        SysConfig sysConfig = BeanUtil.toBean(config, SysConfig.class);
-        sysConfig.setTenantId(Long.valueOf(config.getTenantId()));
+    public int insertConfig(TopSysConfigVo config) {
+        TopSysConfig sysConfig = BeanUtil.toBean(config, TopSysConfig.class);
         int row = baseMapper.insert(sysConfig);
         if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -146,9 +144,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public int updateConfig(SysConfigVo config) {
-        SysConfig sysConfig = BeanUtil.toBean(config, SysConfig.class);
-        sysConfig.setTenantId(Long.valueOf(config.getTenantId()));
+    public int updateConfig(TopSysConfigVo config) {
+        TopSysConfig sysConfig = BeanUtil.toBean(config, TopSysConfig.class);
         int row = baseMapper.updateById(sysConfig);
         if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -178,7 +175,7 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
     @Override
     public int deleteConfigByIds(Long[] configIds) {
         for (Long configId : configIds) {
-            SysConfig config = selectConfigById(configId);
+            TopSysConfig config = selectConfigById(configId);
             if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
@@ -207,9 +204,9 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public String checkConfigKeyUnique(SysConfigVo config) {
+    public String checkConfigKeyUnique(TopSysConfigVo config) {
         Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
+        TopSysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>().eq(TopSysConfig::getConfigKey, config.getConfigKey()));
         if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -217,8 +214,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
     }
 
     @Override
-    public SysConfig getSysConfigByKeyTenant(String key, Long tenantId) {
-        return baseMapper.getSysConfigByKeyTenant(key, tenantId);
+    public TopSysConfig getSysConfigByKeyTenant(String key) {
+        return baseMapper.getSysConfigByKeyTenant(key);
     }
 
     /**