v2.0

README.md

@@ -1,4 +1,4 @@
-### SmartAdmin 2.0 (即 vue3 的 js版本和ts版本 )已经更新了最新代码，请看smart_admin_v2目录，当前正在完善文档，欢迎持续关注 ！
+### SmartAdmin 2.0 (即 vue3 的 js版本和ts版本 )已经更新了最新代码，当前正在完善文档，欢迎持续关注 ！
 #### 简介
 SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团队研发的一套互联网企业级的通用型中后台解决方案！使用最前沿的前后台技术栈SpringBoot和Vue，前后端分离，<font color="#DC143C">**我们开源一套漂亮的代码和一套整洁的代码规范**</font>，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，热爱生活。SmartAdmin 让你从认识到忘不了，绝对是你最想要的！
 
@@ -6,7 +6,7 @@ SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团
 
 在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net)  
 部署文档：[http://smartadmin.1024lab.net](http://smartadmin.1024lab.net)  
-
+vue2版本：请查看 feature/1.x 分支
 
 #### 疑惑
 有人问：又是个“轮子”？ 轮子靠谱吗？为什么要选择你这个轮子？
@@ -25,32 +25,32 @@ SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团
 #### 演示图
 <table>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180453_252f5e9f_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/1-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180630_ee5b4f46_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/1-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180737_9363e283_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/2-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180802_aefb78f4_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/2-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180821_30fc7aaf_5469596.png")"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/3-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180844_01ebd7d2_5469596.png")"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/3-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180902_02c8d838_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/4-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180918_ff1f7ff5_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/4-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180938_86b39645_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/5-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/180956_69e25a9c_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/5-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/181013_791d92f0_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/6-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/181032_9f0dbbee_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/6-2.png"/></td>
 </tr>
 <tr>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/181049_099d0169_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/7-1.png"/></td>
-  <td><img src="https://images.gitee.com/uploads/images/2020/1208/181104_914c457a_5469596.png"/></td>
+  <td><img src="http://img.zhuoluodada.cn/smart-admin-v2/cut/7-2.png"/></td>
 </tr>
 </table>
 
@@ -136,4 +136,4 @@ SmartAdmin微信群（**加我微信拉你入群！**）
 
 ---
 作者简介:
-[卓大](https://zhuoluodada.cn)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。
+[卓大](https://zhuoda.vip)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java

@@ -4,16 +4,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.sa.admin.common.AdminBaseController;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.category.service.CategoryService;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
 import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
 import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
 import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
+import net.lab1024.sa.admin.module.business.category.service.CategoryService;
 import net.lab1024.sa.common.common.domain.ResponseDTO;
 import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -39,15 +38,13 @@ public class CategoryController extends AdminBaseController {
     @ApiOperation("添加类目 @author 胡克")
     @PostMapping("/category/add")
     public ResponseDTO<String> add(@RequestBody @Valid CategoryAddForm addForm) {
-//        return categoryService.add(addForm);
+        return categoryService.add(addForm);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("更新类目 @author 胡克")
     @PostMapping("/category/update")
     public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateForm updateForm) {
-//        return categoryService.update(updateForm);
+        return categoryService.update(updateForm);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("查询类目详情 @author 胡克")
@@ -65,7 +62,6 @@ public class CategoryController extends AdminBaseController {
     @ApiOperation("删除类目 @author 胡克")
     @GetMapping("/category/delete/{categoryId}")
     public ResponseDTO<String> delete(@PathVariable Long categoryId) {
-//        return categoryService.delete(categoryId);
+        return categoryService.delete(categoryId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 }

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java

@@ -48,31 +48,27 @@ public class GoodsController extends AdminBaseController {
     @PreAuthorize("@saAuth.checkPermission('goods:add')")
     public ResponseDTO<String> add(@RequestBody @Valid GoodsAddForm addForm) {
         return goodsService.add(addForm);
-//        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("更新商品 @author 胡克")
     @PostMapping("/goods/update")
     @PreAuthorize("@saAuth.checkPermission('goods:update')")
     public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateForm updateForm) {
-//        return goodsService.update(updateForm);
+        return goodsService.update(updateForm);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("删除 @author 卓大")
     @GetMapping("/goods/delete/{goodsId}")
     @PreAuthorize("@saAuth.checkPermission('goods:delete')")
     public ResponseDTO<String> delete(@PathVariable Long goodsId) {
-//        return goodsService.delete(goodsId);
+        return goodsService.delete(goodsId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("批量 @author 卓大")
     @PostMapping("/goods/batchDelete")
     @PreAuthorize("@saAuth.checkPermission('goods:batchDelete')")
     public ResponseDTO<String> batchDelete(@RequestBody @Valid ValidateList<Long> idList) {
-//        return goodsService.batchDelete(idList);
+        return goodsService.batchDelete(idList);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java

@@ -64,6 +64,7 @@ public class GoodsService {
             return res;
         }
         GoodsEntity goodsEntity = SmartBeanUtil.copy(addForm, GoodsEntity.class);
+        goodsEntity.setDeletedFlag(Boolean.FALSE);
         goodsDao.insert(goodsEntity);
         dataTracerService.insert(goodsEntity.getGoodsId(), DataTracerTypeEnum.GOODS);
         return ResponseDTO.ok();

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java

@@ -69,7 +69,6 @@ public class BankController {
     @ApiOperation(value = "删除银行信息 @author 善逸")
     @GetMapping("/oa/bank/delete/{bankId}")
     public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
-//        return bankService.deleteBank(bankId);
+        return bankService.deleteBank(bankId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 }

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java

@@ -56,27 +56,24 @@ public class EnterpriseController {
     @PostMapping("/oa/enterprise/create")
     @SaAuth
     public ResponseDTO<String> createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) {
-//        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
-//        createVO.setCreateUserId(requestUser.getUserId());
+        createVO.setCreateUserId(requestUser.getUserId());
-//        createVO.setCreateUserName(requestUser.getUserName());
+        createVO.setCreateUserName(requestUser.getUserName());
-//        return enterpriseService.createEnterprise(createVO);
+        return enterpriseService.createEnterprise(createVO);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation(value = "编辑企业 @author 开云")
     @PostMapping("/oa/enterprise/update")
     @SaAuth
     public ResponseDTO<String> updateEnterprise(@RequestBody @Valid EnterpriseUpdateForm updateVO) {
-//        return enterpriseService.updateEnterprise(updateVO);
+        return enterpriseService.updateEnterprise(updateVO);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation(value = "删除企业 @author 开云")
     @GetMapping("/oa/enterprise/delete/{enterpriseId}")
     @SaAuth
     public ResponseDTO<String> deleteEnterprise(@PathVariable Long enterpriseId) {
-//        return enterpriseService.deleteEnterprise(enterpriseId);
+        return enterpriseService.deleteEnterprise(enterpriseId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation(value = "企业列表查询 @author 开云")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java

@@ -54,22 +54,19 @@ public class NoticeController {
     @ApiOperation("通知公告类型-添加 @author 卓大")
     @GetMapping("/oa/noticeType/add/{name}")
     public ResponseDTO<String> add(@PathVariable String name) {
-//        return noticeTypeService.add(name);
+        return noticeTypeService.add(name);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("通知公告类型-修改 @author 卓大")
     @GetMapping("/oa/noticeType/update/{noticeTypeId}/{name}")
     public ResponseDTO<String> update(@PathVariable Long noticeTypeId, @PathVariable String name) {
-//        return noticeTypeService.update(noticeTypeId, name);
+        return noticeTypeService.update(noticeTypeId, name);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("通知公告类型-删除 @author 卓大")
     @GetMapping("/oa/noticeType/delete/{noticeTypeId}")
     public ResponseDTO<String> deleteNoticeType(@PathVariable Long noticeTypeId) {
-//        return noticeTypeService.delete(noticeTypeId);
+        return noticeTypeService.delete(noticeTypeId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     // --------------------- 【管理】通知公告-------------------------
@@ -87,8 +84,7 @@ public class NoticeController {
     @SaAuth
     public ResponseDTO<String> add(@RequestBody @Valid NoticeAddForm addForm) {
         addForm.setCreateUserId(SmartRequestUtil.getRequestUserId());
-//        return noticeService.add(addForm);
+        return noticeService.add(addForm);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("【管理】通知公告-更新 @author 卓大")
@@ -96,8 +92,7 @@ public class NoticeController {
     @RepeatSubmit
     @SaAuth
     public ResponseDTO<String> update(@RequestBody @Valid NoticeUpdateForm updateForm) {
-//        return noticeService.update(updateForm);
+        return noticeService.update(updateForm);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     @ApiOperation("【管理】通知公告-更新详情 @author 卓大")
@@ -111,8 +106,7 @@ public class NoticeController {
     @GetMapping("/oa/notice/delete/{noticeId}")
     @SaAuth
     public ResponseDTO<String> delete(@PathVariable Long noticeId) {
-//        return noticeService.delete(noticeId);
+        return noticeService.delete(noticeId);
-        return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
     }
 
     // --------------------- 【员工】查看 通知公告 -------------------------